[Python-modules-commits] r29717 - in packages/matplotlib/trunk/debian (3 files)

[yoh at users.alioth.debian.org]

    Date: Friday, July 11, 2014 @ 03:30:34
  Author: yoh
Revision: 29717

ENH: one more multiprocessing patch for gtk3cairo backend now

Added:
  packages/matplotlib/trunk/debian/patches/gtk3cairo_check_no-multiprocessing.patch
Modified:
  packages/matplotlib/trunk/debian/changelog
  packages/matplotlib/trunk/debian/patches/series

Modified: packages/matplotlib/trunk/debian/changelog
===================================================================
--- packages/matplotlib/trunk/debian/changelog	2014-07-11 03:29:57 UTC (rev 29716)
+++ packages/matplotlib/trunk/debian/changelog	2014-07-11 03:30:34 UTC (rev 29717)
@@ -13,10 +13,8 @@
   * debian/patches/fix_infinite_recursion.patch
     - fix infinite recursion in units.py with ndarray subclasses
       (Closes: #729590)
-  * debian/patches/gtk3agg_check_no-multiprocessing.patch
-    - fix infinite recursion in units.py with ndarray subclasses
-      (Closes: #729590)
-    - do not use backend_gtk3agg_internal_check with multiprocessing.
+  * debian/patches/gtk3{agg,cairo}_check_no-multiprocessing.patch
+    - do not use backend_gtk3{cairo,agg}_internal_check with multiprocessing.
       Workaround to resolve the deadlock in setup.py
   * debian/patches/multiarch-tktcl.patch
     - fixed missing tkagg due to absent path to multiarch tktcl

Added: packages/matplotlib/trunk/debian/patches/gtk3cairo_check_no-multiprocessing.patch
===================================================================
--- packages/matplotlib/trunk/debian/patches/gtk3cairo_check_no-multiprocessing.patch	                        (rev 0)
+++ packages/matplotlib/trunk/debian/patches/gtk3cairo_check_no-multiprocessing.patch	2014-07-11 03:30:34 UTC (rev 29717)
@@ -0,0 +1,14 @@
+--- a/setupext.py
++++ b/setupext.py
+@@ -1630,7 +1630,10 @@ class BackendGtk3Cairo(OptionalBackendPa
+     def check_requirements(self):
+         if 'TRAVIS' in os.environ:
+             raise CheckFailed("Can't build with Travis")
+-
++        # yoh: Builds of Debian packages often lead to a dead-lock here
++        #      As a workaround forcing build manually without a check
++        BackendAgg.force = True
++        return "ok"
+         # This check needs to be performed out-of-process, because
+         # importing gi and then importing regular old pygtk afterward
+         # segfaults the interpreter.

Modified: packages/matplotlib/trunk/debian/patches/series
===================================================================
--- packages/matplotlib/trunk/debian/patches/series	2014-07-11 03:29:57 UTC (rev 29716)
+++ packages/matplotlib/trunk/debian/patches/series	2014-07-11 03:30:34 UTC (rev 29717)
@@ -7,3 +7,4 @@
 multiarch-tktcl.patch
 fix_infinite_recursion.patch
 gtk3agg_check_no-multiprocessing.patch
+gtk3cairo_check_no-multiprocessing.patch