diff options
Diffstat (limited to 'x11/py-qt3-base/patches/patch-aa')
| -rw-r--r-- | x11/py-qt3-base/patches/patch-aa | 78 |
1 files changed, 61 insertions, 17 deletions
diff --git a/x11/py-qt3-base/patches/patch-aa b/x11/py-qt3-base/patches/patch-aa index 83b94ddacfb..7434db354cd 100644 --- a/x11/py-qt3-base/patches/patch-aa +++ b/x11/py-qt3-base/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.2 2004/05/09 17:06:07 recht Exp $ +$NetBSD: patch-aa,v 1.3 2005/02/24 20:17:37 drochner Exp $ ---- configure.py.orig 2004-03-11 20:23:30.000000000 +0100 -+++ configure.py 2004-05-09 11:30:42.000000000 +0200 -@@ -663,7 +663,7 @@ +--- configure.py.orig 2005-02-19 16:49:33.000000000 +0100 ++++ configure.py +@@ -732,7 +732,7 @@ def check_license(): print "Type 'no' to decline the terms of the license." print @@ -11,12 +11,48 @@ $NetBSD: patch-aa,v 1.2 2004/05/09 17:06:07 recht Exp $ try: resp = raw_input("Do you accept the terms of the license? ") except: -@@ -853,21 +853,21 @@ +@@ -768,7 +768,7 @@ def create_makefiles(): + + sipconfig.inform("Creating pyuic Makefile...") + +- if prof or "qtxml" not in pyqt_modules: ++ if prof: #or "qtxml" not in pyqt_modules: + buildfile= "pyuic-prof.sbf" + + for xml in ("qdom.cpp", "qxml.cpp"): +@@ -789,7 +789,7 @@ def create_makefiles(): + makefile.extra_defines.append("UIC") + makefile.extra_defines.append("QT_INTERNAL_XML") + +- if prof or "qtxml" not in pyqt_modules: ++ if prof: #or "qtxml" not in pyqt_modules: + makefile.extra_defines.append("QT_MODULE_XML") + + if sipcfg.qt_version < 0x030100: +@@ -800,7 +800,7 @@ def create_makefiles(): + + sipconfig.inform("Creating pylupdate Makefile...") + +- if prof or "qtxml" not in pyqt_modules: ++ if prof: #or "qtxml" not in pyqt_modules: + buildfile= "pylupdate-prof.sbf" + + shutil.copyfile(sipcfg.qt_dir + "/src/xml/qxml.cpp", "pylupdate3/qxml.cpp") +@@ -819,7 +819,7 @@ def create_makefiles(): + + makefile.extra_defines.append("QT_INTERNAL_XML") + +- if prof or "qtxml" not in pyqt_modules: ++ if prof: #or "qtxml" not in pyqt_modules: + makefile.extra_defines.append("QT_MODULE_XML") + + makefile.generate() +@@ -936,26 +936,26 @@ def main(argv): sipcfg.error("This version of PyQt requires SIP v%s or later" % sipcfg.version_to_string(minv)) # Check for QScintilla. - check_qscintilla() -+ #check_qscintilla() ++# check_qscintilla() # Check which modules to build. - check_module("qtcanvas", "qcanvas.h", "QCanvas()") @@ -24,24 +60,32 @@ $NetBSD: patch-aa,v 1.2 2004/05/09 17:06:07 recht Exp $ - check_module("qttable", "qtable.h", "QTable()") - check_module("qtxml", "qdom.h", "QDomImplementation()") - check_module("qtgl", "qgl.h", "QGLWidget()", opengl=1) -+ #check_module("qtcanvas", "qcanvas.h", "QCanvas()") -+ #check_module("qtnetwork", "qsocket.h", "QSocket()") -+ #check_module("qttable", "qtable.h", "QTable()") -+ #check_module("qtxml", "qdom.h", "QDomImplementation()") -+ #check_module("qtgl", "qgl.h", "QGLWidget()", opengl=1) ++# check_module("qtcanvas", "qcanvas.h", "QCanvas()") ++# check_module("qtnetwork", "qsocket.h", "QSocket()") ++# check_module("qttable", "qtable.h", "QTable()") ++# check_module("qtxml", "qdom.h", "QDomImplementation()") ++# check_module("qtgl", "qgl.h", "QGLWidget()", opengl=1) + -+ #if sipcfg.qt_version >= 0x030000: -+ # check_module("qtsql", "qsql.h", "QSql()") -+ # check_module("qtui", "qwidgetfactory.h", "QWidgetFactory()", lib="qui") ++# if sipcfg.qt_version >= 0x030000: ++# check_module("qtui", "qwidgetfactory.h", "QWidgetFactory()", lib="qui") - if sipcfg.qt_version >= 0x030000: -- check_module("qtsql", "qsql.h", "QSql()") - check_module("qtui", "qwidgetfactory.h", "QWidgetFactory()", lib="qui") - +- if sipcfg.qt_edition in ("enterprise", "free"): +- check_module("qtsql", "qsql.h", "QSql()") ++# if sipcfg.qt_edition in ("enterprise", "free"): ++# check_module("qtsql", "qsql.h", "QSql()") + +- if sys.platform == "win32" and sipcfg.sip_version >= 0x040200: +- check_module("qtaxcontainer", "qaxobject.h", "QAxObject()", lib="qaxcontainer") ++# if sys.platform == "win32" and sipcfg.sip_version >= 0x040200: ++# check_module("qtaxcontainer", "qaxobject.h", "QAxObject()", lib="qaxcontainer") + - if qsci_version: - check_module("qtext", "qextscintillabase.h", "QextScintillaBase()", define=qsci_define, include_dir=opt_qsciincdir, lib_dir=opt_qscilibdir, lib="qscintilla") -+ #if qsci_version: -+ # check_module("qtext", "qextscintillabase.h", "QextScintillaBase()", define=qsci_define, include_dir=opt_qsciincdir, lib_dir=opt_qscilibdir, lib="qscintilla") ++# if qsci_version: ++# check_module("qtext", "qextscintillabase.h", "QextScintillaBase()", define=qsci_define, include_dir=opt_qsciincdir, lib_dir=opt_qscilibdir, lib="qscintilla") if opt_qtpetag: pyqt_modules.append("qtpe") |