[115805] trunk/dports/python/py-enable

mojca at macports.org mojca at macports.org
Sat Jan 11 14:01:15 PST 2014


Revision: 115805
          https://trac.macports.org/changeset/115805
Author:   mojca at macports.org
Date:     2014-01-11 14:01:15 -0800 (Sat, 11 Jan 2014)
Log Message:
-----------
py-enable: upgrade to 4.3.0, use github PortGroup, add new variants (pyqt4, pyside) (maintainer, #42075)

Modified Paths:
--------------
    trunk/dports/python/py-enable/Portfile

Removed Paths:
-------------
    trunk/dports/python/py-enable/files/pyqt4_qsize.patch

Modified: trunk/dports/python/py-enable/Portfile
===================================================================
--- trunk/dports/python/py-enable/Portfile	2014-01-11 21:00:42 UTC (rev 115804)
+++ trunk/dports/python/py-enable/Portfile	2014-01-11 22:01:15 UTC (rev 115805)
@@ -3,10 +3,12 @@
 
 PortSystem	        1.0
 PortGroup	        python 1.0
+PortGroup           wxWidgets 1.0
 
+PortGroup           github 1.0
+github.setup        enthought enable 4.3.0
+
 name                py-enable
-version             4.2.0
-revision            1
 categories-append   devel
 maintainers         gmail.com:jjstickel openmaintainer
 description         The Enthought enable package
@@ -17,26 +19,47 @@
                     drawing engine.
 license             BSD
 platforms           darwin
-homepage            https://github.com/enthought/enable
-master_sites        http://www.enthought.com/repo/ets/
-distname            enable-${version}
 
-checksums           rmd160  a8b8eb6b8c600127793a08eca3e4ec29cf98aa17 \
-                    sha256  48c510bb833cbc9142babcb1914feac2cf64d5133a8ba7cdcdf0d1d782fafbd7
+checksums           rmd160  73bd0a92c677784ee40432ab65f3ead6ac853b72 \
+                    sha256  6eac82675cc4c52ddf1bb50c53ec82de92309bf7c2f003bfe4709d106c89693c
 
 python.versions     26 27
 
 if {${name} ne ${subport}} {
-    patchfiles              no-64-bit-quartz.diff\
-                            pyqt4_qsize.patch
-    patch.pre_args          -p1
+    # It seems this is not needed for version >= 4.3.0, but leaving here in
+    # case problems are reported JJS 1/9/13
+#    patchfiles              no-64-bit-quartz.diff
+#    patch.pre_args          -p1
 
     depends_build-append    port:py${python.version}-setuptools \
                             port:py${python.version}-cython \
                             port:swig-python
     depends_lib-append      port:py${python.version}-traitsui\
                             port:py${python.version}-reportlab
+
+    # # wx-3.0 is not fully compatible with enthought modules, JJS 1/8/14
+    # # * https://trac.macports.org/ticket/42075
+    # # * https://trac.macports.org/ticket/40333
+    # variant wxwidgets description {Use wxWidgets backend} {
+    #     depends_lib-append      port:py${python.version}-wxpython-3.0
+    # }
+
+    variant pyqt4 conflicts pyside description "Qt backend using PyQt4" {
+        # Can use either py*-pyqt4 or py*-pyqt4-devel.
+        depends_lib-append  path:share/py${python.version}-sip/PyQt4:py${python.version}-pyqt4
+    }
+
+    variant pyside conflicts pyqt4 description "Qt backend using PySide" {
+        depends_lib-append  port:py${python.version}-pyside
+    }
+
+    default_variants        +pyqt4
+
+    notes "If wxpython is installed, enthought modules will try to use it\
+ even if pyqt4 (or pyside) are also installed"
+
 }
 
-# haven't retested if this is still true for version >= 4.0
-universal_variant no
+# haven't retested if this is still true for version >= 4.0; commenting out but
+# leaving here in case someone has a problem with universal, JJS 1/9/13
+#universal_variant no

Deleted: trunk/dports/python/py-enable/files/pyqt4_qsize.patch
===================================================================
--- trunk/dports/python/py-enable/files/pyqt4_qsize.patch	2014-01-11 21:00:42 UTC (rev 115804)
+++ trunk/dports/python/py-enable/files/pyqt4_qsize.patch	2014-01-11 22:01:15 UTC (rev 115805)
@@ -1,26 +0,0 @@
-From 54a27de078eab56138ff4bcb31c185df9f6e3609 Mon Sep 17 00:00:00 2001
-From: Robert Kern <rkern at enthought.com>
-Date: Fri, 15 Jun 2012 17:51:19 +0100
-Subject: [PATCH] BUG: Avoid a PySide-only API.
-
----
- enable/qt4/base_window.py |    3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/enable/qt4/base_window.py b/enable/qt4/base_window.py
-index 8e30688..81cb250 100644
---- a/enable/qt4/base_window.py
-+++ b/enable/qt4/base_window.py
-@@ -138,7 +138,8 @@ def sizeHint(self, qt_size_hint):
-         """
- 
-         preferred_size = self._enable_window.component.get_preferred_size()
--        window_size = self._enable_window.control.size().toTuple()
-+        q_size = self._enable_window.control.size()
-+        window_size = (q_size.width(), q_size.height())
- 
-         if qt_size_hint.width() < 0:
-             width = max(preferred_size[0], window_size[0])
--- 
-1.7.10
-
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140111/a5691b10/attachment.html>


More information about the macports-changes mailing list