[arch-commits] Commit in xulrunner/trunk (PKGBUILD unbreak-plugin-build.patch)

[Jan Steffens]

    Date: Thursday, March 13, 2014 @ 23:57:17
  Author: heftig
Revision: 107170

Fix building plugins

Added:
  xulrunner/trunk/unbreak-plugin-build.patch
Modified:
  xulrunner/trunk/PKGBUILD

----------------------------+
 PKGBUILD                   |    9 +++--
 unbreak-plugin-build.patch |   76 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 82 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-03-13 21:45:37 UTC (rev 107169)
+++ PKGBUILD	2014-03-13 22:57:17 UTC (rev 107170)
@@ -5,7 +5,7 @@
 
 pkgname=xulrunner
 pkgver=27.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Mozilla Runtime Environment"
 arch=('i686' 'x86_64')
 license=('MPL' 'GPL' 'LGPL')
@@ -15,13 +15,15 @@
 source=(ftp://ftp.mozilla.org/pub/mozilla.org/xulrunner/releases/$pkgver/source/xulrunner-$pkgver.source.tar.bz2
         mozconfig
         mozilla-pkgconfig.patch
-        shared-libs.patch)
+        shared-libs.patch
+        unbreak-plugin-build.patch)
 options=('!emptydirs' '!makeflags' 'staticlibs')
 replaces=('xulrunner-oss')
 sha256sums=('4f6125c053e12c4ac3317b075e289b10ce470dd90ed6fc43c4572bf1acc64981'
             '8455f7bc00e8ad6e69bba43171083c778420a8b1c566347ed5381ae9cf98191a'
             '23485d937035648add27a7657f6934dc5b295e886cdb0506eebd02a43d07f269'
-            'e2b4a00d14f4ba69c62b3f9ef9908263fbab179ba8004197cbc67edbd916fdf1')
+            'e2b4a00d14f4ba69c62b3f9ef9908263fbab179ba8004197cbc67edbd916fdf1'
+            '94eef5c52868bf306017898b424f41b124fa39b70dbc8f2bc1c18d9f1c042752')
 
 prepare() {
   cd "$srcdir/mozilla-release"
@@ -30,6 +32,7 @@
   #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

Added: unbreak-plugin-build.patch
===================================================================
--- unbreak-plugin-build.patch	                        (rev 0)
+++ unbreak-plugin-build.patch	2014-03-13 22:57:17 UTC (rev 107170)
@@ -0,0 +1,76 @@
+
+# HG changeset patch
+# User Ehsan Akhgari <ehsan at 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().
+ */
+