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

[michaelld at macports.org]

Revision: 97331
          https://trac.macports.org/changeset/97331
Author:   michaelld at macports.org
Date:     2012-09-03 18:41:43 -0700 (Mon, 03 Sep 2012)
Log Message:
-----------
py-sip : phonon is never installed as a framework within MacPorts, so make sure it is looked for in QT_INSTALL_LIBS and not the new QT_INSTALL_FRAMEWORKS

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	2012-09-04 01:36:25 UTC (rev 97330)
+++ trunk/dports/python/py-sip/Portfile	2012-09-04 01:41:43 UTC (rev 97331)
@@ -6,7 +6,7 @@
 
 name                py-sip
 version             4.13.2
-revision            2
+revision            3
 python.versions     24 25 26 27 31 32
 python.default_version 24
 categories          python devel

Modified: trunk/dports/python/py-sip/files/patch-siputils.py.diff
===================================================================
--- trunk/dports/python/py-sip/files/patch-siputils.py.diff	2012-09-04 01:36:25 UTC (rev 97330)
+++ trunk/dports/python/py-sip/files/patch-siputils.py.diff	2012-09-04 01:41:43 UTC (rev 97331)
@@ -1,5 +1,5 @@
---- siputils.py.orig	2012-08-16 15:48:37.000000000 -0400
-+++ siputils.py	2012-08-16 15:48:52.000000000 -0400
+--- siputils.py.orig	2012-09-03 21:19:45.000000000 -0400
++++ siputils.py	2012-09-03 21:21:17.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
@@ -29,6 +29,15 @@
                          else:
                              incdir.append(os.path.join(qtincdir[0], mod))
  
+@@ -771,7 +775,7 @@
+     def _is_framework(self, mod):
+         """Return true if the given Qt module is a framework.
+         """
+-        return (self.config.qt_framework and (self.config.qt_version >= 0x040200 or mod != "QtAssistant"))
++        return (self.config.qt_framework and (self.config.qt_version >= 0x040200 or mod != "QtAssistant") and (mod != "phonon"))
+ 
+     def _qt4_module_to_lib(self, mname):
+         """Return the name of the Qt4 library corresponding to a module.
 @@ -883,7 +887,7 @@
          if self.generator in ("MSVC", "MSVC.NET", "MSBUILD", "BMAKE"):
              prl_name = os.path.join(self.config.qt_lib_dir, clib + ".prl")
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120903/372feff7/attachment-0001.html>