Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/languages In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv27162
Modified Files: pyqt-py.info sip-py.info sip-py.patch Added Files: pyqt4-py.info pyqt4-py.patch Log Message: new versions. compatible with qt3 and/or qt4-x11 Index: sip-py.patch =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/languages/sip-py.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- sip-py.patch 13 Feb 2006 19:53:03 -0000 1.1 +++ sip-py.patch 5 Mar 2008 06:00:03 -0000 1.2 @@ -1,13 +1,49 @@ ---- sip/siputils.py.orig Tue Nov 1 11:11:19 2005 -+++ sip/siputils.py Tue Nov 1 11:11:59 2005 -@@ -1040,8 +1040,8 @@ +diff -Nurd -x'*~' sip-4.7.3.orig/siputils.py sip-4.7.3/siputils.py +--- sip-4.7.3.orig/siputils.py 2007-12-06 09:15:09.000000000 -0500 ++++ sip-4.7.3/siputils.py 2008-01-31 19:40:40.000000000 -0500 +@@ -1086,7 +1086,7 @@ + if self.generator == "UNIX": + dst = "$(DESTDIR)" + dst - self.LFLAGS.extend(self.optional_list(lflags_console)) +- mfile.write("[EMAIL PROTECTED] %s " % (self.chkdir, _quote(dst))) ++ mfile.write("\t%s %s " % (self.chkdir, _quote(dst))) -- if sys.platform == "darwin": -- self.LFLAGS.append("-framework Python") -+ #if sys.platform == "darwin": -+ # self.LFLAGS.append("-framework Python") + if self.generator == "UNIX": + mfile.write("|| ") +@@ -1168,14 +1168,7 @@ + mfile.write("\n" + target + ":\n") - Makefile.finalise(self) + for d in self._subdirs: +- if self.generator == "MINGW": +- mfile.write("[EMAIL PROTECTED](MAKE) -C %s%s\n" % (d, tname)) +- elif self.generator == "UNIX": +- mfile.write("\t@(cd %s; $(MAKE)%s)\n" % (d, tname)) +- else: +- mfile.write("\tcd %s\n" % d) +- mfile.write("\t$(MAKE)%s\n" % tname) +- mfile.write("[EMAIL PROTECTED] ..\n") ++ mfile.write("\t$(MAKE) -C %s%s\n" % (d, tname)) + + class PythonModuleMakefile(Makefile): +@@ -1324,10 +1317,7 @@ + # can handle extension modules that are bundles or dynamic + # libraries, but python.org versions need bundles (unless built + # with DYNLOADFILE=dynload_shlib.o). +- if sys.platform == "darwin": +- lflags_plugin = ["-bundle"] +- else: +- lflags_plugin = self.optional_list("LFLAGS_PLUGIN") ++ lflags_plugin = self.optional_list("LFLAGS_PLUGIN") + + if not lflags_plugin: + lflags_plugin = self.optional_list("LFLAGS_SHLIB") +@@ -1336,7 +1326,7 @@ + + self.LFLAGS.extend(self.optional_list(lflags_console)) + +- if sys.platform == "darwin": ++ if 0: + # We use the -F flag to explictly specify the directory containing + # the Python framework rather than rely on the default search path. + # This allows Apple's Python to be used even if a later python.org \ No newline at end of file Index: sip-py.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/languages/sip-py.info,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- sip-py.info 16 Jun 2007 22:30:54 -0000 1.6 +++ sip-py.info 5 Mar 2008 06:00:03 -0000 1.7 @@ -1,34 +1,57 @@ Info2: << Package: sip-py%type_pkg[python] -Version: 4.3.1 -Revision: 1006 +Version: 4.7.4 +Revision: 1 Distribution: (%type_pkg[python] = 23) 10.3, (%type_pkg[python] = 23) 10.4 +Type: python (2.3 2.4 2.5) + +Source: http://www.riverbankcomputing.com/Downloads/sip4/sip-%v.tar.gz +Source-MD5: 3bae6d0fb931fe2ddcd6f6c1da245afa + GCC: 4.0 -Maintainer: None <[EMAIL PROTECTED]> -Source: http://www.river-bank.demon.co.uk/download/sip/sip-%v.tar.gz -Source-MD5: c561d8dc19fbe3a8bffc4b10bd56910f -Description: Create Python bindings for C and C++ Libs -Depends: qt3-shlibs (>= 3.3.5-1023), python%type_pkg[python] -BuildDepends: qt3 (>= 3.3.5-1023) -Type: python (2.3 2.4) -Patch: %{ni}.patch +Depends: python%type_pkg[python] +BuildDepends: fink (>= 0.24.12-1) + +PatchFile: %{ni}.patch +PatchFile-MD5: 68ee187f6c740640307194e091c3be8c + CompileScript: << -%p/bin/python%type_raw[python] configure.py -p macx-g++ -b %i/bin -d %i/lib/python%type_raw[python]/site-packages -e %i/include/python%type_raw[python] -v %i/share/sip-py%type_pkg[python] INCDIR_QT=%p/include/qt INCDIR_OPENGL=/usr/X11R6/include LFLAGS_PLUGIN="-bundle -undefined dynamic_lookup" -make + %p/bin/python%type_raw[python] configure.py \ + -p macx-g++ \ + -v %p/share/sip-py%type_pkg[python] \ + INCDIR_OPENGL=/usr/X11R6/include \ + LFLAGS_PLUGIN="-bundle -undefined dynamic_lookup" + make << + InstallScript: << -make install -perl -pi -e 's|%i|%p|g' %i/lib/python%type_raw[python]/site-packages/sipconfig.py + make install DESTDIR=%d << +DocFiles: ChangeLog LICENSE NEWS README + SplitOff: << - Package: %N-bin - Replaces: sip-py24 (<= 4.3.1-3), sip-py23 (<= 4.3.1-3), sip (<< 4.3.1-1006) - Files: bin - DocFiles: ChangeLog LICENSE NEWS README - License: GPL + Package: %N-bin + Depends: sip-py%type_pkg[python] + Conflicts: << + sip-py23-bin, sip-py24-bin, sip-py25-bin + << + Replaces: << + sip-py24 (<= 4.3.1-3), sip-py23 (<= 4.3.1-3), sip (<< 4.3.1-1006), + sip-py23-bin, sip-py24-bin, sip-py25-bin + << + Files: bin + DocFiles: ChangeLog LICENSE NEWS README + License: GPL << -DocFiles: ChangeLog LICENSE NEWS README -License: GPL +DescPackaging: << + Disable requirement of framework-built python on darwin. + Don't over-ride specs/ for plugin compiler flags on darwin. << +Description: Create Python bindings for C and C++ Libs +Homepage: http://www.riverbankcomputing.co.uk/sip +License: GPL +Maintainer: Dave Reiser <[EMAIL PROTECTED]> + +<< \ No newline at end of file Index: pyqt-py.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/languages/pyqt-py.info,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- pyqt-py.info 30 Nov 2007 19:04:26 -0000 1.9 +++ pyqt-py.info 5 Mar 2008 06:00:03 -0000 1.10 @@ -1,20 +1,30 @@ Info2: << Package: pyqt-py%type_pkg[python] -Version: 3.15 -Revision: 7 -#Distribution: (%type_pkg[python] = 23) 10.3, (%type_pkg[python] = 23) 10.4 -Architecture: powerpc -Distribution: 10.4 -GCC: 3.3 -Source: http://www.riverbankcomputing.com/Downloads/PyQt3/GPL/PyQt-mac-gpl-%v.tar.gz -Source-MD5: b0e096a9e71038f3108a40259e0965d4 -Depends: qt3-shlibs, python%type_pkg[python], sip-py%type_pkg[python], qscintilla-shlibs, sip -BuildDepends: qt3, qscintilla, gcc3.3 -Type: python (2.3 2.4) +Version: 3.17.4 +Revision: 2 +Distribution: (%type_pkg[python] = 23) 10.4 +GCC: 4.0 +Source: http://www.riverbankcomputing.com/Downloads/PyQt3/GPL/PyQt-x11-gpl-%v.tar.gz +Source-MD5: 0dffe4bc87a1102d61ee972bb868c65a +Depends: qt3-shlibs, python%type_pkg[python], sip-py%type_pkg[python] (>= 4.7.4-1), qscintilla-shlibs +BuildDepends: qt3, qscintilla, sip-py%type_pkg[python]-bin (>= 4.7.4-1) +Type: python (2.3 2.4 2.5) +PatchScript:<< + perl -pi -e 's|while 1|print "license accepted by fink package maintainer"\n while 0|g' configure.py + << CompileScript: << -echo "yes" | %p/bin/python%type_raw[python] configure.py -b %i/bin -d %i/lib/python%type_raw[python]/site-packages -v %i/share/sip-py%type_pkg[python] -n %p/include -o %p/lib -make CXX=g++-3.3 LINK=g++-3.3 + %p/bin/python%type_raw[python] configure.py \ + -b %i/bin \ + -d %i/lib/python%type_raw[python]/site-packages \ + -v %i/share/sip-py%type_pkg[python] \ + -n %p/include \ + -o %p/lib \ + INCDIR_OPENGL+=/usr/X11R6/include \ + LFLAGS+=-L%p/lib/python%type_raw[python]/config \ + LFLAGS_PLUGIN="-bundle -undefined dynamic_lookup" \ + INCDIR+=%p/include/python%type_raw[python] + make << InstallScript: << make install @@ -24,18 +34,16 @@ License: GPL Description: Python bindings for the Qt toolkit DescPackaging: << - This version is compiled with g++-3.3, even in the 10.4 tree. If it is - ever updated to a more recent compiler, any packages which depend on - this one must be updated at the same time. + Update for gcc4, and uses sip-py compatible with both qt3 and qt4-x11 << Homepage: http://www.riverbankcomputing.co.uk/pyqt -Maintainer: None <[EMAIL PROTECTED]> +Maintainer: Dave Reiser <[EMAIL PROTECTED]> SplitOff: << Package: %N-bin - Replaces: pyqt-py24 (<= 3.15-4), pyqt-py23 (<= 3.15-4), pyqt-bin (<< 3.15-6) - # should Replaces/Conflicts all variants of %{Ni}-bin - Depends: qt3-shlibs + Replaces: pyqt-py25-bin, pyqt-py24-bin, pyqt-py23-bin, pyqt-bin + Conflicts: pyqt-py25-bin, pyqt-py24-bin, pyqt-py23-bin + Depends: qt3-shlibs, pyqt-py%type_pkg[python] Files: bin DocFiles: ChangeLog LICENSE NEWS README License: GPL --- NEW FILE: pyqt4-py.patch --- diff -Nurd oldpyqt/configure.py newpyqt/configure.py --- oldpyqt/configure.py 2008-02-16 12:26:33.000000000 -0500 +++ newpyqt/configure.py 2008-02-20 00:17:00.000000000 -0500 @@ -726,13 +726,12 @@ from distutils.sysconfig import get_config_vars ducfg = get_config_vars() - if sys.platform == "darwin": +# if sys.platform == "darwin": # We need to work out how to specify the right framework # version. - link = "-framework Python" - elif ("--enable-shared" in ducfg.get("CONFIG_ARGS", "") and - glob.glob("%s/lib/libpython%d.%d*" % (ducfg["prefix"], py_major, py_minor))): - lib_dir_flag = quote("-L%s/lib" % ducfg["prefix"]) +# link = "-framework Python" + if 1: + lib_dir_flag = quote("-L%s" % sipcfg.py_lib_dir) link = "%s -lpython%d.%d" % (lib_dir_flag, py_major, py_minor) else: sipconfig.inform("Qt Designer plugin disabled because Python library is static") @@ -798,8 +797,8 @@ sipconfig.inform("Qt v%s %sis being used." % (sipconfig.version_to_string(qt_version), edstr)) - if sys.platform == "darwin" and qt_framework: - sipconfig.inform("Qt is built as a framework.") + # if sys.platform == "darwin" and qt_framework: + # sipconfig.inform("Qt is built as a framework.") sipconfig.inform("SIP %s is being used." % sipcfg.sip_version_str) sipconfig.inform("The Qt header files are in %s." % qt_incdir) @@ -1096,7 +1095,7 @@ if "__USE_WS_X11__" in sipcfg.build_macros()["DEFINES"]: plattag = "WS_X11" else: - plattag = "WS_MACX" + plattag = "WS_X11" else: plattag = "WS_X11" @@ -1402,10 +1401,10 @@ sipconfig.error("PyQt v4 requires Qt v4.1.0 or later.") # Work out how Qt was built on MacOS. - if sys.platform == "darwin": - if os.access(os.path.join(qt_libdir, "QtCore.framework"), os.F_OK): - global qt_framework - qt_framework = 1 +# if sys.platform == "darwin": +# if os.access(os.path.join(qt_libdir, "QtCore.framework"), os.F_OK): +# global qt_framework +# qt_framework = 1 # Get the Makefile generator. generator = macros["MAKEFILE_GENERATOR"] @@ -1459,8 +1458,8 @@ if sys.platform == "win32": exe_file = os.path.join("release", app + ".exe") make_target = " release" - elif sys.platform == "darwin": - exe_file = os.path.join(app + ".app", "Contents", "MacOS", app) +# elif sys.platform == "darwin": +# exe_file = os.path.join(app + ".app", "Contents", "MacOS", app) else: exe_file = os.path.join(".", app) --- NEW FILE: pyqt4-py.info --- Info2: << Package: pyqt4-py%type_pkg[python] Version: 4.3.3 Revision: 2 Distribution: (%type_pkg[python] = 23) 10.4 Source: http://www.riverbankcomputing.com/Downloads/PyQt4/GPL/PyQt-x11-gpl-%v.tar.gz Source-MD5: a2ead359f57d84c24bdd10de387e80b4 PatchFile: %{ni}.patch PatchFile-MD5: 225d98da35790c4f44569ab83a2500cf Depends: << freetype219-shlibs, glib2-shlibs, libgettext3-shlibs, libiconv, libpng3-shlibs, python%type_pkg[python], qscintilla-shlibs qt4-x11-core-shlibs, qt4-x11-designer-shlibs, qt4-x11-gui-shlibs, sip-py%type_pkg[python] (>= 4.7.4-1), x11-shlibs << BuildDepends:<< fink (>= 0.24.12), freetype219, glib2-dev, libgettext3-dev, libiconv-dev, libpng3, qscintilla, qt4-x11, sip-py%type_pkg[python]-bin (>= 4.7.4-1), x11-dev << Type: python (2.3 2.4 2.5) SetCPPFLAGS: -I%p/lib/qt4-x11/include SetLDFLAGS: -L%p/lib/qt4-x11/lib CompileScript: << #! /bin/sh -ev export PATH=%p/lib/qt4-x11/bin:$PATH echo "yes" | %p/bin/python%type_raw[python] configure.py \ -b %i/bin \ -d %i/lib/python%type_raw[python]/site-packages \ -p %i/lib/qt4-x11/plugins/python%type_raw[python] \ -v %i/share/sip-py%type_pkg[python]/pyqt4 \ -n %i/include/python%type_raw[python] \ INCDIR_OPENGL+=/usr/X11R6/include \ LFLAGS+=-L%p/lib/python%type_raw[python]/config \ LFLAGS_PLUGIN="-bundle -undefined dynamic_lookup" make << InstallScript: << make install perl -pi -e 's|%i|%p|g' %i/lib/python%type_raw[python]/site-packages/PyQt4/pyqtconfig.py %i/bin/pyuic4 << DocFiles: ChangeLog LICENSE NEWS README License: GPL Description: Python bindings for the Qt toolkit DescPackaging: << Files do not interfere with installation of older pyqt. Base packages can coexist, but -bin's conflict. Disable requirement of framework-built python on darwin. Allow plugin compiling to work. Even though pkg builds, probably need qt4 compatible qscintilla for correct api file generation << Homepage: http://www.riverbankcomputing.co.uk/pyqt Maintainer: Dave Reiser <[EMAIL PROTECTED]> SplitOff: << Package: %N-bin Conflicts: pyqt4-py23-bin, pyqt4-py24-bin, pyqt4-py25-bin Replaces: pyqt4-py23-bin, pyqt4-py24-bin, pyqt4-py25-bin Depends: << freetype219-shlibs, glib2-shlibs, libgettext3-shlibs, libiconv, pyqt4-py%type_pkg[python], qt4-x11-core-shlibs, qt4-x11-gui-shlibs, x11-shlibs << Files: bin DocFiles: ChangeLog LICENSE NEWS README License: GPL << << ------------------------------------------------------------------------- This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/ _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.cvs