File: debian_configure_changes.diff

package info (click to toggle)
python-qt4 4.12.1%2Bdfsg-2
  • links: PTS, VCS
  • area: main
  • in suites: buster
  • size: 40,300 kB
  • ctags: 6,185
  • sloc: python: 125,988; cpp: 13,291; xml: 292; makefile: 246; php: 27; sh: 2
file content (66 lines) | stat: -rw-r--r-- 2,187 bytes parent folder | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
From: SVN-Git Migration <python-modules-team@lists.alioth.debian.org>
Date: Thu, 8 Oct 2015 12:56:34 -0700
Subject: disable elementtree and pyuic4 wrapper

Forwarded: not-needed
Last-Update: 2014-03-18
---
 configure.py | 31 -------------------------------
 1 file changed, 31 deletions(-)

diff --git a/configure.py b/configure.py
index 6118d39..a537298 100644
--- a/configure.py
+++ b/configure.py
@@ -857,35 +857,6 @@ include(%s)
             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
-
-            if opts.use_arch is None:
-                use_arch = ''
-            else:
-                use_arch = ' '.join(opts.use_arch)
-        else:
-            gui = False
-            use_arch = ''
-
         # The pyuic directory may not exist if we are building away from the
         # source directory.
         try:
@@ -894,7 +865,6 @@ include(%s)
             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...")
 
@@ -903,7 +873,6 @@ include(%s)
             dstdir=uicdir,
             srcdir=os.path.join(src_dir, "pyuic", "uic"),
             dir="pyuic",
-            installs=[[os.path.basename(wrapper), opts.pyqtbindir]]
         )
 
         makefile.generate()