Skip to content
Permalink
Browse files

py-matplotlib: refresh patch-setupext.py.diff

- don't force tkAgg to install and do not overwrite its check method
- remove all previous patches, which are no longer needed
  • Loading branch information
reneeotten authored and pmetzger committed Oct 11, 2018
1 parent fdc8835 commit 942ae4ee49349b9880175fa2ece4adfd42bb6f7c
Showing with 17 additions and 42 deletions.
  1. +2 −2 python/py-matplotlib/Portfile
  2. +15 −40 python/py-matplotlib/files/patch-setupext.py.diff
@@ -56,9 +56,9 @@ if {${name} ne ${subport}} {
}

patchfiles-append patch-setup.cfg.diff \
patch-setupext.py.diff \
patch-src-macosx.m.diff \
patch-qhull.diff
patch-qhull.diff \
patch-setupext.py.diff

build.env PKG_CONFIG_PATH="${python.prefix}/lib/pkgconfig"

@@ -1,42 +1,17 @@
--- setupext.py.orig 2014-08-25 21:24:27.000000000 -0500
+++ setupext.py 2014-09-18 06:38:30.000000000 -0500
@@ -1735,6 +1747,9 @@
name = "gtk3agg"
--- setupext.py.orig 2018-10-04 10:20:58.000000000 -0400
+++ setupext.py 2018-10-04 10:20:58.000000000 -0400
@@ -1453,10 +1453,10 @@

def check_requirements(self):
+ if self.get_config() is False:
+ raise CheckFailed("skipping due to configuration")
+
if 'TRAVIS' in os.environ:
raise CheckFailed("Can't build with Travis")
class BackendTkAgg(OptionalBackendPackage):
name = "tkagg"
- force = True
-
- def check(self):
- return "installing; run-time loading from Python Tcl / Tk"
+## force = True
+##
+## def check(self):
+## return "installing; run-time loading from Python Tcl / Tk"

@@ -1800,6 +1815,9 @@
name = "gtk3cairo"

def check_requirements(self):
+ if self.get_config() is False:
+ raise CheckFailed("skipping due to configuration")
+
if 'TRAVIS' in os.environ:
raise CheckFailed("Can't build with Travis")

@@ -1828,6 +1846,9 @@
name = "wxagg"

def check_requirements(self):
+ if self.get_config() is False:
+ raise CheckFailed("skipping due to configuration")
+
try:
import wxversion
except ImportError:
@@ -2031,6 +2052,9 @@
name = "cairo"

def check_requirements(self):
+ if self.get_config() is False:
+ raise CheckFailed("skipping due to configuration")
+
try:
import cairocffi
except ImportError:
def runtime_check(self):
""" Checks whether TkAgg runtime dependencies are met

0 comments on commit 942ae4e

Please sign in to comment.
You can’t perform that action at this time.