From 3f315b68d2ae2a4d5406a1b92528d1a1d6d13b76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Wed, 28 Nov 2012 13:22:18 -0200 Subject: iceweasel-libre-17.0.1-3: fixing libre.patch --- libre/iceweasel-libre/PKGBUILD | 4 +- libre/iceweasel-libre/libre.patch | 148 +++++++++++++++----------------------- 2 files changed, 61 insertions(+), 91 deletions(-) (limited to 'libre/iceweasel-libre') 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 @@

@@ -124,8 +120,8 @@ diff -urN iceweasel-13.0.orig/build/pgo/blueprint/elements.html iceweasel-13.0/b

<abbr> abbr - extended text when mouseover.
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;"/> @@ -135,8 +131,8 @@ diff -urN iceweasel-13.0.orig/dom/ipc/test.xul iceweasel-13.0/dom/ipc/test.xul

@bookmarks_toolbarfolder@

@bookmarks_toolbarfolder_description@ @@ -320,8 +290,8 @@ diff -urN iceweasel-14.0.1.orig/browser/locales/generic/profile/bookmarks.html.i

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 ***** */ -- cgit v1.2.3-2-g168b