diff options
| author | Matteo Bernardini <ponce@slackbuilds.org> | 2013-05-28 17:45:31 +0200 |
|---|---|---|
| committer | Robby Workman <rworkman@slackbuilds.org> | 2013-11-06 00:56:47 -0600 |
| commit | 4e9f1ae0907d8bed85549e4d197abaf3bbf90747 (patch) | |
| tree | c74313c6a9acb0523f26ded1afe13a124ed9147e /python/python-magick/patches | |
| parent | 678fb210c02fc05123b5dc44418a2fba71e44a8e (diff) | |
| download | slackbuilds-4e9f1ae0907d8bed85549e4d197abaf3bbf90747.tar.gz | |
python/python-magick: Fixed the build system.
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
Diffstat (limited to 'python/python-magick/patches')
3 files changed, 45 insertions, 0 deletions
diff --git a/python/python-magick/patches/__init__-fixup b/python/python-magick/patches/__init__-fixup new file mode 100644 index 0000000000..76154ef209 --- /dev/null +++ b/python/python-magick/patches/__init__-fixup @@ -0,0 +1,13 @@ +diff -Naur PythonMagick-0.9.8.orig/PythonMagick/__init__.py PythonMagick-0.9.8/PythonMagick/__init__.py +--- PythonMagick-0.9.8.orig/PythonMagick/__init__.py 2012-01-25 21:03:38.000000000 +0100 ++++ PythonMagick-0.9.8/PythonMagick/__init__.py 2012-09-20 06:04:26.032241745 +0200 +@@ -1,7 +1,5 @@ +-from . import _PythonMagick +- +-class Image(_PythonMagick.Image): +- pass ++import PythonMagick._PythonMagick as _PythonMagick ++from PythonMagick._PythonMagick import * + + class Blob(_PythonMagick.Blob): + def __init__(self,*args): diff --git a/python/python-magick/patches/pythonmagick-0.9.1-use_active_python_version.patch b/python/python-magick/patches/pythonmagick-0.9.1-use_active_python_version.patch new file mode 100644 index 0000000000..4293fc17df --- /dev/null +++ b/python/python-magick/patches/pythonmagick-0.9.1-use_active_python_version.patch @@ -0,0 +1,21 @@ +--- m4/ax_python.m4 ++++ m4/ax_python.m4 +@@ -58,13 +58,14 @@ + AC_DEFUN([AX_PYTHON], + [AC_MSG_CHECKING(for python build information) + AC_MSG_RESULT([]) +-for python in python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python; do ++for python in python python2.6 python2.5 python2.4 python2.3 python2.2 python2.1; do + AC_CHECK_PROGS(PYTHON_BIN, [$python]) + ax_python_bin=$PYTHON_BIN + if test x$ax_python_bin != x; then +- AC_CHECK_LIB($ax_python_bin, main, ax_python_lib=$ax_python_bin, ax_python_lib=no) +- AC_CHECK_HEADER([$ax_python_bin/Python.h], +- [[ax_python_header=`locate $ax_python_bin/Python.h | sed -e s,/Python.h,,`]], ++ [python_version=`$ax_python_bin -c 'import sys; print(".".join(str(x) for x in sys.version_info[:2]))'`] ++ AC_CHECK_LIB(python$python_version, main, ax_python_lib=python$python_version, ax_python_lib=no) ++ AC_CHECK_HEADER([python$python_version/Python.h], ++ [[ax_python_header=`locate python$python_version/Python.h | sed -e s,/Python.h,,`]], + ax_python_header=no) + if test $ax_python_lib != no; then + if test $ax_python_header != no; then diff --git a/python/python-magick/patches/pythonmagick-0.9.2-fix_detection_of_python_includedir.patch b/python/python-magick/patches/pythonmagick-0.9.2-fix_detection_of_python_includedir.patch new file mode 100644 index 0000000000..6d14363b3d --- /dev/null +++ b/python/python-magick/patches/pythonmagick-0.9.2-fix_detection_of_python_includedir.patch @@ -0,0 +1,11 @@ +--- m4/ax_python.m4 ++++ m4/ax_python.m4 +@@ -65,7 +65,7 @@ + [python_version=`$ax_python_bin -c 'import sys; print(".".join(str(x) for x in sys.version_info[:2]))'`] + AC_CHECK_LIB(python$python_version, main, ax_python_lib=python$python_version, ax_python_lib=no) + AC_CHECK_HEADER([python$python_version/Python.h], +- [[ax_python_header=`locate python$python_version/Python.h | sed -e s,/Python.h,,`]], ++ [[ax_python_header=`$ax_python_bin -c 'import sys; print(sys.prefix + "/include/python%s.%s" % sys.version_info[:2])'`]], + ax_python_header=no) + if test $ax_python_lib != no; then + if test $ax_python_header != no; then |