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

[macsforever2000 at macports.org]

Revision: 101063
          https://trac.macports.org/changeset/101063
Author:   macsforever2000 at macports.org
Date:     2013-01-03 13:15:08 -0800 (Thu, 03 Jan 2013)
Log Message:
-----------
py-enable: Update to version 4.2.0. Add maintainer. (#37407)

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

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

Removed Paths:
-------------
    trunk/dports/python/py-enable/files/enable_clang_patch.diff

Modified: trunk/dports/python/py-enable/Portfile
===================================================================
--- trunk/dports/python/py-enable/Portfile	2013-01-03 20:12:22 UTC (rev 101062)
+++ trunk/dports/python/py-enable/Portfile	2013-01-03 21:15:08 UTC (rev 101063)
@@ -1,13 +1,13 @@
 # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
 # $Id$
 
-PortSystem	1.0
-PortGroup	python 1.0
+PortSystem	        1.0
+PortGroup	        python 1.0
 
 name                py-enable
-version             4.1.0
+version             4.2.0
 categories-append   devel
-maintainers         nomaintainer
+maintainers         gmail.com:jjstickel openmaintainer
 description         The Enthought enable package
 long_description    The Enable project provides two related multi-platform\
                     packages for drawing GUI objects.  Enable: An object\
@@ -20,16 +20,15 @@
 master_sites        http://www.enthought.com/repo/ets/
 distname            enable-${version}
 
-checksums           sha256 b0de7a3eda78c5c527d58a98627c8cabadc71c7f1ee4e360fa3a6d8b087da264 \
-                    rmd160 57c7f1cefb1f0d167603e419bafa355fd4c03906
-                    
+checksums           rmd160  a8b8eb6b8c600127793a08eca3e4ec29cf98aa17 \
+                    sha256  48c510bb833cbc9142babcb1914feac2cf64d5133a8ba7cdcdf0d1d782fafbd7
+
 python.versions     25 26 27
-python.default_version 27
 
 if {$subport != $name} {
-    patchfiles          enable_clang_patch.diff \
-                        no-64-bit-quartz.diff
-    patch.pre_args      -p1
+    patchfiles              no-64-bit-quartz.diff\
+                            pyqt4_qsize.patch
+    patch.pre_args          -p1
 
     depends_build-append    port:py${python.version}-distribute \
                             port:py${python.version}-cython \

Deleted: trunk/dports/python/py-enable/files/enable_clang_patch.diff
===================================================================
--- trunk/dports/python/py-enable/files/enable_clang_patch.diff	2013-01-03 20:12:22 UTC (rev 101062)
+++ trunk/dports/python/py-enable/files/enable_clang_patch.diff	2013-01-03 21:15:08 UTC (rev 101063)
@@ -1,24 +0,0 @@
-diff -ur enable-4.1.0/kiva/agg/agg-24/include/agg_renderer_outline_aa.h enable-4.1.0_clang_patched/kiva/agg/agg-24/include/agg_renderer_outline_aa.h
---- enable-4.1.0/kiva/agg/agg-24/include/agg_renderer_outline_aa.h	2011-12-21 16:11:25.000000000 -0700
-+++ enable-4.1.0_clang_patched/kiva/agg/agg-24/include/agg_renderer_outline_aa.h	2012-04-24 08:52:30.000000000 -0600
-@@ -1365,7 +1365,7 @@
-         //---------------------------------------------------------------------
-         void profile(const line_profile_aa& prof) { m_profile = &prof; }
-         const line_profile_aa& profile() const { return *m_profile; }
--        line_profile_aa& profile() { return *m_profile; }
-+        const line_profile_aa& profile() { return *m_profile; }
- 
-         //---------------------------------------------------------------------
-         int subpixel_width() const { return m_profile->subpixel_width(); }
-diff -ur enable-4.1.0/kiva/agg/agg-24/include/agg_scanline_u.h enable-4.1.0_clang_patched/kiva/agg/agg-24/include/agg_scanline_u.h
---- enable-4.1.0/kiva/agg/agg-24/include/agg_scanline_u.h	2011-12-21 16:11:25.000000000 -0700
-+++ enable-4.1.0_clang_patched/kiva/agg/agg-24/include/agg_scanline_u.h	2012-04-24 08:54:20.000000000 -0600
-@@ -458,7 +458,7 @@
-     class scanline32_u8_am : public scanline32_u8
-     {
-     public:
--        typedef scanline_u8           base_type;
-+        typedef scanline32_u8           base_type;
-         typedef AlphaMask             alpha_mask_type;
-         typedef base_type::cover_type cover_type;
-         typedef base_type::coord_type coord_type;

Added: trunk/dports/python/py-enable/files/pyqt4_qsize.patch
===================================================================
--- trunk/dports/python/py-enable/files/pyqt4_qsize.patch	                        (rev 0)
+++ trunk/dports/python/py-enable/files/pyqt4_qsize.patch	2013-01-03 21:15:08 UTC (rev 101063)
@@ -0,0 +1,26 @@
+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: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130103/bf776783/attachment.html>