<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[115805] trunk/dports/python/py-enable</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/115805">115805</a></dd>
<dt>Author</dt> <dd>mojca@macports.org</dd>
<dt>Date</dt> <dd>2014-01-11 14:01:15 -0800 (Sat, 11 Jan 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>py-enable: upgrade to 4.3.0, use github PortGroup, add new variants (pyqt4, pyside) (maintainer, #42075)</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportspythonpyenablePortfile">trunk/dports/python/py-enable/Portfile</a></li>
</ul>

<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportspythonpyenablefilespyqt4_qsizepatch">trunk/dports/python/py-enable/files/pyqt4_qsize.patch</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportspythonpyenablePortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/python/py-enable/Portfile (115804 => 115805)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -3,10 +3,12 @@
</span><span class="cx"> 
</span><span class="cx"> PortSystem                1.0
</span><span class="cx"> PortGroup                python 1.0
</span><ins>+PortGroup           wxWidgets 1.0
</ins><span class="cx"> 
</span><ins>+PortGroup           github 1.0
+github.setup        enthought enable 4.3.0
+
</ins><span class="cx"> name                py-enable
</span><del>-version             4.2.0
-revision            1
</del><span class="cx"> categories-append   devel
</span><span class="cx"> maintainers         gmail.com:jjstickel openmaintainer
</span><span class="cx"> description         The Enthought enable package
</span><span class="lines">@@ -17,26 +19,47 @@
</span><span class="cx">                     drawing engine.
</span><span class="cx"> license             BSD
</span><span class="cx"> platforms           darwin
</span><del>-homepage            https://github.com/enthought/enable
-master_sites        http://www.enthought.com/repo/ets/
-distname            enable-${version}
</del><span class="cx"> 
</span><del>-checksums           rmd160  a8b8eb6b8c600127793a08eca3e4ec29cf98aa17 \
-                    sha256  48c510bb833cbc9142babcb1914feac2cf64d5133a8ba7cdcdf0d1d782fafbd7
</del><ins>+checksums           rmd160  73bd0a92c677784ee40432ab65f3ead6ac853b72 \
+                    sha256  6eac82675cc4c52ddf1bb50c53ec82de92309bf7c2f003bfe4709d106c89693c
</ins><span class="cx"> 
</span><span class="cx"> python.versions     26 27
</span><span class="cx"> 
</span><span class="cx"> if {${name} ne ${subport}} {
</span><del>-    patchfiles              no-64-bit-quartz.diff\
-                            pyqt4_qsize.patch
-    patch.pre_args          -p1
</del><ins>+    # It seems this is not needed for version &gt;= 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
</ins><span class="cx"> 
</span><span class="cx">     depends_build-append    port:py${python.version}-setuptools \
</span><span class="cx">                             port:py${python.version}-cython \
</span><span class="cx">                             port:swig-python
</span><span class="cx">     depends_lib-append      port:py${python.version}-traitsui\
</span><span class="cx">                             port:py${python.version}-reportlab
</span><ins>+
+    # # 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 &quot;Qt backend using PyQt4&quot; {
+        # 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 &quot;Qt backend using PySide&quot; {
+        depends_lib-append  port:py${python.version}-pyside
+    }
+
+    default_variants        +pyqt4
+
+    notes &quot;If wxpython is installed, enthought modules will try to use it\
+ even if pyqt4 (or pyside) are also installed&quot;
+
</ins><span class="cx"> }
</span><span class="cx"> 
</span><del>-# haven't retested if this is still true for version &gt;= 4.0
-universal_variant no
</del><ins>+# haven't retested if this is still true for version &gt;= 4.0; commenting out but
+# leaving here in case someone has a problem with universal, JJS 1/9/13
+#universal_variant no
</ins></span></pre></div>
<a id="trunkdportspythonpyenablefilespyqt4_qsizepatch"></a>
<div class="delfile"><h4>Deleted: trunk/dports/python/py-enable/files/pyqt4_qsize.patch (115804 => 115805)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,26 +0,0 @@
</span><del>-From 54a27de078eab56138ff4bcb31c185df9f6e3609 Mon Sep 17 00:00:00 2001
-From: Robert Kern &lt;rkern@enthought.com&gt;
-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):
-         &quot;&quot;&quot;

-         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() &lt; 0:
-             width = max(preferred_size[0], window_size[0])
--- 
-1.7.10
-
</del></span></pre>
</div>
</div>

</body>
</html>