[105502] trunk/dports/python/py-pyqt4

michaelld at macports.org michaelld at macports.org
Mon Apr 22 17:47:32 PDT 2013


Revision: 105502
          https://trac.macports.org/changeset/105502
Author:   michaelld at macports.org
Date:     2013-04-22 17:47:32 -0700 (Mon, 22 Apr 2013)
Log Message:
-----------
py*-pyqt4:
* update to latest (4.10.1), and tweak Portfile back to normal with respect to using ${version};
* whitespace;
* update and rename configure.py patch for new version.

Modified Paths:
--------------
    trunk/dports/python/py-pyqt4/Portfile

Added Paths:
-----------
    trunk/dports/python/py-pyqt4/files/patch-configure.py.diff

Removed Paths:
-------------
    trunk/dports/python/py-pyqt4/files/patch-configure.py

Modified: trunk/dports/python/py-pyqt4/Portfile
===================================================================
--- trunk/dports/python/py-pyqt4/Portfile	2013-04-22 23:59:15 UTC (rev 105501)
+++ trunk/dports/python/py-pyqt4/Portfile	2013-04-23 00:47:32 UTC (rev 105502)
@@ -6,9 +6,7 @@
 PortGroup       python 1.0
 
 name            py-pyqt4
-version         4.10.0
-set alt_version 4.10
-revision        1
+version         4.10.1
 python.versions 24 25 26 27 31 32 33
 categories-append     devel
 platforms       macosx
@@ -22,12 +20,11 @@
     and contains 300 classes and over 5,750 functions and methods.
 homepage        http://www.riverbankcomputing.co.uk/software/pyqt/intro
 master_sites    sourceforge:pyqt
-#distname        PyQt-mac-gpl-${version}
-distname        PyQt-mac-gpl-${alt_version}
+distname        PyQt-mac-gpl-${version}
 dist_subdir     python
 
