From 3144d9e25d8bb05e2c1ff69daa51a457d792f068 Mon Sep 17 00:00:00 2001 From: Márcio Alexandre Silva Delgado Date: Sat, 16 Jun 2012 03:19:57 -0300 Subject: updating iceweasel-libre package --- ...Make-the-Reset-Firefox-feature-more-gener.patch | 19 -------- libre/iceweasel-libre/PKGBUILD | 54 +++++++--------------- libre/iceweasel-libre/libre.patch | 44 ++++++++++-------- 3 files changed, 40 insertions(+), 77 deletions(-) diff --git a/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch b/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch index 4da03a569..3e7149308 100644 --- a/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch +++ b/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch @@ -1,22 +1,3 @@ -From: Mike Hommey -Date: Tue, 5 Jun 2012 08:57:06 +0200 -Subject: Bug 756390 - Make the "Reset Firefox" feature more generic - ---- - browser/components/migration/content/migration.js | 15 ++++++++++----- - browser/components/migration/content/migration.xul | 2 +- - .../migration/src/BrowserProfileMigrators.manifest | 2 +- - .../components/migration/src/FirefoxProfileMigrator.js | 2 +- - browser/components/migration/src/ProfileMigrator.js | 4 ++++ - .../en-US/chrome/browser/migration/migration.dtd | 2 -- - .../en-US/chrome/browser/migration/migration.properties | 11 +++++------ - toolkit/content/aboutSupport.js | 8 ++++---- - toolkit/content/jar.mn | 2 +- - toolkit/content/resetProfile.js | 6 ++---- - toolkit/profile/nsIProfileMigrator.idl | 10 +++++++++- - toolkit/xre/nsAppRunner.cpp | 2 +- - 83 files changed, 394 insertions(+), 382 deletions(-) - diff --git a/browser/components/migration/content/migration.js b/browser/components/migration/content/migration.js index ffb0c34..442a5ff 100644 --- a/browser/components/migration/content/migration.js diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD index b4e914356..7962c8148 100644 --- a/libre/iceweasel-libre/PKGBUILD +++ b/libre/iceweasel-libre/PKGBUILD @@ -4,6 +4,7 @@ # Contributor (Parabola): fauno # Contributor (Parabola): vando # Contributor (Parabola): André Silva +# Contributor (Parabola): Márcio Silva # Contributor (Arch): Jakub Schmidtke # Thank you very much to the older contributors: # Contributor: evr @@ -21,7 +22,7 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } _pkgname=iceweasel pkgname=iceweasel-libre pkgver=${_debver}.${_debrel} -pkgrel=3 +pkgrel=4 if [ -z "$pkgname" ]; then pkgname=$_pkgname; fi if $_pgo; then @@ -43,7 +44,6 @@ url="http://www.geticeweasel.org/" install=iceweasel.install source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2" "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.debian.tar.gz" - "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.dsc" mozconfig mozconfig.pgo xulrunner-copy-stub.patch @@ -53,63 +53,44 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2" Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch) md5sums=('e440446bb92dc1c0311346c68024590b' 'cb8bfb543002a5d78db7e8661f9f87ec' - 'a9848e41461776bc4bf8d2de824b1204' 'eab149c1994ab14392e55af3abb08e80' 'ac29b01c189f20abae2f3eef1618ffc0' 'a485a2b5dc544a8a2bd40c985d2e5813' - 'e87d5decbb4dc0013beceaa61acfc7a1' + '54bd934ac23839601c7d23a60fbefe6a' 'e529742c0a425648087bc3ce537fe4c5' '0d053487907de4376d67d8f499c5502b' - '41ce105f0c1877fe22e0c0ec45e09565') + 'efda47526ba76ef926b236bf2cda2456') if [ "$_pkgname" != "$pkgname" ]; then provides+=("$_pkgname=$pkgver") conflicts+=("$_pkgname") fi -dpkg-source() { - # This will simulate dpkg-source -x ${_debname}_${_debver}-${_debrel}.dsc +build() { export QUILT_PATCHES=debian/patches export QUILT_REFRESH_ARGS='-p ab --no-timestamps --no-index' export QUILT_DIFF_ARGS='--no-timestamps' - mv mozilla-release "${_debname}-${_debver}" - mv debian "${_debname}-${_debver}" - cd "${_debname}-${_debver}" + export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$_pkgname" + export PYTHON="/usr/bin/python2" + export DEBIAN_BUILD="mozilla-release" + mv debian "${srcdir}/${DEBIAN_BUILD}" + cd "${srcdir}/${DEBIAN_BUILD}" -# Doesn't apply and seems unimportant + # Doesn't apply and seems unimportant rm -v debian/patches/l10n/Place-google-and-gmail-before-yandex.patch || true -# This patch doesn't works in some parts due that has patches for others locales languages, source code doesn't has it + # This patch doesn't works in some parts due that has patches for others locales languages, source code doesn't has it rm -v debian/patches/debian-hacks/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch || true quilt push -a - find .pc -name .timestamp -delete # why isn't "--no-timestamps" doing this? - cd .. -} -build() { -# Don't run this if we're using -e -if [ $NOEXTRACT -eq 0 ]; then - msg2 "Applying Debian patches..." - cd "${srcdir}" - dpkg-source -x ${_debname}_${_debver}-${_debrel}.dsc - - msg2 "Starting normal build..." - mv "${_debname}-${_debver}" "$srcdir/mozilla-build" - cd "$srcdir/mozilla-build" - - cp "$srcdir/mozconfig" .mozconfig # Load our build config, disable SafeSearch + patch -Np1 -i "$srcdir/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch" # Adding fixed Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch patch -Np1 -i "$srcdir/iceweasel-install-dir.patch" # install to /usr/lib/$_pkgname patch -Np1 -i "$srcdir/xulrunner-copy-stub.patch" # small fix patch -Np1 -i "$srcdir/libre.patch" -# Adding fixed Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch - patch -Np1 -i "$srcdir/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch" - -fi - - cd "$srcdir/mozilla-build" - + cp "$srcdir/mozconfig" .mozconfig # Load our build config, disable SafeSearch + if $_pgo; then cat "$srcdir/mozconfig.pgo" >> .mozconfig fi @@ -132,9 +113,6 @@ fi echo 'ac_add_options --disable-jemalloc' >> .mozconfig fi - export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$_pkgname" - export PYTHON="/usr/bin/python2" - if $_pgo; then LD_PRELOAD="" /usr/bin/Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 :99 & LD_PRELOAD="" DISPLAY=:99 make -j1 -f client.mk profiledbuild MOZ_MAKE_FLAGS="$MAKEFLAGS" @@ -145,7 +123,7 @@ fi } package() { - cd "$srcdir/mozilla-build" + cd "${srcdir}/${DEBIAN_BUILD}" make -j1 -f client.mk DESTDIR="$pkgdir" install install -m644 "$srcdir"/vendor.js "$pkgdir/usr/lib/$_pkgname/defaults/pref" diff --git a/libre/iceweasel-libre/libre.patch b/libre/iceweasel-libre/libre.patch index e726a58e9..39ea86c05 100644 --- a/libre/iceweasel-libre/libre.patch +++ b/libre/iceweasel-libre/libre.patch @@ -10,8 +10,8 @@ diff -urN iceweasel-13.0.orig/browser/app/profile/firefox.js iceweasel-13.0/brow -pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/firefox/search?q=%TERMS%&platform=%OS%&appver=%VERSION%"); -pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%/%COMPATIBILITY_MODE%?src=firefox"); -pref("extensions.webservice.discoverURL", "https://services.addons.mozilla.org/%LOCALE%/firefox/discovery/pane/%VERSION%/%OS%/%COMPATIBILITY_MODE%"); -+pref("extensions.getAddons.get.url", ""); +pref("extensions.getAddons.get.url", "http://www.gnu.org/s/gnuzilla/addons.html"); ++pref("extensions.getAddons.getWithPerformance.url", "http://www.gnu.org/s/gnuzilla/addons.html"); +pref("extensions.getAddons.search.browseURL", "http://www.gnu.org/s/gnuzilla/addons.html"); +pref("extensions.getAddons.search.url", "http://www.gnu.org/s/gnuzilla/addons.html"); +pref("extensions.webservice.discoverURL", "http://www.gnu.org/s/gnuzilla/addons.html"); @@ -23,7 +23,7 @@ diff -urN iceweasel-13.0.orig/browser/app/profile/firefox.js iceweasel-13.0/brow // Dictionary download preference -pref("browser.dictionaries.download.url", "https://addons.mozilla.org/%LOCALE%/firefox/dictionaries/"); -+pref("browser.dictionaries.download.url", ""); ++pref("browser.dictionaries.download.url", "about:blank"); // The minimum delay in seconds for the timer to fire. // default=2 minutes @@ -86,9 +86,9 @@ diff -urN iceweasel-13.0.orig/browser/locales/en-US/chrome/browser-region/region -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= ++browser.contentHandlers.types.0.uri=about:blank +browser.contentHandlers.types.1.title= -+browser.contentHandlers.types.1.uri= ++browser.contentHandlers.types.1.uri=about:blank # URL for site-specific search engines # TRANSLATION NOTE: {moz:domain} and {searchTerms} are placeholders for the site @@ -106,7 +106,7 @@ diff -urN iceweasel-13.0.orig/browser/locales/en-US/chrome/browser-region/region -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= ++gecko.handlerService.schemes.webcal.0.uriTemplate=about:blank # The default set of protocol handlers for mailto: -gecko.handlerService.schemes.mailto.0.name=Yahoo! Mail @@ -114,9 +114,9 @@ diff -urN iceweasel-13.0.orig/browser/locales/en-US/chrome/browser-region/region -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= ++gecko.handlerService.schemes.mailto.0.uriTemplate=about:blank +gecko.handlerService.schemes.mailto.1.name= -+gecko.handlerService.schemes.mailto.1.uriTemplate= ++gecko.handlerService.schemes.mailto.1.uriTemplate=about:blank # The default set of protocol handlers for irc: -gecko.handlerService.schemes.irc.0.name=Mibbit @@ -214,9 +214,9 @@ diff -urN iceweasel-13.0.orig/mobile/locales/en-US/chrome/region.properties icew -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= ++browser.contentHandlers.types.0.uri=about:blank +browser.contentHandlers.types.1.title= -+browser.contentHandlers.types.1.uri= ++browser.contentHandlers.types.1.uri=about:blank # Keyword URL (for location bar searches) -keyword.URL=http://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&gfns=1&q= @@ -231,7 +231,7 @@ diff -urN iceweasel-13.0.orig/mobile/locales/en-US/chrome/region.properties icew -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= ++gecko.handlerService.schemes.webcal.0.uriTemplate=about:blank # The default set of protocol handlers for mailto: -gecko.handlerService.schemes.mailto.0.name=Yahoo! Mail @@ -239,9 +239,9 @@ diff -urN iceweasel-13.0.orig/mobile/locales/en-US/chrome/region.properties icew -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= ++gecko.handlerService.schemes.mailto.0.uriTemplate=about:blank +gecko.handlerService.schemes.mailto.1.name= -+gecko.handlerService.schemes.mailto.1.uriTemplate= ++gecko.handlerService.schemes.mailto.1.uriTemplate=about:blank 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 @@ -276,28 +276,32 @@ diff -urN iceweasel-13.0.orig/toolkit/locales/en-US/chrome/global-region/region. diff -urN iceweasel-13.0.orig/browser/locales/generic/profile/bookmarks.html.in iceweasel-13.0/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 15:11:46.364192476 -0300 -@@ -10,14 +10,16 @@ -

++++ mozilla-release/browser/locales/generic/profile/bookmarks.html.in 2012-06-15 22:54:08.446274144 -0300 +@@ -11,13 +11,20 @@

@bookmarks_toolbarfolder@

@bookmarks_toolbarfolder_description@ -+

Parabola GNU/Linux-libre

-

@getting_started@ -+
Parabola GNU/Linux-libre -+
Parabola GNU/Linux-libre Wiki -+
Parabola GNU/Linux-libre Bugs ++
Parabola GNU/Linux-libre

-

@firefox_heading@

-+

Free Software Fundation

++

Parabola GNU/Linux-libre

-

@firefox_help@ -
@firefox_customize@ -
@firefox_community@ -
@firefox_about@ ++
Parabola GNU/Linux-libre ++
Parabola GNU/Linux-libre Packages ++
Parabola GNU/Linux-libre Wiki ++
Parabola GNU/Linux-libre Labs ++

++

Free Software Foundation

++

+

Free Software Foundation +
LibrePlanet +
Free addons ++
h-node

diff -urN iceweasel-13.0.orig/browser/base/content/abouthome/aboutHome.js iceweasel-13.0/browser/base/content/abouthome/aboutHome.js -- cgit v1.2.3-54-g00ecf