diff options
Diffstat (limited to 'devel/py-qt4-designer/files/patch-configure.py')
| -rw-r--r-- | devel/py-qt4-designer/files/patch-configure.py | 68 |
1 files changed, 51 insertions, 17 deletions
diff --git a/devel/py-qt4-designer/files/patch-configure.py b/devel/py-qt4-designer/files/patch-configure.py index 189c4b8f6157..be44c3ba7760 100644 --- a/devel/py-qt4-designer/files/patch-configure.py +++ b/devel/py-qt4-designer/files/patch-configure.py @@ -1,6 +1,6 @@ ---- configure.py.orig Mon Feb 19 04:39:13 2007 -+++ configure.py Tue Feb 20 19:59:20 2007 -@@ -133,21 +133,21 @@ +--- configure.py.orig Tue Apr 10 17:59:52 2007 ++++ configure.py Thu Apr 12 21:26:39 2007 +@@ -138,26 +138,26 @@ } def check_modules(self): @@ -23,7 +23,12 @@ + #check_module("QtTest", "QtTest", "QTest::qSleep(0)") + #check_module("QtXml", "qdom.h", "new QDomDocument()") + #check_module("QtAssistant", "qassistantclient.h", "new QAssistantClient(\"foo\")") - check_module("QtDesigner", "QExtensionFactory", "new QExtensionFactory()") + + if sipcfg.universal: + sipconfig.inform("QtDesigner module disabled with universal binaries") + else: + check_module("QtDesigner", "QExtensionFactory", "new QExtensionFactory()") + - check_module("QAxContainer", "qaxobject.h", "new QAxObject()", "QAxContainer") + #check_module("QAxContainer", "qaxobject.h", "new QAxObject()", "QAxContainer") @@ -34,7 +39,7 @@ def code(self): # Note that the order of the dependent modules is important. -@@ -201,31 +201,31 @@ +@@ -211,31 +211,31 @@ generate_code("QAxContainer", ["QAxContainer", "QtGui", "QtCore"]) # Generate the consolidated module. @@ -81,7 +86,7 @@ def qpylibs(self): # See which QPy libraries to build. -@@ -278,7 +278,7 @@ +@@ -308,7 +308,7 @@ tool.append("dbus") # Only include ElementTree for older versions of Python. @@ -90,7 +95,7 @@ sipconfig.inform("Creating elementtree Makefile...") makefile = sipconfig.PythonModuleMakefile( -@@ -309,7 +309,7 @@ +@@ -339,7 +339,7 @@ ) makefile.generate() @@ -99,7 +104,35 @@ if "QtXml" in pyqt_modules: sipconfig.inform("Creating pylupdate4 Makefile...") -@@ -428,7 +428,7 @@ +@@ -376,7 +376,8 @@ + makefile.generate() + tool.append("pyrcc") + else: +- sipconfig.inform("pylupdate4 and pyrcc4 will not be built because the Qt XML module is missing.") ++ #sipconfig.inform("pylupdate4 and pyrcc4 will not be built because the Qt XML module is missing.") ++ pass + + if "QtDesigner" in pyqt_modules: + enabled = True +@@ -400,7 +401,7 @@ + glob.glob("%s/lib/libpython%d.%d*" % (ducfg["prefix"], py_major, py_minor))): + link = "-L%s/lib -lpython%d.%d" % (ducfg["prefix"], py_major, py_minor) + else: +- sipconfig.inform("Qt Designer plugin disabled because Python library is static") ++ #sipconfig.inform("Qt Designer plugin disabled because Python library is static") + enabled = False + + pysh_lib = ducfg["LDLIBRARY"] +@@ -460,7 +461,7 @@ + sipconfig.inform("The Qt mkspecs directory is in %s." % qt_datadir) + sipconfig.inform("These PyQt modules will be built: %s." % string.join(pyqt_modules)) + sipconfig.inform("The PyQt modules will be installed in %s." % opt_pyqtmoddir) +- sipconfig.inform("The Designer plugin will be installed in %s." % os.path.join(opt_plugindir, "designer")) ++ #sipconfig.inform("The Designer plugin will be installed in %s." % os.path.join(opt_plugindir, "designer")) + + if opt_api: + sipconfig.inform("The QScintilla API file will be installed in %s." % os.path.join(opt_qscidir, "api", "python")) +@@ -470,7 +471,7 @@ sipconfig.inform("The PyQt .sip files will be installed in %s." % opt_pyqtsipdir) @@ -108,7 +141,7 @@ if opt_vendorcheck: sipconfig.inform("PyQt will only be usable with signed interpreters.") -@@ -761,7 +761,8 @@ +@@ -808,7 +809,8 @@ sipfiles = [] for s in glob.glob("sip/" + mname + "/*.sip"): @@ -118,7 +151,7 @@ installs.append([sipfiles, os.path.join(opt_pyqtsipdir, mname)]) -@@ -825,7 +826,7 @@ +@@ -873,7 +875,7 @@ sipconfig.error("This version of PyQt and the %s edition of Qt have incompatible licenses." % qted) # Confirm the license. @@ -127,7 +160,7 @@ print "Type 'L' to view the license." print "Type 'yes' to accept the terms of the license." print "Type 'no' to decline the terms of the license." -@@ -847,7 +848,7 @@ +@@ -895,7 +897,7 @@ if resp == "l": os.system("more LICENSE") @@ -136,14 +169,15 @@ # If there should be a license file then check it is where it should be. if lfile: if os.access(os.path.join("sip", lfile), os.F_OK): -@@ -1367,16 +1368,18 @@ - scidir = os.path.join(qt_datadir, "qsci") +@@ -1433,17 +1435,19 @@ + + installs=[(pyqt.module_installs(), opt_pyqtmoddir)] - if opt_api or os.path.isdir(scidir): -- installs.append(("PyQt4.api", os.path.join(scidir, "api", "python"))) -+ installs.append(("QtDesigner.api", os.path.join(scidir, "api", "python"))) -+ + pyqt_modules = ["QtDesigner"] ++ + if opt_api: +- installs.append(("PyQt4.api", os.path.join(opt_qscidir, "api", "python"))) ++ installs.append(("QtDesigner.api", os.path.join(opt_qscidir, "api", "python"))) sipconfig.ParentMakefile( configuration=sipcfg, |