iceweasel-libre-17.0.1-3: fixing libre.patch

2 files changed, 61 insertions, 91 deletions

diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD
index ab35bf55f..7ac6debab 100755
--- a/libre/iceweasel-libre/PKGBUILD
+++ b/libre/iceweasel-libre/PKGBUILD
@@ -22,7 +22,7 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
 _pkgname=iceweasel
 pkgname=iceweasel-libre
 pkgver=${_debver}.${_debrel}
-pkgrel=2
+pkgrel=3
 
 if [ -z "$pkgname" ]; then pkgname=$_pkgname; fi
 if $_pgo; then
@@ -57,7 +57,7 @@ md5sums=('3e555026478026987753b4859ec91d3b'
          'eab149c1994ab14392e55af3abb08e80'
          'ac29b01c189f20abae2f3eef1618ffc0'
          'a485a2b5dc544a8a2bd40c985d2e5813'
-         'a54ac42a670b72deb38f17b571740a6e'
+         'f617d556dc5c1ce0d47d2b69034b82a4'
          'abf5ecb74caa857abb42bcfbb3442d9c'
          '0d053487907de4376d67d8f499c5502b'
          '52e52f840a49eb1d14be1c0065b03a93'
diff --git a/libre/iceweasel-libre/libre.patch b/libre/iceweasel-libre/libre.patch
index 183bcd4c6..c29a3565c 100755
--- a/libre/iceweasel-libre/libre.patch
+++ b/libre/iceweasel-libre/libre.patch
@@ -45,10 +45,12 @@ diff -urN iceweasel-16.0.orig/browser/app/profile/firefox.js iceweasel-16.0/brow
  
  // by default we show an infobar message when pages require plugins the user has not installed, or are outdated
  pref("plugins.hide_infobar_for_missing_plugin", false);
-diff -urN iceweasel-14.0.1.orig/browser/locales/en-US/chrome/browser-region/region.properties iceweasel-14.0.1/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-15 02:17:00.978636665 -0300
-@@ -1,23 +1,23 @@
+diff -urN iceweasel-17.0.orig/browser/locales/en-US/chrome/browser-region/region.properties iceweasel-17.0/browser/locales/en-US/chrome/browser-region/region.properties
+--- iceweasel-17.0.orig/browser/locales/en-US/chrome/browser-region/region.properties	2012-11-20 00:45:50.000000000 -0200
++++ iceweasel-17.0/browser/locales/en-US/chrome/browser-region/region.properties	2012-11-28 12:54:19.326326121 -0200
+@@ -3,25 +3,21 @@
+ # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ 
  # Default search engine
 -browser.search.defaultenginename=Google
 +browser.search.defaultenginename=Duck Duck Go (HTML)
@@ -57,20 +59,19 @@ diff -urN iceweasel-14.0.1.orig/browser/locales/en-US/chrome/browser-region/regi
 -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=Duck Duck Go (HTML)
++browser.search.order.2=Seeks Search
++browser.search.order.3=YaCy
++
++# Keyword URL (for location bar searches)
++keyword.URL=https://duckduckgo.com/?q=
  
  # URL for site-specific search engines
  # TRANSLATION NOTE: {moz:domain} and {searchTerms} are placeholders for the site
@@ -81,25 +82,20 @@ diff -urN iceweasel-14.0.1.orig/browser/locales/en-US/chrome/browser-region/regi
  
  # 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 @@
+@@ -30,20 +26,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
@@ -112,8 +108,8 @@ diff -urN iceweasel-14.0.1.orig/browser/locales/en-US/chrome/browser-region/regi
 +gecko.handlerService.schemes.ircs.0.name=Freenode
 +gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net/
 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
+--- iceweasel-13.0.orig/build/pgo/blueprint/elements.html	2012-06-01 09:03:49.000000000 -0300
++++ iceweasel-13.0/build/pgo/blueprint/elements.html		2012-06-05 20:37:22.059133787 -0300
 @@ -143,7 +143,7 @@
        </p>
        <p>
@@ -124,8 +120,8 @@ diff -urN iceweasel-13.0.orig/build/pgo/blueprint/elements.html iceweasel-13.0/b
        <p>
          <abbr title="extended abbr text should show when mouse over">&lt;abbr&gt; abbr - extended text when mouseover.</abbr><br>
 diff -urN iceweasel-13.0.orig/dom/ipc/test.xul iceweasel-13.0/dom/ipc/test.xul
---- mozilla-build.orig/dom/ipc/test.xul	2012-06-01 09:03:55.000000000 -0300
-+++ mozilla-build/dom/ipc/test.xul	2012-06-05 20:40:59.453890004 -0300
+--- iceweasel-13.0.orig/dom/ipc/test.xul	2012-06-01 09:03:55.000000000 -0300
++++ iceweasel-13.0/dom/ipc/test.xul		2012-06-05 20:40:59.453890004 -0300
 @@ -294,6 +294,6 @@
                 oncommand="document.getElementById('page').QueryInterface(Components.interfaces.nsIFrameLoaderOwner).frameLoader.delayRemoteDialogs = this.checked;"/>
    </toolbar>
@@ -135,8 +131,8 @@ diff -urN iceweasel-13.0.orig/dom/ipc/test.xul iceweasel-13.0/dom/ipc/test.xul
    <label id="messageLog" value="" crop="center"/>
  </window>
 diff -Naur iceweasel-14.0.1.orig/mobile/android/app/mobile.js iceweasel-14.0.1.orig/mobile/android/app/mobile.js
---- mozilla-build.orig/mobile/android/app/mobile.js	2012-07-12 14:27:37.000000000 -0300
-+++ mozilla-build/mobile/android/app/mobile.js		2012-07-17 22:14:47.293560718 -0300
+--- iceweasel-14.0.1.orig/mobile/android/app/mobile.js	2012-07-12 14:27:37.000000000 -0300
++++ iceweasel-14.0.1/mobile/android/app/mobile.js	2012-07-17 22:14:47.293560718 -0300
 @@ -226,13 +226,13 @@
  /* preferences for the Get Add-ons pane */
  pref("extensions.getAddons.cache.enabled", true);
@@ -168,8 +164,8 @@ diff -Naur iceweasel-14.0.1.orig/mobile/android/app/mobile.js iceweasel-14.0.1.o
  pref("accessibility.typeaheadfind", false);
  pref("accessibility.typeaheadfind.timeout", 5000);
 diff -urN iceweasel-13.0.orig/layout/ipc/test-ipcbrowser.xul iceweasel-13.0/layout/ipc/test-ipcbrowser.xul
---- mozilla-build.orig/layout/ipc/test-ipcbrowser.xul	2012-06-01 09:04:06.000000000 -0300
-+++ mozilla-build/layout/ipc/test-ipcbrowser.xul	2012-06-05 20:44:00.714006926 -0300
+--- iceweasel-13.0.orig/layout/ipc/test-ipcbrowser.xul	2012-06-01 09:04:06.000000000 -0300
++++ iceweasel-13.0/layout/ipc/test-ipcbrowser.xul	2012-06-05 20:44:00.714006926 -0300
 @@ -69,6 +69,6 @@
         label="setViewportScale"/>
    </toolbar>
@@ -179,8 +175,8 @@ diff -urN iceweasel-13.0.orig/layout/ipc/test-ipcbrowser.xul iceweasel-13.0/layo
             remote="true"/>
  </window>
 diff -urN iceweasel-14.0.1.orig/mobile/xul/app/mobile.js iceweasel-14.0.1/mobile/xul/app/mobile.js
---- mozilla-build.orig/mobile/xul/app/mobile.js	2012-06-01 09:04:14.000000000 -0300
-+++ mozilla-build/mobile/xul/app/mobile.js	2012-06-05 20:48:20.193241600 -0300
+--- iceweasel-14.0.1.orig/mobile/xul/app/mobile.js	2012-06-01 09:04:14.000000000 -0300
++++ iceweasel-14.0.1/mobile/xul/app/mobile.js		2012-06-05 20:48:20.193241600 -0300
 @@ -221,13 +221,12 @@
  /* preferences for the Get Add-ons pane */
  pref("extensions.getAddons.cache.enabled", true);
@@ -210,56 +206,50 @@ diff -urN iceweasel-14.0.1.orig/mobile/xul/app/mobile.js iceweasel-14.0.1/mobile
  
  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-15 02:17:43.446130868 -0300
-@@ -1,18 +1,18 @@
+diff -urN iceweasel-17.0.orig/mobile/locales/en-US/chrome/region.properties iceweasel-17.0/mobile/locales/en-US/chrome/region.properties
+--- iceweasel-17.0.orig/mobile/locales/en-US/chrome/region.properties	2012-11-20 00:46:15.000000000 -0200
++++ iceweasel-17.0/mobile/locales/en-US/chrome/region.properties	2012-11-28 12:42:29.600175386 -0200
+@@ -3,34 +3,10 @@
+ # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ 
  # Default search engine
 -browser.search.defaultenginename=Google
 +browser.search.defaultenginename=Duck Duck Go (HTML)
  
  # Search engine order (order displayed in the search bar dropdown)s
 -browser.search.order.1=Google
-+browser.search.order.1=Duck Duck Go (HTML)
- 
- # 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=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.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=Duck Duck Go (HTML)
  
  # Keyword URL (for location bar searches)
 -keyword.URL=https://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&gfns=1&q=
-+keyword.URL=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
-@@ -22,11 +22,11 @@
- gecko.handlerService.defaultHandlersVersion=2
- 
- # The default set of protocol handlers for webcal:
+-
+-# 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
-+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
++keyword.URL=https://duckduckgo.com/?q=
 diff -urN iceweasel-14.0.orig/modules/libpref/src/init/all.js iceweasel-14.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
+--- iceweasel-14.0.orig/modules/libpref/src/init/all.js	2012-06-01 09:04:16.000000000 -0300
++++ iceweasel-14.0/modules/libpref/src/init/all.js	2012-06-05 20:55:41.569045759 -0300
 @@ -47,7 +47,7 @@
  // SYNTAX HINTS:  dashes are delimiters.  Use underscores instead.
  //  The first character after a period must be alphabetic.
@@ -269,29 +259,9 @@ diff -urN iceweasel-14.0.orig/modules/libpref/src/init/all.js iceweasel-14.0/mod
  pref("keyword.enabled", false);
  pref("general.useragent.locale", "chrome://global/locale/intl.properties");
  pref("general.useragent.compatMode.firefox", false);
-diff -urN iceweasel-13.0.orig/toolkit/locales/en-US/chrome/global-region/region.properties iceweasel-13.0/toolkit/locales/en-US/chrome/global-region/region.properties
---- mozilla-build.orig/toolkit/locales/en-US/chrome/global-region/region.properties	2012-06-01 09:04:20.000000000 -0300
-+++ mozilla-build/toolkit/locales/en-US/chrome/global-region/region.properties	2012-06-05 20:58:59.068158482 -0300
-@@ -4,10 +4,10 @@
- pluginStartupMessage=Starting Plugin for type
- 
- # plug-ins URLs
--more_plugins_label=mozilla.org
--more_plugins_url=https://pfs.mozilla.org/plugins/
--pluginupdates_label=mozilla.com/plugincheck
--pluginupdates_url=http://www.mozilla.com/plugincheck/
--plugindoc_label=plugindoc.mozdev.org
--plugindoc_url=http://plugindoc.mozdev.org/
-+more_plugins_label=
-+more_plugins_url=about:blank
-+pluginupdates_label=
-+pluginupdates_url=about:blank
-+plugindoc_label=
-+plugindoc_url=about:blank
- 
 diff -urN iceweasel-14.0.1.orig/browser/locales/generic/profile/bookmarks.html.in iceweasel-14.0.1/browser/locales/generic/profile/bookmarks.html.in
---- mozilla-release.orig/browser/locales/generic/profile/bookmarks.html.in	2012-06-01 09:03:48.000000000 -0300
-+++ mozilla-release/browser/locales/generic/profile/bookmarks.html.in	2012-06-15 22:54:08.446274144 -0300
+--- iceweasel-14.0.1.orig/browser/locales/generic/profile/bookmarks.html.in	2012-06-01 09:03:48.000000000 -0300
++++ iceweasel-14.0.1/browser/locales/generic/profile/bookmarks.html.in		2012-06-15 22:54:08.446274144 -0300
 @@ -11,13 +11,20 @@
      <DT><H3 PERSONAL_TOOLBAR_FOLDER="true" ID="rdf:#$FvPhC3">@bookmarks_toolbarfolder@</H3>
  <DD>@bookmarks_toolbarfolder_description@
@@ -320,8 +290,8 @@ diff -urN iceweasel-14.0.1.orig/browser/locales/generic/profile/bookmarks.html.i
      </DL><p>
  </DL><p>
 diff -urN iceweasel-13.0.orig/browser/base/content/abouthome/aboutHome.js iceweasel-13.0/browser/base/content/abouthome/aboutHome.js
---- mozilla-release.orig/browser/base/content/abouthome/aboutHome.js	2012-06-01 09:03:47.000000000 -0300
-+++ mozilla-release/browser/base/content/abouthome/aboutHome.js	2012-06-13 18:07:51.217531774 -0300
+--- iceweasel-13.0.orig/browser/base/content/abouthome/aboutHome.js	2012-06-01 09:03:47.000000000 -0300
++++ iceweasel-13.0/browser/base/content/abouthome/aboutHome.js		2012-06-13 18:07:51.217531774 -0300
 @@ -38,104 +38,6 @@
   *
   * ***** END LICENSE BLOCK ***** */