diff options
author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-12-31 17:29:39 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-12-31 17:29:39 -0300 |
commit | 6f102d1647580e0bb9513c124b26a64c77da4f15 (patch) | |
tree | 0340f1f588be251183fe2b251bdba778f2c85c22 /libre/iceape-libre | |
parent | 433900b14f11dc9ee55b72e8e5946bf47f65b636 (diff) | |
parent | b6cb10de275cea63bab0bee2a98342afa4fdc4ee (diff) | |
download | abslibre-6f102d1647580e0bb9513c124b26a64c77da4f15.tar.gz abslibre-6f102d1647580e0bb9513c124b26a64c77da4f15.tar.bz2 abslibre-6f102d1647580e0bb9513c124b26a64c77da4f15.zip |
Merge branch 'master' of ssh://gparabola/srv/git/abslibre
Diffstat (limited to 'libre/iceape-libre')
-rw-r--r--[-rwxr-xr-x] | libre/iceape-libre/PKGBUILD | 10 | ||||
-rw-r--r--[-rwxr-xr-x] | libre/iceape-libre/clrf.patch | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | libre/iceape-libre/gcc47.patch | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | libre/iceape-libre/iceape-2.0-lang.patch | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | libre/iceape-libre/iceape.desktop | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | libre/iceape-libre/iceape.install | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | libre/iceape-libre/libre.patch | 75 | ||||
-rw-r--r--[-rwxr-xr-x] | libre/iceape-libre/mozconfig | 0 |
8 files changed, 36 insertions, 49 deletions
diff --git a/libre/iceape-libre/PKGBUILD b/libre/iceape-libre/PKGBUILD index eedd8f584..2595a36f9 100755..100644 --- a/libre/iceape-libre/PKGBUILD +++ b/libre/iceape-libre/PKGBUILD @@ -3,7 +3,7 @@ # We're getting this from Debian Sid _debname=iceape -_debver=2.7.10 +_debver=2.7.11 _debrel=1 _debrepo=http://ftp.debian.org/debian/pool/main/ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } @@ -11,7 +11,7 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } _pkgname=${_debname} pkgname=${_debname}-libre pkgver=${_debver}.${_debrel} -pkgrel=1 +pkgrel=2 pkgdesc="A libre version of Debian Iceape, the Internet Suite based on Mozilla Seamonkey." arch=('i586' 'i686' 'x86_64' 'mips64el') license=('GPL2' 'MPL' 'LGPL') @@ -29,13 +29,13 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2" ${_pkgname}-2.0-lang.patch clrf.patch libre.patch) -md5sums=('63596601fd01000c842d9543ea8dfd56' - 'f8de6b9e1906c8349e8799f819503897' +md5sums=('40473b4c662975eda865e1fc35c4953b' + 'f704b69cc0328c83edd6223420fbd412' '60ba9e8f2fafd20e41268af534a55ea7' '7266333e31731af8bb50c2eca8d0bd26' '25b6fe16ac24cd5c852213e5c1adb272' 'c395d443a8c4c16880c7322bcf174743' - '433b5cd7f02f0ed8861237e877f51ebf') + 'ebe66195898c89644138ffc88ba26a24') build() { export QUILT_PATCHES=debian/patches diff --git a/libre/iceape-libre/clrf.patch b/libre/iceape-libre/clrf.patch index 375708ac4..375708ac4 100755..100644 --- a/libre/iceape-libre/clrf.patch +++ b/libre/iceape-libre/clrf.patch diff --git a/libre/iceape-libre/gcc47.patch b/libre/iceape-libre/gcc47.patch index 115d65131..115d65131 100755..100644 --- a/libre/iceape-libre/gcc47.patch +++ b/libre/iceape-libre/gcc47.patch diff --git a/libre/iceape-libre/iceape-2.0-lang.patch b/libre/iceape-libre/iceape-2.0-lang.patch index b9f4a5cde..b9f4a5cde 100755..100644 --- a/libre/iceape-libre/iceape-2.0-lang.patch +++ b/libre/iceape-libre/iceape-2.0-lang.patch diff --git a/libre/iceape-libre/iceape.desktop b/libre/iceape-libre/iceape.desktop index 0868e5058..0868e5058 100755..100644 --- a/libre/iceape-libre/iceape.desktop +++ b/libre/iceape-libre/iceape.desktop diff --git a/libre/iceape-libre/iceape.install b/libre/iceape-libre/iceape.install index 709ad81f2..709ad81f2 100755..100644 --- a/libre/iceape-libre/iceape.install +++ b/libre/iceape-libre/iceape.install diff --git a/libre/iceape-libre/libre.patch b/libre/iceape-libre/libre.patch index d25f8dbf5..6273a05a9 100755..100644 --- a/libre/iceape-libre/libre.patch +++ b/libre/iceape-libre/libre.patch @@ -1,57 +1,48 @@ --- comm-release.orig/mozilla/browser/locales/en-US/chrome/browser-region/region.properties 2012-02-16 12:08:39.000000000 -0200 -+++ comm-release/mozilla/browser/locales/en-US/chrome/browser-region/region.properties 2012-06-15 23:23:02.484406177 -0300 -@@ -1,23 +1,23 @@ ++++ comm-release/mozilla/browser/locales/en-US/chrome/browser-region/region.properties 2012-11-29 22:19:37.998383034 -0200 +@@ -1,23 +1,16 @@ # Default search engine -browser.search.defaultenginename=Google -+browser.search.defaultenginename=Duck Duck Go (Lite) ++browser.search.defaultenginename=DuckDuckGo HTML # Search engine order (order displayed in the search bar dropdown)s -browser.search.order.1=Google -browser.search.order.2=Yahoo -browser.search.order.3=Bing -+browser.search.order.1=Duck Duck Go (Lite) -+browser.search.order.2=Seeks Search -+browser.search.order.3=YaCy - - # This is the default set of web based feed handlers shown in the reader - # selection UI +- +-# This is the default set of web based feed handlers shown in the reader +-# selection UI -browser.contentHandlers.types.0.title=Google -browser.contentHandlers.types.0.uri=http://fusion.google.com/add?feedurl=%s -browser.contentHandlers.types.1.title=My Yahoo! -browser.contentHandlers.types.1.uri=http://add.my.yahoo.com/rss?url=%s -+browser.contentHandlers.types.0.title= -+browser.contentHandlers.types.0.uri=about:blank -+browser.contentHandlers.types.1.title= -+browser.contentHandlers.types.1.uri=about:blank ++browser.search.order.1=DuckDuckGo HTML ++browser.search.order.2=DuckDuckGo Lite ++browser.search.order.3=Seeks Search # URL for site-specific search engines # TRANSLATION NOTE: {moz:domain} and {searchTerms} are placeholders for the site # to be searched and the user's search query. Place them in the appropriate location # for your locale's URL but do not translate them. -browser.search.siteSearchURL=http://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&q=site%3A{moz:domain}+{searchTerms} -+browser.search.siteSearchURL=https://duckduckgo.com/lite/?q=site%3A{moz:domain}+{searchTerms} ++browser.search.siteSearchURL=https://duckduckgo.com/html/?q=site%3A{moz:domain}+{searchTerms} # increment this number when anything gets changed in the list below. This will # cause Firefox to re-read these prefs and inject any new handlers into the -@@ -27,19 +27,19 @@ +@@ -26,20 +19,10 @@ + # don't make any spelling errors here. gecko.handlerService.defaultHandlersVersion=3 - # The default set of protocol handlers for webcal: +-# The default set of protocol handlers for webcal: -gecko.handlerService.schemes.webcal.0.name=30 Boxes -gecko.handlerService.schemes.webcal.0.uriTemplate=http://30boxes.com/external/widget?refer=ff&url=%s -+gecko.handlerService.schemes.webcal.0.name= -+gecko.handlerService.schemes.webcal.0.uriTemplate=about:blank - - # The default set of protocol handlers for mailto: +- +-# The default set of protocol handlers for mailto: -gecko.handlerService.schemes.mailto.0.name=Yahoo! Mail -gecko.handlerService.schemes.mailto.0.uriTemplate=http://compose.mail.yahoo.com/?To=%s -gecko.handlerService.schemes.mailto.1.name=Gmail -gecko.handlerService.schemes.mailto.1.uriTemplate=https://mail.google.com/mail/?extsrc=mailto&url=%s -+gecko.handlerService.schemes.mailto.0.name= -+gecko.handlerService.schemes.mailto.0.uriTemplate=about:blank -+gecko.handlerService.schemes.mailto.1.name= -+gecko.handlerService.schemes.mailto.1.uriTemplate=about:blank - +- # The default set of protocol handlers for irc: -gecko.handlerService.schemes.irc.0.name=Mibbit -gecko.handlerService.schemes.irc.0.uriTemplate=https://www.mibbit.com/?url=%s @@ -70,7 +61,7 @@ // The first character after a period must be alphabetic. -pref("keyword.URL", "http://www.google.com/search?ie=UTF-8&oe=utf-8&q="); -+pref("keyword.URL", "https://duckduckgo.com/lite/?q="); ++pref("keyword.URL", "https://duckduckgo.com/html/?q="); pref("keyword.enabled", false); pref("general.useragent.locale", "chrome://global/locale/intl.properties"); pref("general.useragent.compatMode.firefox", false); @@ -118,46 +109,42 @@ </wizardpage> </wizard> ---- comm-release.orig/suite/locales/en-US/chrome/browser/region.properties 2012-06-16 00:28:27.000000000 -0300 -+++ comm-release/suite/locales/en-US/chrome/browser/region.properties 2012-06-16 00:52:31.135268099 -0300 -@@ -4,10 +4,10 @@ +--- comm-release.orig/suite/locales/en-US/chrome/browser/region.properties 2012-11-29 21:25:41.879931999 -0200 ++++ comm-release/suite/locales/en-US/chrome/browser/region.properties 2012-11-29 22:25:15.125790092 -0200 +@@ -4,18 +4,11 @@ # browser.startup.homepage=about: browser.throbber.url=about: -browser.search.defaulturl=http://www.google.com/search?q= -+browser.search.defaulturl=https://duckduckgo.com/lite/?q= ++browser.search.defaulturl=https://duckduckgo.com/html/?q= -browser.translation.service=http://translate.google.com/translate?prev=/language_tools&u= -browser.translation.serviceDomain=translate.google.com -+browser.translation.service=about:blank ++browser.translation.service=about: +browser.translation.serviceDomain= #config.js # -@@ -15,7 +15,7 @@ - - # This is the default set of web based feed handlers shown in the reader - # selection UI + startup.homepage_override_url=about: +- +-# This is the default set of web based feed handlers shown in the reader +-# selection UI -browser.contentHandlers.types.0.title=Google -browser.contentHandlers.types.0.uri=http://fusion.google.com/add?feedurl=%s -browser.contentHandlers.types.1.title=My Yahoo! -browser.contentHandlers.types.1.uri=http://add.my.yahoo.com/rss?url=%s -+browser.contentHandlers.types.0.title= -+browser.contentHandlers.types.0.uri=about:blank -+browser.contentHandlers.types.1.title= -+browser.contentHandlers.types.1.uri=about:blank --- comm-release.orig/suite/locales/en-US/chrome/common/region.properties 2012-02-16 11:59:54.000000000 -0200 -+++ comm-release/suite/locales/en-US/chrome/common/region.properties 2012-06-15 23:46:27.744272972 -0300 ++++ comm-release/suite/locales/en-US/chrome/common/region.properties 2012-11-29 22:26:25.271781371 -0200 @@ -1,10 +1,10 @@ # Default search engine -browser.search.defaultenginename=Google -+browser.search.defaultenginename=Duck Duck Go (Lite) ++browser.search.defaultenginename=DuckDuckGo HTML # Search engine order (order displayed in the search bar dropdown) -browser.search.order.1=Google -browser.search.order.2=Yahoo -+browser.search.order.1=Duck Duck Go (Lite) -+browser.search.order.2=Seeks Search ++browser.search.order.1=DuckDuckGo HTML ++browser.search.order.2=DuckDuckGo Lite # More information about this update link available in the update wizard. # Only change this if you are providing localized release notes. @@ -187,7 +174,7 @@ - <DT><A HREF="http://www.google.com/">Google</A> - <DT><A HREF="http://groups.google.com/">Google Groups</A> - <DT><A HREF="http://news.google.com/">Google News</A> -+ <DT><A HREF="https://duckduckgo.com/lite/">Duck Duck Go (Lite)</A> ++ <DT><A HREF="https://duckduckgo.com/html/">Duck Duck Go (HTML)</A> </DL><p> #unfilter emptyLines diff --git a/libre/iceape-libre/mozconfig b/libre/iceape-libre/mozconfig index 5227d77a5..5227d77a5 100755..100644 --- a/libre/iceape-libre/mozconfig +++ b/libre/iceape-libre/mozconfig |