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

[qboosh]

Author: qboosh                       Date: Sun Jun 24 05:19:02 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 4.9.2
- updated 64bit patch

---- Files affected:
packages/python-PyQt4:
   python-PyQt4-64bit.patch (1.4 -> 1.5) , python-PyQt4.spec (1.72 -> 1.73) 

---- Diffs:

================================================================
Index: packages/python-PyQt4/python-PyQt4-64bit.patch
diff -u packages/python-PyQt4/python-PyQt4-64bit.patch:1.4 packages/python-PyQt4/python-PyQt4-64bit.patch:1.5
--- packages/python-PyQt4/python-PyQt4-64bit.patch:1.4	Fri Jul  1 15:54:48 2011
+++ packages/python-PyQt4/python-PyQt4-64bit.patch	Sun Jun 24 07:18:57 2012
@@ -1,28 +1,28 @@
---- 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 @@
+--- PyQt-x11-gpl-4.9.2/configure.py.orig	2012-06-23 22:27:26.000000000 +0200
++++ PyQt-x11-gpl-4.9.2/configure.py	2012-06-23 22:31:20.495786424 +0200
+@@ -965,6 +965,7 @@
              else:
                  # Use distutils to get the additional configuration.
                  from distutils.sysconfig import get_config_vars
 +                from distutils.sysconfig import get_python_lib
                  ducfg = get_config_vars()
  
-                 if sys.platform == "darwin":
-                     # We need to work out how to specify the right framework
-                     # version.
-                     link = "-framework Python"
--                elif "--enable-shared" in ducfg.get("CONFIG_ARGS", ""):
+                 config_args = ducfg.get("CONFIG_ARGS", "")
+@@ -979,16 +980,7 @@
+                     dynamic_pylib = "--enable-shared" in config_args
+ 
+                 if dynamic_pylib:
 -                    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")
+-                        lib_dir_flag = ''
 -                        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", "") ):
-+                    link = "-L%s -lpython%d.%d" % (get_python_lib(plat_specific=1, standard_lib=1), py_major, py_minor)
++                    link = "-L%s -lpython%d.%d%s" % (get_python_lib(plat_specific=1, standard_lib=1), py_major, py_minor, abi)
                  else:
                      sipconfig.inform("Qt Designer plugin disabled because Python library is static")
                      opts.designer_plugin = False

================================================================
Index: packages/python-PyQt4/python-PyQt4.spec
diff -u packages/python-PyQt4/python-PyQt4.spec:1.72 packages/python-PyQt4/python-PyQt4.spec:1.73
--- packages/python-PyQt4/python-PyQt4.spec:1.72	Sat Feb 18 21:09:02 2012
+++ packages/python-PyQt4/python-PyQt4.spec	Sun Jun 24 07:18:57 2012
@@ -1,19 +1,19 @@
 # $Revision$, $Date$
 %define		module	PyQt4
 # minimal required sip version
-%define		sip_ver	2:4.13.1
+%define		sip_ver	2:4.13.3
 # last qt version covered by these bindings (minimal required is currently 4.1.0)
 %define		qt_ver	4.8.0
 
 Summary:	Python bindings for the Qt4 toolkit
 Summary(pl.UTF-8):	Dowiązania do toolkitu Qt4 dla Pythona
 Name:		python-%{module}
-Version:	4.9.1
+Version:	4.9.2
 Release:	1
 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
-# Source0-md5:	7f495dc49f71e3bfb64bf942e0d8bb3c
+# Source0-md5:	df3f588118697d6d16f7ffddb141d0d2
 Patch0:		%{name}-dbuspath.patch
 Patch1:		%{name}-64bit.patch
 URL:		http://www.riverbankcomputing.com/software/pyqt/
@@ -223,6 +223,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.73  2012/06/24 05:18:57  qboosh
+- updated to 4.9.2
+- updated 64bit patch
+
 Revision 1.72  2012/02/18 20:09:02  qboosh
 - updated to 4.9.1
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/python-PyQt4/python-PyQt4-64bit.patch?r1=1.4&r2=1.5
    http://cvs.pld-linux.org/packages/python-PyQt4/python-PyQt4.spec?r1=1.72&r2=1.73