Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/languages
In directory vz-cvs-3.sog:/tmp/cvs-serv7971
Modified Files:
pyqt4-mac-py.info pyqt4-py.info pyqt4-py.patch
Log Message:
New upstream pyqt4 4.9.4.
Now precompile installed .py files.
Index: pyqt4-py.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/languages/pyqt4-py.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- pyqt4-py.info 20 Mar 2012 14:20:21 -0000 1.1
+++ pyqt4-py.info 12 Aug 2012 14:08:16 -0000 1.2
@@ -1,18 +1,18 @@
Info2: <<
Package: pyqt4-py%type_pkg[python]
-Version: 4.9.1
-Revision: 3
+Version: 4.9.4
+Revision: 1
#Source: mirror:master:PyQt-x11-gpl-%v.tar.gz
Source:
http://www.riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-x11-gpl-%v.tar.gz
#Source:
http://www.riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-x11-gpl-snapshot-%v-4bd2045a6bc8.tar.gz
-Source-MD5: 7f495dc49f71e3bfb64bf942e0d8bb3c
+Source-MD5: a0b6a820633366365af5124ddbd059c7
Conflicts: pyqt4-py23-bin, pyqt4-py24-bin, pyqt4-py25-bin, pyqt4-py26-bin,
pyqt4-mac-py24-bin, pyqt4-mac-py25-bin, pyqt4-mac-py26-bin, pyqt4-py23 (<<
4.7.4-1), pyqt4-py24 (<< 4.7.4-1), pyqt4-py25 (<< 4.7.4-1), pyqt4-py26 (<<
4.7.4-1), pyqt4-mac-py24 (<< 4.7.4-1), pyqt4-mac-py25 (<< 4.7.4-1),
pyqt4-mac-py26 (<< 4.7.4-1)
Replaces: pyqt4-py23-bin, pyqt4-py24-bin, pyqt4-py25-bin, pyqt4-py26-bin,
pyqt4-mac-py24-bin, pyqt4-mac-py25-bin, pyqt4-mac-py26-bin, pyqt4-py23 (<<
4.7.4-1), pyqt4-py24 (<< 4.7.4-1), pyqt4-py25 (<< 4.7.4-1), pyqt4-py26 (<<
4.7.4-1), pyqt4-mac-py24 (<< 4.7.4-1), pyqt4-mac-py25 (<< 4.7.4-1),
pyqt4-mac-py26 (<< 4.7.4-1)
PatchFile: %{ni}.patch
-PatchFile-MD5: e3f1569a90cd425671d8f7c3293e0741
+PatchFile-MD5: 28c778c8c8dc6cfc4f2e4f3e01b45f70
PatchScript: <<
%{default_script}
perl -pi -e 's,macx-g\+\+,darwin-g++,g' configure.py
@@ -40,7 +40,7 @@
qt4-base-x11-qtxml-shlibs (>= 4.7.3-1),
qt4-base-x11-qtxmlpatterns-shlibs (>= 4.7.3-1),
qtwebkit-x11-shlibs (>= 2.0.0-6),
- sip-py%type_pkg[python] (>= 4.13.2-1),
+ sip-py%type_pkg[python] (>= 4.13.3-1),
x11-shlibs
<<
BuildDepends:<<
@@ -51,7 +51,7 @@
( %type_pkg[python] <= 27 ) pydbus-py%type_pkg[python]-dev,
qt4-base-x11 (>= 4.7.3-1),
qtwebkit-x11 (>= 2.0.0-6),
- sip-py%type_pkg[python]-bin (>= 4.13.2-1),
+ sip-py%type_pkg[python]-bin (>= 4.13.3-1),
system-openssl-dev,
x11-dev
<<
@@ -71,14 +71,23 @@
-p %i/lib/qt4-x11/plugins/python%type_raw[python] \
-v %i/share/sip-py%type_pkg[python]/pyqt4 \
-n %i/lib/qt4-x11/include/python%type_raw[python] \
+ --qsci-api \
INCDIR_OPENGL+=/usr/X11R6/include \
LFLAGS_PLUGIN="-bundle `%p/bin/python%type_raw[python]-config --ldflags`"
make
<<
InstallScript: <<
+#!/bin/bash -ev
make install
perl -pi -e 's|%i|%p|g'
%i/lib/qt4-x11/lib/python%type_raw[python]/site-packages/PyQt4/pyqtconfig.py
%i/lib/qt4-x11/lib/python%type_raw[python]/bin/pyuic4
perl -pi -e
's|python%type_raw[python]%type_raw[python]|python%type_raw[python]|g'
%i/lib/qt4-x11/lib/python%type_raw[python]/bin/pyuic4
+cd %i/lib/qt4-x11/lib/python%type_raw[python]/site-packages
+if [ %type_pkg[python] -gt 27 ]; then
+ rm -r PyQt4/uic/port_v2
+else
+ rm -r PyQt4/uic/port_v3
+fi
+%p/bin/python%type_raw[python] -m compileall PyQt4
<<
DocFiles: LICENSE.GPL2 LICENSE.GPL3 GPL_EXCEPTION_ADDENDUM.TXT
GPL_EXCEPTION.TXT OPENSOURCE-NOTICE.TXT NEWS README
License: GPL
Index: pyqt4-py.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/languages/pyqt4-py.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- pyqt4-py.patch 20 Mar 2012 14:20:21 -0000 1.1
+++ pyqt4-py.patch 12 Aug 2012 14:08:16 -0000 1.2
@@ -1,51 +1,33 @@
-diff -ru PyQt-x11-gpl-4.8.4.orig/configure.py PyQt-x11-gpl-4.8.4/configure.py
---- PyQt-x11-gpl-4.8.4.orig/configure.py 2011-05-01 08:50:12.000000000
-0400
-+++ PyQt-x11-gpl-4.8.4/configure.py 2011-05-13 21:44:12.000000000 -0400
-@@ -946,19 +946,12 @@
- from distutils.sysconfig import get_config_vars
- ducfg = get_config_vars()
+diff -ru PyQt-x11-gpl-4.9.4.orig/configure.py PyQt-x11-gpl-4.9.4/configure.py
+--- PyQt-x11-gpl-4.9.4.orig/configure.py 2012-06-26 09:09:24.000000000
-0400
++++ PyQt-x11-gpl-4.9.4/configure.py 2012-08-12 09:10:03.000000000 -0400
+@@ -970,7 +970,7 @@
+
+ config_args = ducfg.get("CONFIG_ARGS", "")
- 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", ""):
++ if sys.platform == "notdarwin":
+ dynamic_pylib = "--enable-framework" in config_args
+
+ # It's probably a Python bug that the library name doesn't
+@@ -980,15 +980,7 @@
+ dynamic_pylib = "--enable-shared" in config_args
+
+ if dynamic_pylib:
- if glob.glob("%s/lib/libpython%d.%d*" %
(ducfg["exec_prefix"], py_major, py_minor)):
- lib_dir_flag = quote("-L%s/lib" %
ducfg["exec_prefix"])
- elif glob.glob("%s/libpython%d.%d*" % (ducfg["LIBDIR"],
py_major, py_minor)):
- lib_dir_flag = quote("-L%s" % ducfg["LIBDIR"])
- else:
- sipconfig.inform("Qt Designer plugin disabled because
Python library couldn't be found")
+- lib_dir_flag = ''
- opts.designer_plugin = False
-
-+# link = "-framework Python"
-+ if 1:
+ lib_dir_flag = quote("-L%s" % sipcfg.py_lib_dir)
link = "%s -lpython%d.%d%s" % (lib_dir_flag, py_major,
py_minor, abi)
else:
sipconfig.inform("Qt Designer plugin disabled because
Python library is static")
-@@ -1053,8 +1046,8 @@
- if qt_licensee:
- sipconfig.inform("Qt is licensed to %s." % qt_licensee)
-
-- 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)
-@@ -1472,7 +1465,7 @@
- if "__USE_WS_X11__" in sipcfg.build_macros()["DEFINES"]:
- plattag = "WS_X11"
- else:
-- plattag = "WS_MACX"
-+ plattag = "WS_X11"
- else:
- plattag = "WS_X11"
-
-@@ -1881,10 +1874,10 @@
+@@ -1937,10 +1929,10 @@
macros['CXXFLAGS'] += ' -mstackrealign'
# Work out how Qt was built on MacOS.
@@ -60,16 +42,7 @@
# Get the Makefile generator.
generator = macros["MAKEFILE_GENERATOR"]
-@@ -1908,7 +1901,7 @@
- """
- if sys.platform == "darwin":
- # The Qt binary installer has macx-xcode as the default.
-- args = "-spec %s %s" % (sipcfg.platform, args)
-+ args = "-spec %s %s" % ("macx-g++", args)
-
- return args
-
-@@ -1935,8 +1928,8 @@
+@@ -1991,8 +1983,8 @@
else:
exe_file = os.path.join("release", app + ".exe")
make_target = " release"
Index: pyqt4-mac-py.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/languages/pyqt4-mac-py.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- pyqt4-mac-py.info 20 Mar 2012 14:20:21 -0000 1.2
+++ pyqt4-mac-py.info 12 Aug 2012 14:08:16 -0000 1.3
@@ -3,12 +3,11 @@
Package: pyqt4-mac-py%type_pkg[python]
Distribution: (%type_pkg[python] = 24) 10.4, (%type_pkg[python] = 24) 10.5
Type: python (2.4 2.5 2.6 2.7 3.1 3.2)
-Version: 4.9.1
-Revision: 2
+Version: 4.9.4
+Revision: 1
#Source: mirror:master:PyQt-mac-gpl-%v.tar.gz
Source:
http://www.riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-mac-gpl-%v.tar.gz
-#Source:
http://www.riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-mac-gpl-snapshot-%v-4bd2045a6bc8.tar.gz
-Source-MD5: 3b9112a49a3484032f29ea7fe65c31e5
+Source-MD5: e31dae8ff5294086ed5de6b9a4215b1b
Conflicts: pyqt4-py23-bin, pyqt4-py24-bin, pyqt4-py25-bin, pyqt4-py26-bin,
pyqt4-mac-py24-bin, pyqt4-mac-py25-bin, pyqt4-mac-py26-bin, pyqt4-py23 (<<
4.7.4-1), pyqt4-py24 (<< 4.7.4-1), pyqt4-py25 (<< 4.7.4-1), pyqt4-py26 (<<
4.7.4-1), pyqt4-mac-py24 (<< 4.7.4-1), pyqt4-mac-py25 (<< 4.7.4-1),
pyqt4-mac-py26 (<< 4.7.4-1)
Replaces: pyqt4-py23-bin, pyqt4-py24-bin, pyqt4-py25-bin, pyqt4-py26-bin,
pyqt4-mac-py24-bin, pyqt4-mac-py25-bin, pyqt4-mac-py26-bin, pyqt4-py23 (<<
4.7.4-1), pyqt4-py24 (<< 4.7.4-1), pyqt4-py25 (<< 4.7.4-1), pyqt4-py26 (<<
4.7.4-1), pyqt4-mac-py24 (<< 4.7.4-1), pyqt4-mac-py25 (<< 4.7.4-1),
pyqt4-mac-py26 (<< 4.7.4-1)
@@ -38,7 +37,7 @@
qt4-base-mac-qtxml-shlibs (>= 4.7.3-1),
qt4-base-mac-qtxmlpatterns-shlibs (>= 4.7.3-1),
qtwebkit-mac-shlibs (>= 2.0.0-7),
- sip-py%type_pkg[python] (>= 4.13.2-1)
+ sip-py%type_pkg[python] (>= 4.13.3-1)
<<
BuildDepends:<<
( %type_pkg[python] <= 27 ) dbus1.3-dev,
@@ -49,7 +48,7 @@
( %type_pkg[python] <= 27 ) pydbus-py%type_pkg[python]-dev,
qt4-base-mac (>= 4.7.3-1),
qtwebkit-mac (>= 2.0.0-7),
- sip-py%type_pkg[python]-bin (>= 4.13.2-1),
+ sip-py%type_pkg[python]-bin (>= 4.13.3-1),
system-openssl-dev
<<
@@ -82,6 +81,13 @@
export PYTHONPATH=%p/lib/qt4-mac/lib/python%type_raw[python]/site-packages
exec %p/bin/python%type_raw[python]
%p/lib/qt4-mac/lib/python%type_raw[python]/site-packages/PyQt4/uic/pyuic.py
${1+"$@"}
EOF
+cd %i/lib/qt4-mac/lib/python%type_raw[python]/site-packages
+if [ %type_pkg[python] -gt 27 ]; then
+ rm -r PyQt4/uic/port_v2
+else
+ rm -r PyQt4/uic/port_v3
+fi
+%p/bin/python%type_raw[python] -m compileall PyQt4
<<
DocFiles: LICENSE.GPL2 LICENSE.GPL3 GPL_EXCEPTION_ADDENDUM.TXT
GPL_EXCEPTION.TXT OPENSOURCE-NOTICE.TXT NEWS README
License: GPL
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
