SOURCES: python-PyQt4-64bit.patch - updated for 4.4.4
charles
charles at pld-linux.org
Tue Nov 18 10:51:25 CET 2008
Author: charles Date: Tue Nov 18 09:51:25 2008 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated for 4.4.4
---- Files affected:
SOURCES:
python-PyQt4-64bit.patch (1.1 -> 1.2)
---- Diffs:
================================================================
Index: SOURCES/python-PyQt4-64bit.patch
diff -u SOURCES/python-PyQt4-64bit.patch:1.1 SOURCES/python-PyQt4-64bit.patch:1.2
--- SOURCES/python-PyQt4-64bit.patch:1.1 Thu Oct 16 18:48:57 2008
+++ SOURCES/python-PyQt4-64bit.patch Tue Nov 18 10:51:20 2008
@@ -1,11 +1,10 @@
-diff -up PyQt-x11-gpl-4.4.3/configure.py.64bit PyQt-x11-gpl-4.4.3/configure.py
---- PyQt-x11-gpl-4.4.3/configure.py.64bit 2008-08-08 09:09:58.000000000 -0500
-+++ PyQt-x11-gpl-4.4.3/configure.py 2008-08-14 10:38:22.000000000 -0500
-@@ -755,16 +755,15 @@ include(%s)
+--- 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 @@
else:
# Use distutils to get the additional configuration.
from distutils.sysconfig import get_config_vars
-+ from distutils.sysconfig import get_python_lib
++ from distutils.sysconfig import get_python_lib
ducfg = get_config_vars()
if sys.platform == "darwin":
@@ -13,11 +12,11 @@
# version.
link = "-framework Python"
- elif ("--enable-shared" in ducfg.get("CONFIG_ARGS", "") and
-- glob.glob("%s/lib/libpython%d.%d*" % (ducfg["prefix"], py_major, py_minor))):
-- lib_dir_flag = quote("-L%s/lib" % ducfg["prefix"])
+- glob.glob("%s/lib/libpython%d.%d*" % (ducfg["exec_prefix"], py_major, py_minor))):
+- lib_dir_flag = quote("-L%s/lib" % ducfg["exec_prefix"])
- link = "%s -lpython%d.%d" % (lib_dir_flag, py_major, py_minor)
+ 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")
- enabled = False
+ opts.designer_plugin = False
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/python-PyQt4-64bit.patch?r1=1.1&r2=1.2&f=u
More information about the pld-cvs-commit
mailing list