Date: Thursday, August 28, 2014 @ 21:59:16 Author: heftig Revision: 118042
archrelease: copy trunk to community-testing-i686, community-testing-x86_64 Added: xulrunner/repos/community-testing-i686/ xulrunner/repos/community-testing-i686/PKGBUILD (from rev 118041, xulrunner/trunk/PKGBUILD) xulrunner/repos/community-testing-i686/freetype-headers.patch (from rev 118041, xulrunner/trunk/freetype-headers.patch) xulrunner/repos/community-testing-i686/mozconfig (from rev 118041, xulrunner/trunk/mozconfig) xulrunner/repos/community-testing-i686/mozilla-pkgconfig.patch (from rev 118041, xulrunner/trunk/mozilla-pkgconfig.patch) xulrunner/repos/community-testing-i686/rhbz-966424.patch (from rev 118041, xulrunner/trunk/rhbz-966424.patch) xulrunner/repos/community-testing-i686/shared-libs.patch (from rev 118041, xulrunner/trunk/shared-libs.patch) xulrunner/repos/community-testing-i686/unbreak-plugin-build.patch (from rev 118041, xulrunner/trunk/unbreak-plugin-build.patch) xulrunner/repos/community-testing-x86_64/ xulrunner/repos/community-testing-x86_64/PKGBUILD (from rev 118041, xulrunner/trunk/PKGBUILD) xulrunner/repos/community-testing-x86_64/freetype-headers.patch (from rev 118041, xulrunner/trunk/freetype-headers.patch) xulrunner/repos/community-testing-x86_64/mozconfig (from rev 118041, xulrunner/trunk/mozconfig) xulrunner/repos/community-testing-x86_64/mozilla-pkgconfig.patch (from rev 118041, xulrunner/trunk/mozilla-pkgconfig.patch) xulrunner/repos/community-testing-x86_64/rhbz-966424.patch (from rev 118041, xulrunner/trunk/rhbz-966424.patch) xulrunner/repos/community-testing-x86_64/shared-libs.patch (from rev 118041, xulrunner/trunk/shared-libs.patch) xulrunner/repos/community-testing-x86_64/unbreak-plugin-build.patch (from rev 118041, xulrunner/trunk/unbreak-plugin-build.patch) -----------------------------------------------------+ community-testing-i686/PKGBUILD | 77 ++++++++++++++++++ community-testing-i686/freetype-headers.patch | 66 +++++++++++++++ community-testing-i686/mozconfig | 32 +++++++ community-testing-i686/mozilla-pkgconfig.patch | 40 +++++++++ community-testing-i686/rhbz-966424.patch | 23 +++++ community-testing-i686/shared-libs.patch | 12 ++ community-testing-i686/unbreak-plugin-build.patch | 76 +++++++++++++++++ community-testing-x86_64/PKGBUILD | 77 ++++++++++++++++++ community-testing-x86_64/freetype-headers.patch | 66 +++++++++++++++ community-testing-x86_64/mozconfig | 32 +++++++ community-testing-x86_64/mozilla-pkgconfig.patch | 40 +++++++++ community-testing-x86_64/rhbz-966424.patch | 23 +++++ community-testing-x86_64/shared-libs.patch | 12 ++ community-testing-x86_64/unbreak-plugin-build.patch | 76 +++++++++++++++++ 14 files changed, 652 insertions(+) Copied: xulrunner/repos/community-testing-i686/PKGBUILD (from rev 118041, xulrunner/trunk/PKGBUILD) =================================================================== --- community-testing-i686/PKGBUILD (rev 0) +++ community-testing-i686/PKGBUILD 2014-08-28 19:59:16 UTC (rev 118042) @@ -0,0 +1,77 @@ +# $Id$ +# Maintainer: Connor Behan <connor.be...@gmail.com> +# Contributor: Jan de Groot <j...@archlinux.org> +# Contributor: Alexander Baldeck <alexan...@archlinux.org> + +pkgname=xulrunner +pkgver=31.0 +pkgrel=2 +pkgdesc="Mozilla Runtime Environment" +arch=('i686' 'x86_64') +license=('MPL' 'GPL' 'LGPL') +depends=('gtk2' 'mozilla-common' 'nss' 'libxt' 'hunspell' 'startup-notification' 'mime-types' 'dbus-glib' 'libpulse' 'libevent' 'libvpx' 'icu' 'python2') +makedepends=('zip' 'unzip' 'pkg-config' 'diffutils' 'yasm' 'mesa' 'autoconf2.13' 'gst-plugins-base-libs') +url="http://wiki.mozilla.org/XUL:Xul_Runner" +source=(ftp://ftp.mozilla.org/pub/mozilla.org/xulrunner/releases/$pkgver/source/xulrunner-$pkgver.source.tar.bz2 + mozconfig + mozilla-pkgconfig.patch + shared-libs.patch + rhbz-966424.patch) +options=('!emptydirs' '!makeflags' 'staticlibs') +replaces=('xulrunner-oss') +sha256sums=('6f4cb97e4debe2225f94bc813057154d2aa2680f5aa69573048633507cecb21e' + 'df0e663e7f9246b84936882e564270fac541c6bb39450b759abe686e5c27a052' + '23485d937035648add27a7657f6934dc5b295e886cdb0506eebd02a43d07f269' + 'e2b4a00d14f4ba69c62b3f9ef9908263fbab179ba8004197cbc67edbd916fdf1' + '746cb474c5a2c26fc474256e430e035e604b71b27df1003d4af85018fa263f4a') + +prepare() { + cd "$srcdir/mozilla-release" + cp "$srcdir/mozconfig" .mozconfig + + #fix libdir/sdkdir - fedora + patch -Np1 -i ../mozilla-pkgconfig.patch + patch -Np1 -i ../shared-libs.patch + + # https://bugs.archlinux.org/task/41689 + patch -Np1 -i ../rhbz-966424.patch + + # WebRTC build tries to execute "python" and expects Python 2 + # Workaround taken from chromium PKGBUILD + mkdir "$srcdir/python2-path" + ln -s /usr/bin/python2 "$srcdir/python2-path/python" + + # configure script misdetects the preprocessor without an optimization level + # https://bugs.archlinux.org/task/34644 + sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' configure +} + +build() { + cd "$srcdir/mozilla-release" + + export PATH="$srcdir/python2-path:$PATH" + export LDFLAGS="$LDFALGS -Wl,-rpath,/usr/lib/xulrunner-$pkgver" + export PYTHON="/usr/bin/python2" + + make -j1 -f client.mk build +} + +package() { + cd "$srcdir/mozilla-release" + make -j1 -f client.mk DESTDIR="$pkgdir" install + + # Use system-provided dictionaries + rm -rf "$pkgdir"/usr/lib/xulrunner-$pkgver/{dictionaries,hyphenation} + ln -sf /usr/share/hunspell "$pkgdir/usr/lib/xulrunner-$pkgver/dictionaries" + ln -sf /usr/share/hyphen "$pkgdir/usr/lib/xulrunner-$pkgver/hyphenation" + + # add xulrunner library path to ld.so.conf + install -d $pkgdir/etc/ld.so.conf.d + echo "/usr/lib/xulrunner-$pkgver" > $pkgdir/etc/ld.so.conf.d/xulrunner.conf + + chmod +x "${pkgdir}/usr/lib/xulrunner-devel-$pkgver/sdk/bin/xpt.py" + chmod +x "${pkgdir}/usr/lib/xulrunner-devel-$pkgver/sdk/bin/xpcshell" + ln -s /usr/lib/xulrunner-devel-$pkgver/sdk/bin/xpcshell "${pkgdir}/usr/lib/xulrunner-$pkgver/xpcshell" + sed -i 's|!/usr/bin/env python$|!/usr/bin/env python2|' \ + "$pkgdir"/usr/lib/xulrunner-devel-$pkgver/sdk/bin/{xpt,header,typelib,xpidl}.py +} Copied: xulrunner/repos/community-testing-i686/freetype-headers.patch (from rev 118041, xulrunner/trunk/freetype-headers.patch) =================================================================== --- community-testing-i686/freetype-headers.patch (rev 0) +++ community-testing-i686/freetype-headers.patch 2014-08-28 19:59:16 UTC (rev 118042) @@ -0,0 +1,66 @@ +diff -Nur mozilla-release.orig/config/system-headers mozilla-release/config/system-headers +--- mozilla-release.orig/config/system-headers ++++ mozilla-release/config/system-headers +@@ -408,16 +408,29 @@ freetype/ftoutln.h + freetype/ttnameid.h + freetype/tttables.h + freetype/t1tables.h + freetype/ftlcdfil.h + freetype/ftsizes.h + freetype/ftadvanc.h + freetype/ftbitmap.h + freetype/ftxf86.h ++freetype.h ++ftcache.h ++ftglyph.h ++ftsynth.h ++ftoutln.h ++ttnameid.h ++tttables.h ++t1tables.h ++ftlcdfil.h ++ftsizes.h ++ftadvanc.h ++ftbitmap.h ++ftxf86.h + fribidi/fribidi.h + FSp_fopen.h + fstream + fstream.h + ft2build.h + fts.h + gconf/gconf-client.h + Gdiplus.h +diff -Nur mozilla-release.orig/js/src/config/system-headers mozilla-release/js/src/config/system-headers +--- mozilla-release.orig/js/src/config/system-headers ++++ mozilla-release/js/src/config/system-headers +@@ -408,16 +408,29 @@ freetype/ftoutln.h + freetype/ttnameid.h + freetype/tttables.h + freetype/t1tables.h + freetype/ftlcdfil.h + freetype/ftsizes.h + freetype/ftadvanc.h + freetype/ftbitmap.h + freetype/ftxf86.h ++freetype.h ++ftcache.h ++ftglyph.h ++ftsynth.h ++ftoutln.h ++ttnameid.h ++tttables.h ++t1tables.h ++ftlcdfil.h ++ftsizes.h ++ftadvanc.h ++ftbitmap.h ++ftxf86.h + fribidi/fribidi.h + FSp_fopen.h + fstream + fstream.h + ft2build.h + fts.h + gconf/gconf-client.h + Gdiplus.h Copied: xulrunner/repos/community-testing-i686/mozconfig (from rev 118041, xulrunner/trunk/mozconfig) =================================================================== --- community-testing-i686/mozconfig (rev 0) +++ community-testing-i686/mozconfig 2014-08-28 19:59:16 UTC (rev 118042) @@ -0,0 +1,32 @@ +. $topsrcdir/xulrunner/config/mozconfig + +ac_add_options --prefix=/usr +ac_add_options --libdir=/usr/lib + +# System libraries +ac_add_options --with-system-nspr +ac_add_options --with-system-nss +ac_add_options --with-system-jpeg +ac_add_options --with-system-zlib +ac_add_options --with-system-bz2 +ac_add_options --with-system-png +ac_add_options --with-system-libevent +ac_add_options --with-system-libvpx +ac_add_options --with-system-icu +ac_add_options --enable-system-hunspell +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 +ac_add_options --enable-gstreamer=1.0 +ac_add_options --disable-crashreporter +ac_add_options --disable-updater +ac_add_options --disable-tests +ac_add_options --disable-installer + +# https://bugzilla.mozilla.org/show_bug.cgi?id=955876 +#ac_add_options --enable-release Copied: xulrunner/repos/community-testing-i686/mozilla-pkgconfig.patch (from rev 118041, xulrunner/trunk/mozilla-pkgconfig.patch) =================================================================== --- community-testing-i686/mozilla-pkgconfig.patch (rev 0) +++ community-testing-i686/mozilla-pkgconfig.patch 2014-08-28 19:59:16 UTC (rev 118042) @@ -0,0 +1,40 @@ +diff -Nur mozilla-release.orig/xulrunner/installer/libxul-embedding.pc.in mozilla-release/xulrunner/installer/libxul-embedding.pc.in +--- mozilla-release.orig/xulrunner/installer/libxul-embedding.pc.in 2011-12-19 22:11:38.100005674 +0000 ++++ mozilla-release/xulrunner/installer/libxul-embedding.pc.in 2011-12-19 22:14:35.095147521 +0000 +@@ -6,5 +6,6 @@ + Name: libxul-embedding + Description: Static library for version-independent embedding of the Mozilla runtime + Version: %MOZILLA_VERSION% ++Requires: %NSPR_NAME% >= %NSPR_VERSION% + Libs: -L${sdkdir}/lib -lxpcomglue -ldl + Cflags: -DXPCOM_GLUE -I${includedir} %WCHAR_CFLAGS% +diff -Nur mozilla-release.orig/xulrunner/installer/libxul.pc.in mozilla-release/xulrunner/installer/libxul.pc.in +--- mozilla-release.orig/xulrunner/installer/libxul.pc.in 2011-12-19 22:11:38.126672110 +0000 ++++ mozilla-release/xulrunner/installer/libxul.pc.in 2011-12-19 22:14:04.375412141 +0000 +@@ -1,5 +1,6 @@ + prefix=%prefix% + sdkdir=%sdkdir% ++libdir=%libdir% + includedir=%includedir% + idldir=%idldir% + +diff -Nur mozilla-release.orig/xulrunner/installer/Makefile.in mozilla-release/xulrunner/installer/Makefile.in +--- mozilla-release.orig/xulrunner/installer/Makefile.in 2011-12-19 22:11:38.126672110 +0000 ++++ mozilla-release/xulrunner/installer/Makefile.in 2011-12-19 22:18:28.743135321 +0000 +@@ -108,6 +108,7 @@ + -e "s|%includedir%|$(includedir)|" \ + -e "s|%idldir%|$(idldir)|" \ + -e "s|%sdkdir%|$(sdkdir)|" \ ++ -e "s|%libdir%|$(installdir)|" \ + -e "s|%MOZ_APP_NAME%|$(MOZ_APP_NAME)|" \ + -e "s|%MOZILLA_VERSION%|$(MOZ_APP_VERSION)|" \ + -e "s|%WCHAR_CFLAGS%|$(WCHAR_CFLAGS)|" \ +diff -Nur mozilla-release.orig/xulrunner/installer/mozilla-js.pc.in mozilla-release/xulrunner/installer/mozilla-js.pc.in +--- mozilla-release.orig/xulrunner/installer/mozilla-js.pc.in 2011-12-19 22:11:38.126672110 +0000 ++++ mozilla-release/xulrunner/installer/mozilla-js.pc.in 2011-12-19 22:18:55.569571004 +0000 +@@ -7,4 +7,4 @@ + Version: %MOZILLA_VERSION% + Requires: %NSPR_NAME% >= %NSPR_VERSION% + Libs: -L${sdkdir}/lib %MOZ_JS_LINK% +-Cflags: -I${includedir} -DXP_UNIX -DJS_THREADSAFE ++Cflags: -I${includedir} -I${includedir}/js -DXP_UNIX -DJS_THREADSAFE Copied: xulrunner/repos/community-testing-i686/rhbz-966424.patch (from rev 118041, xulrunner/trunk/rhbz-966424.patch) =================================================================== --- community-testing-i686/rhbz-966424.patch (rev 0) +++ community-testing-i686/rhbz-966424.patch 2014-08-28 19:59:16 UTC (rev 118042) @@ -0,0 +1,23 @@ +--- a/toolkit/modules/CertUtils.jsm ++++ b/toolkit/modules/CertUtils.jsm +@@ -170,17 +170,19 @@ this.checkCert = + issuerCert = issuerCert.QueryInterface(Ci.nsIX509Cert3); + var tokenNames = issuerCert.getAllTokenNames({}); + + if (!tokenNames || !tokenNames.some(isBuiltinToken)) + throw new Ce(certNotBuiltInErr, Cr.NS_ERROR_ABORT); + } + + function isBuiltinToken(tokenName) { +- return tokenName == "Builtin Object Token"; ++ return tokenName == "Builtin Object Token" || ++ tokenName == "Default Trust" || ++ tokenName == "System Trust"; + } + + /** + * This class implements nsIBadCertListener. Its job is to prevent "bad cert" + * security dialogs from being shown to the user. It is better to simply fail + * if the certificate is bad. See bug 304286. + * + * @param aAllowNonBuiltInCerts (optional) Copied: xulrunner/repos/community-testing-i686/shared-libs.patch (from rev 118041, xulrunner/trunk/shared-libs.patch) =================================================================== --- community-testing-i686/shared-libs.patch (rev 0) +++ community-testing-i686/shared-libs.patch 2014-08-28 19:59:16 UTC (rev 118042) @@ -0,0 +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 + # Some files have been already bundled with xulrunner + ifndef SYSTEM_LIBXUL +-MOZ_PKG_FATAL_WARNINGS = 1 ++MOZ_PKG_FATAL_WARNINGS = 0 + endif + + MOZ_NONLOCALIZED_PKG_LIST = \ Copied: xulrunner/repos/community-testing-i686/unbreak-plugin-build.patch (from rev 118041, xulrunner/trunk/unbreak-plugin-build.patch) =================================================================== --- community-testing-i686/unbreak-plugin-build.patch (rev 0) +++ community-testing-i686/unbreak-plugin-build.patch 2014-08-28 19:59:16 UTC (rev 118042) @@ -0,0 +1,76 @@ + +# HG changeset patch +# User Ehsan Akhgari <eh...@mozilla.com> +# Date 1392421799 18000 +# Node ID 0691948a0abedc7db35c4cb67ec11ad06f782ab0 +# Parent 6f78482c5792b03adca38c924cc4a41f6e16b8ff +Bug 784739 follow-up: Use NULL in npruntime.h + +diff --git a/dom/plugins/base/npruntime.h b/dom/plugins/base/npruntime.h +--- a/dom/plugins/base/npruntime.h ++++ b/dom/plugins/base/npruntime.h +@@ -132,23 +132,23 @@ void NPN_ReleaseVariantValue(NPVariant * + #define NPVARIANT_TO_INT32(_v) ((_v).value.intValue) + #define NPVARIANT_TO_DOUBLE(_v) ((_v).value.doubleValue) + #define NPVARIANT_TO_STRING(_v) ((_v).value.stringValue) + #define NPVARIANT_TO_OBJECT(_v) ((_v).value.objectValue) + + #define VOID_TO_NPVARIANT(_v) \ + NP_BEGIN_MACRO \ + (_v).type = NPVariantType_Void; \ +- (_v).value.objectValue = nullptr; \ ++ (_v).value.objectValue = NULL; \ + NP_END_MACRO + + #define NULL_TO_NPVARIANT(_v) \ + NP_BEGIN_MACRO \ + (_v).type = NPVariantType_Null; \ +- (_v).value.objectValue = nullptr; \ ++ (_v).value.objectValue = NULL; \ + NP_END_MACRO + + #define BOOLEAN_TO_NPVARIANT(_val, _v) \ + NP_BEGIN_MACRO \ + (_v).type = NPVariantType_Bool; \ + (_v).value.boolValue = !!(_val); \ + NP_END_MACRO + +@@ -211,17 +211,17 @@ typedef void *NPIdentifier; + + /* + NPObjects have methods and properties. Methods and properties are + identified with NPIdentifiers. These identifiers may be reflected + in script. NPIdentifiers can be either strings or integers, IOW, + methods and properties can be identified by either strings or + integers (i.e. foo["bar"] vs foo[1]). NPIdentifiers can be + compared using ==. In case of any errors, the requested +- NPIdentifier(s) will be nullptr. NPIdentifier lifetime is controlled ++ NPIdentifier(s) will be NULL. NPIdentifier lifetime is controlled + by the browser. Plugins do not need to worry about memory management + with regards to NPIdentifiers. + */ + NPIdentifier NPN_GetStringIdentifier(const NPUTF8 *name); + void NPN_GetStringIdentifiers(const NPUTF8 **names, int32_t nameCount, + NPIdentifier *identifiers); + NPIdentifier NPN_GetIntIdentifier(int32_t intid); + bool NPN_IdentifierIsString(NPIdentifier identifier); +@@ -278,17 +278,17 @@ typedef bool (*NPConstructFunctionPtr)(N + NPInvokeFunctionPtr function may return 0 to indicate a void + result. + + NPInvalidateFunctionPtr is called by the scripting environment + when the native code is shutdown. Any attempt to message a + NPObject instance after the invalidate callback has been + called will result in undefined behavior, even if the native code + is still retaining those NPObject instances. (The runtime +- will typically return immediately, with 0 or nullptr, from an ++ will typically return immediately, with 0 or NULL, from an + attempt to dispatch to a NPObject, but this behavior should not + be depended upon.) + + The NPEnumerationFunctionPtr function may pass an array of + NPIdentifiers back to the caller. The callee allocs the memory of + the array using NPN_MemAlloc(), and it's the caller's responsibility + to release it using NPN_MemFree(). + */ + Copied: xulrunner/repos/community-testing-x86_64/PKGBUILD (from rev 118041, xulrunner/trunk/PKGBUILD) =================================================================== --- community-testing-x86_64/PKGBUILD (rev 0) +++ community-testing-x86_64/PKGBUILD 2014-08-28 19:59:16 UTC (rev 118042) @@ -0,0 +1,77 @@ +# $Id$ +# Maintainer: Connor Behan <connor.be...@gmail.com> +# Contributor: Jan de Groot <j...@archlinux.org> +# Contributor: Alexander Baldeck <alexan...@archlinux.org> + +pkgname=xulrunner +pkgver=31.0 +pkgrel=2 +pkgdesc="Mozilla Runtime Environment" +arch=('i686' 'x86_64') +license=('MPL' 'GPL' 'LGPL') +depends=('gtk2' 'mozilla-common' 'nss' 'libxt' 'hunspell' 'startup-notification' 'mime-types' 'dbus-glib' 'libpulse' 'libevent' 'libvpx' 'icu' 'python2') +makedepends=('zip' 'unzip' 'pkg-config' 'diffutils' 'yasm' 'mesa' 'autoconf2.13' 'gst-plugins-base-libs') +url="http://wiki.mozilla.org/XUL:Xul_Runner" +source=(ftp://ftp.mozilla.org/pub/mozilla.org/xulrunner/releases/$pkgver/source/xulrunner-$pkgver.source.tar.bz2 + mozconfig + mozilla-pkgconfig.patch + shared-libs.patch + rhbz-966424.patch) +options=('!emptydirs' '!makeflags' 'staticlibs') +replaces=('xulrunner-oss') +sha256sums=('6f4cb97e4debe2225f94bc813057154d2aa2680f5aa69573048633507cecb21e' + 'df0e663e7f9246b84936882e564270fac541c6bb39450b759abe686e5c27a052' + '23485d937035648add27a7657f6934dc5b295e886cdb0506eebd02a43d07f269' + 'e2b4a00d14f4ba69c62b3f9ef9908263fbab179ba8004197cbc67edbd916fdf1' + '746cb474c5a2c26fc474256e430e035e604b71b27df1003d4af85018fa263f4a') + +prepare() { + cd "$srcdir/mozilla-release" + cp "$srcdir/mozconfig" .mozconfig + + #fix libdir/sdkdir - fedora + patch -Np1 -i ../mozilla-pkgconfig.patch + patch -Np1 -i ../shared-libs.patch + + # https://bugs.archlinux.org/task/41689 + patch -Np1 -i ../rhbz-966424.patch + + # WebRTC build tries to execute "python" and expects Python 2 + # Workaround taken from chromium PKGBUILD + mkdir "$srcdir/python2-path" + ln -s /usr/bin/python2 "$srcdir/python2-path/python" + + # configure script misdetects the preprocessor without an optimization level + # https://bugs.archlinux.org/task/34644 + sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' configure +} + +build() { + cd "$srcdir/mozilla-release" + + export PATH="$srcdir/python2-path:$PATH" + export LDFLAGS="$LDFALGS -Wl,-rpath,/usr/lib/xulrunner-$pkgver" + export PYTHON="/usr/bin/python2" + + make -j1 -f client.mk build +} + +package() { + cd "$srcdir/mozilla-release" + make -j1 -f client.mk DESTDIR="$pkgdir" install + + # Use system-provided dictionaries + rm -rf "$pkgdir"/usr/lib/xulrunner-$pkgver/{dictionaries,hyphenation} + ln -sf /usr/share/hunspell "$pkgdir/usr/lib/xulrunner-$pkgver/dictionaries" + ln -sf /usr/share/hyphen "$pkgdir/usr/lib/xulrunner-$pkgver/hyphenation" + + # add xulrunner library path to ld.so.conf + install -d $pkgdir/etc/ld.so.conf.d + echo "/usr/lib/xulrunner-$pkgver" > $pkgdir/etc/ld.so.conf.d/xulrunner.conf + + chmod +x "${pkgdir}/usr/lib/xulrunner-devel-$pkgver/sdk/bin/xpt.py" + chmod +x "${pkgdir}/usr/lib/xulrunner-devel-$pkgver/sdk/bin/xpcshell" + ln -s /usr/lib/xulrunner-devel-$pkgver/sdk/bin/xpcshell "${pkgdir}/usr/lib/xulrunner-$pkgver/xpcshell" + sed -i 's|!/usr/bin/env python$|!/usr/bin/env python2|' \ + "$pkgdir"/usr/lib/xulrunner-devel-$pkgver/sdk/bin/{xpt,header,typelib,xpidl}.py +} Copied: xulrunner/repos/community-testing-x86_64/freetype-headers.patch (from rev 118041, xulrunner/trunk/freetype-headers.patch) =================================================================== --- community-testing-x86_64/freetype-headers.patch (rev 0) +++ community-testing-x86_64/freetype-headers.patch 2014-08-28 19:59:16 UTC (rev 118042) @@ -0,0 +1,66 @@ +diff -Nur mozilla-release.orig/config/system-headers mozilla-release/config/system-headers +--- mozilla-release.orig/config/system-headers ++++ mozilla-release/config/system-headers +@@ -408,16 +408,29 @@ freetype/ftoutln.h + freetype/ttnameid.h + freetype/tttables.h + freetype/t1tables.h + freetype/ftlcdfil.h + freetype/ftsizes.h + freetype/ftadvanc.h + freetype/ftbitmap.h + freetype/ftxf86.h ++freetype.h ++ftcache.h ++ftglyph.h ++ftsynth.h ++ftoutln.h ++ttnameid.h ++tttables.h ++t1tables.h ++ftlcdfil.h ++ftsizes.h ++ftadvanc.h ++ftbitmap.h ++ftxf86.h + fribidi/fribidi.h + FSp_fopen.h + fstream + fstream.h + ft2build.h + fts.h + gconf/gconf-client.h + Gdiplus.h +diff -Nur mozilla-release.orig/js/src/config/system-headers mozilla-release/js/src/config/system-headers +--- mozilla-release.orig/js/src/config/system-headers ++++ mozilla-release/js/src/config/system-headers +@@ -408,16 +408,29 @@ freetype/ftoutln.h + freetype/ttnameid.h + freetype/tttables.h + freetype/t1tables.h + freetype/ftlcdfil.h + freetype/ftsizes.h + freetype/ftadvanc.h + freetype/ftbitmap.h + freetype/ftxf86.h ++freetype.h ++ftcache.h ++ftglyph.h ++ftsynth.h ++ftoutln.h ++ttnameid.h ++tttables.h ++t1tables.h ++ftlcdfil.h ++ftsizes.h ++ftadvanc.h ++ftbitmap.h ++ftxf86.h + fribidi/fribidi.h + FSp_fopen.h + fstream + fstream.h + ft2build.h + fts.h + gconf/gconf-client.h + Gdiplus.h Copied: xulrunner/repos/community-testing-x86_64/mozconfig (from rev 118041, xulrunner/trunk/mozconfig) =================================================================== --- community-testing-x86_64/mozconfig (rev 0) +++ community-testing-x86_64/mozconfig 2014-08-28 19:59:16 UTC (rev 118042) @@ -0,0 +1,32 @@ +. $topsrcdir/xulrunner/config/mozconfig + +ac_add_options --prefix=/usr +ac_add_options --libdir=/usr/lib + +# System libraries +ac_add_options --with-system-nspr +ac_add_options --with-system-nss +ac_add_options --with-system-jpeg +ac_add_options --with-system-zlib +ac_add_options --with-system-bz2 +ac_add_options --with-system-png +ac_add_options --with-system-libevent +ac_add_options --with-system-libvpx +ac_add_options --with-system-icu +ac_add_options --enable-system-hunspell +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 +ac_add_options --enable-gstreamer=1.0 +ac_add_options --disable-crashreporter +ac_add_options --disable-updater +ac_add_options --disable-tests +ac_add_options --disable-installer + +# https://bugzilla.mozilla.org/show_bug.cgi?id=955876 +#ac_add_options --enable-release Copied: xulrunner/repos/community-testing-x86_64/mozilla-pkgconfig.patch (from rev 118041, xulrunner/trunk/mozilla-pkgconfig.patch) =================================================================== --- community-testing-x86_64/mozilla-pkgconfig.patch (rev 0) +++ community-testing-x86_64/mozilla-pkgconfig.patch 2014-08-28 19:59:16 UTC (rev 118042) @@ -0,0 +1,40 @@ +diff -Nur mozilla-release.orig/xulrunner/installer/libxul-embedding.pc.in mozilla-release/xulrunner/installer/libxul-embedding.pc.in +--- mozilla-release.orig/xulrunner/installer/libxul-embedding.pc.in 2011-12-19 22:11:38.100005674 +0000 ++++ mozilla-release/xulrunner/installer/libxul-embedding.pc.in 2011-12-19 22:14:35.095147521 +0000 +@@ -6,5 +6,6 @@ + Name: libxul-embedding + Description: Static library for version-independent embedding of the Mozilla runtime + Version: %MOZILLA_VERSION% ++Requires: %NSPR_NAME% >= %NSPR_VERSION% + Libs: -L${sdkdir}/lib -lxpcomglue -ldl + Cflags: -DXPCOM_GLUE -I${includedir} %WCHAR_CFLAGS% +diff -Nur mozilla-release.orig/xulrunner/installer/libxul.pc.in mozilla-release/xulrunner/installer/libxul.pc.in +--- mozilla-release.orig/xulrunner/installer/libxul.pc.in 2011-12-19 22:11:38.126672110 +0000 ++++ mozilla-release/xulrunner/installer/libxul.pc.in 2011-12-19 22:14:04.375412141 +0000 +@@ -1,5 +1,6 @@ + prefix=%prefix% + sdkdir=%sdkdir% ++libdir=%libdir% + includedir=%includedir% + idldir=%idldir% + +diff -Nur mozilla-release.orig/xulrunner/installer/Makefile.in mozilla-release/xulrunner/installer/Makefile.in +--- mozilla-release.orig/xulrunner/installer/Makefile.in 2011-12-19 22:11:38.126672110 +0000 ++++ mozilla-release/xulrunner/installer/Makefile.in 2011-12-19 22:18:28.743135321 +0000 +@@ -108,6 +108,7 @@ + -e "s|%includedir%|$(includedir)|" \ + -e "s|%idldir%|$(idldir)|" \ + -e "s|%sdkdir%|$(sdkdir)|" \ ++ -e "s|%libdir%|$(installdir)|" \ + -e "s|%MOZ_APP_NAME%|$(MOZ_APP_NAME)|" \ + -e "s|%MOZILLA_VERSION%|$(MOZ_APP_VERSION)|" \ + -e "s|%WCHAR_CFLAGS%|$(WCHAR_CFLAGS)|" \ +diff -Nur mozilla-release.orig/xulrunner/installer/mozilla-js.pc.in mozilla-release/xulrunner/installer/mozilla-js.pc.in +--- mozilla-release.orig/xulrunner/installer/mozilla-js.pc.in 2011-12-19 22:11:38.126672110 +0000 ++++ mozilla-release/xulrunner/installer/mozilla-js.pc.in 2011-12-19 22:18:55.569571004 +0000 +@@ -7,4 +7,4 @@ + Version: %MOZILLA_VERSION% + Requires: %NSPR_NAME% >= %NSPR_VERSION% + Libs: -L${sdkdir}/lib %MOZ_JS_LINK% +-Cflags: -I${includedir} -DXP_UNIX -DJS_THREADSAFE ++Cflags: -I${includedir} -I${includedir}/js -DXP_UNIX -DJS_THREADSAFE Copied: xulrunner/repos/community-testing-x86_64/rhbz-966424.patch (from rev 118041, xulrunner/trunk/rhbz-966424.patch) =================================================================== --- community-testing-x86_64/rhbz-966424.patch (rev 0) +++ community-testing-x86_64/rhbz-966424.patch 2014-08-28 19:59:16 UTC (rev 118042) @@ -0,0 +1,23 @@ +--- a/toolkit/modules/CertUtils.jsm ++++ b/toolkit/modules/CertUtils.jsm +@@ -170,17 +170,19 @@ this.checkCert = + issuerCert = issuerCert.QueryInterface(Ci.nsIX509Cert3); + var tokenNames = issuerCert.getAllTokenNames({}); + + if (!tokenNames || !tokenNames.some(isBuiltinToken)) + throw new Ce(certNotBuiltInErr, Cr.NS_ERROR_ABORT); + } + + function isBuiltinToken(tokenName) { +- return tokenName == "Builtin Object Token"; ++ return tokenName == "Builtin Object Token" || ++ tokenName == "Default Trust" || ++ tokenName == "System Trust"; + } + + /** + * This class implements nsIBadCertListener. Its job is to prevent "bad cert" + * security dialogs from being shown to the user. It is better to simply fail + * if the certificate is bad. See bug 304286. + * + * @param aAllowNonBuiltInCerts (optional) Copied: xulrunner/repos/community-testing-x86_64/shared-libs.patch (from rev 118041, xulrunner/trunk/shared-libs.patch) =================================================================== --- community-testing-x86_64/shared-libs.patch (rev 0) +++ community-testing-x86_64/shared-libs.patch 2014-08-28 19:59:16 UTC (rev 118042) @@ -0,0 +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 + # Some files have been already bundled with xulrunner + ifndef SYSTEM_LIBXUL +-MOZ_PKG_FATAL_WARNINGS = 1 ++MOZ_PKG_FATAL_WARNINGS = 0 + endif + + MOZ_NONLOCALIZED_PKG_LIST = \ Copied: xulrunner/repos/community-testing-x86_64/unbreak-plugin-build.patch (from rev 118041, xulrunner/trunk/unbreak-plugin-build.patch) =================================================================== --- community-testing-x86_64/unbreak-plugin-build.patch (rev 0) +++ community-testing-x86_64/unbreak-plugin-build.patch 2014-08-28 19:59:16 UTC (rev 118042) @@ -0,0 +1,76 @@ + +# HG changeset patch +# User Ehsan Akhgari <eh...@mozilla.com> +# Date 1392421799 18000 +# Node ID 0691948a0abedc7db35c4cb67ec11ad06f782ab0 +# Parent 6f78482c5792b03adca38c924cc4a41f6e16b8ff +Bug 784739 follow-up: Use NULL in npruntime.h + +diff --git a/dom/plugins/base/npruntime.h b/dom/plugins/base/npruntime.h +--- a/dom/plugins/base/npruntime.h ++++ b/dom/plugins/base/npruntime.h +@@ -132,23 +132,23 @@ void NPN_ReleaseVariantValue(NPVariant * + #define NPVARIANT_TO_INT32(_v) ((_v).value.intValue) + #define NPVARIANT_TO_DOUBLE(_v) ((_v).value.doubleValue) + #define NPVARIANT_TO_STRING(_v) ((_v).value.stringValue) + #define NPVARIANT_TO_OBJECT(_v) ((_v).value.objectValue) + + #define VOID_TO_NPVARIANT(_v) \ + NP_BEGIN_MACRO \ + (_v).type = NPVariantType_Void; \ +- (_v).value.objectValue = nullptr; \ ++ (_v).value.objectValue = NULL; \ + NP_END_MACRO + + #define NULL_TO_NPVARIANT(_v) \ + NP_BEGIN_MACRO \ + (_v).type = NPVariantType_Null; \ +- (_v).value.objectValue = nullptr; \ ++ (_v).value.objectValue = NULL; \ + NP_END_MACRO + + #define BOOLEAN_TO_NPVARIANT(_val, _v) \ + NP_BEGIN_MACRO \ + (_v).type = NPVariantType_Bool; \ + (_v).value.boolValue = !!(_val); \ + NP_END_MACRO + +@@ -211,17 +211,17 @@ typedef void *NPIdentifier; + + /* + NPObjects have methods and properties. Methods and properties are + identified with NPIdentifiers. These identifiers may be reflected + in script. NPIdentifiers can be either strings or integers, IOW, + methods and properties can be identified by either strings or + integers (i.e. foo["bar"] vs foo[1]). NPIdentifiers can be + compared using ==. In case of any errors, the requested +- NPIdentifier(s) will be nullptr. NPIdentifier lifetime is controlled ++ NPIdentifier(s) will be NULL. NPIdentifier lifetime is controlled + by the browser. Plugins do not need to worry about memory management + with regards to NPIdentifiers. + */ + NPIdentifier NPN_GetStringIdentifier(const NPUTF8 *name); + void NPN_GetStringIdentifiers(const NPUTF8 **names, int32_t nameCount, + NPIdentifier *identifiers); + NPIdentifier NPN_GetIntIdentifier(int32_t intid); + bool NPN_IdentifierIsString(NPIdentifier identifier); +@@ -278,17 +278,17 @@ typedef bool (*NPConstructFunctionPtr)(N + NPInvokeFunctionPtr function may return 0 to indicate a void + result. + + NPInvalidateFunctionPtr is called by the scripting environment + when the native code is shutdown. Any attempt to message a + NPObject instance after the invalidate callback has been + called will result in undefined behavior, even if the native code + is still retaining those NPObject instances. (The runtime +- will typically return immediately, with 0 or nullptr, from an ++ will typically return immediately, with 0 or NULL, from an + attempt to dispatch to a NPObject, but this behavior should not + be depended upon.) + + The NPEnumerationFunctionPtr function may pass an array of + NPIdentifiers back to the caller. The callee allocs the memory of + the array using NPN_MemAlloc(), and it's the caller's responsibility + to release it using NPN_MemFree(). + */ +