[117941] trunk/dports/python/py-sip
michaelld at macports.org
michaelld at macports.org
Mon Mar 17 09:44:00 PDT 2014
Revision: 117941
https://trac.macports.org/changeset/117941
Author: michaelld at macports.org
Date: 2014-03-17 09:44:00 -0700 (Mon, 17 Mar 2014)
Log Message:
-----------
py*-sip:
+ update to 4.15.5, which provides SIP API 11.0;
+ add SDK info for OS X 10.9.
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-03-17 16:08:18 UTC (rev 117940)
+++ trunk/dports/python/py-sip/Portfile 2014-03-17 16:44:00 UTC (rev 117941)
@@ -5,7 +5,7 @@
PortGroup python 1.0
name py-sip
-version 4.15.4
+version 4.15.5
python.versions 24 25 26 27 31 32 33 34
python.default_version 27
categories-append devel
@@ -30,8 +30,8 @@
distname sip-${version}
- checksums rmd160 6bfee460b16f76c7f250f9454aef2a8c1610c1e2 \
- sha256 594b742873cd135dc945e61f0fff4d9d35ea5da8d23e2fc8f3820c3771a52228
+ checksums rmd160 94dc342a19b213b0a0997ced9ad46f1ff476241b \
+ sha256 9b11d87e7f382ce22bf013137f29462e75b56f5ea46f3fea6061bb20f967d559
patchfiles patch-siputils.py.diff \
patch-specs_macx-g++.diff \
@@ -88,6 +88,7 @@
10 { configure.args-append "--sdk=${sdk_dir}/MacOSX10.6.sdk" }
11 { configure.args-append "--sdk=${sdk_dir}/MacOSX10.7.sdk" }
12 { configure.args-append "--sdk=${sdk_dir}/MacOSX10.8.sdk" }
+ 13 { configure.args-append "--sdk=${sdk_dir}/MacOSX10.9.sdk" }
}
build.cmd make
Modified: trunk/dports/python/py-sip/files/patch-configure.py.diff
===================================================================
--- trunk/dports/python/py-sip/files/patch-configure.py.diff 2014-03-17 16:08:18 UTC (rev 117940)
+++ trunk/dports/python/py-sip/files/patch-configure.py.diff 2014-03-17 16:44:00 UTC (rev 117941)
@@ -1,6 +1,6 @@
---- configure.py.orig 2013-08-21 01:25:44.000000000 -0400
-+++ configure.py 2013-08-21 19:10:47.000000000 -0400
-@@ -547,7 +547,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 @@
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-03-17 16:08:18 UTC (rev 117940)
+++ trunk/dports/python/py-sip/files/patch-siputils.py.diff 2014-03-17 16:44:00 UTC (rev 117941)
@@ -1,5 +1,5 @@
---- siputils.py.orig 2013-03-06 08:41:38.000000000 -0500
-+++ siputils.py 2013-03-27 08:24:05.000000000 -0400
+--- siputils.py.orig 2014-03-17 11:32:18.000000000 -0400
++++ siputils.py 2014-03-17 11:37:29.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,10 +9,11 @@
val = val.split()
# We also want to treat lists of libraries in the same way so that
-@@ -613,6 +613,16 @@
+@@ -613,7 +613,17 @@
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
@@ -23,9 +24,10 @@
+ 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"))
@@ -53,18 +55,7 @@
else:
prl_name = os.path.join(self.config.qt_lib_dir, "lib" + clib + ".prl")
-@@ -1561,8 +1571,8 @@
- # Note that I can't remember why we need a framework build.
- dl = get_python_inc().split(os.sep)
-
-- if "Python.framework" not in dl:
-- error("SIP requires Python to be built as a framework")
-+# if "Python.framework" not in dl:
-+# error("SIP requires Python to be built as a framework")
-
- self.LFLAGS.append("-undefined dynamic_lookup")
-
-@@ -2472,6 +2482,40 @@
+@@ -2462,6 +2472,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/20140317/5fc10895/attachment.html>
More information about the macports-changes
mailing list