iceweasel-libre-13.0.1-1: fixing parts on libre.patch

2 files changed, 60 insertions, 51 deletions

diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD
index 8fa19f7b8..5936421ea 100644
--- a/libre/iceweasel-libre/PKGBUILD
+++ b/libre/iceweasel-libre/PKGBUILD
@@ -57,7 +57,7 @@ md5sums=('e440446bb92dc1c0311346c68024590b'
          'eab149c1994ab14392e55af3abb08e80'
          'ac29b01c189f20abae2f3eef1618ffc0'
          'a485a2b5dc544a8a2bd40c985d2e5813'
-         '7d4878a28d82a36235ff92f64889d552'
+         'bbd1c6862a546177850ffcf967dfbaf1'
          'e529742c0a425648087bc3ce537fe4c5'
          '0d053487907de4376d67d8f499c5502b'
          '41ce105f0c1877fe22e0c0ec45e09565')
diff --git a/libre/iceweasel-libre/libre.patch b/libre/iceweasel-libre/libre.patch
index 0b0711389..992a67feb 100644
--- a/libre/iceweasel-libre/libre.patch
+++ b/libre/iceweasel-libre/libre.patch
@@ -65,8 +65,8 @@ diff -urN iceweasel-13.0.orig/browser/app/profile/firefox.js iceweasel-13.0/brow
  pref("plugins.hide_infobar_for_missing_plugin", false);
 diff -urN iceweasel-13.0.orig/browser/locales/en-US/chrome/browser-region/region.properties iceweasel-13.0/browser/locales/en-US/chrome/browser-region/region.properties
 --- mozilla-release.orig/browser/locales/en-US/chrome/browser-region/region.properties	2012-06-01 09:03:48.000000000 -0300
-+++ mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties	2012-06-13 17:38:58.964852582 -0300
-@@ -1,45 +1,12 @@
++++ mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties	2012-06-15 01:35:29.658859067 -0300
+@@ -1,23 +1,23 @@
  # Default search engine
 -browser.search.defaultenginename=Google
 +browser.search.defaultenginename=Duck Duck Go (Lite)
@@ -75,47 +75,54 @@ diff -urN iceweasel-13.0.orig/browser/locales/en-US/chrome/browser-region/region
 -browser.search.order.1=Google
 -browser.search.order.2=Yahoo
 -browser.search.order.3=Bing
--
--# This is the default set of web based feed handlers shown in the reader
--# selection UI
++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
 -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.search.order.1=Duck Duck Go (Lite)
-+browser.search.order.2=Seeks Search
++browser.contentHandlers.types.0.title=
++browser.contentHandlers.types.0.uri=
++browser.contentHandlers.types.1.title=
++browser.contentHandlers.types.1.uri=
  
  # 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}
--
--# 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 
--# profile database.  Note that "new" is defined as "has a different URL"; this
--# means that it's not possible to update the name of existing handler, so 
--# don't make any spelling errors here.
--gecko.handlerService.defaultHandlersVersion=3
--
--# 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
--
--# The default set of protocol handlers for mailto:
++browser.search.siteSearchURL=https://duckduckgo.com/lite/?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 
+@@ -31,15 +31,15 @@
+ gecko.handlerService.schemes.webcal.0.uriTemplate=http://30boxes.com/external/widget?refer=ff&url=%s
+ 
+ # 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
--
--# The default set of protocol handlers for irc:
++gecko.handlerService.schemes.mailto.0.name=
++gecko.handlerService.schemes.mailto.0.uriTemplate= 
++gecko.handlerService.schemes.mailto.1.name=
++gecko.handlerService.schemes.mailto.1.uriTemplate=
+ 
+ # 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
--
--# The default set of protocol handlers for ircs:
++gecko.handlerService.schemes.irc.0.name=Freenode
++gecko.handlerService.schemes.irc.0.uriTemplate=https://freenode.net/?url=%s
+ 
+ # The default set of protocol handlers for ircs:
 -gecko.handlerService.schemes.ircs.0.name=Mibbit
 -gecko.handlerService.schemes.ircs.0.uriTemplate=https://www.mibbit.com/?url=%s
-+browser.search.siteSearchURL=https://duckduckgo.com/lite/?q=site%3A{moz:domain}+{searchTerms} 
++gecko.handlerService.schemes.ircs.0.name=Freenode
++gecko.handlerService.schemes.ircs.0.uriTemplate=https://freenode.net/?url=%s 
 diff -urN iceweasel-13.0.orig/build/pgo/blueprint/elements.html iceweasel-13.0/build/pgo/blueprint/elements.html
 --- mozilla-build.orig/build/pgo/blueprint/elements.html	2012-06-01 09:03:49.000000000 -0300
 +++ mozilla-build/build/pgo/blueprint/elements.html	2012-06-05 20:37:22.059133787 -0300
@@ -124,7 +131,7 @@ diff -urN iceweasel-13.0.orig/build/pgo/blueprint/elements.html iceweasel-13.0/b
        <p>
          <a>&lt;a&gt; anchor</a><br>
 -        <a href="http://www.google.com">&lt;a&gt; a + href</a>
-+        <a href="http://duckduckgo.com/lite">&lt;a&gt; a + href</a>
++        <a href="https://duckduckgo.com/lite">&lt;a&gt; a + href</a>
        </p>
        <p>
          <abbr title="extended abbr text should show when mouse over">&lt;abbr&gt; abbr - extended text when mouseover.</abbr><br>
