From 6f2fb1294314da2e7a34637062f816e45f785d27 Mon Sep 17 00:00:00 2001 From: Patrice Clement Date: Thu, 18 Dec 2014 20:24:42 +0000 Subject: [PATCH] Add patch to avoid launching multiple image viewers. Fix bug 353153. Package-Manager: portage-2.2.8-r2/cvs/Linux i686 --- dev-python/imaging/ChangeLog | 9 +- dev-python/imaging/Manifest | 26 +---- ...ging-1.1.7-dont-run-multiple-viewers.patch | 10 ++ dev-python/imaging/imaging-1.1.7-r4.ebuild | 3 +- dev-python/imaging/imaging-1.1.7-r5.ebuild | 105 ++++++++++++++++++ 5 files changed, 129 insertions(+), 24 deletions(-) create mode 100644 dev-python/imaging/files/imaging-1.1.7-dont-run-multiple-viewers.patch create mode 100644 dev-python/imaging/imaging-1.1.7-r5.ebuild diff --git a/dev-python/imaging/ChangeLog b/dev-python/imaging/ChangeLog index ab5651a63936..803b74af4fbe 100644 --- a/dev-python/imaging/ChangeLog +++ b/dev-python/imaging/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-python/imaging # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/imaging/ChangeLog,v 1.92 2014/07/30 01:21:21 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/imaging/ChangeLog,v 1.93 2014/12/18 20:24:34 monsieurp Exp $ + +*imaging-1.1.7-r5 (18 Dec 2014) + + 18 Dec 2014; Patrice Clement + +files/imaging-1.1.7-dont-run-multiple-viewers.patch, + +imaging-1.1.7-r5.ebuild, imaging-1.1.7-r4.ebuild: + Add patch to avoid launching multiple image viewers. Fix bug 353153. 30 Jul 2014; Mike Frysinger +files/imaging-1.1.7-ft-header-include.patch, imaging-1.1.7-r4.ebuild: diff --git a/dev-python/imaging/Manifest b/dev-python/imaging/Manifest index bad7ec1bb636..7f5456deb7d5 100644 --- a/dev-python/imaging/Manifest +++ b/dev-python/imaging/Manifest @@ -1,6 +1,4 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - +AUX imaging-1.1.7-dont-run-multiple-viewers.patch 348 SHA256 8b70ee8433868dd5b81d8def418da00a9e51f0c19ca80289dad5e01363f4921a SHA512 adf8c836ab1526a78eeaf043f86c57bf76ffbf1c11d9c0da4678538f18de5a33ba0a44d700c3f31c5e6ad8aa9fdf45687b1ba60d8648d58e2fe07249ac9b1fa5 WHIRLPOOL 2905a75bd313da27506c69a6222bbb01bb9461120c90c89cb37383f1d1dd2dcb629bc304c9014af6f2d19dfe7fe384758ba4578fa890ca2068e2807237061263 AUX imaging-1.1.7-ft-header-include.patch 432 SHA256 5edaf0cb22b62aa0bb1626fd243c728323c7e6a3ca884bdfa63a7fbcf089bffb SHA512 2fa491cede517c1adce04aaac9fdad8ea8ccc5409d11c0da514995149476cb7903237ac5d7875210280551a2c69741f2a91968022957b21d73c1bd35956be632 WHIRLPOOL 4a26117d7b7add5aa14a44964da83248e4f1667c481f233384dd30aa30e47e34d3a7316ef28d4286f88cb19725483dacc438a0e72ca7866211816980310d50b3 AUX imaging-1.1.7-giftrans.patch 530 SHA256 70af27dc98f63bb3e625685ba82e6660f7b605453a1f995e4ca420af49c49c6f SHA512 104e1685f4a01a7c6743d80328c7738b19a04415e4f941f5155e1f27237bd6db4dcb829b20b749d36031333ff44603c5d0780ccf48635d1049d236e2a458e19d WHIRLPOOL bcf324b2e85ce89ce15344c18abe2c55263f3107f127db86fbce37706bf1cbae411573bfbe27b5132114aec2002452077c38e237b2c089a8026639da5ce5def4 AUX imaging-1.1.7-missing-math.patch 717 SHA256 9bce95374278416d183a7a5dd67de7d4b0c4e98bb7ee61dc29821a9fe2ae3a15 SHA512 73ac3c7e59fd29eed7b07042bdb3dcc0067210be0ba0f5eb536fb7076883173ee713d30da4cdc46023abda3941930069ebfacebed25549b7c4c2b677a904acb3 WHIRLPOOL 86babecb9526feaae77e6e2dc56ab116d041564ceb82ecc2f31d11689c66742f3a5e2d7cf9a871dd272c71d4250061a7a709351f38aacce9e0ed706fe44fa129 @@ -10,23 +8,7 @@ AUX imaging-1.1.7-sane.patch 401 SHA256 9d6bc8d5134bdaa199bc39e793a46dad42c57659 DIST Imaging-1.1.7.tar.gz 498749 SHA256 895bc7c2498c8e1f9b99938f1a40dc86b3f149741f105cf7c7bd2e0725405211 SHA512 fec2d39b4db3cb33cd7e7895aba4c3a8a5d4cff28decb9106c88e392cb848edf5593fcd77d11994bb16321837fdb26958787dac2c86d6f7c09996f466bac11f1 WHIRLPOOL e610b4097723f77de4c495537c64741ee4bd996f89d12e2e7853fb8f09028d02fa46920a86827f263eb6324a9063d2321ff865c80b7f8482b19f8143500575e8 EBUILD imaging-1.1.7-r1.ebuild 2721 SHA256 871fba0e3b0d4e46a46834a1623ce5354fd94fdbe13396d05da5d82c97fef47d SHA512 58c432ec574c6ca43ec6cd1042f542f774ab38a42bff469e714274b30ba6854a5a3a3b63cc714896623e6fa4d28edf8639aa0898da65d14ad2631944b9b46527 WHIRLPOOL 664d45effef8751a13f8bc0beea9961af964f4a62522d3dcd5a0c145c086a9a0c790dad27c354a329734a774ce3f61f967e19e156a7581d8fc4882bb9ad616d2 EBUILD imaging-1.1.7-r2.ebuild 2385 SHA256 5e37618dfe0592034e3849744049b301551f31917aa1658179de53db404887c0 SHA512 e27e9273077e83dd41a9a79e27b540c80d4323a6364d6669a1efefdce237271cbbca9f0b8f18dc2ebd0941d584d4f4213bdc4a02e0952338bafdbbfbccb30d53 WHIRLPOOL ec90b1a9f4099a274f67e5a7ef1bffbe849c03599f7df4b98153a08fbaff45af588793785954a4c7ebef4b7f66d80ca5790f9e5b2b2190a4cd37652ab80435aa -EBUILD imaging-1.1.7-r4.ebuild 2449 SHA256 036712b6ab8c03f192cada16389c32c41e4c76057270de26ea6c9a4b4e2bf6b0 SHA512 d9ed8160eefc9e36ad7040d9f4c719134399252b4706edf723f5459c9bca2e504438e6114904b320653aa1b81efdfcc3f0dc272719d611a147b6997fc6dab080 WHIRLPOOL a12bc05a4913e85f315039130c4dd8b36a84f67bf0eb46db922d38f16fe25033ebacbefd1eb8c2aaca1f36235a6a720d252461d81ed5fd291f026a65412a5492 -MISC ChangeLog 15917 SHA256 0d523545d680c9d6690fbbfdfd72aaddbf59c024191b57381e9d0d0f2e8e5002 SHA512 66498467788959a4afdc45f08fb482d04ff530bb511760513f8d330db017518c52ebd6738e3c3bbf2832b6b5d7c4848de4d99fcbc043fca8acf5564f6bfd9a35 WHIRLPOOL 883cf064ba0fa60d44dbe5dd4bcf1159ee7acf077b753a61667580cd476cc0ae6ae3c844329e298bc340d8247dd20fcfe222b1554dc57563ab64236889c46a22 +EBUILD imaging-1.1.7-r4.ebuild 2505 SHA256 78ef821c97abc4f6df9a642474ee8e35b4d1f60f2489f2e890aa4ba33c8df38c SHA512 6c4c164a3c6d787caf50294b3e280cd3695b62b85b52264befd6d45def5a714614beb024f416dd2f4808b6cbbc4c29bb55edc632d164e07c2ed7a3641dad2ca0 WHIRLPOOL 6ea4052fe827184cdb84e3961c81599e15287985b2ec99a1f81a27e912d905564addaa22061e927eddcf20278134d72412861ab4926f4f80596a4ff19498d8a8 +EBUILD imaging-1.1.7-r5.ebuild 2505 SHA256 6c5e9b4f1d583c8cd91fe0df4bb748acaeaf24223e2937f436033b9613de08b2 SHA512 4f6afc7ddd8dd332a7d995daebf542c77e09552c40bdbde419b902efbc9191f81b8f0f6c40fb9fec706ac4b22c523069a4c416aa83af441be3f050ac65479102 WHIRLPOOL 87a0330e1e69f510c64e9f958dad4b00ffc0ea2edf919edc2a891dfa2f0f1ff04cfc684d2c5d681d3e12e25a5ddbba56af0503a111cfb3030f77dd71fe88b56e +MISC ChangeLog 16188 SHA256 55b95d7ba0bcd03bc98ef7b5e7b5048af73351a20e9dc01d36e6b24e70c33558 SHA512 8e2379b5f3f33cfef0cb474a041e1eb7ea7945e8a8588885b68581d4282dfa41f9e9a902897d8f20f446241d21bc050982cbe15a4d21d1aa3cb05d7d2cfbbe1b WHIRLPOOL 0f5a47d150e811d23f5cb494d7d8663c2e55b0e0fe2a4c7435d075a44bfdbb0b68cba539f18f6b9e1f321c8c4ab9bdaa03f22a2a32e79648962a99007343b3b1 MISC metadata.xml 160 SHA256 6cd954a9de2307c57d32b25fa3599dee2908a4ddc6a98594f593d53577307a3a SHA512 7c02a1de1ddcb6b7c6378cceff0458da3a15d5381417f7cdf01874e7c372664b8899863f41b3a2fd8d6ad67ceb732dac6da0cc17575bf8e3e6d89480417c6628 WHIRLPOOL ed2795e4466eda8c804d5067c87386e269a59fe959393057ca5ddc36851e00f5210c4da1adf4bbdfdbb7d1d3d5c60aced25727ca12fdc8305d9e263a3aca9b13 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2 - -iQIcBAEBCAAGBQJT2EiYAAoJEPGu1DbS6WIAqw4P/jsN6Hznmjf3uVB38Wb5SEnO -R1ziNpij9Zkvl82FRV9KkDj56xL4CiDxYMRQ1v1/5NK4MraI8i17F6VOeKrCrCiA -o0p4YXO+zpPRkw7i/etkzTn1OZOXiSq4Qk+vvu222IGdTOk7B+B3ppqimTR5bg2i -nKXv4c6xlG/XCZuaOAyjBfxOoyVZfyPq+YUANAqgjD6ms4fN3zuxUSRFWI7f/6fJ -jabiH22+MOe/rBFcg4FwkgEsYTv+lUh3PeB52fN4heVldHBnma0dCQkJSzT85jfp -qjB5PBDeOfBe1MUIRMD0OuwsGOn9DSM36mLfAfiX3xrTO2LN4tuUYGlVqzvz5/s5 -GyM7luyk2IjKQxZReksTQcdiHGZU+CMpKyCD4WKMJ1fnrObl9OBYgU3GBbHqIgcN -vT40JcUoWwrGV11H0YSaoVQ0Mihyw/2FhJsKfwgfnBkByaYn+EOueywkm58t2R4M -NobErY5yr6UMvOxWsopFOMa0P1bIb27MncN9+UZ4HjAJm4qj8iCXVoVloLUkYI8G -IECVEvS7oV80B9TiX3uXA0tT7Ns43Cxj6D22ev0yaxjVCbaWOzZpkIFsi0SOas4L -Lv6F5AAWxPadbvuJw9mQkseIJaJ7sxmoAYH43BduE6nEc+sM92SWOM3U+/0VC42m -fr879FlZB3NM/3PsLFkN -=RobI ------END PGP SIGNATURE----- diff --git a/dev-python/imaging/files/imaging-1.1.7-dont-run-multiple-viewers.patch b/dev-python/imaging/files/imaging-1.1.7-dont-run-multiple-viewers.patch new file mode 100644 index 000000000000..7733a489038b --- /dev/null +++ b/dev-python/imaging/files/imaging-1.1.7-dont-run-multiple-viewers.patch @@ -0,0 +1,10 @@ +--- PIL/ImageShow.py.old 2011-01-29 14:09:12.000000000 -0200 ++++ PIL/ImageShow.py 2011-01-29 14:09:28.000000000 -0200 +@@ -63,7 +63,7 @@ + if base != image.mode and image.mode != "1": + image = image.convert(base) + +- self.show_image(image, **options) ++ return self.show_image(image, **options) + + # hook methods diff --git a/dev-python/imaging/imaging-1.1.7-r4.ebuild b/dev-python/imaging/imaging-1.1.7-r4.ebuild index b3e8d5b517be..768726091852 100644 --- a/dev-python/imaging/imaging-1.1.7-r4.ebuild +++ b/dev-python/imaging/imaging-1.1.7-r4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/imaging/imaging-1.1.7-r4.ebuild,v 1.4 2014/07/30 01:21:21 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/imaging/imaging-1.1.7-r4.ebuild,v 1.5 2014/12/18 20:24:34 monsieurp Exp $ EAPI=5 PYTHON_COMPAT=( python{2_6,2_7} ) @@ -42,6 +42,7 @@ python_prepare_all() { "${FILESDIR}/${P}-giftrans.patch" "${FILESDIR}/${P}-missing-math.patch" "${FILESDIR}/${P}-ft-header-include.patch" + "${FILESDIR}/${P}-dont-run-multiple-viewers.patch" ) # Add shebangs. diff --git a/dev-python/imaging/imaging-1.1.7-r5.ebuild b/dev-python/imaging/imaging-1.1.7-r5.ebuild new file mode 100644 index 000000000000..84a80bd18c95 --- /dev/null +++ b/dev-python/imaging/imaging-1.1.7-r5.ebuild @@ -0,0 +1,105 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-python/imaging/imaging-1.1.7-r5.ebuild,v 1.1 2014/12/18 20:24:34 monsieurp Exp $ + +EAPI=5 +PYTHON_COMPAT=( python{2_6,2_7} ) +PYTHON_REQ_USE='tk?' + +inherit distutils-r1 + +MY_P=Imaging-${PV} + +DESCRIPTION="Python Imaging Library (PIL)" +HOMEPAGE="http://www.pythonware.com/products/pil/index.htm" +SRC_URI="http://www.effbot.org/downloads/${MY_P}.tar.gz" + +LICENSE="HPND" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris" +IUSE="doc examples jpeg lcms scanner test tiff tk truetype zlib" + +RDEPEND=" + truetype? ( media-libs/freetype:2 ) + jpeg? ( virtual/jpeg ) + lcms? ( media-libs/lcms:0 ) + scanner? ( media-gfx/sane-backends ) + tiff? ( media-libs/tiff ) + zlib? ( sys-libs/zlib ) + !dev-python/pillow" +DEPEND="${RDEPEND}" +RDEPEND+=" !dev-python/pillow" + +# Tests don't handle missing jpeg, tiff & zlib properly. +REQUIRED_USE="test? ( jpeg tiff zlib )" + +S="${WORKDIR}/${MY_P}" + +python_prepare_all() { + local PATCHES=( + "${FILESDIR}/${P}-no-xv.patch" + "${FILESDIR}/${P}-sane.patch" + "${FILESDIR}/${P}-giftrans.patch" + "${FILESDIR}/${P}-missing-math.patch" + "${FILESDIR}/${P}-ft-header-include.patch" + "${FILESDIR}/${P}-dont-run-multiple-viewers.patch" + ) + + # Add shebangs. + sed -e "1i#!/usr/bin/env python" -i Scripts/*.py || die + + # Disable all the stuff we don't want. + local f + for f in jpeg lcms tiff tk zlib; do + if ! use ${f}; then + sed -i -e "s:feature.${f} =:& None #:" setup.py || die + fi + done + if ! use truetype; then + sed -i -e 's:feature.freetype =:& None #:' setup.py || die + fi + + distutils-r1_python_prepare_all +} + +# XXX: split into two ebuilds? +wrap_phase() { + "${@}" + + if use scanner; then + cd Sane || die + "${@}" + fi +} + +python_compile() { + wrap_phase distutils-r1_python_compile +} + +python_test() { + "${PYTHON}" selftest.py || die "Tests fail with ${EPYTHON}" +} + +python_install() { + python_doheader libImaging/{Imaging.h,ImPlatform.h} + + wrap_phase distutils-r1_python_install +} + +python_install_all() { + use doc && local HTML_DOCS=( Docs/. ) + use examples && local EXAMPLES=( Scripts/. ) + + distutils-r1_python_install_all + + if use scanner; then + docinto sane + dodoc Sane/{CHANGES,README,sanedoc.txt} + fi + + if use examples && use scanner; then + docinto examples/sane + dodoc Sane/demo_*.py + docompress -x /usr/share/${PF}/examples + fi +} -- 2.26.2