[103431] trunk/dports/python/py-sip
michaelld at macports.org
michaelld at macports.org
Mon Feb 25 10:47:35 PST 2013
Revision: 103431
https://trac.macports.org/changeset/103431
Author: michaelld at macports.org
Date: 2013-02-25 10:47:35 -0800 (Mon, 25 Feb 2013)
Log Message:
-----------
py-sip:
* Fix error when the project using SIP does not define FRAMEWORKDIR_QT as an option;
* Per the request of the project developers, change how to report a build error to direct to MacPorts and not Riverback at least initially.
Modified Paths:
--------------
trunk/dports/python/py-sip/Portfile
trunk/dports/python/py-sip/files/patch-siputils.py.diff
Added Paths:
-----------
trunk/dports/python/py-sip/files/patch-configure.py.diff
Modified: trunk/dports/python/py-sip/Portfile
===================================================================
--- trunk/dports/python/py-sip/Portfile 2013-02-25 17:53:31 UTC (rev 103430)
+++ trunk/dports/python/py-sip/Portfile 2013-02-25 18:47:35 UTC (rev 103431)
@@ -6,6 +6,7 @@
name py-sip
version 4.14.3
+revision 1
python.versions 24 25 26 27 31 32 33
python.default_version 24
categories-append devel
@@ -33,7 +34,8 @@
checksums rmd160 fd5b11da6c6652bf701961d24b9e6fb255bdb676 \
sha256 a84fcaf0e400a45496fe70f0cf1adc7eddf0788ade44a4567d51db8bf1ff5770
patchfiles patch-siputils.py.diff \
- patch-specs_macx-g++.diff
+ patch-specs_macx-g++.diff \
+ patch-configure.py.diff
use_configure yes
pre-configure {
Added: trunk/dports/python/py-sip/files/patch-configure.py.diff
===================================================================
--- trunk/dports/python/py-sip/files/patch-configure.py.diff (rev 0)
+++ trunk/dports/python/py-sip/files/patch-configure.py.diff 2013-02-25 18:47:35 UTC (rev 103431)
@@ -0,0 +1,11 @@
+--- configure.py.orig 2013-02-25 12:33:22.000000000 -0500
++++ configure.py 2013-02-25 12:37:50.000000000 -0500
+@@ -531,7 +531,6 @@
+ raise
+ except:
+ sys.stderr.write(
+-"""An internal error occured. Please report all the output from the program,
+-including the following traceback, to support at riverbankcomputing.com.
++"""An internal error occured. Please follow the instructions provided by MacPorts < http://www.macports.org > to report this issue. Please do not report this issue to Riverbank Computing until MacPorts developers have determined that it is appropriate to do so.
+ """)
+ raise
Modified: trunk/dports/python/py-sip/files/patch-siputils.py.diff
===================================================================
--- trunk/dports/python/py-sip/files/patch-siputils.py.diff 2013-02-25 17:53:31 UTC (rev 103430)
+++ trunk/dports/python/py-sip/files/patch-siputils.py.diff 2013-02-25 18:47:35 UTC (rev 103431)
@@ -1,5 +1,5 @@
---- siputils.py.orig 2013-01-11 12:09:13.000000000 -0500
-+++ siputils.py 2013-01-28 21:01:25.000000000 -0500
+--- siputils.py.orig 2013-02-25 12:32:21.000000000 -0500
++++ siputils.py 2013-02-25 12:35:49.000000000 -0500
@@ -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,18 +9,24 @@
val = val.split()
# We also want to treat lists of libraries in the same way so that
-@@ -613,6 +613,10 @@
+@@ -613,6 +613,16 @@
libdir.extend(libdir_qt)
rpaths.extend(libdir_qt)
-+ frameworkdir_qt = self.optional_list("FRAMEWORKDIR_QT")
++ # 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
++ try:
++ frameworkdir_qt = self.optional_list("FRAMEWORKDIR_QT")
++ except:
++ frameworkdir_qt = self.config.qt_dir + "/Library/Frameworks"
+ libdir.extend(frameworkdir_qt)
+ rpaths.extend(frameworkdir_qt)
+
if qt_version >= 0x040000:
# Try and read QT_LIBINFIX from qconfig.pri.
qconfig = os.path.join(mkspecs, "qconfig.pri")
-@@ -724,7 +728,7 @@
+@@ -724,7 +734,7 @@
if mod == "QAxContainer":
incdir.append(os.path.join(qtincdir[0], "ActiveQt"))
elif self._is_framework(mod):
@@ -29,7 +35,7 @@
if mod == "QtAssistant" and qt_version < 0x040202:
mod = "QtAssistantClient"
-@@ -810,7 +814,7 @@
+@@ -810,7 +820,7 @@
def _is_framework(self, mod):
"""Return true if the given Qt module is a framework.
"""
@@ -38,7 +44,7 @@
def _qt4_module_to_lib(self, mname):
"""Return the name of the Qt4 library corresponding to a module.
-@@ -929,7 +933,7 @@
+@@ -929,7 +939,7 @@
if self.generator in ("MSVC", "MSVC.NET", "MSBUILD", "BMAKE"):
prl_name = os.path.join(self.config.qt_lib_dir, clib + ".prl")
elif sys.platform == "darwin" and framework:
@@ -47,7 +53,7 @@
else:
prl_name = os.path.join(self.config.qt_lib_dir, "lib" + clib + ".prl")
-@@ -1520,8 +1524,8 @@
+@@ -1520,8 +1530,8 @@
# Note that I can't remember why we need a framework build.
dl = get_python_inc().split(os.sep)
@@ -58,7 +64,7 @@
self.LFLAGS.append("-undefined dynamic_lookup")
-@@ -2427,6 +2431,40 @@
+@@ -2427,6 +2437,40 @@
lhs = line[:assstart].strip()
rhs = line[assend + 1:].strip()
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130225/ecb9f3f6/attachment-0001.html>
More information about the macports-changes
mailing list