From 5186934cd9578e2c5bcd62819b32a08514635563 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Mon, 20 Oct 2014 18:56:10 +0000 Subject: [PATCH] community/xulrunner to 33.0-1 --- community/xulrunner/PKGBUILD | 8 ++++---- community/xulrunner/shared-libs.patch | 8 +++----- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/community/xulrunner/PKGBUILD b/community/xulrunner/PKGBUILD index 3bce7c7cc..6d539840c 100644 --- a/community/xulrunner/PKGBUILD +++ b/community/xulrunner/PKGBUILD @@ -8,7 +8,7 @@ # - set extra CFLAG for v5 pkgname=xulrunner -pkgver=32.0 +pkgver=33.0 pkgrel=1 pkgdesc="Mozilla Runtime Environment" arch=('i686' 'x86_64') @@ -23,17 +23,17 @@ source=(ftp://ftp.mozilla.org/pub/mozilla.org/xulrunner/releases/$pkgver/source/ rhbz-966424.patch) options=('!emptydirs' 'staticlibs') replaces=('xulrunner-oss') -sha256sums=('769671c97bfa5ab0719cc792a55109540287939e11d515e125769b5104056a21' +sha256sums=('99402cf84949e06bac72d8abbdecde57e8af465727001ed6849a34632f20bcdb' '6d9bae5f7bc952583fddff7ae839bc559ae9be784d5021784653963875905489' '23485d937035648add27a7657f6934dc5b295e886cdb0506eebd02a43d07f269' - '3729eb95167f704e627cfd4ef5ce24414c6c33df68d2fd968d315f1873d6dc7c' + '59d9fc421bc10a5515b73e159f44a72365bf7b7e8b3fc8a8c46043ef40bd3a40' '746cb474c5a2c26fc474256e430e035e604b71b27df1003d4af85018fa263f4a') prepare() { cd "$srcdir/mozilla-release" cp "$srcdir/mozconfig" .mozconfig - #fix libdir/sdkdir - fedora + # fix libdir/sdkdir - fedora patch -Np1 -i ../mozilla-pkgconfig.patch patch -Np1 -i ../shared-libs.patch diff --git a/community/xulrunner/shared-libs.patch b/community/xulrunner/shared-libs.patch index 852e191af..b2cac8b29 100644 --- a/community/xulrunner/shared-libs.patch +++ b/community/xulrunner/shared-libs.patch @@ -1,14 +1,12 @@ diff -Nur mozilla-release.orig/browser/installer/Makefile.in mozilla-release/browser/installer/Makefile.in --- mozilla-release.orig/browser/installer/Makefile.in 2012-07-17 16:19:29.480356991 +0000 +++ mozilla-release/browser/installer/Makefile.in 2012-07-17 17:32:41.250937293 +0000 -@@ -50,7 +50,7 @@ - MOZ_PKG_MANIFEST_P = $(srcdir)/package-manifest.in +@@ -17,7 +17,7 @@ + # Some files have been already bundled with xulrunner - ifndef SYSTEM_LIBXUL ifndef MOZ_MULET -MOZ_PKG_FATAL_WARNINGS = 1 +MOZ_PKG_FATAL_WARNINGS = 0 endif - endif - MOZ_NONLOCALIZED_PKG_LIST = \ + DEFINES += -DAB_CD=$(AB_CD) -DMOZ_APP_NAME=$(MOZ_APP_NAME) -DPREF_DIR=$(PREF_DIR)