diff options
Diffstat (limited to 'dilos/dependencies/sip4-tqt')
7 files changed, 11 insertions, 59 deletions
diff --git a/dilos/dependencies/sip4-tqt/debian/compat b/dilos/dependencies/sip4-tqt/debian/compat index ec635144f..f599e28b8 100644 --- a/dilos/dependencies/sip4-tqt/debian/compat +++ b/dilos/dependencies/sip4-tqt/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/dilos/dependencies/sip4-tqt/debian/control b/dilos/dependencies/sip4-tqt/debian/control index 247b6f3b3..2c7df285c 100644 --- a/dilos/dependencies/sip4-tqt/debian/control +++ b/dilos/dependencies/sip4-tqt/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian Python Modules Team <python-modules-team@lists.alioth.debian.org> Uploaders: Torsten Marek <shlomme@debian.org>, Bernd Zeimetz <bzed@debian.org>, Michael Casadevall <mcasadevall@debian.org> -Build-Depends: debhelper (>= 9~), python3-all-dev, python3-all-dbg, dh-python, libtqtinterface-dev, bison, flex +Build-Depends: debhelper (>= 10~), python3-all-dev, python3-all-dbg, dh-python, libtqtinterface-dev, bison, flex Standards-Version: 3.8.4 XS-Python-Version: all X-Python3-Version: >= 3.0 diff --git a/dilos/dependencies/sip4-tqt/debian/patches/series b/dilos/dependencies/sip4-tqt/debian/patches/series index 0b31a69ff..e69de29bb 100644 --- a/dilos/dependencies/sip4-tqt/debian/patches/series +++ b/dilos/dependencies/sip4-tqt/debian/patches/series @@ -1,2 +0,0 @@ -# siputils_debian_changes.diff -# siputils_objdir_module_fix.diff diff --git a/dilos/dependencies/sip4-tqt/debian/patches/siputils_debian_changes.diff b/dilos/dependencies/sip4-tqt/debian/patches/siputils_debian_changes.diff deleted file mode 100644 index 2640f57c2..000000000 --- a/dilos/dependencies/sip4-tqt/debian/patches/siputils_debian_changes.diff +++ /dev/null @@ -1,32 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 02_siputils.dpatch by Torsten Marek <shlomme@debian.org> -Index: sip4-qt3-4.10/siputils.py -=================================================================== ---- sip4-qt3-4.10.orig/siputils.py 2010-01-14 15:52:09.000000000 +0100 -+++ sip4-qt3-4.10/siputils.py 2010-01-26 21:09:49.172700039 +0100 -@@ -718,7 +718,8 @@ - - libs.extend(self.optional_list("LIBS_WINDOWS")) - -- lflags.extend(self._platform_rpaths(rpaths.as_list())) -+ # Don't append any rpaths -+ #lflags.extend(self._platform_rpaths(rpaths.as_list())) - - # Save the transformed values. - self.CFLAGS.set(cflags) -@@ -843,6 +844,15 @@ - clib is the library name in cannonical form. - framework is set of the library is implemented as a MacOS framework. - """ -+ ################################################################## -+ # Generally, the linker is intelligent enough not to need this # -+ # additional information! # -+ # And Qt4's pkg-config and prl files are broken # -+ # Changed for Debian packaging, Torsten Marek <shlomme@gmx.net> # -+ ################################################################## -+ -+ return [] -+ - prl_libs = [] - - if self.generator in ("MSVC", "MSVC.NET", "BMAKE"): diff --git a/dilos/dependencies/sip4-tqt/debian/patches/siputils_objdir_module_fix.diff b/dilos/dependencies/sip4-tqt/debian/patches/siputils_objdir_module_fix.diff deleted file mode 100644 index 3c4570b21..000000000 --- a/dilos/dependencies/sip4-tqt/debian/patches/siputils_objdir_module_fix.diff +++ /dev/null @@ -1,18 +0,0 @@ -Index: b/siputils.py -=================================================================== ---- a/siputils.py -+++ b/siputils.py -@@ -1547,9 +1547,12 @@ - mfile.write("\n$(OFILES): $(HFILES)\n") - - for mf in self._build["tqmoc_headers"].split(): -- root, discard = os.path.splitext(mf) -+ root, _ = os.path.splitext(mf) - cpp = "tqmoc_" + root + ".cpp" - -+ if self._src_dir != self.dir: -+ mf = os.path.join(self._src_dir, mf) -+ - mfile.write("\n%s: %s\n" % (cpp, mf)) - mfile.write("\t$(MOC) -o %s %s\n" % (cpp, mf)) - diff --git a/dilos/dependencies/sip4-tqt/debian/rules b/dilos/dependencies/sip4-tqt/debian/rules index 2acbad3d6..9f54ca009 100755 --- a/dilos/dependencies/sip4-tqt/debian/rules +++ b/dilos/dependencies/sip4-tqt/debian/rules @@ -119,11 +119,11 @@ install-arch-3.%: install -m 644 -o root -g root debian/sip_tqt_config_py3.py debian/python3-sip-tqt/usr/lib/python3.$*/dist-packages/sip_tqt_config.py install -m 644 -o root -g root build-3.$*/sip_tqt_config.py debian/python3-sip-tqt/usr/lib/python3.$*/dist-packages/sip_tqt_config_nd.py # install -m 644 -o root -g root dbg-build-3.$*/sip_tqt_config.py debian/python3-sip-tqt-dbg/usr/lib/python3.$*/dist-packages/sip_tqt_config_d.py - mkdir -p debian/python3-sip-tqt-dev$$(python3.$* -c 'from distutils import sysconfig; print (sysconfig.get_python_inc())') - install -m 644 -o root -g root siplib/sip-tqt.h debian/python3-sip-tqt-dev$$(python3.$* -c 'from distutils import sysconfig; print (sysconfig.get_python_inc())')/ -# mkdir -p debian/python3-sip-tqt-dev/$$(python3.$*-dbg -c 'from distutils import sysconfig; print (sysconfig.get_python_inc())') -# ln -s ../$$(python3.$* -c 'from distutils import sysconfig; print (sysconfig.get_python_inc())' | xargs basename)/sip-tqt.h \ -# debian/python3-sip-tqt-dev/$$(python3.$*-dbg -c 'from distutils import sysconfig; print (sysconfig.get_python_inc())')/sip-tqt.h + mkdir -p debian/python3-sip-tqt-dev$$(python3.$* -c 'import sysconfig; print (sysconfig.get_path("include"))') + install -m 644 -o root -g root siplib/sip-tqt.h debian/python3-sip-tqt-dev$$(python3.$* -c 'import sysconfig; print (sysconfig.get_path("include"))')/ +# mkdir -p debian/python3-sip-tqt-dev/$$(python3.$*-dbg -c 'import sysconfig; print (sysconfig.get_path("include"))') +# ln -s ../$$(python3.$* -c 'import sysconfig; print (sysconfig.get_path("include"))' | xargs basename)/sip-tqt.h \ +# debian/python3-sip-tqt-dev/$$(python3.$*-dbg -c 'import sysconfig; print (sysconfig.get_path("include"))')/sip-tqt.h mkdir -p debian/python3-sip-tqt-dev/usr/lib/python3.$*/dist-packages install -m 644 -o root -g root sip_tqt_distutils.py debian/python3-sip-tqt-dev/usr/lib/python3.$*/dist-packages diff --git a/dilos/dependencies/sip4-tqt/debian/sip_tqt_config_py3.py b/dilos/dependencies/sip4-tqt/debian/sip_tqt_config_py3.py index 5aa6d22c1..a937df69a 100644 --- a/dilos/dependencies/sip4-tqt/debian/sip_tqt_config_py3.py +++ b/dilos/dependencies/sip4-tqt/debian/sip_tqt_config_py3.py @@ -1,6 +1,10 @@ # import the sip_tqt_config.py for the normal or the debug build +import os import sys +import sysconfig + +sys.path.insert(0, os.path.join(sysconfig.get_path('platstdlib'), 'dist-packages')) if 'd' in sys.abiflags: try: |