[arch-commits] CVS update of extra/lib/xulrunner (2 files)

[Alexander Baldeck]

    Date: Thursday, May 31, 2007 @ 10:19:48
  Author: alexander
    Path: /home/cvs-extra/extra/lib/xulrunner

   Added: xulrunner-1.8.1.4-amd64-python-input.patch (1.1)
Modified: PKGBUILD (1.19 -> 1.20)

upgpkg: xulrunner 1.8.1.4


--------------------------------------------+
 PKGBUILD                                   |   27 ++++++-----
 xulrunner-1.8.1.4-amd64-python-input.patch |   63 +++++++++++++++++++++++++++
 2 files changed, 78 insertions(+), 12 deletions(-)


Index: extra/lib/xulrunner/PKGBUILD
diff -u extra/lib/xulrunner/PKGBUILD:1.19 extra/lib/xulrunner/PKGBUILD:1.20
--- extra/lib/xulrunner/PKGBUILD:1.19	Thu May 31 05:10:38 2007
+++ extra/lib/xulrunner/PKGBUILD	Thu May 31 10:19:48 2007
@@ -1,6 +1,5 @@
-# $Id: PKGBUILD,v 1.19 2007/05/31 09:10:38 jgc Exp $
+# $Id: PKGBUILD,v 1.20 2007/05/31 14:19:48 alexander Exp $
 # Maintainer: Jan de Groot <jgc at archlinux.org>
-
 pkgname=xulrunner
 pkgver=1.8.1.4
 pkgrel=1
@@ -18,14 +17,8 @@
 	firefox-2.0-buildversion.patch
         moz310924.patch
 	moz325644.patch
-	nsIPermission.patch)
-md5sums=('f9422104ef62a02afb78becca010d9f1'
-         '2bafb127caff08ee79b7f10091f2cfcb'
-         '288fb7db871700ff5cf7286db6192b45'
-         '11b221ff41078d97c131e17361072e47'
-         '29194973e2a535b460c6b7f92c635eaf'
-         '2082c2a2d1cedd08e83179271aacf337'
-         'c24033e06bde73b3bd3d935ea87c22df')
+	nsIPermission.patch
+	xulrunner-1.8.1.4-amd64-python-input.patch)
 
 build() {
   export MAKEFLAGS="-j1"
@@ -35,8 +28,10 @@
   patch -Np0 -i ${startdir}/src/moz325644.patch || return 1
   patch -Np1 -i ${startdir}/src/firefox-1.5-pango-cursor-position.patch || return 1
   patch -Np0 -i ${startdir}/src/nsIPermission.patch || return 1
-  
-  [ "${CARCH}" = "x86_64" ] && echo "ac_cv_visibility_pragma=no" >> ${startdir}/src/mozconfig
+  if [ ${CARCH} == 'x86_64' ]; then
+    patch -Np1 -i ${startdir}/src/xulrunner-1.8.1.4-amd64-python-input.patch || return 1
+    echo "ac_cv_visibility_pragma=no" >> ${startdir}/src/mozconfig
+  fi
 
   sed "s/#CFLAGS#/${CFLAGS}/g" ${startdir}/src/mozconfig >.mozconfig
 
@@ -58,3 +53,11 @@
   mkdir -p ${startdir}/pkg/usr/lib
   mv ${startdir}/pkg/opt/mozilla/lib/python2.5 ${startdir}/pkg/usr/lib/python2.5
 }
