From e4bc599941f542850125b6f49e7374471283c351 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Sat, 31 Jan 2015 14:35:03 -0200 Subject: iceweasel-1:35.0.1.deb1-1: updating version --- libre/iceweasel/PKGBUILD | 10 ++-- libre/iceweasel/libre.patch | 127 ++++++++++++++++++++++++++++++++------------ 2 files changed, 98 insertions(+), 39 deletions(-) (limited to 'libre/iceweasel') diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD index 3b46f4742..3402dbec8 100644 --- a/libre/iceweasel/PKGBUILD +++ b/libre/iceweasel/PKGBUILD @@ -16,7 +16,7 @@ _pgo=true # We're getting this from Debian Experimental _debname=iceweasel -_debver=35.0 +_debver=35.0.1 _debrel=deb1 _debrepo=http://ftp.debian.org/debian/pool/main/ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } @@ -24,7 +24,7 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } pkgname=iceweasel epoch=1 pkgver=$_debver.$_debrel -pkgrel=3 +pkgrel=1 pkgdesc="A libre version of Debian Iceweasel, the standalone web browser based on Mozilla Firefox." arch=(i686 x86_64 mips64el) @@ -53,10 +53,10 @@ source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2" vendor.js rhbz-966424.patch $pkgname-fixed-loading-icon.png) -sha256sums=('7702b1873757c8ec2f911680ff63ded124ab7b3610ef5c1456581146451a641e' - '0b59e3f72ac50475832fbd64055411bb81264526f06492f2a5801e4d859da7de' +sha256sums=('44646270b68b7ec5ee73516ea5bada0f32d1c2c01d4afdb7102ba7f98c93a7a8' + '8ca7c37f040f0f3ebe7aeb3d57e13c4aa1d4e53ce8f3622d600b6e9f61f832a1' '831720c1efd6e67d54e70cf4e2b02f9554aa6c914315be6dd2ca837adbbdcabd' - 'e3aa10890a54c312d7a8aa36e4371f78799a8bd7a1b887612fcd7223d2fe30bf' + '1fd1383f87473671370e89f33c4d8ffdc89dbe6ae4b7d8ad23e15d83bb17740f' '93e3001ce152e1d142619e215a9ef07dd429943b99d21726c25da9ceb31e31cd' '84895ff873a89770c62c4568fd111ac92d540b4499b2b77258c6c88a929ef049' '3aea6676f1e53a09673b6ae219d281fc28054beb6002b09973611c02f827651d' diff --git a/libre/iceweasel/libre.patch b/libre/iceweasel/libre.patch index 089be5913..7025151ad 100644 --- a/libre/iceweasel/libre.patch +++ b/libre/iceweasel/libre.patch @@ -668,40 +668,6 @@ diff -Nur mozilla-release.orig/browser/base/jar.mn mozilla-release/browser/base/ content/browser/aboutNetError.xhtml (content/aboutNetError.xhtml) -diff -Nur mozilla-release.orig/browser/devtools/webide/webide-prefs.js mozilla-release/browser/devtools/webide/webide-prefs.js ---- mozilla-release.orig/browser/devtools/webide/webide-prefs.js 2015-01-09 02:38:16.000000000 -0200 -+++ mozilla-release/browser/devtools/webide/webide-prefs.js 2015-01-22 15:54:09.172617578 -0200 -@@ -4,21 +4,21 @@ - # file, You can obtain one at http://mozilla.org/MPL/2.0/. - - pref("devtools.webide.showProjectEditor", true); --pref("devtools.webide.templatesURL", "https://code.cdn.mozilla.net/templates/list.json"); --pref("devtools.webide.autoinstallADBHelper", true); -+pref("devtools.webide.templatesURL", ""); -+pref("devtools.webide.autoinstallADBHelper", false); - #ifdef MOZ_DEV_EDITION - pref("devtools.webide.autoinstallFxdtAdapters", true); - #else - pref("devtools.webide.autoinstallFxdtAdapters", false); - #endif - pref("devtools.webide.restoreLastProject", true); --pref("devtools.webide.addonsURL", "https://ftp.mozilla.org/pub/mozilla.org/labs/fxos-simulator/index.json"); --pref("devtools.webide.simulatorAddonsURL", "https://ftp.mozilla.org/pub/mozilla.org/labs/fxos-simulator/#VERSION#/#OS#/fxos_#SLASHED_VERSION#_simulator-#OS#-latest.xpi"); --pref("devtools.webide.simulatorAddonID", "fxos_#SLASHED_VERSION#_simulator@mozilla.org"); --pref("devtools.webide.adbAddonURL", "https://ftp.mozilla.org/pub/mozilla.org/labs/fxos-simulator/adb-helper/#OS#/adbhelper-#OS#-latest.xpi"); --pref("devtools.webide.adbAddonID", "adbhelper@mozilla.org"); --pref("devtools.webide.adaptersAddonURL", "https://ftp.mozilla.org/pub/mozilla.org/labs/fxdt-adapters/#OS#/fxdt-adapters-#OS#-latest.xpi"); --pref("devtools.webide.adaptersAddonID", "fxdevtools-adapters@mozilla.org"); -+pref("devtools.webide.addonsURL", ""); -+pref("devtools.webide.simulatorAddonsURL", ""); -+pref("devtools.webide.simulatorAddonID", ""); -+pref("devtools.webide.adbAddonURL", ""); -+pref("devtools.webide.adbAddonID", ""); -+pref("devtools.webide.adaptersAddonURL", ""); -+pref("devtools.webide.adaptersAddonID", ""); - pref("devtools.webide.monitorWebSocketURL", "ws://localhost:9000"); - pref("devtools.webide.lastConnectedRuntime", ""); - pref("devtools.webide.lastSelectedProject", ""); diff -Nur mozilla-release.orig/browser/locales/en-US/chrome/browser/aboutHome.dtd mozilla-release/browser/locales/en-US/chrome/browser/aboutHome.dtd --- mozilla-release.orig/browser/locales/en-US/chrome/browser/aboutHome.dtd 2015-01-09 02:38:16.000000000 -0200 +++ mozilla-release/browser/locales/en-US/chrome/browser/aboutHome.dtd 2015-01-16 15:03:01.408257268 -0200 @@ -723,6 +689,99 @@ diff -Nur mozilla-release.orig/browser/locales/en-US/chrome/browser/aboutHome.dt +- ++ + + + +diff -Nur mozilla-release.orig/browser/locales/en-US/chrome/browser/devtools/sourceeditor.properties mozilla-release/browser/locales/en-US/chrome/browser/devtools/sourceeditor.properties +--- mozilla-release.orig/browser/locales/en-US/chrome/browser/devtools/sourceeditor.properties 2015-01-09 02:38:16.000000000 -0200 ++++ mozilla-release/browser/locales/en-US/chrome/browser/devtools/sourceeditor.properties 2015-01-31 12:33:10.797565416 -0200 +@@ -4,7 +4,7 @@ + + # LOCALIZATION NOTE These strings are used inside the Source Editor component. + # This component is used whenever source code is displayed for the purpose of +-# being edited, inside the Firefox developer tools - current examples are the ++# being edited, inside the Iceweasel developer tools - current examples are the + # Scratchpad and the Style Editor tools. + + # LOCALIZATION NOTE The correct localization of this file might be to keep it +diff -Nur mozilla-release.orig/browser/locales/en-US/chrome/browser/devtools/toolbox.dtd mozilla-release/browser/locales/en-US/chrome/browser/devtools/toolbox.dtd +--- mozilla-release.orig/browser/locales/en-US/chrome/browser/devtools/toolbox.dtd 2015-01-09 02:38:16.000000000 -0200 ++++ mozilla-release/browser/locales/en-US/chrome/browser/devtools/toolbox.dtd 2015-01-31 12:34:06.301357174 -0200 +@@ -79,7 +79,7 @@ + - checkbox that toggles remote debugging, i.e. devtools.debugger.remote-enabled + - boolean preference in about:config, in the options panel. --> + +- ++ + + +- ++ + + + +- ++ + + + +@@ -48,7 +48,7 @@ + + + +- ++ + + + +diff -Nur mozilla-release.orig/browser/locales/en-US/chrome/browser/devtools/webide.properties mozilla-release/browser/locales/en-US/chrome/browser/devtools/webide.properties +--- mozilla-release.orig/browser/locales/en-US/chrome/browser/devtools/webide.properties 2015-01-09 02:38:16.000000000 -0200 ++++ mozilla-release/browser/locales/en-US/chrome/browser/devtools/webide.properties 2015-01-31 12:35:03.848498325 -0200 +@@ -2,8 +2,8 @@ + # License, v. 2.0. If a copy of the MPL was not distributed with this + # file, You can obtain one at http://mozilla.org/MPL/2.0/. + +-title_noApp=Firefox WebIDE +-title_app=Firefox WebIDE: %S ++title_noApp=Iceweasel WebIDE ++title_app=Iceweasel WebIDE: %S + + runtimeButton_label=Select Runtime + projectButton_label=Open App +@@ -45,10 +45,10 @@ + addons_stable=stable + addons_unstable=unstable + # LOCALIZATION NOTE (addons_simulator_label): This label is shown as the name of +-# a given simulator version in the "Manage Simulators" pane. %1$S: Firefox OS ++# a given simulator version in the "Manage Simulators" pane. %1$S: Iceweasel OS + # version in the simulator, ex. 1.3. %2$S: Simulator stability label, ex. + # "stable" or "unstable". +-addons_simulator_label=Firefox OS %1$S Simulator (%2$S) ++addons_simulator_label=Iceweasel OS %1$S Simulator (%2$S) + addons_install_button=install + addons_uninstall_button=uninstall + addons_adb_label=ADB Helper Add-on diff -Nur mozilla-release.orig/browser/locales/en-US/chrome/browser-region/region.properties mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties --- mozilla-release.orig/browser/locales/en-US/chrome/browser-region/region.properties 2015-01-09 02:38:16.000000000 -0200 +++ mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties 2015-01-16 15:03:01.408257268 -0200 -- cgit v1.2.3