[pkgsrc/trunk]: pkgsrc/devel/xulrunner Resurrect patch deleted during upgrade...

[jmmv <jmmv%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3fb2f0328cb8
branches:  trunk
changeset: 609793:3fb2f0328cb8
user:      jmmv <jmmv%pkgsrc.org@localhost>
date:      Wed Oct 10 11:59:26 2012 +0000

description:
Resurrect patch deleted during upgrade to fix build under NetBSD/macppc.

diffstat:

 devel/xulrunner/distinfo         |   3 +-
 devel/xulrunner/patches/patch-xm |  49 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 51 insertions(+), 1 deletions(-)

diffs (70 lines):

diff -r 34d07e84532f -r 3fb2f0328cb8 devel/xulrunner/distinfo
--- a/devel/xulrunner/distinfo  Wed Oct 10 11:48:39 2012 +0000
+++ b/devel/xulrunner/distinfo  Wed Oct 10 11:59:26 2012 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.78 2012/09/12 14:27:14 ryoon Exp $
+$NetBSD: distinfo,v 1.79 2012/10/10 11:59:26 jmmv Exp $
 
 SHA1 (firefox-15.0.1.source.tar.bz2) = bdbc4b6656c59b926e18f99b3335484427d08641
 RMD160 (firefox-15.0.1.source.tar.bz2) = 2b2116053c883a9a7bb0e04bf8058775d137a070
@@ -102,6 +102,7 @@
 SHA1 (patch-xj) = 5cf280cc2373c73949068c0eaad0a823999d264f
 SHA1 (patch-xk) = cc196485c4e61cf655445910ee069352e3174756
 SHA1 (patch-xl) = 1ad5e95ce8b79ebd3f1f2cbd694c61e821ef8996
+SHA1 (patch-xm) = 051b5e7cca12fd7b922b5e54c58ec5f54d8c18fa
 SHA1 (patch-xn) = 27ca333ce018a5f72278461a55d141c063ac98ca
 SHA1 (patch-xo) = 3d875dad673a47b2059b8eea9f41fe9e370295d5
 SHA1 (patch-xpcom_Makefile.in) = c44608dc176900c3ce49fb7059e42e404a7c6df3
diff -r 34d07e84532f -r 3fb2f0328cb8 devel/xulrunner/patches/patch-xm
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/xulrunner/patches/patch-xm  Wed Oct 10 11:59:26 2012 +0000
@@ -0,0 +1,49 @@
+$NetBSD: patch-xm,v 1.3 2012/10/10 11:59:26 jmmv Exp $
+
+NetBSD/ppc xptcall support code. Originally from pkgsrc/www/mozilla.
+
+--- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc_netbsd.cpp.orig   2012-10-10 00:45:21.000000000 +0000
++++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc_netbsd.cpp
+@@ -5,9 +5,9 @@
+ 
+ // Platform specific code to invoke XPCOM methods on native objects
+ 
+-// The purpose of XPTC_InvokeByIndex() is to map a platform
++// The purpose of NS_InvokeByIndex_P() is to map a platform
+ // indepenpent call to the platform ABI. To do that,
+-// XPTC_InvokeByIndex() has to determine the method to call via vtable
++// NS_InvokeByIndex_P() has to determine the method to call via vtable
+ // access. The parameters for the method are read from the
+ // nsXPTCVariant* and prepared for the native ABI.  For the Linux/PPC
+ // ABI this means that the first 8 integral and floating point
+@@ -69,8 +69,10 @@ invoke_copy_to_stack(PRUint32* d,
+                 if ((PRUint32) d & 4) d++; // doubles are 8-byte aligned on stack
+                 *((double*) d) = s->val.d;
+                 d += 2;
++#if __GXX_ABI_VERSION < 100
+               if (gpr < GPR_COUNT)
+                   gpr += 2;
++#endif
+             }
+         }
+         else if (!s->IsPtrData() && s->type == nsXPTType::T_FLOAT) {
+@@ -79,8 +81,10 @@ invoke_copy_to_stack(PRUint32* d,
+             else {
+                 *((float*) d) = s->val.f;
+               d += 1;
++#if __GXX_ABI_VERSION < 100
+               if (gpr < GPR_COUNT)
+                   gpr += 1;
++#endif
+           }
+         }
+         else if (!s->IsPtrData() && (s->type == nsXPTType::T_I64
+@@ -107,6 +111,6 @@ invoke_copy_to_stack(PRUint32* d,
+ }
+ 
+ extern "C"
+-XPTC_PUBLIC_API(nsresult)
+-XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex,
++EXPORT_XPCOM_API(nsresult)
++NS_InvokeByIndex_P(nsISupports* that, PRUint32 methodIndex,
+                    PRUint32 paramCount, nsXPTCVariant* params);