+md5sums=('f9422104ef62a02afb78becca010d9f1'
+         '2bafb127caff08ee79b7f10091f2cfcb'
+         '288fb7db871700ff5cf7286db6192b45'
+         '11b221ff41078d97c131e17361072e47'
+         '29194973e2a535b460c6b7f92c635eaf'
+         '2082c2a2d1cedd08e83179271aacf337'
+         'c24033e06bde73b3bd3d935ea87c22df'
+         '11b4bb9460429cc27b1c739875296b7a')
Index: extra/lib/xulrunner/xulrunner-1.8.1.4-amd64-python-input.patch
diff -u /dev/null extra/lib/xulrunner/xulrunner-1.8.1.4-amd64-python-input.patch:1.1
--- /dev/null	Thu May 31 10:19:48 2007
+++ extra/lib/xulrunner/xulrunner-1.8.1.4-amd64-python-input.patch	Thu May 31 10:19:48 2007
@@ -0,0 +1,63 @@
+diff -urNad xulrunner-1.8.0.9~/extensions/python/xpcom/src/PyGInputStream.cpp xulrunner-1.8.0.9/extensions/python/xpcom/src/PyGInputStream.cpp
+--- xulrunner-1.8.0.9~/extensions/python/xpcom/src/PyGInputStream.cpp	2004-04-19 00:13:54.000000000 +0200
++++ xulrunner-1.8.0.9/extensions/python/xpcom/src/PyGInputStream.cpp	2007-01-19 17:49:19.553832250 +0100
+@@ -105,7 +105,11 @@
+ 	if (NS_SUCCEEDED(nr)) {
+ 		PRUint32 py_size;
+ 		const void *py_buf;
++#ifdef __x86_64__
++		if (PyObject_AsReadBuffer(ret, &py_buf, (long *)&py_size)!=0) {
++#else
+ 		if (PyObject_AsReadBuffer(ret, &py_buf, (int *)&py_size)!=0) {
++#endif
+ 			PyErr_Format(PyExc_TypeError, "nsIInputStream::read() method must return a buffer object - not a '%s' object", ret->ob_type->tp_name);
+ 			nr = HandleNativeGatewayError(methodName);
+ 		} else {
+diff -urNad xulrunner-1.8.0.9~/extensions/python/xpcom/src/PyIInputStream.cpp xulrunner-1.8.0.9/extensions/python/xpcom/src/PyIInputStream.cpp
+--- xulrunner-1.8.0.9~/extensions/python/xpcom/src/PyIInputStream.cpp	2004-04-19 00:13:54.000000000 +0200
++++ xulrunner-1.8.0.9/extensions/python/xpcom/src/PyIInputStream.cpp	2007-01-20 16:39:36.756086250 +0100
+@@ -66,7 +66,11 @@
+ 	PRUint32 nread;
+ 	void *buf;
+ 	PRUint32 buf_len;
++#ifdef __x86_64__
++	if (PyObject_AsWriteBuffer(obBuffer, &buf, (long *)&buf_len) != 0) {
++#else
+ 	if (PyObject_AsWriteBuffer(obBuffer, &buf, (int *)&buf_len) != 0) {
++#endif
+ 		PyErr_Clear();
+ 		PyErr_SetString(PyExc_TypeError, "The buffer object does not have a write buffer!");
+ 		return NULL;
+@@ -117,7 +121,11 @@
+ 		if (rc != NULL) {
+ 			void *ob_buf;
+ 			PRUint32 buf_len;
++#ifdef __x86_64__
++			if (PyObject_AsWriteBuffer(rc, &ob_buf, (long *)&buf_len) != 0) {
++#else	
+ 			if (PyObject_AsWriteBuffer(rc, &ob_buf, (int *)&buf_len) != 0) {
++#endif
+ 				// should never fail - we just created it!
+ 				return NULL;
+ 			}
+@@ -141,12 +149,20 @@
+ 	nsIInputStream *pI = GetI(self);
+ 	if (pI==NULL)
+ 		return NULL;
++#ifdef __x86_64__
++	if (PyArg_ParseTuple(args, "|i", (long *)&n))
++#else
+ 	if (PyArg_ParseTuple(args, "|i", (int *)&n))
++#endif
+ 		// This worked - no args, or just an int.
+ 		return DoPyRead_Size(pI, n);
+ 	// try our other supported arg format.
+ 	PyErr_Clear();
++#ifdef __x86_64__
++	if (!PyArg_ParseTuple(args, "O|i", &obBuffer, (long *)&n)) {
++#else
+ 	if (!PyArg_ParseTuple(args, "O|i", &obBuffer, (int *)&n)) {
++#endif
+ 		PyErr_Clear();
+ 		PyErr_SetString(PyExc_TypeError, "'read()' must be called as (buffer_ob, int_size=-1) or (int_size=-1)");
+ 		return NULL;