diff options
| author |   Ian Delaney <idella4@gentoo.org> | 2014-03-25 11:31:54 +0000 |
|---|---|---|
| committer | Ian Delaney <idella4@gentoo.org> | 2014-03-25 11:31:54 +0000 |
| commit | 270479bb6ff2c6fd692644d46f890a5c9cadc329 (patch) | |
| tree | 7fe915c922744f71aee9a5c139556f721fcc80c2 /dev-python | |
| parent | Bumped EAPI to 5. Removed old (diff) | |
| download | gentoo-2-270479bb6ff2c6fd692644d46f890a5c9cadc329.tar.gz gentoo-2-270479bb6ff2c6fd692644d46f890a5c9cadc329.tar.bz2 gentoo-2-270479bb6ff2c6fd692644d46f890a5c9cadc329.zip | |
Patched to fix build issue, fixes Byg #500414 by megabaks, patch by M. von Gagern
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0xB8072B0D)
Diffstat (limited to 'dev-python')
| -rw-r--r-- | dev-python/pythonmagick/ChangeLog | 9 | ||||
| -rw-r--r-- | dev-python/pythonmagick/files/pythonmagick-0.9.8-build.patch | 14 | ||||
| -rw-r--r-- | dev-python/pythonmagick/pythonmagick-0.9.8.ebuild | 5 |
3 files changed, 24 insertions, 4 deletions
diff --git a/dev-python/pythonmagick/ChangeLog b/dev-python/pythonmagick/ChangeLog index 834ab6c052f0..01ba21a28b24 100644 --- a/dev-python/pythonmagick/ChangeLog +++ b/dev-python/pythonmagick/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-python/pythonmagick -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pythonmagick/ChangeLog,v 1.43 2013/04/23 05:35:51 patrick Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-python/pythonmagick/ChangeLog,v 1.44 2014/03/25 11:31:54 idella4 Exp $ + + 25 Mar 2014; Ian Delaney <idella4@gentoo.org> + +files/pythonmagick-0.9.8-build.patch, pythonmagick-0.9.8.ebuild: + Patched to fix build issue, fixes Byg #500414 by megabaks, patch by M. von + Gagern 23 Apr 2013; Patrick Lauer <patrick@gentoo.org> pythonmagick-0.9.8.ebuild: Better fix for automake dependency diff --git a/dev-python/pythonmagick/files/pythonmagick-0.9.8-build.patch b/dev-python/pythonmagick/files/pythonmagick-0.9.8-build.patch new file mode 100644 index 000000000000..95d3b4d29ded --- /dev/null +++ b/dev-python/pythonmagick/files/pythonmagick-0.9.8-build.patch @@ -0,0 +1,14 @@ +Index: PythonMagick-0.9.8/pythonmagick_src/_Image.cpp +=================================================================== +--- pythonmagick_src/_Image.cpp ++++ pythonmagick_src/_Image.cpp +@@ -93,7 +93,7 @@ void Export_pyste_src_Image() + .def("colorize", (void (Magick::Image::*)(const unsigned int, const unsigned int, const unsigned int, const Magick::Color&) )&Magick::Image::colorize) + .def("colorize", (void (Magick::Image::*)(const unsigned int, const Magick::Color&) )&Magick::Image::colorize) + .def("comment", (void (Magick::Image::*)(const std::string&) )&Magick::Image::comment) +- .def("compare", &Magick::Image::compare) ++ .def("compare", (bool (Magick::Image::*)(const Magick::Image&) )&Magick::Image::compare) + .def("composite", (void (Magick::Image::*)(const Magick::Image&, const ::ssize_t, const ::ssize_t, const MagickCore::CompositeOperator) )&Magick::Image::composite, Magick_Image_composite_overloads_3_4()) + .def("composite", (void (Magick::Image::*)(const Magick::Image&, const Magick::Geometry&, const MagickCore::CompositeOperator) )&Magick::Image::composite, Magick_Image_composite_overloads_2_3()) + .def("composite", (void (Magick::Image::*)(const Magick::Image&, const MagickCore::GravityType, const MagickCore::CompositeOperator) )&Magick::Image::composite, Magick_Image_composite_overloads_2_3()) + diff --git a/dev-python/pythonmagick/pythonmagick-0.9.8.ebuild b/dev-python/pythonmagick/pythonmagick-0.9.8.ebuild index 9dc97aaf44c5..4e5b3ff924c8 100644 --- a/dev-python/pythonmagick/pythonmagick-0.9.8.ebuild +++ b/dev-python/pythonmagick/pythonmagick-0.9.8.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pythonmagick/pythonmagick-0.9.8.ebuild,v 1.4 2013/04/23 05:35:51 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/pythonmagick/pythonmagick-0.9.8.ebuild,v 1.5 2014/03/25 11:31:54 idella4 Exp $ EAPI="4" PYTHON_DEPEND="*:2.6" @@ -37,6 +37,7 @@ PYTHON_CXXFLAGS=("2.* + -fno-strict-aliasing") src_prepare() { epatch "${FILESDIR}/${PN}-0.9.1-use_active_python_version.patch" epatch "${FILESDIR}/${PN}-0.9.2-fix_detection_of_python_includedir.patch" + epatch "${FILESDIR}/${P}-build.patch" sed -e "s/AM_PATH_PYTHON(3.1)/AM_PATH_PYTHON(2.6)/" -i configure.ac || die "sed failed" |