From 0dee03071a0643c3ee5820afa3c694dcef71d385 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 7 Feb 2012 23:15:14 +0000 Subject: Tue Feb 7 23:15:14 UTC 2012 --- mozilla-testing/iceweasel-libre/PKGBUILD | 47 ++++++------------------- mozilla-testing/iceweasel-libre/libre.patch | 53 ++++++++++++++--------------- 2 files changed, 36 insertions(+), 64 deletions(-) (limited to 'mozilla-testing') diff --git a/mozilla-testing/iceweasel-libre/PKGBUILD b/mozilla-testing/iceweasel-libre/PKGBUILD index f601af07a..c630fbb35 100644 --- a/mozilla-testing/iceweasel-libre/PKGBUILD +++ b/mozilla-testing/iceweasel-libre/PKGBUILD @@ -30,40 +30,8 @@ fi pkgdesc="A libre version of Debian Iceweasel, the browser based on Mozilla Firefox." arch=('i586' 'i686' 'x86_64' 'mips64el') license=('GPL2' 'MPL' 'LGPL') -depends=( - 'alsa-lib' - 'dbus-glib' - 'desktop-file-utils' - 'gtk2' - 'hicolor-icon-theme' - 'hunspell' - 'libevent' - 'libnotify' - 'libvpx' - 'libxt' - 'mime-types' - 'mozilla-common' - 'mozilla-searchplugins' - 'nss>=3.13.1' - 'sqlite3' - 'startup-notification' -) -makedepends=( - 'autoconf2.13' - 'diffutils' - 'imagemagick' - 'libidl2' - 'librsvg' - 'libxslt' - 'mesa' - 'pkg-config' - 'python2' - 'quilt' - 'unzip' - 'wireless_tools' - 'yasm' - 'zip' -) +depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'hicolor-icon-theme' 'hunspell' 'libevent' 'libnotify' 'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'mozilla-searchplugins' 'nss>=3.13.1' 'sqlite3' 'startup-notification') +makedepends=( 'autoconf2.13' 'diffutils' 'imagemagick' 'libidl2' 'librsvg' 'libxslt' 'mesa' 'pkg-config' 'python2' 'quilt' 'unzip' 'wireless_tools' 'yasm' 'zip') if $_pgo; then makedepends+=('xorg-server-xvfb') options=(!ccache) @@ -87,7 +55,7 @@ md5sums=('bc86bf0d74649f9b3fcde6dfa914141e' 'eab149c1994ab14392e55af3abb08e80' 'ac29b01c189f20abae2f3eef1618ffc0' 'a485a2b5dc544a8a2bd40c985d2e5813' - '3c1a7d6984b47a0ab36a5d8e6672cb2b' + '24fb7dba021ef94a351ebd3750cc0451' 'e529742c0a425648087bc3ce537fe4c5' 'f1c76e7e244257856a386ca2de69bdf0' '0d053487907de4376d67d8f499c5502b') @@ -106,14 +74,17 @@ dpkg-source() { mv debian "${_debname}-${_debver}" cd "${_debname}-${_debver}" +# Doesn't apply and seems unimportant rm -v debian/patches/l10n/Place-google-and-gmail-before-yandex.patch || true - quilt push -af + 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 @@ -126,6 +97,9 @@ build() { 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" +fi + + cd "$srcdir/mozilla-build" cp -f ${srcdir}/region.properties ./browser/locales/en-US/chrome/browser-region/ if $_pgo; then @@ -180,4 +154,3 @@ package() { # Workaround for now: https://bugzilla.mozilla.org/show_bug.cgi?id=658850 ln -sf $_pkgname "$pkgdir/usr/lib/$_pkgname/$_pkgname-bin" } - diff --git a/mozilla-testing/iceweasel-libre/libre.patch b/mozilla-testing/iceweasel-libre/libre.patch index b99174a16..935df297b 100644 --- a/mozilla-testing/iceweasel-libre/libre.patch +++ b/mozilla-testing/iceweasel-libre/libre.patch @@ -1,14 +1,15 @@ diff -urN iceweasel-9.0.1.orig/browser/app/profile/firefox.js iceweasel-9.0.1/browser/app/profile/firefox.js ---- iceweasel-9.0.1.orig/browser/app/profile/firefox.js 2011-12-21 09:07:20.000000000 +0000 -+++ iceweasel-9.0.1/browser/app/profile/firefox.js 2011-12-21 12:54:53.816066166 +0000 -@@ -57,10 +57,10 @@ +--- iceweasel-10.0.orig/browser/app/profile/firefox.js 2011-12-21 09:07:20.000000000 +0000 ++++ iceweasel-10.0/browser/app/profile/firefox.js 2011-12-21 12:54:53.816066166 +0000 +@@ -64,10 +64,11 @@ // Preferences for AMO integration pref("extensions.getAddons.cache.enabled", true); pref("extensions.getAddons.maxResults", 15); -pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/guid:%IDS%?src=firefox&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%"); -pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/firefox/search?q=%TERMS%"); --pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%?src=firefox"); +-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%"); ++pref("extensions.getAddons.get.url", ""); +pref("extensions.getAddons.get.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"); @@ -96,29 +97,6 @@ diff -urN iceweasel-9.0.1.orig/browser/locales/en-US/chrome/browser-region/regio # 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 -diff -urN iceweasel-9.0.1.orig/browser/locales/generic/profile/bookmarks.html.in iceweasel-9.0.1/browser/locales/generic/profile/bookmarks.html.in ---- iceweasel-9.0.1.orig/browser/locales/generic/profile/bookmarks.html.in 2011-12-16 20:29:13.000000000 +0000 -+++ iceweasel-9.0.1/browser/locales/generic/profile/bookmarks.html.in 2011-12-21 10:24:32.872063067 +0000 -@@ -11,14 +11,13 @@ -

