Fri Nov 30 02:29:05 PST 2012

2 files changed, 28 insertions, 41 deletions

diff --git a/libre/iceape-libre/PKGBUILD b/libre/iceape-libre/PKGBUILD
index 2325b8cd7..2595a36f9 100644
--- a/libre/iceape-libre/PKGBUILD
+++ b/libre/iceape-libre/PKGBUILD
@@ -35,7 +35,7 @@ md5sums=('40473b4c662975eda865e1fc35c4953b'
          '7266333e31731af8bb50c2eca8d0bd26'
          '25b6fe16ac24cd5c852213e5c1adb272'
          'c395d443a8c4c16880c7322bcf174743'
-         'ed7a06c9e73a9f3e023d7bff9878504b')
+         'ebe66195898c89644138ffc88ba26a24')
 
 build() {
   export QUILT_PATCHES=debian/patches
diff --git a/libre/iceape-libre/libre.patch b/libre/iceape-libre/libre.patch
index 9947b1bbe..6273a05a9 100644
--- a/libre/iceape-libre/libre.patch
+++ b/libre/iceape-libre/libre.patch
@@ -1,28 +1,24 @@
 --- 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 (HTML)
++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 (HTML)
-+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
@@ -33,25 +29,20 @@
  
  # 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
@@ -118,9 +109,9 @@
    </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:
@@ -129,35 +120,31 @@
  
 -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 (HTML)
++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 (HTML)
-+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.