From 7a369db91fe9ddd8fb150c4dcbe3f531427e9e2c Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Thu, 31 Jan 2013 17:09:47 -0200 Subject: xulrunner-libre-18.0.1.1-1: updating version --- ...Make-the-Reset-Firefox-feature-more-gener.patch | 18 +++++++++--------- libre/xulrunner-libre/PKGBUILD | 22 ++++++++++++++-------- libre/xulrunner-libre/mozconfig | 10 +--------- 3 files changed, 24 insertions(+), 26 deletions(-) (limited to 'libre/xulrunner-libre') diff --git a/libre/xulrunner-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch b/libre/xulrunner-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch index 69fe5c072..f59454192 100644 --- a/libre/xulrunner-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch +++ b/libre/xulrunner-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch @@ -67,7 +67,7 @@ index d7fec75..d531b83 100644 component {3d2532e3-4932-4774-b7ba-968f5899d3a4} IEProfileMigrator.js contract @mozilla.org/profile/migrator;1?app=browser&type=ie {3d2532e3-4932-4774-b7ba-968f5899d3a4} diff --git a/browser/components/migration/src/FirefoxProfileMigrator.js b/browser/components/migration/src/FirefoxProfileMigrator.js -index a6598fe..8f83da8 100644 +index 52722e9..0448444 100644 --- a/browser/components/migration/src/FirefoxProfileMigrator.js +++ b/browser/components/migration/src/FirefoxProfileMigrator.js @@ -88,7 +88,7 @@ Object.defineProperty(FirefoxProfileMigrator.prototype, "startupOnlyMigrator", { @@ -78,12 +78,12 @@ index a6598fe..8f83da8 100644 +FirefoxProfileMigrator.prototype.contractID = "@mozilla.org/profile/migrator;1?app=browser&type=self"; FirefoxProfileMigrator.prototype.classID = Components.ID("{91185366-ba97-4438-acba-48deaca63386}"); - const NSGetFactory = XPCOMUtils.generateNSGetFactory([FirefoxProfileMigrator]); + this.NSGetFactory = XPCOMUtils.generateNSGetFactory([FirefoxProfileMigrator]); diff --git a/browser/components/migration/src/MigrationUtils.jsm b/browser/components/migration/src/MigrationUtils.jsm -index 0669aa8..19552e3 100644 +index 1f60879..fc83a99 100644 --- a/browser/components/migration/src/MigrationUtils.jsm +++ b/browser/components/migration/src/MigrationUtils.jsm -@@ -403,11 +403,6 @@ let MigrationUtils = Object.freeze({ +@@ -403,11 +403,6 @@ this.MigrationUtils = Object.freeze({ * @see nsIStringBundle */ getLocalizedString: function MU_getLocalizedString(aKey, aReplacements) { @@ -95,7 +95,7 @@ index 0669aa8..19552e3 100644 if (aReplacements === undefined) return getMigrationBundle().GetStringFromName(aKey); return getMigrationBundle().formatStringFromName( -@@ -622,6 +617,17 @@ let MigrationUtils = Object.freeze({ +@@ -622,6 +617,17 @@ this.MigrationUtils = Object.freeze({ }, /** @@ -114,7 +114,7 @@ index 0669aa8..19552e3 100644 */ finishMigration: function MU_finishMigration() { diff --git a/browser/components/migration/src/ProfileMigrator.js b/browser/components/migration/src/ProfileMigrator.js -index 744f117..59e5a4c 100644 +index f67823b..36016b8 100644 --- a/browser/components/migration/src/ProfileMigrator.js +++ b/browser/components/migration/src/ProfileMigrator.js @@ -12,6 +12,7 @@ function ProfileMigrator() { @@ -184,10 +184,10 @@ index 260bc29..52b32cc 100644 -64_firefox=Bookmarks Backups +64_self=Bookmarks Backups diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn -index 339ffda..6999b26 100644 +index 687c8d8..203d8cf 100644 --- a/toolkit/content/jar.mn +++ b/toolkit/content/jar.mn -@@ -38,7 +38,7 @@ toolkit.jar: +@@ -39,7 +39,7 @@ toolkit.jar: + content/global/mozilla.xhtml (mozilla.xhtml) content/global/nsDragAndDrop.js (nsDragAndDrop.js) content/global/resetProfile.css (resetProfile.css) @@ -267,7 +267,7 @@ index f35c227..7062886 100644 %{C++ diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp -index 68a52e6..02bb30e 100644 +index e3dd0df..ef7bb74 100644 --- a/toolkit/xre/nsAppRunner.cpp +++ b/toolkit/xre/nsAppRunner.cpp @@ -3669,7 +3669,7 @@ XREMain::XRE_mainRun() diff --git a/libre/xulrunner-libre/PKGBUILD b/libre/xulrunner-libre/PKGBUILD index 1d485e6d5..02dad8d90 100644 --- a/libre/xulrunner-libre/PKGBUILD +++ b/libre/xulrunner-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 172187 2012-12-01 13:09:58Z foutrelis $ +# $Id: PKGBUILD 174912 2013-01-08 16:59:52Z heftig $ # Maintainer: Jan de Groot # Contributor: Alexander Baldeck @@ -6,7 +6,7 @@ # We're getting this from Debian Experimental _debname=iceweasel -_debver=17.0.1 +_debver=18.0.1 _debrel=1 _debrepo=http://ftp.debian.org/debian/pool/main/ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } @@ -18,8 +18,8 @@ pkgrel=1 pkgdesc="Mozilla Runtime Environment" arch=('i686' 'x86_64' 'mips64el') license=('MPL' 'GPL' 'LGPL') -depends=('gtk2' 'mozilla-common' 'nss>=3.13.1' 'libxt' 'libxrender' 'hunspell' 'startup-notification' 'mime-types' 'dbus-glib' 'alsa-lib' 'libevent' 'sqlite3>=3.7.4' 'libvpx' 'python2') -makedepends=('zip' 'unzip' 'pkg-config' 'diffutils' 'wireless_tools' 'yasm' 'mesa' 'autoconf2.13' 'quilt') +depends=('gtk2' 'mozilla-common' 'nss>=3.14.1' 'libxt' 'libxrender' 'hunspell' 'startup-notification' 'mime-types' 'dbus-glib' 'alsa-lib' 'libevent' 'sqlite3>=3.7.4' 'libvpx' 'python2') +makedepends=('zip' 'unzip' 'pkg-config' 'diffutils' 'yasm' 'mesa' 'autoconf2.13' 'quilt') url="http://wiki.mozilla.org/XUL:Xul_Runner" source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2" "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.debian.tar.gz" @@ -31,14 +31,20 @@ options=('!emptydirs') conflicts=('xulrunner') provides=("xulrunner=${_debver}") replaces=('xulrunner-oss' 'xulrunner') -md5sums=('37b9b7eafc8affa9b8a5942f8ff19f8f' - '1bbf435ff33f9824de23c0b13fbfb452' - 'f2f4f4a573f549e8b494e33b3ad226bc' +md5sums=('5d481dd35a304702d1f311eeb3f1149f' + '6a4781e8ddc1b166f36930c4864e095f' + 'd2bb0dce75a431357961b5aeada65450' '27271ce647a83906ef7a24605e840d61' '52e52f840a49eb1d14be1c0065b03a93' - '65f68090d2a69b467bd2707d0c4ea3bd') + '46a4b19b414065b99b870ea79b454f6e') build() { + # WebRTC build tries to execute "python" and expects Python 2 + # Workaround taken from chromium PKGBUILD on Archlinux + mkdir "$srcdir/python2-path" + ln -s /usr/bin/python2 "$srcdir/python2-path/python" + export PATH="$srcdir/python2-path:$PATH" + export QUILT_PATCHES=debian/patches export QUILT_REFRESH_ARGS='-p ab --no-timestamps --no-index' export QUILT_DIFF_ARGS='--no-timestamps' diff --git a/libre/xulrunner-libre/mozconfig b/libre/xulrunner-libre/mozconfig index 34c5a6137..1cd8b85b5 100644 --- a/libre/xulrunner-libre/mozconfig +++ b/libre/xulrunner-libre/mozconfig @@ -22,17 +22,9 @@ ac_add_options --with-pthreads # Features ac_add_options --disable-safe-browsing ac_add_options --enable-startup-notification -ac_add_options --enable-gio +#ac_add_options --enable-gstreamer -ac_add_options --disable-gnomevfs ac_add_options --disable-crashreporter ac_add_options --disable-updater ac_add_options --disable-tests -ac_add_options --disable-mochitest ac_add_options --disable-installer - -# Optimization -ac_add_options --enable-optimize - -export MOZILLA_OFFICIAL=1 -mk_add_options MOZILLA_OFFICIAL=1 -- cgit v1.2.3-54-g00ecf