packages: python-PyQt4/python-PyQt4-64bit.patch, python-PyQt4/python-PyQt4....

[arekm]

Author: arekm                        Date: Fri Jul  1 13:54:53 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 2; 64bit patch fixed

---- Files affected:
packages/python-PyQt4:
   python-PyQt4-64bit.patch (1.3 -> 1.4) , python-PyQt4.spec (1.67 -> 1.68) 

---- Diffs:

================================================================
Index: packages/python-PyQt4/python-PyQt4-64bit.patch
diff -u packages/python-PyQt4/python-PyQt4-64bit.patch:1.3 packages/python-PyQt4/python-PyQt4-64bit.patch:1.4
--- packages/python-PyQt4/python-PyQt4-64bit.patch:1.3	Mon Jan 24 19:40:00 2011
+++ packages/python-PyQt4/python-PyQt4-64bit.patch	Fri Jul  1 15:54:48 2011
@@ -1,6 +1,6 @@
---- PyQt-x11-gpl-4.4.4/configure.py.orig	2008-11-18 03:44:10.692417175 +0100
-+++ PyQt-x11-gpl-4.4.4/configure.py	2008-11-18 03:47:26.735730174 +0100
-@@ -758,16 +758,15 @@
+--- PyQt-x11-gpl-4.8.4/configure.py~	2011-07-01 15:32:10.000000000 +0200
++++ PyQt-x11-gpl-4.8.4/configure.py	2011-07-01 15:33:57.466398732 +0200
+@@ -946,22 +946,15 @@
              else:
                  # Use distutils to get the additional configuration.
                  from distutils.sysconfig import get_config_vars
@@ -11,11 +11,17 @@
                      # We need to work out how to specify the right framework
                      # version.
                      link = "-framework Python"
--                elif ("--enable-shared" in ducfg.get("CONFIG_ARGS", "") and
--                      glob.glob("%s/lib/libpython%d.%d*" % (ducfg["exec_prefix"], py_major, py_minor))):
--                    lib_dir_flag = quote("-L%s/lib" % ducfg["exec_prefix"])
+-                elif "--enable-shared" in ducfg.get("CONFIG_ARGS", ""):
+-                    if glob.glob("%s/lib/libpython%d.%d*" % (ducfg["exec_prefix"], py_major, py_minor)):
+-                        lib_dir_flag = quote("-L%s/lib" % ducfg["exec_prefix"])
+-                    elif glob.glob("%s/libpython%d.%d*" % (ducfg["LIBDIR"], py_major, py_minor)):
+-                        lib_dir_flag = quote("-L%s" % ducfg["LIBDIR"])
+-                    else:
+-                        sipconfig.inform("Qt Designer plugin disabled because Python library couldn't be found")
+-                        opts.designer_plugin = False
+-
 -                    link = "%s -lpython%d.%d%s" % (lib_dir_flag, py_major, py_minor, abi)
-+                elif ("--enable-shared" in ducfg.get("CONFIG_ARGS", "") ): 
++                elif ("--enable-shared" in ducfg.get("CONFIG_ARGS", "") ):
 +                    link = "-L%s -lpython%d.%d" % (get_python_lib(plat_specific=1, standard_lib=1), py_major, py_minor)
                  else:
                      sipconfig.inform("Qt Designer plugin disabled because Python library is static")

================================================================
Index: packages/python-PyQt4/python-PyQt4.spec
diff -u packages/python-PyQt4/python-PyQt4.spec:1.67 packages/python-PyQt4/python-PyQt4.spec:1.68
--- packages/python-PyQt4/python-PyQt4.spec:1.67	Thu Jun 23 09:11:25 2011
+++ packages/python-PyQt4/python-PyQt4.spec	Fri Jul  1 15:54:48 2011
@@ -9,7 +9,7 @@
 Summary(pl.UTF-8):	Dowiązania do toolkitu Qt4 dla Pythona
 Name:		python-%{module}
 Version:	4.8.4
-Release:	1
+Release:	2
 License:	GPL v2 or GPL v3 with FLOSS exception
 Group:		Libraries/Python
 Source0:	http://www.riverbankcomputing.com/static/Downloads/PyQt4/PyQt-x11-gpl-%{version}.tar.gz
@@ -221,6 +221,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.68  2011/07/01 13:54:48  arekm
+- rel 2; 64bit patch fixed
+
 Revision 1.67  2011/06/23 07:11:25  qboosh
 - updated to 4.8.4; covers qt up to 4.7.2, needs sip >= 4.12.2
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/python-PyQt4/python-PyQt4-64bit.patch?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/python-PyQt4/python-PyQt4.spec?r1=1.67&r2=1.68&f=u