[Python-modules-commits] [python-enable] 05/06: merge patched into master
Mattia Rizzolo
mattia at debian.org
Fri Mar 10 20:31:31 UTC 2017
This is an automated email from the git hooks/post-receive script.
mattia pushed a commit to branch master
in repository python-enable.
commit 3feb36bbf2d386c53aa060795fb3b4cc143d3cb7
Merge: 843d758 f7ce08f
Author: Mattia Rizzolo <mattia at debian.org>
Date: Fri Mar 10 21:19:37 2017 +0100
merge patched into master
Signed-off-by: Mattia Rizzolo <mattia at debian.org>
debian/.git-dpm | 4 +-
debian/patches/0007-fix-FTBFS-with-SWIG-3.patch | 98 +++++++++++++++++++++++++
debian/patches/freetype2.diff | 7 +-
debian/patches/series | 1 +
kiva/agg/src/affine_matrix.i | 4 +-
kiva/agg/src/constants.i | 4 +-
kiva/agg/src/hit_test.i | 4 +-
kiva/agg/src/rgba.i | 4 +-
8 files changed, 113 insertions(+), 13 deletions(-)
diff --cc debian/.git-dpm
index aeb4ca9,0000000..6009746
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
+# see git-dpm(1) from git-dpm package
- 316021cb141dd85ad66d31474f4016e8c94013b5
- 316021cb141dd85ad66d31474f4016e8c94013b5
++f7ce08f4b6f07515b2874bc03fc36ecfbdf30f7d
++f7ce08f4b6f07515b2874bc03fc36ecfbdf30f7d
+b25761891fb29bddca201e4a9c9e2f5d0be51098
+b25761891fb29bddca201e4a9c9e2f5d0be51098
+python-enable_4.5.1.orig.tar.gz
+88dc7f47a342a0b601c10ee127952eb86b15d322
+842484
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/0007-fix-FTBFS-with-SWIG-3.patch
index 0000000,0000000..a1a0e16
new file mode 100644
--- /dev/null
+++ b/debian/patches/0007-fix-FTBFS-with-SWIG-3.patch
@@@ -1,0 -1,0 +1,98 @@@
++From f7ce08f4b6f07515b2874bc03fc36ecfbdf30f7d Mon Sep 17 00:00:00 2001
++From: Jonathan Stickel <jjstickel at gmail.com>
++Date: Fri, 10 Mar 2017 21:19:16 +0100
++Subject: fix FTBFS with SWIG 3
++
++Origin: upstream
++Forwarded: not-needed
++Applied-Upstream: https://github.com/enthought/enable/commit/f0e399174c5f55eb3a72860c620fdd5193ad57da
++Last-Update: 2015-12-09
++Bug-Debian: https://bugs.debian.org/804584
++---
++ kiva/agg/src/affine_matrix.i | 4 ++--
++ kiva/agg/src/constants.i | 4 ++--
++ kiva/agg/src/hit_test.i | 4 ++--
++ kiva/agg/src/rgba.i | 4 ++--
++ 4 files changed, 8 insertions(+), 8 deletions(-)
++
++diff --git a/kiva/agg/src/affine_matrix.i b/kiva/agg/src/affine_matrix.i
++index 2f30e51..7c05a6a 100644
++--- a/kiva/agg/src/affine_matrix.i
+++++ b/kiva/agg/src/affine_matrix.i
++@@ -157,7 +157,7 @@ namespace agg24
++ };
++ };
++
++-%pythoncode {
+++%pythoncode %{
++ def is_sequence(arg):
++ try:
++ len(arg)
++@@ -184,7 +184,7 @@ class AffineMatrix(_AffineMatrix):
++ """
++ self.multiply(other)
++ return self
++-}
+++%}
++
++ %extend agg24::trans_affine
++ {
++diff --git a/kiva/agg/src/constants.i b/kiva/agg/src/constants.i
++index b680cae..78f9d0c 100644
++--- a/kiva/agg/src/constants.i
+++++ b/kiva/agg/src/constants.i
++@@ -44,7 +44,7 @@
++ unsigned path_cmd(unsigned c);
++ unsigned path_flags(unsigned c);
++
++-%pythoncode {
+++%pythoncode %{
++
++ #----------------------------------------------------------------------------
++ #
++@@ -141,4 +141,4 @@ interp_enum_map = {}
++ for key,value in interp_string_map.items():
++ interp_enum_map[value] = key
++
++-}
+++%}
++diff --git a/kiva/agg/src/hit_test.i b/kiva/agg/src/hit_test.i
++index 76de0c9..2cfb1cf 100644
++--- a/kiva/agg/src/hit_test.i
+++++ b/kiva/agg/src/hit_test.i
++@@ -22,7 +22,7 @@ namespace kiva
++ }
++
++ %pythoncode
++-{
+++%{
++ from numpy import shape, transpose, zeros, rank, reshape, int32
++
++ def points_in_polygon(pts, poly_pts, use_winding=False):
++@@ -92,4 +92,4 @@ def points_in_polygon(pts, poly_pts, use_winding=False):
++ else:
++ _agg.points_in_polygon(pts, poly_pts, results)
++ return results
++-}
+++%}
++diff --git a/kiva/agg/src/rgba.i b/kiva/agg/src/rgba.i
++index f7624b8..183014f 100644
++--- a/kiva/agg/src/rgba.i
+++++ b/kiva/agg/src/rgba.i
++@@ -74,7 +74,7 @@ namespace agg24
++ }
++
++
++-%pythoncode {
+++%pythoncode %{
++ def is_sequence(arg):
++ try:
++ len(arg)
++@@ -90,6 +90,6 @@ class Rgba(_Rgba):
++ if len(args) not in [3,4]:
++ raise ValueError, "array argument must be 1x3 or 1x4"
++ _Rgba.__init__(self,*args)
++-}
+++%}
++
++ %clear double r, double g, double b, double a;
diff --cc debian/patches/freetype2.diff
index 979f834,0000000..d6566aa
mode 100644,000000..100644
--- a/debian/patches/freetype2.diff
+++ b/debian/patches/freetype2.diff
@@@ -1,157 -1,0 +1,158 @@@
+From 13867f934ccd23e6380046af6f81b66dfaf02a81 Mon Sep 17 00:00:00 2001
+From: Varun Hiremath <varun at debian.org>
+Date: Sun, 28 Feb 2010 15:16:17 -0500
+Subject: Remove freetype2 sources from upstream and use the
+
+ pre-built libfreetype6-dev library in Debian.
+Patch-Name: freetype2.diff
+---
+ kiva/agg/setup.py | 97 ++++---------------------------------------------------
+ 1 file changed, 6 insertions(+), 91 deletions(-)
+
+diff --git a/kiva/agg/setup.py b/kiva/agg/setup.py
+index 5b4d458..c0df584 100644
+--- a/kiva/agg/setup.py
++++ b/kiva/agg/setup.py
+@@ -4,59 +4,6 @@ import os
+ import re
+ import platform
+
+-freetype2_sources =['autofit/autofit.c',
+- 'base/ftbase.c','base/ftsystem.c','base/ftinit.c',
+- 'base/ftglyph.c','base/ftmm.c','base/ftbdf.c',
+- 'base/ftbbox.c','base/ftdebug.c','base/ftxf86.c',
+- 'base/fttype1.c',
+- 'bdf/bdf.c',
+- 'cff/cff.c',
+- 'cid/type1cid.c',
+- 'lzw/ftlzw.c',
+- 'pcf/pcf.c','pfr/pfr.c',
+- 'psaux/psaux.c',
+- 'pshinter/pshinter.c',
+- 'psnames/psnames.c',
+- 'raster/raster.c',
+- 'sfnt/sfnt.c',
+- 'smooth/smooth.c',
+- 'truetype/truetype.c',
+- 'type1/type1.c',
+- 'type42/type42.c',
+- 'winfonts/winfnt.c',
+- 'gzip/ftgzip.c',
+- 'base/ftmac.c',
+- ]
+-
+-freetype2_dirs = [
+- 'autofit',
+- 'base',
+- 'bdf',
+- 'cache',
+- 'cff',
+- 'cid',
+- 'gxvalid',
+- 'gzip',
+- 'lzw',
+- 'otvalid',
+- 'pcf',
+- 'pfr',
+- 'psaux',
+- 'pshinter',
+- 'psnames',
+- 'raster',
+- 'sfnt',
+- 'smooth',
+- 'tools',
+- 'truetype',
+- 'type1',
+- 'type42',
+- 'winfonts',
+- 'gzip'
+- ]
+-
+-
+-
+ def configuration(parent_package='', top_path=None):
+ from numpy.distutils.misc_util import Configuration
+ from numpy.distutils.system_info import dict_append, get_info
- @@ -87,44 +34,11 @@ def configuration(parent_package='', top_path=None):
++@@ -86,45 +33,12 @@ def configuration(parent_package='', top_path=None):
++ #plat = 'gdkpixbuf2'
+
+
- #-------------------------------------------------------------------------
++- #-------------------------------------------------------------------------
+- # Add the freetype library (agg 2.4 links against this)
+- #-------------------------------------------------------------------------
+-
+- prefix = config.paths('freetype2/src')[0]
+- freetype_lib = 'freetype2_src'
+-
+- def get_ft2_sources((lib_name, build_info), build_dir):
+- sources = [prefix + "/" + s for s in freetype2_sources]
+- if sys.platform=='darwin':
+- return sources[:]
+- return sources[:-1]
+-
+- ft2_incl_dirs = ['freetype2/src/' + s for s in freetype2_dirs] \
+- + ['freetype2/include', 'freetype2/src']
+- ft2_incl_dirs = config.paths(*ft2_incl_dirs)
+- if sys.platform == 'darwin' and '64bit' not in platform.architecture():
+- ft2_incl_dirs.append("/Developer/Headers/FlatCarbon")
+-
+- config.add_library(freetype_lib,
+- sources = [get_ft2_sources],
+- include_dirs = ft2_incl_dirs,
+-
+- # This macro was introduced in Freetype 2.2; if it is
+- # not defined, then the ftheader.h file (one of the
+- # primary headers) won't pull in any additional internal
+- # Freetype headers, and the library will mysteriously
+- # fail to build.
+- macros = [("FT2_BUILD_LIBRARY", None)],
+-
+- depends = ['freetype2'],
+- )
+-
- - #-------------------------------------------------------------------------
++ #-------------------------------------------------------------------------
+ # Add the Agg sources
+ #-------------------------------------------------------------------------
+
+- agg_include_dirs = [agg_dir+'/include',agg_dir+'/font_freetype'] + \
+- ft2_incl_dirs
++ agg_include_dirs = [agg_dir+'/include',agg_dir+'/font_freetype'] + ["/usr/include/freetype2/"]
++
+ agg_sources = [agg_dir+'/src/*.cpp',
+ agg_dir+'/font_freetype/*.cpp']
+ config.add_library(agg_lib,
+@@ -138,7 +52,7 @@ def configuration(parent_package='', top_path=None):
+ if sys.platform == 'darwin':
+ define_macros = [('__DARWIN__', None)]
+ macros = [('__DARWIN__', None)]
+- extra_link_args = ['-framework', 'Carbon']
++ extra_link_args = ['-framework', 'Carbon', '-Wl,-search_paths_first']
+ else:
+ define_macros = []
+ macros = []
+@@ -182,7 +96,7 @@ def configuration(parent_package='', top_path=None):
+ if '64bit' not in platform.architecture():
+ darwin_frameworks = ['Carbon', 'ApplicationServices', 'OpenGL']
+ else:
+- darwin_frameworks = ['ApplicationServices', 'OpenGL']
++ darwin_frameworks = ['ApplicationServices', 'OpenGL']
+ darwin_opengl_opts = dict(
+ include_dirs = [
+ '/System/Library/Frameworks/%s.framework/Versions/A/Headers' % x
+@@ -193,7 +107,7 @@ def configuration(parent_package='', top_path=None):
+
+ build_info = {}
+ kiva_lib = 'kiva_src'
+- build_libraries = [kiva_lib, agg_lib, freetype_lib]
++ build_libraries = [kiva_lib, agg_lib, "freetype", "X11"]
+ if sys.platform == "win32":
+ build_libraries += ["opengl32", "glu32"]
+ elif sys.platform == "darwin":
+@@ -236,6 +150,7 @@ def configuration(parent_package='', top_path=None):
+ # the builder if we do not raise an exception.
+ x11_info = get_info('x11', notfound_action=2)
+ dict_append(plat_info, **x11_info)
++ dict_append(plat_info, libraries = ['X11'])
+
+ elif plat=='gdkpixbuf2':
+ #gdk_pixbuf_xlib_2 = get_info('gdk_pixbuf_xlib_2',notfound_action=1)
diff --cc debian/patches/series
index 8e380d3,0000000..c36da1f
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,6 -1,0 +1,7 @@@
+fonttools.diff
+freetype2.diff
+pillow.diff
+gcc5.diff
+setup.diff
+no-opt.patch
++0007-fix-FTBFS-with-SWIG-3.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-enable.git
More information about the Python-modules-commits
mailing list