From 3a64f8a864548510db28fc98a08bdc94dbc283c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Fri, 17 May 2013 00:06:35 -0300 Subject: iceweasel-libre-21.0.1-1: updating version --- ...Make-the-Reset-Firefox-feature-more-gener.patch | 4 +- libre/iceweasel-libre/PKGBUILD | 44 +++++++--------------- libre/iceweasel-libre/libre.patch | 38 +++++++++---------- libre/iceweasel-libre/mozconfig | 1 - libre/iceweasel-libre/replace-urls.txt | 2 +- libre/iceweasel-libre/vendor.js | 16 ++++++++ 6 files changed, 51 insertions(+), 54 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 4ca4fc704..d89e4d1ae 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 @@ -267,10 +267,10 @@ index f35c227..7062886 100644 %{C++ diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp -index 7665de2..4588f4a 100644 +index b08f8ce..446ee74 100644 --- a/toolkit/xre/nsAppRunner.cpp +++ b/toolkit/xre/nsAppRunner.cpp -@@ -3699,7 +3699,7 @@ XREMain::XRE_mainRun() +@@ -3747,7 +3747,7 @@ XREMain::XRE_mainRun() if (gDoProfileReset) { // Automatically migrate from the current application if we just // reset the profile. diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD index c35b83600..774d80f92 100644 --- a/libre/iceweasel-libre/PKGBUILD +++ b/libre/iceweasel-libre/PKGBUILD @@ -14,7 +14,7 @@ _pgo=true # We're getting this from Debian Experimental _debname=iceweasel -_debver=20.0 +_debver=21.0 _debrel=1 _debrepo=http://ftp.debian.org/debian/pool/main/ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } @@ -22,7 +22,7 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } _pkgname=iceweasel pkgname=iceweasel-libre pkgver=$_debver.$_debrel -pkgrel=5 +pkgrel=1 pkgdesc="A libre version of Debian Iceweasel, the standalone web browser based on Mozilla Firefox." arch=(i686 x86_64 mips64el) @@ -30,7 +30,7 @@ license=(MPL GPL LGPL) depends=(alsa-lib dbus-glib desktop-file-utils gtk2 gstreamer0.10-base hicolor-icon-theme hunspell libevent libnotify libvpx libxt mime-types mozilla-common mozilla-searchplugins nss sqlite startup-notification) makedepends=(autoconf2.13 diffutils imagemagick libidl2 librsvg libxslt mesa pkg-config python2 quilt unzip zip) [ "$CARCH" != "mips64el" ] && makedepends+=('yasm') -options=(!emptydirs) +options=(!emptydirs !makeflags) if $_pgo; then makedepends+=(xorg-server-xvfb) options+=(!ccache) @@ -50,19 +50,17 @@ source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2" iceweasel-install-dir.patch vendor.js shared-libs.patch - replace-urls.txt Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch) -md5sums=('22daa24b6490c654f131550cbf20fad3' - '0c70ab52f35701558081df3d360361a2' - 'a65f285d20e11e650f7220b9c7f2bbf2' +md5sums=('0a7c51bb494463c327af918bae6c4ee4' + 'c17121a4ffd40f463e16d7828445d96e' + 'e1e903ca91997f18b428c54ef604f27d' '383e8e2a97a8b13fe56d153adb6878b6' - 'ea7fec9c58670aae945c0f472471cdff' + '1c6b47e2123c684c1da1e08bd0a107d9' '7b9e5996dd9fe0b186a43a297db1c6b5' 'abf5ecb74caa857abb42bcfbb3442d9c' - '0c26941504d3f2abed759221e9bb5de1' + 'e7e915720aaf6883ab4b706fe2195dda' '52e52f840a49eb1d14be1c0065b03a93' - '3bf8aefb861095caa45649c118163454' - 'd0e1f2625cd9f7234abdeb55aee00529') + '85e67561e0e491cd538ce018dfc2d948') prepare() { export DEBIAN_BUILD="mozilla-release" @@ -86,17 +84,6 @@ prepare() { patch -Np1 -i "$srcdir/iceweasel-install-dir.patch" # install to /usr/lib/$_pkgname patch -Np1 -i "$srcdir/shared-libs.patch" - # Replace common URLs - sed '/^#/d' ../replace-urls.txt | while read -r moz_url free_url; do - if [[ -n $moz_url ]]; then - printf 'liberating: %s -> %s\n' "$moz_url" "$free_url" - grep -Erl "${moz_url}" \ - --exclude='*.'{patch,orig,rej} \ - --exclude-dir={.pc,test,tests,testing} \ - | xargs -d '\n' --no-run-if-empty sed -ri "s<${moz_url}<${free_url} part of the snippet will be linked to the corresponding url. const DEFAULT_SNIPPETS_URLS = [ - "http://www.mozilla.com/firefox/features/?WT.mc_ID=default1" +-, "https://addons.mozilla.org/firefox/?src=snippet&WT.mc_ID=default2" + "http://packages.debian.org/experimental/iceweasel" - , "https://www.gnu.org/software/gnuzilla/addons.html" ++, "https://trisquel.info/browser-plain" ]; -@@ -141,10 +112,6 @@ + const SNIPPETS_UPDATE_INTERVAL_MS = 86400000; // 1 Day. +@@ -139,10 +111,6 @@ if (searchEngineInfo.image) { let logoElt = document.getElementById("searchEngineLogo"); logoElt.src = searchEngineInfo.image; diff --git a/libre/iceweasel-libre/mozconfig b/libre/iceweasel-libre/mozconfig index 8fa6a5da1..21d56e13c 100644 --- a/libre/iceweasel-libre/mozconfig +++ b/libre/iceweasel-libre/mozconfig @@ -21,7 +21,6 @@ ac_add_options --enable-system-sqlite ac_add_options --enable-system-ffi #ac_add_options --enable-system-cairo ac_add_options --enable-system-pixman -ac_add_options --with-pthreads # Features ac_add_options --enable-startup-notification diff --git a/libre/iceweasel-libre/replace-urls.txt b/libre/iceweasel-libre/replace-urls.txt index 32c94b018..5f8c88e9e 100644 --- a/libre/iceweasel-libre/replace-urls.txt +++ b/libre/iceweasel-libre/replace-urls.txt @@ -13,7 +13,7 @@ https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/?(\?[ https://addons.mozilla.org/firefox/collections/mozilla/webdeveloper/ https://trisquel.info/browser-plain -https?://services\.addons\.mozilla\.org/(%LOCALE%|@AB_CD@|en-US|ru)/([a-zA-Z%-]+)/ https://trisquel.info/browser-plain +https?://services\.addons\.mozilla\.org/(%LOCALE%|@AB_CD@|en-US|ru)/([a-zA-Z%-]+)/?(\?[^"']*)? https://trisquel.info/browser-plain https?://pfs\.mozilla\.org/plugins/PluginFinderService\.php http://trisquel.info/sites/pfs.php?mime=%PLUGIN_MIMETYPE% #https?://versioncheck\.addons\.mozilla\.org/update/VersionCheck\.php diff --git a/libre/iceweasel-libre/vendor.js b/libre/iceweasel-libre/vendor.js index bd8bcb148..5e17c00d0 100644 --- a/libre/iceweasel-libre/vendor.js +++ b/libre/iceweasel-libre/vendor.js @@ -19,3 +19,19 @@ pref("dom.storage.enabled", false); // Enable gstreamer support pref("media.gstreamer.enabled", true); + +// Preferences for the Get Add-ons panel +pref ("extensions.update.notifyUser", false); +pref ("extensions.getAddons.showPane", false); +pref ("extensions.getAddons.browseAddons", "http://trisquel.info/browser-plain"); +pref ("extensions.getAddons.maxResults", 5); +pref ("extensions.getAddons.recommended.browseURL", "http://trisquel.info/browser-plain"); +pref ("extensions.getAddons.recommended.url", "http://trisquel.info/browser-plain"); +pref ("extensions.getAddons.search.browseURL", "http://trisquel.info/browser-plain"); +pref ("extensions.getAddons.search.url", "http://trisquel.info/browser-plain"); +pref ("extensions.getMoreExtensionsURL" , "http://trisquel.info/browser-plain"); +pref ("extensions.getMorePluginsURL" , "http://trisquel.info/browser-plain"); +pref ("extensions.getMoreThemesURL" , "http://trisquel.info/browser-plain"); + +// Dictionary download preference +pref("browser.dictionaries.download.url", "http://trisquel.info/browser-plain"); -- cgit v1.2.3-2-g168b