-checksums       sha1    080057f3e83a0f57325b7abeb3f2cf5d20e93cdd \
-                rmd160  b0d52cbe38db396f9ceca4d99db194fad4f3b6df
+checksums       sha1    cf20699c4db8d3031c19dd51df8857bba1a4956b \
+                rmd160  a053a92d154a030b707a570b7a755cb17fb17c87
 
 if {$subport != $name} {
 
@@ -75,7 +72,7 @@
     # "framework" directory concept to make the split in qt4-mac as of
     # 4.8.0, and uses it where appropriate.
 
-    patchfiles      patch-configure.py
+    patchfiles      patch-configure.py.diff
 
     # fix location of MacPorts'-installed Qt .apps, step 1
 
@@ -84,7 +81,7 @@
     post-patch {
         reinplace "s|@@MACPORTS_PYTHON_FRAMEWORK@@|${frameworks_dir}/Python.framework/Versions/${python.branch}/Python|" ${worksrcpath}/configure.py
 
-    # fix location of MacPorts'-installed Qt .apps, step 2
+        # fix location of MacPorts'-installed Qt .apps, step 2
 
         reinplace "s|@QT_APPS_DIR@|${qt_apps_dir}|" \
             ${worksrcpath}/examples/demos/qtdemo/menumanager.py \
@@ -216,4 +213,3 @@
 livecheck.type   regex
 livecheck.url    http://www.riverbankcomputing.co.uk/software/pyqt/download
 livecheck.regex  >PyQt-mac-gpl-(\[0-9.\]*).tar.gz<
-livecheck.version ${alt_version}

Deleted: trunk/dports/python/py-pyqt4/files/patch-configure.py
===================================================================
--- trunk/dports/python/py-pyqt4/files/patch-configure.py	2013-04-22 23:59:15 UTC (rev 105501)
+++ trunk/dports/python/py-pyqt4/files/patch-configure.py	2013-04-23 00:47:32 UTC (rev 105502)
@@ -1,150 +0,0 @@
---- configure.py.orig	2013-03-12 11:48:19.000000000 -0400
-+++ configure.py	2013-03-12 11:49:23.000000000 -0400
-@@ -44,6 +44,7 @@
- qt_dir = None
- qt_incdir = None
- qt_libdir = None
-+qt_frameworkdir = None
- qt_bindir = None
- qt_datadir = None
- qt_pluginsdir = None
-@@ -398,8 +399,6 @@
- 
-         if not qt_shared:
-             sipconfig.inform("QtDesigner module disabled with static Qt libraries.")
--        elif sipcfg.universal:
--            sipconfig.inform("QtDesigner module disabled with universal binaries.")
-         else:
-             check_module("QtDesigner", "QExtensionFactory",
-                     "new QExtensionFactory()")
-@@ -1003,16 +1002,9 @@
-                     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 = "%s -lpython%d.%d%s" % (lib_dir_flag, py_major, py_minor, abi)
-+                    link = "%s @@MACPORTS_PYTHON_FRAMEWORK@@" % sipcfg.build_macros().get('LFLAGS', '')
-+
-                 else:
-                     sipconfig.inform("Qt Designer plugin disabled because Python library is static")
-                     opts.designer_plugin = False
-@@ -1111,7 +1103,10 @@
- 
-     sipconfig.inform("SIP %s is being used." % sipcfg.sip_version_str)
-     sipconfig.inform("The Qt header files are in %s." % qt_incdir)
--    sipconfig.inform("The %s Qt libraries are in %s." % (lib_type, qt_libdir))
-+    if sys.platform == "darwin" and qt_framework:
-+        sipconfig.inform("The %s Qt frameworks are in %s." % (lib_type, qt_frameworkdir))
-+    else:
-+        sipconfig.inform("The %s Qt libraries are in %s." % (lib_type, qt_libdir))
-     sipconfig.inform("The Qt binaries are in %s." % qt_bindir)
-     sipconfig.inform("The Qt mkspecs directory is in %s." % qt_datadir)
-     sipconfig.inform("These PyQt modules will be built: %s." % ", ".join(pyqt_modules))
-@@ -1174,7 +1169,8 @@
-         "qt_dir":             qt_dir,
-         "qt_data_dir":        qt_datadir,
-         "qt_inc_dir":         qt_incdir,
--        "qt_lib_dir":         qt_libdir
-+        "qt_lib_dir":         qt_libdir,
-+        "qt_framework_dir":   qt_frameworkdir
-     }
- 
-     sipconfig.create_config_module(module, template, content, macros)
-@@ -1830,7 +1826,7 @@
-             lfile = license.LicenseFile
-         except AttributeError:
-             lfile = None
--    except ImportError:
-+    except:
-         ltype = None
- 
-     if ltype is None:
-@@ -1947,12 +1943,14 @@
-     names = list(sipcfg.build_macros().keys())
-     names.append("INCDIR_QT")
-     names.append("LIBDIR_QT")
-+    names.append("FRAMEWORKDIR_QT")
-     names.append("MOC")
- 
-     properties = {
-         "QT_INSTALL_BINS":      qt_bindir,
-         "QT_INSTALL_HEADERS":   qt_incdir,
--        "QT_INSTALL_LIBS":      qt_libdir
-+        "QT_INSTALL_LIBS":      qt_libdir,
-+        "QT_INSTALL_FRAMEWORKS": qt_frameworkdir
-     }
- 
-     macros = sipconfig.parse_build_macros(fname, names, overrides, properties)
-@@ -1998,7 +1996,7 @@
- 
-     # 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):
-+        if os.access(os.path.join(qt_frameworkdir, "QtCore.framework"), os.F_OK):
-             global qt_framework
-             qt_framework = 1
- 
-@@ -2015,6 +2013,7 @@
-     sipcfg.qt_threaded = 1
-     sipcfg.qt_dir = qt_dir
-     sipcfg.qt_lib_dir = qt_libdir
-+    sipcfg.qt_framework_dir = qt_frameworkdir
- 
-     return ConfigurePyQt4(generator)
- 
-@@ -2030,7 +2029,7 @@
- 
- 
- def get_qt_configuration():
--    """Set the qt_dir, qt_incdir, qt_libdir, qt_bindir, qt_datadir,
-+    """Set the qt_dir, qt_incdir, qt_libdir, qt_frameworkdir, qt_bindir, qt_datadir,
-     qt_pluginsdir and qt_xfeatures globals for the Qt installation.
-     """
-     sipconfig.inform("Determining the layout of your Qt installation...")
-@@ -2103,6 +2102,7 @@
-     out << QLibraryInfo::location(QLibraryInfo::PrefixPath) << '\\n';
-     out << QLibraryInfo::location(QLibraryInfo::HeadersPath) << '\\n';
-     out << QLibraryInfo::location(QLibraryInfo::LibrariesPath) << '\\n';
-+    out << QLibraryInfo::location(QLibraryInfo::FrameworksPath) << '\\n';
-     out << QLibraryInfo::location(QLibraryInfo::BinariesPath) << '\\n';
-     out << QLibraryInfo::location(QLibraryInfo::DataPath) << '\\n';
-     out << QLibraryInfo::location(QLibraryInfo::PluginsPath) << '\\n';
-@@ -2225,20 +2225,21 @@
-     lines = f.read().strip().split("\n")
-     f.close()
- 
--    global qt_dir, qt_incdir, qt_libdir, qt_bindir, qt_datadir, qt_pluginsdir
-+    global qt_dir, qt_incdir, qt_libdir, qt_frameworkdir, qt_bindir, qt_datadir, qt_pluginsdir
-     global qt_version, qt_edition, qt_licensee, qt_shared, qt_xfeatures
- 
-     qt_dir = lines[0]
-     qt_incdir = lines[1]
-     qt_libdir = lines[2]
--    qt_bindir = lines[3]
--    qt_datadir = lines[4]
--    qt_pluginsdir = lines[5]
--    qt_version = lines[6]
--    qt_edition = lines[7]
--    qt_licensee = lines[8]
--    qt_shared = lines[9]
--    qt_xfeatures = lines[10:]
-+    qt_frameworkdir = lines[3]
-+    qt_bindir = lines[4]
-+    qt_datadir = lines[5]
-+    qt_pluginsdir = lines[6]
-+    qt_version = lines[7]
-+    qt_edition = lines[8]
-+    qt_licensee = lines[9]
-+    qt_shared = lines[10]
-+    qt_xfeatures = lines[11:]
- 
-     if opts.assume_shared:
-         qt_shared = "shared"

Copied: trunk/dports/python/py-pyqt4/files/patch-configure.py.diff (from rev 105473, trunk/dports/python/py-pyqt4/files/patch-configure.py)
===================================================================
--- trunk/dports/python/py-pyqt4/files/patch-configure.py.diff	                        (rev 0)
+++ trunk/dports/python/py-pyqt4/files/patch-configure.py.diff	2013-04-23 00:47:32 UTC (rev 105502)
@@ -0,0 +1,143 @@
+--- configure.py.orig	2013-04-22 20:06:08.000000000 -0400
++++ configure.py	2013-04-22 20:21:29.000000000 -0400
+@@ -44,6 +44,7 @@
+ qt_dir = None
+ qt_incdir = None
+ qt_libdir = None
++qt_frameworkdir = None
+ qt_bindir = None
+ qt_datadir = None
+ qt_archdatadir = None
+@@ -977,16 +978,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 = "%s -lpython%d.%d%s" % (lib_dir_flag, py_major, py_minor, abi)
++                    link = "%s @@MACPORTS_PYTHON_FRAMEWORK@@" % sipcfg.build_macros().get('LFLAGS', '')
+                 else:
+                     sipconfig.inform("Qt Designer plugin disabled because Python library is static")
+                     opts.designer_plugin = False
+@@ -1085,7 +1077,10 @@
+ 
+     sipconfig.inform("SIP %s is being used." % sipcfg.sip_version_str)
+     sipconfig.inform("The Qt header files are in %s." % qt_incdir)
+-    sipconfig.inform("The %s Qt libraries are in %s." % (lib_type, qt_libdir))
++    if sys.platform == "darwin" and qt_framework:
++        sipconfig.inform("The %s Qt frameworks are in %s." % (lib_type, qt_frameworkdir))
++    else:
++        sipconfig.inform("The %s Qt libraries are in %s." % (lib_type, qt_libdir))
+     sipconfig.inform("The Qt binaries are in %s." % qt_bindir)
+     sipconfig.inform("The Qt mkspecs directory is in %s." % qt_archdatadir)
+     sipconfig.inform("These PyQt modules will be built: %s." % ", ".join(pyqt_modules))
+@@ -1149,7 +1144,8 @@
+         "qt_data_dir":        qt_datadir,
+         "qt_archdata_dir":    qt_archdatadir,
+         "qt_inc_dir":         qt_incdir,
+-        "qt_lib_dir":         qt_libdir
++        "qt_lib_dir":         qt_libdir,
++        "qt_framework_dir":   qt_frameworkdir
+     }
+ 
+     sipconfig.create_config_module(module, template, content, macros)
+@@ -1805,7 +1801,7 @@
+             lfile = license.LicenseFile
+         except AttributeError:
+             lfile = None
+-    except ImportError:
++    except:
+         ltype = None
+ 
+     if ltype is None:
+@@ -1922,12 +1918,14 @@
+     names = list(sipcfg.build_macros().keys())
+     names.append("INCDIR_QT")
+     names.append("LIBDIR_QT")
++    names.append("FRAMEWORKDIR_QT")
+     names.append("MOC")
+ 
+     properties = {
+         "QT_INSTALL_BINS":      qt_bindir,
+         "QT_INSTALL_HEADERS":   qt_incdir,
+-        "QT_INSTALL_LIBS":      qt_libdir
++        "QT_INSTALL_LIBS":      qt_libdir,
++        "QT_INSTALL_FRAMEWORKS": qt_frameworkdir
+     }
+ 
+     macros = sipconfig.parse_build_macros(fname, names, overrides, properties)
+@@ -1973,7 +1971,7 @@
+ 
+     # 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):
++        if os.access(os.path.join(qt_frameworkdir, "QtCore.framework"), os.F_OK):
+             global qt_framework
+             qt_framework = 1
+ 
+@@ -1990,6 +1988,7 @@
+     sipcfg.qt_threaded = 1
+     sipcfg.qt_dir = qt_dir
+     sipcfg.qt_lib_dir = qt_libdir
++    sipcfg.qt_framework_dir = qt_frameworkdir
+ 
+     return ConfigurePyQt4(generator)
+ 
+@@ -2005,7 +2004,7 @@
+ 
+ 
+ def get_qt_configuration():
+-    """Set the qt_dir, qt_incdir, qt_libdir, qt_bindir, qt_datadir,
++    """Set the qt_dir, qt_incdir, qt_libdir, qt_frameworkdir, qt_bindir, qt_datadir,
+     qt_archdatadir, qt_pluginsdir and qt_xfeatures globals for the Qt
+     installation.
+     """
+@@ -2079,6 +2078,7 @@
+     out << QLibraryInfo::location(QLibraryInfo::PrefixPath) << '\\n';
+     out << QLibraryInfo::location(QLibraryInfo::HeadersPath) << '\\n';
+     out << QLibraryInfo::location(QLibraryInfo::LibrariesPath) << '\\n';
++    out << QLibraryInfo::location(QLibraryInfo::FrameworksPath) << '\\n';
+     out << QLibraryInfo::location(QLibraryInfo::BinariesPath) << '\\n';
+     out << QLibraryInfo::location(QLibraryInfo::DataPath) << '\\n';
+ #if QT_VERSION >= 0x050000
+@@ -2206,22 +2206,23 @@
+     lines = f.read().strip().split("\n")
+     f.close()
+ 
+-    global qt_dir, qt_incdir, qt_libdir, qt_bindir, qt_datadir, qt_archdatadir
++    global qt_dir, qt_incdir, qt_libdir, qt_frameworkdir, qt_bindir, qt_datadir, qt_archdatadir
+     global qt_pluginsdir
+     global qt_version, qt_edition, qt_licensee, qt_shared, qt_xfeatures
+ 
+     qt_dir = lines[0]
+     qt_incdir = lines[1]
+     qt_libdir = lines[2]
+-    qt_bindir = lines[3]
+-    qt_datadir = lines[4]
+-    qt_archdatadir = lines[5]
+-    qt_pluginsdir = lines[6]
+-    qt_version = lines[7]
+-    qt_edition = lines[8]
+-    qt_licensee = lines[9]
+-    qt_shared = lines[10]
+-    qt_xfeatures = lines[11:]
++    qt_frameworkdir = lines[3]
++    qt_bindir = lines[4]
++    qt_datadir = lines[5]
++    qt_archdatadir = lines[6]
++    qt_pluginsdir = lines[7]
++    qt_version = lines[8]
++    qt_edition = lines[9]
++    qt_licensee = lines[10]
++    qt_shared = lines[11]
++    qt_xfeatures = lines[12:]
+ 
+     if opts.assume_shared:
+         qt_shared = "shared"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130422/2048edc5/attachment-0001.html>


More information about the macports-changes mailing list