diff --git a/community/xulrunner/PKGBUILD b/community/xulrunner/PKGBUILD index 40d3c33e8..b9d2af494 100644 --- a/community/xulrunner/PKGBUILD +++ b/community/xulrunner/PKGBUILD @@ -8,8 +8,8 @@ # - set extra CFLAG for v5 pkgname=xulrunner -pkgver=27.0 -pkgrel=2 +pkgver=28.0 +pkgrel=1 pkgdesc="Mozilla Runtime Environment" arch=('i686' 'x86_64') license=('MPL' 'GPL' 'LGPL') @@ -19,15 +19,13 @@ 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 - unbreak-plugin-build.patch) + shared-libs.patch) options=('!emptydirs' 'staticlibs') replaces=('xulrunner-oss') -sha256sums=('4f6125c053e12c4ac3317b075e289b10ce470dd90ed6fc43c4572bf1acc64981' - '1afb707bb7bdeb1f9b7a0d5ff875255bb634c1da81cb943e823559b773908204' +sha256sums=('6eacdc549c252da57d1f51a363ad8c7e62f09ec8c796e8eb69ddb3e1008df7af' + '7fd271e467e7bc61907d61c64b8dd57be152443d0517df3f3579a0e12785e5cd' '23485d937035648add27a7657f6934dc5b295e886cdb0506eebd02a43d07f269' - 'e2b4a00d14f4ba69c62b3f9ef9908263fbab179ba8004197cbc67edbd916fdf1' - '94eef5c52868bf306017898b424f41b124fa39b70dbc8f2bc1c18d9f1c042752') + 'e2b4a00d14f4ba69c62b3f9ef9908263fbab179ba8004197cbc67edbd916fdf1') prepare() { cd "$srcdir/mozilla-release" @@ -36,7 +34,6 @@ prepare() { #fix libdir/sdkdir - fedora patch -Np1 -i ../mozilla-pkgconfig.patch patch -Np1 -i ../shared-libs.patch - patch -Np1 -i ../unbreak-plugin-build.patch # WebRTC build tries to execute "python" and expects Python 2 # Workaround taken from chromium PKGBUILD diff --git a/community/xulrunner/mozconfig b/community/xulrunner/mozconfig index 63255fedf..4807c7189 100644 --- a/community/xulrunner/mozconfig +++ b/community/xulrunner/mozconfig @@ -34,4 +34,4 @@ ac_add_options --disable-tests ac_add_options --disable-installer # https://bugzilla.mozilla.org/show_bug.cgi?id=955876 -ac_add_options --enable-release +#ac_add_options --enable-release diff --git a/community/xulrunner/unbreak-plugin-build.patch b/community/xulrunner/unbreak-plugin-build.patch deleted file mode 100644 index 63e624ef3..000000000 --- a/community/xulrunner/unbreak-plugin-build.patch +++ /dev/null @@ -1,76 +0,0 @@ - -# HG changeset patch -# User Ehsan Akhgari -# 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(). - */ -