[Python-modules-commits] r26440 - in packages/python-qt4/trunk/debian (5 files)
mitya57-guest at users.alioth.debian.org
mitya57-guest at users.alioth.debian.org
Sat Nov 9 10:18:18 UTC 2013
Date: Saturday, November 9, 2013 @ 10:18:16
Author: mitya57-guest
Revision: 26440
* Switch from configure.py to configure-ng.py to solve Phonon
detection issue.
* Adopt config_extra_headers.diff to configure-ng.py.
* Drop debian_configure_changes.diff, no longer needed.
* Pass --debug to configure-ng.py when doing debug builds.
Modified:
packages/python-qt4/trunk/debian/changelog
packages/python-qt4/trunk/debian/patches/config_extra_headers.diff
packages/python-qt4/trunk/debian/patches/series
packages/python-qt4/trunk/debian/rules
Deleted:
packages/python-qt4/trunk/debian/patches/debian_configure_changes.diff
Modified: packages/python-qt4/trunk/debian/changelog
===================================================================
--- packages/python-qt4/trunk/debian/changelog 2013-11-09 09:39:22 UTC (rev 26439)
+++ packages/python-qt4/trunk/debian/changelog 2013-11-09 10:18:16 UTC (rev 26440)
@@ -7,6 +7,11 @@
* Add debian/get-orig-source.sh script.
* Update debian/watch to mangle dfsg version.
* Drop debian/python-qt4-doc.docs, we install docs directly.
+ * Switch from configure.py to configure-ng.py to solve Phonon
+ detection issue.
+ * Adopt config_extra_headers.diff to configure-ng.py.
+ * Drop debian_configure_changes.diff, no longer needed.
+ * Pass --debug to configure-ng.py when doing debug builds.
* Add myself to Uploaders.
-- Dmitry Shachnev <mitya57 at gmail.com> Fri, 01 Nov 2013 11:12:39 +0400
Modified: packages/python-qt4/trunk/debian/patches/config_extra_headers.diff
===================================================================
--- packages/python-qt4/trunk/debian/patches/config_extra_headers.diff 2013-11-09 09:39:22 UTC (rev 26439)
+++ packages/python-qt4/trunk/debian/patches/config_extra_headers.diff 2013-11-09 10:18:16 UTC (rev 26440)
@@ -1,43 +1,37 @@
-Description: Include additional Python header directories
- This patch makes is so that additional header directories used in python3.3
- due to multiarch are searched when PyQt is building.
+Description: fix searching for libpython
+ This patch adds support for multiarch locations of libpython,
+ and also explicitly specified that we want to use posix_prefix
+ sysconfig scheme (and not posix_local).
+ .
+ Adopted for configure-ng.py by Dmitry Shachnev <mitya57 at gmail.com>.
Origin: vendor
Forwarded: http://www.riverbankcomputing.com/pipermail/pyqt/2012-October/032049.html
Reviewed-By: Scott Kitterman <scott at kitterman.cm>
-Last-Update: <2012-10-21>
+Last-Update: 2013-11-09
-Index: python-qt4-4.10.3/configure.py
-===================================================================
---- python-qt4-4.10.3.orig/configure.py 2013-08-21 23:31:38.072871657 -0400
-+++ python-qt4-4.10.3/configure.py 2013-08-21 23:31:38.064871658 -0400
-@@ -797,6 +797,9 @@
- if sipcfg.py_conf_inc_dir != sipcfg.py_inc_dir:
- inc_path.insert(0, sipcfg.py_conf_inc_dir)
+--- a/configure-ng.py
++++ b/configure-ng.py
+@@ -247,8 +247,8 @@
-+ if sipcfg.py_inc_dir != sipcfg.py_conf_inc_dir:
-+ inc_path.insert(0, sipcfg.py_conf_inc_dir)
-+
- if opts.bigqt:
- api_dir = "../../_qt"
- else:
-@@ -948,7 +951,10 @@
- dynamic_pylib = "--enable-shared" in config_args
+ if hasattr(sysconfig, 'get_path'):
+ # The modern API.
+- self.inc_dir = sysconfig.get_path('include')
+- self.module_dir = sysconfig.get_path('platlib')
++ self.inc_dir = sysconfig.get_path('include', 'posix_prefix')
++ self.module_dir = sysconfig.get_path('platlib', 'posix_prefix')
+ else:
+ # The legacy distutils API.
+ self.inc_dir = sysconfig.get_python_inc(plat_specific=1)
+@@ -1285,7 +1285,10 @@
+ inform("The Qt Designer plugin was disabled because the Python library is static.")
+ return False
- if dynamic_pylib:
-- if glob.glob("%s/lib/libpython%d.%d*" % (ducfg["exec_prefix"], py_major, py_minor)):
-+ if 'MULTIARCH' in ducfg and glob.glob("%s/lib/%s/libpython%d.%d*" % (
-+ ducfg["exec_prefix"], ducfg["MULTIARCH"], py_major, py_minor)):
-+ lib_dir_flag = quote("-L%s/lib/%s" % (ducfg["exec_prefix"], ducfg["MULTIARCH"]))
-+ elif 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"])
-@@ -979,7 +985,6 @@
- prj = fin.read()
- fin.close()
-
-- prj = prj.replace("@PYINCDIR@", quote(sipcfg.py_inc_dir))
- prj = prj.replace("@PYINCDIR@", " ".join((quote(sipcfg.py_conf_inc_dir), quote(sipcfg.py_inc_dir))))
- prj = prj.replace("@PYLINK@", link)
- prj = prj.replace("@PYSHLIB@", pysh_lib)
+- if glob.glob('%s/lib/libpython%d.%d*' % (ducfg['exec_prefix'], py_major, py_minor)):
++ if 'MULTIARCH' in ducfg and glob.glob("%s/lib/%s/libpython%d.%d*" % (
++ ducfg["exec_prefix"], ducfg["MULTIARCH"], py_major, py_minor)):
++ lib_dir_flag = quote("-L%s/lib/%s" % (ducfg["exec_prefix"], ducfg["MULTIARCH"]))
++ elif glob.glob('%s/lib/libpython%d.%d*' % (ducfg['exec_prefix'], py_major, py_minor)):
+ lib_dir_flag = qmake_quote('-L%s/lib' % ducfg['exec_prefix'])
+ elif glob.glob('%s/libpython%d.%d*' % (ducfg['LIBDIR'], py_major, py_minor)):
+ lib_dir_flag = qmake_quote('-L%s' % ducfg['LIBDIR'])
Deleted: packages/python-qt4/trunk/debian/patches/debian_configure_changes.diff
===================================================================
--- packages/python-qt4/trunk/debian/patches/debian_configure_changes.diff 2013-11-09 09:39:22 UTC (rev 26439)
+++ packages/python-qt4/trunk/debian/patches/debian_configure_changes.diff 2013-11-09 10:18:16 UTC (rev 26440)
@@ -1,52 +0,0 @@
-Index: python-qt4-4.10.3/configure.py
-===================================================================
---- python-qt4-4.10.3.orig/configure.py 2013-08-21 23:31:24.192872067 -0400
-+++ python-qt4-4.10.3/configure.py 2013-08-21 23:31:24.184872068 -0400
-@@ -863,31 +863,6 @@
- makefile.generate()
- tool.append("dbus")
-
-- # Only include ElementTree for older versions of Python.
-- if sipcfg.py_version < 0x020500:
-- sipconfig.inform("Creating elementtree Makefile...")
--
-- makefile = sipconfig.PythonModuleMakefile(
-- configuration=sipcfg,
-- dstdir=os.path.join(pyqt_modroot, "elementtree"),
-- dir="elementtree"
-- )
--
-- makefile.generate()
-- tool.append("elementtree")
--
-- # Create the pyuic4 wrapper. Use the GUI version on MacOS (so that
-- # previews work properly and normal console use will work anyway), but
-- # not on Windows (so that normal console use will work).
-- sipconfig.inform("Creating pyuic4 wrapper...")
--
-- if sys.platform == 'darwin':
-- gui = True
-- use_arch = opts.use_arch
-- else:
-- gui = False
-- use_arch = ''
--
- # The pyuic directory may not exist if we are building away from the
- # source directory.
- try:
-@@ -896,7 +871,6 @@
- pass
-
- uicdir=os.path.join(pyqt_modroot, "uic")
-- wrapper = sipconfig.create_wrapper(os.path.join(uicdir, "pyuic.py"), os.path.join("pyuic", "pyuic4"), gui, use_arch)
-
- sipconfig.inform("Creating pyuic4 Makefile...")
-
-@@ -905,7 +879,6 @@
- dstdir=uicdir,
- srcdir=os.path.join(src_dir, "pyuic", "uic"),
- dir="pyuic",
-- installs=[[os.path.basename(wrapper), opts.pyqtbindir]]
- )
-
- makefile.generate()
Modified: packages/python-qt4/trunk/debian/patches/series
===================================================================
--- packages/python-qt4/trunk/debian/patches/series 2013-11-09 09:39:22 UTC (rev 26439)
+++ packages/python-qt4/trunk/debian/patches/series 2013-11-09 10:18:16 UTC (rev 26440)
@@ -1,3 +1,2 @@
-debian_configure_changes.diff
config_extra_headers.diff
qreal_float_support.diff
Modified: packages/python-qt4/trunk/debian/rules
===================================================================
--- packages/python-qt4/trunk/debian/rules 2013-11-09 09:39:22 UTC (rev 26439)
+++ packages/python-qt4/trunk/debian/rules 2013-11-09 10:18:16 UTC (rev 26440)
@@ -72,7 +72,7 @@
build-%/configure-stamp:
dh_testdir
mkdir -p build-$*
- cd build-$* && python$* ../configure.py $(SHARED_CONFIGURE_OPTIONS) \
+ cd build-$* && python$* ../configure-ng.py $(SHARED_CONFIGURE_OPTIONS) \
-m $(shell python$*-config --configdir) \
-d /usr/lib/python$*/$(call py_sitename, $*) \
--dbus /usr/include/dbus-1.0 \
@@ -82,11 +82,11 @@
dbg-build-%/configure-stamp:
dh_testdir
mkdir -p dbg-build-$*
- cd dbg-build-$* && python$*-dbg ../configure.py $(SHARED_CONFIGURE_OPTIONS) \
+ cd dbg-build-$* && python$*-dbg ../configure-ng.py $(SHARED_CONFIGURE_OPTIONS) \
-m $(shell python$*-dbg-config --configdir) \
-l /usr/include/python$*$(if $(filter 3.%, $*),dm,_d) \
-d /usr/lib/python$*/$(call py_sitename, $*) \
- --no-designer-plugin
+ --debug --no-designer-plugin
touch $@
More information about the Python-modules-commits
mailing list