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

michaelld at macports.org michaelld at macports.org
Fri Jul 25 10:37:34 PDT 2014


Revision: 122644
          https://trac.macports.org/changeset/122644
Author:   michaelld at macports.org
Date:     2014-07-25 10:37:34 -0700 (Fri, 25 Jul 2014)
Log Message:
-----------
py*-pyqt4:
+ update to 4.11.1;
+ redo version handling to be more robust;
+ rearrange some parts for easier maintenance.

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

Modified: trunk/dports/python/py-pyqt4/Portfile
===================================================================
--- trunk/dports/python/py-pyqt4/Portfile	2014-07-25 17:02:34 UTC (rev 122643)
+++ trunk/dports/python/py-pyqt4/Portfile	2014-07-25 17:37:34 UTC (rev 122644)
@@ -6,8 +6,7 @@
 PortGroup       python 1.0
 
 name            py-pyqt4
-python.versions 24 25 26 27 31 32 33 34
-python.default_version 27
+
 categories-append     devel
 platforms       macosx
 maintainers     michaelld openmaintainer
@@ -20,19 +19,21 @@
     and contains 300 classes and over 5,750 functions and methods.
 homepage        http://www.riverbankcomputing.co.uk/software/pyqt/intro
 
+version         4.11.1
+
+set branch      [join [lrange [split ${version} .] 0 1] .]
+set patch       [lindex [split ${version} .] 2]
+
 # pre-declare provided subports
 
+python.versions 24 25 26 27 31 32 33 34
+python.default_version 27
+
 foreach py_ver ${python.versions} {
     subport py${py_ver}-pyqt4-devel {}
     subport py${py_ver}-pyqt4 {}
 }
 
-# keep 'port' happy, by defining a global version which is for the
-# primary release
-
-set patch 4.10
-version ${patch}.4
-
 if {${name} ne ${subport}} {
 
     if {[string last devel ${subport}] != -1} {
@@ -54,14 +55,17 @@
 
         # release port
 
-        revision        1
-
         master_sites    sourceforge:pyqt
-        distname        PyQt-mac-gpl-${version}
 
-        checksums       rmd160 e3db64a1535a774a99a9a3a8b2deb406fc31a922 \
-                        sha256 43ca99e80911ac82a6840335a6681f3193ce5257a50f1a31eb8ce4097330d023
+        if {${patch} == 0} {
+            distname    PyQt-mac-gpl-${branch}
+        } else {
+            distname    PyQt-mac-gpl-${version}
+        }
 
+        checksums       rmd160 cba54dcbb6a41d5ccb45d9b38e7e2647696772f9 \
+                        sha256 f1eee5a2d523173143df1d64fcd99e462c73a96d9a4fb4e568895d8efbafdd14
+
         patchfiles-append patch-configure.py.diff
 
     }

Modified: trunk/dports/python/py-pyqt4/files/patch-configure.py.diff
===================================================================
--- trunk/dports/python/py-pyqt4/files/patch-configure.py.diff	2014-07-25 17:02:34 UTC (rev 122643)
+++ trunk/dports/python/py-pyqt4/files/patch-configure.py.diff	2014-07-25 17:37:34 UTC (rev 122644)
@@ -1,5 +1,5 @@
---- configure.py.orig	2014-03-14 10:30:42.000000000 -0400
-+++ configure.py	2014-03-17 11:53:24.000000000 -0400
+--- configure.py.orig	2014-07-03 10:11:34.000000000 -0400
++++ configure.py	2014-07-24 21:38:26.000000000 -0400
 @@ -44,6 +44,7 @@
  qt_dir = None
  qt_incdir = None
@@ -8,7 +8,7 @@
  qt_bindir = None
  qt_datadir = None
  qt_archdatadir = None
-@@ -979,18 +980,7 @@
+@@ -978,18 +979,7 @@
                      dynamic_pylib = "--enable-shared" in config_args
  
                  if dynamic_pylib:
@@ -28,7 +28,7 @@
                  else:
                      sipconfig.inform("Qt Designer plugin disabled because Python library is static")
                      opts.designer_plugin = False
-@@ -1089,7 +1079,10 @@
+@@ -1088,7 +1078,10 @@
  
      sipconfig.inform("SIP %s is being used." % sipcfg.sip_version_str)
      sipconfig.inform("The Qt header files are in %s." % qt_incdir)
@@ -40,7 +40,7 @@
      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))
