[102259] trunk/dports/python/py-sip

[michaelld at macports.org]

Revision: 102259
          https://trac.macports.org/changeset/102259
Author:   michaelld at macports.org
Date:     2013-01-29 09:06:52 -0800 (Tue, 29 Jan 2013)
Log Message:
-----------
py-sip : updates for 4.14.3

Modified Paths:
--------------
    trunk/dports/python/py-sip/Portfile
    trunk/dports/python/py-sip/files/patch-siputils.py.diff

Modified: trunk/dports/python/py-sip/Portfile
===================================================================
--- trunk/dports/python/py-sip/Portfile	2013-01-29 17:05:15 UTC (rev 102258)
+++ trunk/dports/python/py-sip/Portfile	2013-01-29 17:06:52 UTC (rev 102259)
@@ -5,7 +5,7 @@
 PortGroup           python 1.0
 
 name                py-sip
-version             4.14.2
+version             4.14.3
 python.versions     24 25 26 27 31 32 33
 python.default_version 24
 categories          python devel
@@ -30,8 +30,8 @@
 
     distname            sip-${version}
 
-    checksums           rmd160  e820a5fbde74bca4d43471fae9d469d38d5d91bc \
-                        sha256  1a9d3bf26c821f369c175f8e68946b79bc994da4f96e8f5ecff06e6ee7ac0528
+    checksums           rmd160  fd5b11da6c6652bf701961d24b9e6fb255bdb676 \
+                        sha256  a84fcaf0e400a45496fe70f0cf1adc7eddf0788ade44a4567d51db8bf1ff5770
     patchfiles          patch-siputils.py.diff \
                         patch-specs_macx-g++.diff
 

Modified: trunk/dports/python/py-sip/files/patch-siputils.py.diff
===================================================================
--- trunk/dports/python/py-sip/files/patch-siputils.py.diff	2013-01-29 17:05:15 UTC (rev 102258)
+++ trunk/dports/python/py-sip/files/patch-siputils.py.diff	2013-01-29 17:06:52 UTC (rev 102259)
@@ -1,5 +1,5 @@
---- siputils.py.orig	2012-12-10 09:50:57.000000000 -0500
-+++ siputils.py	2012-12-10 09:56:47.000000000 -0500
+--- siputils.py.orig	2013-01-11 12:09:13.000000000 -0500
++++ siputils.py	2013-01-28 21:01:25.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,7 +9,7 @@
                  val = val.split()
  
              # We also want to treat lists of libraries in the same way so that
-@@ -608,6 +608,10 @@
+@@ -613,6 +613,10 @@
              libdir.extend(libdir_qt)
              rpaths.extend(libdir_qt)
  
@@ -20,7 +20,7 @@
              if qt_version >= 0x040000:
                  # Try and read QT_LIBINFIX from qconfig.pri.
                  qconfig = os.path.join(mkspecs, "qconfig.pri")
-@@ -719,7 +723,7 @@
+@@ -724,7 +728,7 @@
                          if mod == "QAxContainer":
                              incdir.append(os.path.join(qtincdir[0], "ActiveQt"))
                          elif self._is_framework(mod):
@@ -29,7 +29,7 @@
  
                              if mod == "QtAssistant" and qt_version < 0x040202:
                                  mod = "QtAssistantClient"
-@@ -805,7 +809,7 @@
+@@ -810,7 +814,7 @@
      def _is_framework(self, mod):
          """Return true if the given Qt module is a framework.
          """
@@ -38,7 +38,7 @@
  
      def _qt4_module_to_lib(self, mname):
          """Return the name of the Qt4 library corresponding to a module.
-@@ -919,7 +923,7 @@
+@@ -929,7 +933,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,9 +47,9 @@
          else:
              prl_name = os.path.join(self.config.qt_lib_dir, "lib" + clib + ".prl")
  
-@@ -1504,8 +1508,8 @@
-             # 'real_prefix' exists if virtualenv is being used.
-             dl = getattr(sys, 'real_prefix', sys.exec_prefix).split(os.sep)
+@@ -1520,8 +1524,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")
@@ -58,7 +58,7 @@
  
              self.LFLAGS.append("-undefined dynamic_lookup")
  
-@@ -2411,6 +2415,40 @@
+@@ -2427,6 +2431,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/20130129/7080d5c4/attachment.html>