@@ -136,7 +143,7 @@ diff -urN iceweasel-13.0.orig/dom/ipc/test.xul iceweasel-13.0/dom/ipc/test.xul
    </toolbar>
  
 -  <browser type="content" src="http://www.google.com/" flex="1" id="page" remote="true"/>
-+  <browser type="content" src="http://duckduckgo.com/lite" flex="1" id="page" remote="true"/>
++  <browser type="content" src="https://duckduckgo.com/lite" flex="1" id="page" remote="true"/>
    <label id="messageLog" value="" crop="center"/>
  </window>
 diff -urN iceweasel-13.0.orig/layout/ipc/test-ipcbrowser.xul iceweasel-13.0/layout/ipc/test-ipcbrowser.xul
@@ -147,7 +154,7 @@ diff -urN iceweasel-13.0.orig/layout/ipc/test-ipcbrowser.xul iceweasel-13.0/layo
    </toolbar>
  
 -  <browser type="content" src="http://www.google.com/" flex="1" id="content"
-+  <browser type="content" src="http://duckduckgo.com/lite" flex="1" id="content"
++  <browser type="content" src="https://duckduckgo.com/lite" flex="1" id="content"
             remote="true"/>
  </window>
 diff -urN iceweasel-13.0.orig/mobile/xul/app/mobile.js iceweasel-13.0/mobile/xul/app/mobile.js
@@ -178,49 +185,51 @@ diff -urN iceweasel-13.0.orig/mobile/xul/app/mobile.js iceweasel-13.0/mobile/xul
  
  pref("keyword.enabled", true);
 -pref("keyword.URL", "http://www.google.com/m?ie=UTF-8&oe=UTF-8&sourceid=navclient&gfns=1&q=");
-+pref("keyword.URL", "http://duckduckgo.com/lite/?q=");
++pref("keyword.URL", "https://duckduckgo.com/lite/?q=");
  
  pref("accessibility.typeaheadfind", false);
  pref("accessibility.typeaheadfind.timeout", 5000);
 diff -urN iceweasel-13.0.orig/mobile/locales/en-US/chrome/region.properties iceweasel-13.0/mobile/locales/en-US/chrome/region.properties
 --- mozilla-release.orig/mobile/locales/en-US/chrome/region.properties	2012-06-01 09:04:14.000000000 -0300
-+++ mozilla-release/mobile/locales/en-US/chrome/region.properties	2012-06-13 17:55:37.900875270 -0300
-@@ -1,32 +1,8 @@
++++ mozilla-release/mobile/locales/en-US/chrome/region.properties	2012-06-15 01:39:40.332985721 -0300
+@@ -1,18 +1,18 @@
  # Default search engine
 -browser.search.defaultenginename=Google
 +browser.search.defaultenginename=Duck Duck Go (Lite)
  
  # Search engine order (order displayed in the search bar dropdown)s
 -browser.search.order.1=Google
--
--# This is the default set of web based feed handlers shown in the reader
--# selection UI
++browser.search.order.1=Duck Duck Go (Lite)
+ 
+ # This is the default set of web based feed handlers shown in the reader
+ # selection UI
 -browser.contentHandlers.types.0.title=My Yahoo
 -browser.contentHandlers.types.0.uri=http://add.my.yahoo.com/rss?url=%s
 -browser.contentHandlers.types.1.title=Google
 -browser.contentHandlers.types.1.uri=http://fusion.google.com/add?feedurl=%s
-+browser.search.order.1=Duck Duck Go (Lite)
++browser.contentHandlers.types.0.title=
++browser.contentHandlers.types.0.uri=
++browser.contentHandlers.types.1.title=
++browser.contentHandlers.types.1.uri=
  
  # Keyword URL (for location bar searches)
 -keyword.URL=http://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&gfns=1&q=
--
--# 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
--# profile database.  Note that "new" is defined as "has a different URL"; this
--# means that it's not possible to update the name of existing handler, so
--# don't make any spelling errors here.
--gecko.handlerService.defaultHandlersVersion=2
--
--# 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
--
--# The default set of protocol handlers for mailto:
++keyword.URL=https://duckduckgo.com/lite/?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
+@@ -26,7 +26,7 @@
+ gecko.handlerService.schemes.webcal.0.uriTemplate=http://30boxes.com/external/widget?refer=ff&url=%s
+ 
+ # 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
-+keyword.URL=http://duckduckgo.com/lite/?q=
++gecko.handlerService.schemes.mailto.0.name=
++gecko.handlerService.schemes.mailto.0.uriTemplate=
++gecko.handlerService.schemes.mailto.1.name=
++gecko.handlerService.schemes.mailto.1.uriTemplate=
 diff -urN iceweasel-13.0.orig/modules/libpref/src/init/all.js iceweasel-13.0/modules/libpref/src/init/all.js
 --- mozilla-build.orig/modules/libpref/src/init/all.js	2012-06-01 09:04:16.000000000 -0300
 +++ mozilla-build/modules/libpref/src/init/all.js	2012-06-05 20:55:41.569045759 -0300
@@ -229,7 +238,7 @@ diff -urN iceweasel-13.0.orig/modules/libpref/src/init/all.js iceweasel-13.0/mod
  //  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", "http://duckduckgo.com/lite/?q=");
++pref("keyword.URL", "https://duckduckgo.com/lite/?q=");
  pref("keyword.enabled", false);
  pref("general.useragent.locale", "chrome://global/locale/intl.properties");
  pref("general.useragent.compatMode.firefox", false);