-@@ -1154,7 +1147,8 @@
+@@ -1153,7 +1146,8 @@
          "qt_data_dir":        qt_datadir,
          "qt_archdata_dir":    qt_archdatadir,
          "qt_inc_dir":         qt_incdir,
@@ -50,7 +50,7 @@
      }
  
      sipconfig.create_config_module(module, template, content, macros)
-@@ -1809,7 +1803,7 @@
+@@ -1741,7 +1735,7 @@
              lfile = license.LicenseFile
          except AttributeError:
              lfile = None
@@ -59,7 +59,7 @@
          ltype = None
  
      if ltype is None:
-@@ -1926,12 +1920,14 @@
+@@ -1858,12 +1852,14 @@
      names = list(sipcfg.build_macros().keys())
      names.append("INCDIR_QT")
      names.append("LIBDIR_QT")
@@ -75,7 +75,7 @@
      }
  
      macros = sipconfig.parse_build_macros(fname, names, overrides, properties)
-@@ -1977,7 +1973,7 @@
+@@ -1909,7 +1905,7 @@
  
      # Work out how Qt was built on MacOS.
      if sys.platform == "darwin":
@@ -84,7 +84,7 @@
              global qt_framework
              qt_framework = 1
  
-@@ -1994,6 +1990,7 @@
+@@ -1926,6 +1922,7 @@
      sipcfg.qt_threaded = 1
      sipcfg.qt_dir = qt_dir
      sipcfg.qt_lib_dir = qt_libdir
@@ -92,7 +92,7 @@
  
      return ConfigurePyQt4(generator)
  
-@@ -2009,7 +2006,7 @@
+@@ -1941,7 +1938,7 @@
  
  
  def get_qt_configuration():
@@ -101,7 +101,7 @@
      qt_archdatadir, qt_pluginsdir and qt_xfeatures globals for the Qt
      installation.
      """
-@@ -2083,6 +2080,7 @@
+@@ -2013,6 +2010,7 @@
      out << QLibraryInfo::location(QLibraryInfo::PrefixPath) << '\\n';
      out << QLibraryInfo::location(QLibraryInfo::HeadersPath) << '\\n';
      out << QLibraryInfo::location(QLibraryInfo::LibrariesPath) << '\\n';
@@ -109,7 +109,7 @@
      out << QLibraryInfo::location(QLibraryInfo::BinariesPath) << '\\n';
      out << QLibraryInfo::location(QLibraryInfo::DataPath) << '\\n';
  #if QT_VERSION >= 0x050000
-@@ -2211,22 +2209,23 @@
+@@ -2141,22 +2139,23 @@
      lines = f.read().strip().split("\n")
      f.close()
  
@@ -142,8 +142,8 @@
 +    qt_xfeatures = lines[12:]
  
      if opts.assume_shared:
-         qt_shared = "shared"
-@@ -2287,6 +2286,11 @@
+         qt_shared = 'shared'
+@@ -2219,6 +2218,11 @@
      p = create_optparser()
      opts, args = p.parse_args()
  
@@ -155,7 +155,7 @@
      # Provide defaults for platform-specific options.
      if sys.platform == 'win32':
          opts.qmake = find_default_qmake()
-@@ -2404,7 +2408,6 @@
+@@ -2336,7 +2340,6 @@
          raise
      except:
          sys.stderr.write(
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140725/21bf6c4b/attachment.html>


More information about the macports-changes mailing list