[120854] trunk/dports/python/py-sip
michaelld at macports.org
michaelld at macports.org
Mon Jun 9 18:16:12 PDT 2014
Revision: 120854
https://trac.macports.org/changeset/120854
Author: michaelld at macports.org
Date: 2014-06-09 18:16:11 -0700 (Mon, 09 Jun 2014)
Log Message:
-----------
py*sip:
+ update to 4.16.1;
+ add comment about how SIP API works;
+ add comment about which SIP API the prior and current SIP version provide, to be able to keep track of when a rev-bump is required;
+ no rev-bumping of dependencies is required for this SIP API change;
+ rearrange some segments;
+ add better support for different patch versions, so that in the future just the version and checksums need to be updated (and, any patches).
Modified Paths:
--------------
trunk/dports/python/py-sip/Portfile
trunk/dports/python/py-sip/files/patch-configure.py.diff
trunk/dports/python/py-sip/files/patch-siputils.py.diff
Modified: trunk/dports/python/py-sip/Portfile
===================================================================
--- trunk/dports/python/py-sip/Portfile 2014-06-10 00:48:02 UTC (rev 120853)
+++ trunk/dports/python/py-sip/Portfile 2014-06-10 01:16:11 UTC (rev 120854)
@@ -5,9 +5,6 @@
PortGroup python 1.0
name py-sip
-version 4.15.5
-python.versions 24 25 26 27 31 32 33 34
-python.default_version 27
categories-append devel
maintainers phw michaelld openmaintainer
license {GPL-2 GPL-3 PSF}
@@ -24,14 +21,40 @@
homepage http://www.riverbankcomputing.co.uk/software/sip/intro
+version 4.16.1
+
+# from siplib/sip.h.in:
+#
+# Define the current API version number. SIP must handle modules with
+# the same major number and with the same or earlier minor number.
+# Whenever data structure elements are added they must be appended and
+# the minor number incremented. Whenever data structure elements are
+# removed or the order changed then the major number must be
+# incremented and the minor number set to 0.
+#
+# SIP 4.16.1 provides SIP API 11.1.
+#
+# SIP 4.15.5 provided SIP API 11.0, so SIP 4.16.1 is backward
+# compatible with 4.15.5 without a rev-bump.
+
+set branch [join [lrange [split ${version} .] 0 1] .]
+set patch [lindex [split ${version} .] 2]
+
+python.versions 24 25 26 27 31 32 33 34
+python.default_version 27
+
if {${name} ne ${subport}} {
master_sites sourceforge:pyqt
- distname sip-${version}
+ if {${patch} == 0} {
+ distname sip-${branch}
+ } else {
+ distname sip-${version}
+ }
- checksums rmd160 94dc342a19b213b0a0997ced9ad46f1ff476241b \
- sha256 9b11d87e7f382ce22bf013137f29462e75b56f5ea46f3fea6061bb20f967d559
+ checksums rmd160 59cd159fdf0cc81a086b43ad66eddf8c9ea3836a \
+ sha256 a49eabd36897ab0362c247f0e3cbb10387023e9936cd9898d7442419c3a176c2
patchfiles patch-siputils.py.diff \
patch-specs_macx-g++.diff \
@@ -119,9 +142,16 @@
GPL-2 or GPL-3 licenses are also available. For details see
${prefix}/share/doc/${subport}/LICENSE \[-GPL2 -GPL3\]\n\n"
- livecheck.type none
+}
+
+if {[string last devel ${subport}] != -1} {
+
+ livecheck.type none
+
} else {
+
+ livecheck.type regex
livecheck.url http://www.riverbankcomputing.co.uk/software/sip/download
livecheck.regex sip-(\\d+(\\.\\d+)+)${extract.suffix}
+
}
-
Modified: trunk/dports/python/py-sip/files/patch-configure.py.diff
===================================================================
--- trunk/dports/python/py-sip/files/patch-configure.py.diff 2014-06-10 00:48:02 UTC (rev 120853)
+++ trunk/dports/python/py-sip/files/patch-configure.py.diff 2014-06-10 01:16:11 UTC (rev 120854)
@@ -1,6 +1,6 @@
---- configure.py.orig 2014-03-14 10:09:34.000000000 -0400
-+++ configure.py 2014-03-17 11:38:56.000000000 -0400
-@@ -548,7 +548,6 @@
+--- configure.py.orig 2014-06-02 14:22:56.000000000 -0400
++++ configure.py 2014-06-02 14:23:07.000000000 -0400
+@@ -872,7 +872,6 @@
raise
except:
sys.stderr.write(
Modified: trunk/dports/python/py-sip/files/patch-siputils.py.diff
===================================================================
--- trunk/dports/python/py-sip/files/patch-siputils.py.diff 2014-06-10 00:48:02 UTC (rev 120853)
+++ trunk/dports/python/py-sip/files/patch-siputils.py.diff 2014-06-10 01:16:11 UTC (rev 120854)
@@ -1,5 +1,5 @@
---- siputils.py.orig 2014-03-17 11:32:18.000000000 -0400
-+++ siputils.py 2014-03-17 11:37:29.000000000 -0400
+--- siputils.py.orig 2014-05-10 11:00:48.000000000 -0400
++++ siputils.py 2014-06-02 14:22:26.000000000 -0400
@@ -297,7 +297,7 @@
# These require special handling as they are (potentially) a set of
# space separated values rather than a single value that might
@@ -9,11 +9,10 @@
val = val.split()
# We also want to treat lists of libraries in the same way so that
-@@ -613,7 +613,17 @@
+@@ -613,6 +613,16 @@
libdir.extend(libdir_qt)
rpaths.extend(libdir_qt)
-- if qt_version >= 0x040000:
+ # projects using SIP may not define FRAMEWORKDIR_QT as a
+ # configuration option, so try to retrieve it and fallback
+ # as necessary to a reasonable default for MacPorts
@@ -24,10 +23,9 @@
+ libdir.extend(frameworkdir_qt)
+ rpaths.extend(frameworkdir_qt)
+
-+ if qt_version >= 0x040000:
+ if qt_version >= 0x040000:
# Try and read QT_LIBINFIX from qconfig.pri.
qconfig = os.path.join(mkspecs, "qconfig.pri")
- self._infix = self._extract_value(qconfig, "QT_LIBINFIX")
@@ -748,7 +758,7 @@
if mod == "QAxContainer":
incdir.append(os.path.join(qtincdir[0], "ActiveQt"))
@@ -55,7 +53,7 @@
else:
prl_name = os.path.join(self.config.qt_lib_dir, "lib" + clib + ".prl")
-@@ -2462,6 +2472,40 @@
+@@ -2471,6 +2481,40 @@
lhs = line[:assstart].strip()
rhs = line[assend + 1:].strip()
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140609/a91225d2/attachment.html>
More information about the macports-changes
mailing list