diff options
author | Michael Mair-Keimberger (asterix) <m.mairkeimberger@gmail.com> | 2016-09-16 17:49:24 +0200 |
---|---|---|
committer | David Seifert <soap@gentoo.org> | 2016-09-18 15:28:21 +0200 |
commit | a2245f155beac3c6d2f1fcaaae60c76b31181c00 (patch) | |
tree | 54ed1e499002f814d2aac9f65b8913c6c9b699d6 /dev-python/pycairo | |
parent | 40c6e26067b6b1dff5e9a1569a0fab648c2ca950 (diff) | |
download | gentoo-a2245f155beac3c6d2f1fcaaae60c76b31181c00.tar.gz gentoo-a2245f155beac3c6d2f1fcaaae60c76b31181c00.tar.xz |
dev-python/pycairo: remove unused patches
Closes: https://github.com/gentoo/gentoo/pull/2343
Signed-off-by: David Seifert <soap@gentoo.org>
Diffstat (limited to 'dev-python/pycairo')
4 files changed, 0 insertions, 174 deletions
diff --git a/dev-python/pycairo/files/pycairo-1.10.0-10_test-target-py3.patch b/dev-python/pycairo/files/pycairo-1.10.0-10_test-target-py3.patch deleted file mode 100644 index 85d27dbbbe1..00000000000 --- a/dev-python/pycairo/files/pycairo-1.10.0-10_test-target-py3.patch +++ /dev/null @@ -1,18 +0,0 @@ -Description: Use all versions for py.test - This patch changes py.test script to use all versions of Python 3 command - instead of python. -Author: Koichi Akabe <vbkaisetsu@gmail.com> -Last-Update: <2012-04-12> - ---- py3cairo-1.10.0+dfsg.orig/test/examples_test.py -+++ py3cairo-1.10.0+dfsg/test/examples_test.py -@@ -14,7 +14,8 @@ def test_snippets(): - examples/cairo_snippets/snippets/ - ''' - def doSnippets(name): -- retcode = subprocess.call('python %s -s' % name, shell=True) -+ import sys -+ retcode = subprocess.call('PYTHONPATH=../../test python%d.%d %s -s' % (sys.version_info[0], sys.version_info[1], name), shell=True) - assert retcode == 0, 'Error: retcode == {0}'.format(retcode) - - os.chdir(os.path.join(os.path.dirname(__file__), '..', 'examples', diff --git a/dev-python/pycairo/files/pycairo-1.10.0-70_dont-link-libpython.patch b/dev-python/pycairo/files/pycairo-1.10.0-70_dont-link-libpython.patch deleted file mode 100644 index 7ea2efd06d4..00000000000 --- a/dev-python/pycairo/files/pycairo-1.10.0-70_dont-link-libpython.patch +++ /dev/null @@ -1,29 +0,0 @@ -Description: don't link libpython - This patch removes dependency to libpython -Author: Matthias Klose <doko@ubuntu.com> -Origin: http://launchpadlibrarian.net/166876566/py3cairo_1.10.0%2Bdfsg-3build2_1.10.0%2Bdfsg-3ubuntu1.diff.gz -Bug-Debian: http://bugs.debian.org/739607 -Last-Update: 2014-02-20 - ---- py3cairo-1.10.0+dfsg.orig/waflib/Tools/python.py -+++ py3cairo-1.10.0+dfsg/waflib/Tools/python.py -@@ -155,8 +155,10 @@ def check_python_headers(conf): - if result: - break - if result: -- env['LIBPATH_PYEMBED']=path -- env.append_value('LIB_PYEMBED',[name]) -+ # don't link libpython explicitly -+ #env['LIBPATH_PYEMBED']=path -+ #env.append_value('LIB_PYEMBED',[name]) -+ pass - else: - conf.to_log("\n\n### LIB NOT FOUND\n") - if(sys.platform=='win32'or sys.platform.startswith('os2')or sys.platform=='darwin'or dct['Py_ENABLE_SHARED']): -@@ -278,4 +280,4 @@ feature('pyembed')(init_pyembed) - conf(get_python_variables) - conf(check_python_headers) - conf(check_python_version) --conf(check_python_module) -\ No newline at end of file -+conf(check_python_module) diff --git a/dev-python/pycairo/files/pycairo-1.8.10-pkgconfig_dir.patch b/dev-python/pycairo/files/pycairo-1.8.10-pkgconfig_dir.patch deleted file mode 100644 index 13015af9c33..00000000000 --- a/dev-python/pycairo/files/pycairo-1.8.10-pkgconfig_dir.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- setup.py -+++ setup.py -@@ -109,7 +109,7 @@ - ext_modules = [cairo], - data_files = [ - ('include/pycairo', ['src/pycairo.h']), -- ('lib/pkgconfig', [pkgconfig_file]), -+ (os.environ.get('PKGCONFIG_DIR', 'lib/pkgconfig'), [pkgconfig_file]), - (os.path.join(dsy.get_python_lib(), 'cairo'), - ['src/__init__.py']), - ], diff --git a/dev-python/pycairo/files/pycairo-1.8.8-svg_check.patch b/dev-python/pycairo/files/pycairo-1.8.8-svg_check.patch deleted file mode 100644 index 78dc13bd174..00000000000 --- a/dev-python/pycairo/files/pycairo-1.8.8-svg_check.patch +++ /dev/null @@ -1,116 +0,0 @@ ---- setup.py -+++ setup.py -@@ -29,6 +30,16 @@ - print pipe.stderr.read() - raise SystemExit('Error: %s >= %s not found' % (pkg, version)) - -+def pkg_config_svg_check(): -+ if os.environ.get('PYCAIRO_DISABLE_SVG', None) is None: -+ pipe = call('pkg-config --exists cairo-svg') -+ if pipe.returncode == 0: -+ return [('PYCAIRO_ENABLE_SVG', None)] -+ else: -+ return [] -+ else: -+ return [] -+ - def pkg_config_parse(opt, pkg): - pipe = call("pkg-config %s %s" % (opt, pkg)) - output = pipe.stdout.read() -@@ -94,6 +105,7 @@ - 'src/pattern.c', - 'src/surface.c', - ], -+ define_macros = pkg_config_svg_check(), - include_dirs = pkg_config_parse('--cflags-only-I', 'cairo'), - library_dirs = pkg_config_parse('--libs-only-L', 'cairo'), - libraries = pkg_config_parse('--libs-only-l', 'cairo'), ---- src/cairomodule.c -+++ src/cairomodule.c -@@ -122,7 +122,7 @@ - #else - 0, - #endif --#ifdef CAIRO_HAS_SVG_SURFACE -+#ifdef PYCAIRO_ENABLE_SVG - &PycairoSVGSurface_Type, - #else - 0, -@@ -209,7 +209,7 @@ - if (PyType_Ready(&PycairoPSSurface_Type) < 0) - return; - #endif --#ifdef CAIRO_HAS_SVG_SURFACE -+#ifdef PYCAIRO_ENABLE_SVG - if (PyType_Ready(&PycairoSVGSurface_Type) < 0) - return; - #endif -@@ -285,7 +285,7 @@ - PyModule_AddObject(m, "PSSurface", (PyObject *)&PycairoPSSurface_Type); - #endif - --#ifdef CAIRO_HAS_SVG_SURFACE -+#ifdef PYCAIRO_ENABLE_SVG - Py_INCREF(&PycairoSVGSurface_Type); - PyModule_AddObject(m, "SVGSurface", (PyObject *)&PycairoSVGSurface_Type); - #endif -@@ -350,7 +350,7 @@ - #else - PyModule_AddIntConstant(m, "HAS_PS_SURFACE", 0); - #endif --#if CAIRO_HAS_SVG_SURFACE -+#if PYCAIRO_ENABLE_SVG - PyModule_AddIntConstant(m, "HAS_SVG_SURFACE", 1); - #else - PyModule_AddIntConstant(m, "HAS_SVG_SURFACE", 0); ---- src/private.h -+++ src/private.h -@@ -86,7 +86,7 @@ - extern PyTypeObject PycairoPSSurface_Type; - #endif - --#if CAIRO_HAS_SVG_SURFACE -+#if PYCAIRO_ENABLE_SVG - extern PyTypeObject PycairoSVGSurface_Type; - #endif - ---- src/pycairo.h -+++ src/pycairo.h -@@ -178,7 +178,7 @@ - #define PycairoPSSurface_Type *(Pycairo_CAPI->PSSurface_Type) - #endif - --#if CAIRO_HAS_SVG_SURFACE -+#if PYCAIRO_ENABLE_SVG - #define PycairoSVGSurface_Type *(Pycairo_CAPI->SVGSurface_Type) - #endif - ---- src/surface.c -+++ src/surface.c -@@ -80,7 +80,7 @@ - type = &PycairoPSSurface_Type; - break; - #endif --#if CAIRO_HAS_SVG_SURFACE -+#if PYCAIRO_ENABLE_SVG - case CAIRO_SURFACE_TYPE_SVG: - type = &PycairoSVGSurface_Type; - break; -@@ -965,7 +965,7 @@ - - - /* Class SVGSurface(Surface) ----------------------------------------------- */ --#ifdef CAIRO_HAS_SVG_SURFACE -+#ifdef PYCAIRO_ENABLE_SVG - #include <cairo-svg.h> - - static PyObject * -@@ -1067,7 +1067,7 @@ - 0, /* tp_is_gc */ - 0, /* tp_bases */ - }; --#endif /* CAIRO_HAS_SVG_SURFACE */ -+#endif /* PYCAIRO_ENABLE_SVG */ - - - /* Class Win32Surface(Surface) -------------------------------------------- */ |