summaryrefslogtreecommitdiff
path: root/x11/py-qt3-qscintilla/patches/patch-aa
diff options
context:
space:
mode:
Diffstat (limited to 'x11/py-qt3-qscintilla/patches/patch-aa')
-rw-r--r--x11/py-qt3-qscintilla/patches/patch-aa303
1 files changed, 190 insertions, 113 deletions
diff --git a/x11/py-qt3-qscintilla/patches/patch-aa b/x11/py-qt3-qscintilla/patches/patch-aa
index 1731232bb2f..a38c6c5945d 100644
--- a/x11/py-qt3-qscintilla/patches/patch-aa
+++ b/x11/py-qt3-qscintilla/patches/patch-aa
@@ -1,33 +1,17 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/07/22 17:27:05 drochner Exp $
+$NetBSD: patch-aa,v 1.2 2004/05/09 17:06:07 recht Exp $
---- build.py.orig 2003-07-05 12:52:49.000000000 +0200
-+++ build.py 2003-07-22 17:45:49.000000000 +0200
-@@ -50,7 +50,7 @@
- pyVersNr = None
- makefileGen = None
- makeBin = None
--buildModules = ["qt"]
-+buildModules = []
- proPatches = {}
- makefilePatches = {}
- tempBuildDir = None
-@@ -162,12 +162,13 @@
- global pyFullVers, pyVersNr
-
- pyFullVers = string.split(sys.version)[0]
-+ pyFullVersn = string.replace(pyFullVers, 'p', '.');
-
-- vl = string.split(re.findall("[0-9.]*",pyFullVers)[0],".")
-+ vl = string.split(re.findall("[0-9.]*",pyFullVersn)[0],".")
- major = vl[0]
- minor = vl[1]
-
-- pyVers = major + "." + minor
-+ pyVers = sys.version[0:3]
- pyVersNr = int(major) * 10 + int(minor)
-
- global platMake, platCopy, platMkdir, platRmdir
-@@ -717,7 +718,7 @@
+--- configure.py.orig 2004-03-11 20:23:30.000000000 +0100
++++ configure.py 2004-05-09 18:38:38.000000000 +0200
+@@ -38,7 +38,7 @@
+ sip_min_v3_version = 0x030a01
+ sip_min_v4_version = 0x040000
+
+-pyqt_modules = ["qt"]
++pyqt_modules = []
+ qt_sip_flags = []
+ qtext_sip_flags = []
+ qtpe_sip_flags = []
+@@ -663,7 +663,7 @@
print "Type 'no' to decline the terms of the license."
print
@@ -36,90 +20,183 @@ $NetBSD: patch-aa,v 1.1.1.1 2003/07/22 17:27:05 drochner Exp $
try:
resp = raw_input("Do you accept the terms of the license? ")
except:
-@@ -962,26 +963,26 @@
- if qtVersion >= 0x020000:
- inform("Checking which additional PyQt modules to build.");
-
-- tryModule("qtcanvas","qcanvas.h","QCanvas()")
-- tryModule("qtnetwork","qsocket.h","QSocket()")
-- tryModule("qttable","qtable.h","QTable()")
-- tryModule("qtxml","qdom.h","QDomImplementation()")
-+# tryModule("qtcanvas","qcanvas.h","QCanvas()")
-+# tryModule("qtnetwork","qsocket.h","QSocket()")
-+# tryModule("qttable","qtable.h","QTable()")
-+# tryModule("qtxml","qdom.h","QDomImplementation()")
-
-- if qtVersion >= 0x030000:
-+ if 0:
- tryModule("qtsql","qsql.h","QSql()")
-
- # We need a different Makefile for the qtgl module.
-- proPatches["TOPENGL"] = [re.compile("@TEST_OPENGL@",re.M), "opengl"]
-- buildMakefile("qttest.pro")
-+# proPatches["TOPENGL"] = [re.compile("@TEST_OPENGL@",re.M), "opengl"]
-+# buildMakefile("qttest.pro")
-
-- tryModule("qtgl","qgl.h","QGLWidget()")
-+# tryModule("qtgl","qgl.h","QGLWidget()")
-
- # Put things back.
-- proPatches["TOPENGL"] = [re.compile("@TEST_OPENGL@",re.M), ""]
-- buildMakefile("qttest.pro")
-+# proPatches["TOPENGL"] = [re.compile("@TEST_OPENGL@",re.M), ""]
-+# buildMakefile("qttest.pro")
-
- # Check for the qui library.
-- if qtVersion >= 0x030000:
-+ if 0:
- if sys.platform == "win32":
- quilib = "$(QTDIR)\\lib\\qui.lib"
- else:
-@@ -993,8 +994,8 @@
- tryModule("qtui","qwidgetfactory.h","QWidgetFactory()")
-
- # Put things back.
-- proPatches["TQUILIB"] = [re.compile("@TEST_QUILIB@",re.M), ""]
-- buildMakefile("qttest.pro")
-+# proPatches["TQUILIB"] = [re.compile("@TEST_QUILIB@",re.M), ""]
-+# buildMakefile("qttest.pro")
-
- # Check the location of the QScintilla library.
- if sciVersion >= 0:
-@@ -1551,23 +1552,23 @@
- subdirs = subdirs + " qtpe"
-
- # See which version of pyuic to build.
-- proPatches["BINDIR"] = [re.compile("@BL_BINDIR@",re.M), escape(platBinDir)]
-+# proPatches["BINDIR"] = [re.compile("@BL_BINDIR@",re.M), escape(platBinDir)]
-
-- if qtVersion >= 0x030000:
-- inform("Creating Makefile for pyuic3.")
-- subdirs = subdirs + " pyuic3"
-- olddir = pushDir("pyuic3")
-- elif qtVersion >= 0x020000:
-- inform("Creating Makefile for pyuic2.")
-- subdirs = subdirs + " pyuic2"
-- olddir = pushDir("pyuic2")
+@@ -697,82 +697,82 @@
+ # The Professional Edition needs special handling.
+ prof = (sipcfg.qt_edition == "professional")
+
+- sipconfig.inform("Creating pyuic Makefile...")
++# sipconfig.inform("Creating pyuic Makefile...")
+
+- if prof:
+- buildfile= "pyuic-prof.sbf"
++# if prof:
++# buildfile= "pyuic-prof.sbf"
+
+- for xml in ("qdom.cpp", "qxml.cpp"):
+- shutil.copyfile(sipcfg.qt_dir + "/src/xml/" + xml, "pyuic3/" + xml)
+- else:
+- buildfile= "pyuic.sbf"
+-
+- makefile = sipconfig.ProgramMakefile(
+- configuration=sipcfg,
+- build_file=buildfile,
+- dir="pyuic3",
+- install_dir=opt_pyqtbindir,
+- console=1,
+- qt=1,
+- warnings=1
+- )
+-
+- makefile.extra_defines.append("UIC")
+- makefile.extra_defines.append("QT_INTERNAL_XML")
+-
+- if prof:
+- makefile.extra_defines.append("QT_MODULE_XML")
++# for xml in ("qdom.cpp", "qxml.cpp"):
++# shutil.copyfile(sipcfg.qt_dir + "/src/xml/" + xml, "pyuic3/" + xml)
++# else:
++# buildfile= "pyuic.sbf"
++
++# makefile = sipconfig.ProgramMakefile(
++# configuration=sipcfg,
++# build_file=buildfile,
++# dir="pyuic3",
++# install_dir=opt_pyqtbindir,
++# console=1,
++# qt=1,
++# warnings=1
++# )
++
++# makefile.extra_defines.append("UIC")
++# makefile.extra_defines.append("QT_INTERNAL_XML")
++
++# if prof:
++# makefile.extra_defines.append("QT_MODULE_XML")
++
++# if sipcfg.qt_version < 0x030100:
++# makefile.extra_include_dirs.append(sipcfg.qt_dir + "/src/3rdparty/zlib")
++
++# makefile.generate()
++# subdirs.append("pyuic3")
++
++# sipconfig.inform("Creating pylupdate Makefile...")
++
++# if prof:
++# buildfile= "pylupdate-prof.sbf"
++
++# shutil.copyfile(sipcfg.qt_dir + "/src/xml/qxml.cpp", "pylupdate3/qxml.cpp")
++# else:
++# buildfile= "pylupdate.sbf"
++
++# makefile = sipconfig.ProgramMakefile(
++# configuration=sipcfg,
++# build_file=buildfile,
++# dir="pylupdate3",
++# install_dir=opt_pyqtbindir,
++# console=1,
++# qt=1,
++# warnings=1
++# )
++
++# makefile.extra_defines.append("QT_INTERNAL_XML")
++
++# if prof:
++# makefile.extra_defines.append("QT_MODULE_XML")
++
++# makefile.generate()
++# subdirs.append("pylupdate3")
++# elif sipcfg.qt_version >= 0x020000:
++# sipconfig.inform("Creating pyuic Makefile...")
++
++# makefile = sipconfig.ProgramMakefile(
++# configuration=sipcfg,
++# build_file="pyuic.sbf",
++# dir="pyuic2",
++# install_dir=opt_pyqtbindir,
++# console=1,
++# qt=1,
++# warnings=1
++# )
+
+- if sipcfg.qt_version < 0x030100:
+- makefile.extra_include_dirs.append(sipcfg.qt_dir + "/src/3rdparty/zlib")
++# makefile.extra_defines.append("UIC")
++# makefile.extra_include_dirs.append(sipcfg.qt_dir + "/src/3rdparty/zlib")
+
+- makefile.generate()
+- subdirs.append("pyuic3")
+-
+- sipconfig.inform("Creating pylupdate Makefile...")
+-
+- if prof:
+- buildfile= "pylupdate-prof.sbf"
+-
+- shutil.copyfile(sipcfg.qt_dir + "/src/xml/qxml.cpp", "pylupdate3/qxml.cpp")
+- else:
+- buildfile= "pylupdate.sbf"
+-
+- makefile = sipconfig.ProgramMakefile(
+- configuration=sipcfg,
+- build_file=buildfile,
+- dir="pylupdate3",
+- install_dir=opt_pyqtbindir,
+- console=1,
+- qt=1,
+- warnings=1
+- )
+-
+- makefile.extra_defines.append("QT_INTERNAL_XML")
+-
+- if prof:
+- makefile.extra_defines.append("QT_MODULE_XML")
+-
+- makefile.generate()
+- subdirs.append("pylupdate3")
+- elif sipcfg.qt_version >= 0x020000:
+- sipconfig.inform("Creating pyuic Makefile...")
+-
+- makefile = sipconfig.ProgramMakefile(
+- configuration=sipcfg,
+- build_file="pyuic.sbf",
+- dir="pyuic2",
+- install_dir=opt_pyqtbindir,
+- console=1,
+- qt=1,
+- warnings=1
+- )
+-
+- makefile.extra_defines.append("UIC")
+- makefile.extra_include_dirs.append(sipcfg.qt_dir + "/src/3rdparty/zlib")
+-
+- makefile.generate()
+- subdirs.append("pyuic2")
++# makefile.generate()
++# subdirs.append("pyuic2")
+
+ sipconfig.inform("Creating top level Makefile...")
+
+@@ -856,15 +856,15 @@
+ check_qscintilla()
+
+ # Check which modules to build.
+- 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)
-
-- buildMakefile("pyuic.pro")
-- fixInstallTarget()
-- popDir(olddir)
-+# if qtVersion >= 0x030000:
-+# inform("Creating Makefile for pyuic3.")
-+# subdirs = subdirs + " pyuic3"
-+# olddir = pushDir("pyuic3")
-+# elif qtVersion >= 0x020000:
-+# inform("Creating Makefile for pyuic2.")
-+# subdirs = subdirs + " pyuic2"
-+# olddir = pushDir("pyuic2")
+- if sipcfg.qt_version >= 0x030000:
+- check_module("qtsql", "qsql.h", "QSql()")
+- check_module("qtui", "qwidgetfactory.h", "QWidgetFactory()", lib="qui")
++# 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)
+
-+# buildMakefile("pyuic.pro")
-+# fixInstallTarget()
-+# popDir(olddir)
++# if sipcfg.qt_version >= 0x030000:
++# check_module("qtsql", "qsql.h", "QSql()")
++# check_module("qtui", "qwidgetfactory.h", "QWidgetFactory()", lib="qui")
- # Build pylupdate if Qt v3.0 or later.
-- if qtVersion >= 0x030000:
-+ if 0:
- inform("Creating Makefile for pylupdate3.")
- subdirs = subdirs + " pylupdate3"
- olddir = pushDir("pylupdate3")
+ if qsci_version:
+ check_module("qtext", "qextscintillabase.h", "QextScintillaBase()", define=qsci_define, include_dir=opt_qsciincdir, lib_dir=opt_qscilibdir, lib="qscintilla")
generated by cgit v1.2.3 (git 2.39.1) at 2024-10-19 17:47:44 +0000