@bookmarks_toolbarfolder@

-
@bookmarks_toolbarfolder_description@ -

--

@getting_started@ --
@latest_headlines@ -+
ConnochaetOS -+
Parabola -

-

@firefox_heading@

-

--

@firefox_help@ --
@firefox_customize@ --
@firefox_community@ --
@firefox_about@ -+
Free Software Foundation -+
LibrePlanet -+
Free addons -

-

diff -urN iceweasel-9.0.1.orig/build/pgo/blueprint/elements.html iceweasel-9.0.1/build/pgo/blueprint/elements.html --- iceweasel-9.0.1.orig/build/pgo/blueprint/elements.html 2011-12-16 20:29:13.000000000 +0000 +++ iceweasel-9.0.1/build/pgo/blueprint/elements.html 2011-12-21 10:04:42.988062659 +0000 @@ -240,3 +218,24 @@ diff -urN iceweasel-9.0.1.orig/toolkit/locales/en-US/chrome/global-region/region +plugindoc_label=gnuzilla.gnu.org +plugindoc_url=http://www.gnu.org/s/gnuzilla/addons.html +--- iceweasel-10.0.orig/browser/locales/generic/profile/bookmarks.html.in 2012-02-07 15:40:34.279657460 -0300 ++++ iceweasel-10.0/browser/locales/generic/profile/bookmarks.html.in 2012-02-07 15:40:19.226324812 -0300 +@@ -11,13 +11,13 @@ +

@bookmarks_toolbarfolder@

+
@bookmarks_toolbarfolder_description@ +

+-

@getting_started@ ++
ConnochaetOS ++
Parabola +

+

@firefox_heading@

+

+-

@firefox_help@ +-
@firefox_customize@ +-
@firefox_community@ +-
@firefox_about@ ++
Free Software Foundation ++
LibrePlanet ++
Free addons +

+

-- cgit v1.2.3-54-g00ecf