mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-23 16:49:10 -07:00
dev-python/pillow: Remove old
Signed-off-by: Michał Górny <mgorny@gentoo.org>
This commit is contained in:
Michał Górny
@@ -1,4 +1,2 @@
|
||||
DIST pillow-10.0.1.gh.tar.gz 50539264 BLAKE2B 83c3bf4abc9c3eab210576dc28d6f8926ce0998ec344e792433afc05190bb248a926902ce7706e3569cd6cbf8deb640cafda86f102166cf6492ec00b66f9392f SHA512 27e2f0d86563c3b7f5a2e0ba2bbe98fc2cb2fa5871d0b6cbb5a0014e9d9eb03dde9969301419d806d1a22cd4881e624465a355ba9bc42b95746226e1f95712a9
|
||||
DIST pillow-10.1.0.gh.tar.gz 50798274 BLAKE2B a69be8187e7206b50350af399b73b5c43b29c249a4a5a6bb23438dae9967bb84f1d487f52b188811cb3d2e550245f8d5a765668d8d5de1375a84fcd96fc531d9 SHA512 01c97b68d4167d10539a2d29fb82676fb417ee5003f0acd9f602ed13d41b200579497cc0ef0949b2c1549b684f76f2d43895a52abdb1367345d2affd544c5b5a
|
||||
DIST pillow-10.2.0.gh.tar.gz 46244216 BLAKE2B 27bb076f0adade34295e6dfec5c5a1499471036e4f5358f0b3985c064a0ae962be9e91985851b369a49162ef520a84bb20eb1a5acb074fe94d861f042e4ada92 SHA512 d77ebedfb89d541db2fcba4fc354e097b9917594170bad07c67e22de123c9e0bbc9c55a938fc152bbdcca3ce23de6fa374a6d3d3bdbd44f16dbc2616c1bddf60
|
||||
DIST pillow-10.3.0.gh.tar.gz 46636534 BLAKE2B 523486a3adc8905dbe0691e7092654e7884c34703f351e228a49b1cb6e9cffdf504b842aa0c83b18afb8f0dbe1265274044003aba540d6427ec3cd46ddda1498 SHA512 11095f435ba30ac364575271de4c94d498b6fc1d67730b8212fae6f187902129018ca950aa878843f4d1b29e25aab1be245ed313fd3bc110ccf9ce3ae266d840
|
||||
|
||||
@@ -1,50 +0,0 @@
|
||||
From 0e523d986858e7c0b4acd45ea1c5a3a639e39b4b Mon Sep 17 00:00:00 2001
|
||||
From: Andrew Murray <radarhere@users.noreply.github.com>
|
||||
Date: Sat, 2 Dec 2023 10:57:16 +1100
|
||||
Subject: [PATCH] Fixed closing file pointer with olefile 0.47
|
||||
|
||||
---
|
||||
src/PIL/FpxImagePlugin.py | 1 +
|
||||
src/PIL/MicImagePlugin.py | 3 +++
|
||||
2 files changed, 4 insertions(+)
|
||||
|
||||
diff --git a/src/PIL/FpxImagePlugin.py b/src/PIL/FpxImagePlugin.py
|
||||
index a878cbfd2..3027ef45b 100644
|
||||
--- a/src/PIL/FpxImagePlugin.py
|
||||
+++ b/src/PIL/FpxImagePlugin.py
|
||||
@@ -227,6 +227,7 @@ class FpxImageFile(ImageFile.ImageFile):
|
||||
break # isn't really required
|
||||
|
||||
self.stream = stream
|
||||
+ self._fp = self.fp
|
||||
self.fp = None
|
||||
|
||||
def load(self):
|
||||
diff --git a/src/PIL/MicImagePlugin.py b/src/PIL/MicImagePlugin.py
|
||||
index 801318930..e4154902f 100644
|
||||
--- a/src/PIL/MicImagePlugin.py
|
||||
+++ b/src/PIL/MicImagePlugin.py
|
||||
@@ -66,6 +66,7 @@ class MicImageFile(TiffImagePlugin.TiffImageFile):
|
||||
self._n_frames = len(self.images)
|
||||
self.is_animated = self._n_frames > 1
|
||||
|
||||
+ self.__fp = self.fp
|
||||
self.seek(0)
|
||||
|
||||
def seek(self, frame):
|
||||
@@ -87,10 +88,12 @@ class MicImageFile(TiffImagePlugin.TiffImageFile):
|
||||
return self.frame
|
||||
|
||||
def close(self):
|
||||
+ self.__fp.close()
|
||||
self.ole.close()
|
||||
super().close()
|
||||
|
||||
def __exit__(self, *args):
|
||||
+ self.__fp.close()
|
||||
self.ole.close()
|
||||
super().__exit__()
|
||||
|
||||
--
|
||||
2.43.0
|
||||
|
||||
@@ -1,134 +0,0 @@
|
||||
# Copyright 1999-2023 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
DISTUTILS_EXT=1
|
||||
# setuptools wrapper
|
||||
DISTUTILS_USE_PEP517=standalone
|
||||
PYTHON_COMPAT=( python3_{10..12} pypy3 )
|
||||
PYTHON_REQ_USE='tk?,threads(+)'
|
||||
|
||||
inherit distutils-r1 toolchain-funcs virtualx
|
||||
|
||||
MY_PN=Pillow
|
||||
MY_P=${MY_PN}-${PV}
|
||||
|
||||
DESCRIPTION="Python Imaging Library (fork)"
|
||||
HOMEPAGE="
|
||||
https://python-pillow.org/
|
||||
https://github.com/python-pillow/
|
||||
https://pypi.org/project/Pillow/
|
||||
"
|
||||
SRC_URI="
|
||||
https://github.com/python-pillow/Pillow/archive/${PV}.tar.gz
|
||||
-> ${P}.gh.tar.gz
|
||||
"
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
|
||||
LICENSE="HPND"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
|
||||
IUSE="examples imagequant +jpeg jpeg2k lcms test tiff tk truetype webp xcb zlib"
|
||||
REQUIRED_USE="test? ( jpeg jpeg2k lcms tiff truetype )"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
DEPEND="
|
||||
imagequant? ( media-gfx/libimagequant:= )
|
||||
jpeg? ( media-libs/libjpeg-turbo:= )
|
||||
jpeg2k? ( media-libs/openjpeg:2= )
|
||||
lcms? ( media-libs/lcms:2= )
|
||||
tiff? ( media-libs/tiff:=[jpeg,zlib] )
|
||||
truetype? ( media-libs/freetype:2= )
|
||||
webp? ( media-libs/libwebp:= )
|
||||
xcb? ( x11-libs/libxcb )
|
||||
zlib? ( sys-libs/zlib:= )
|
||||
"
|
||||
RDEPEND="
|
||||
${DEPEND}
|
||||
dev-python/olefile[${PYTHON_USEDEP}]
|
||||
"
|
||||
BDEPEND="
|
||||
dev-python/setuptools[${PYTHON_USEDEP}]
|
||||
dev-python/wheel[${PYTHON_USEDEP}]
|
||||
virtual/pkgconfig
|
||||
test? (
|
||||
${RDEPEND}
|
||||
dev-python/defusedxml[${PYTHON_USEDEP}]
|
||||
dev-python/packaging[${PYTHON_USEDEP}]
|
||||
dev-python/pytest[${PYTHON_USEDEP}]
|
||||
dev-python/pytest-timeout[${PYTHON_USEDEP}]
|
||||
|| (
|
||||
media-gfx/imagemagick[png]
|
||||
media-gfx/graphicsmagick[png]
|
||||
)
|
||||
)
|
||||
"
|
||||
|
||||
EPYTEST_DESELECT=(
|
||||
# TODO; incompatible Qt version?
|
||||
Tests/test_qt_image_qapplication.py::test_sanity
|
||||
)
|
||||
|
||||
usepil() {
|
||||
usex "${1}" enable disable
|
||||
}
|
||||
|
||||
python_configure_all() {
|
||||
# It's important that these flags are also passed during the install phase
|
||||
# as well. Make sure of that if you change the lines below. See bug 661308.
|
||||
cat >> setup.cfg <<-EOF || die
|
||||
[build_ext]
|
||||
disable_platform_guessing = True
|
||||
$(usepil truetype)_freetype = True
|
||||
$(usepil jpeg)_jpeg = True
|
||||
$(usepil jpeg2k)_jpeg2000 = True
|
||||
$(usepil lcms)_lcms = True
|
||||
$(usepil tiff)_tiff = True
|
||||
$(usepil imagequant)_imagequant = True
|
||||
$(usepil webp)_webp = True
|
||||
$(usepil webp)_webpmux = True
|
||||
$(usepil xcb)_xcb = True
|
||||
$(usepil zlib)_zlib = True
|
||||
EOF
|
||||
|
||||
# setup.py won't let us add the right toolchain paths but it does
|
||||
# accept additional ones from INCLUDE and LIB so set these. You
|
||||
# wouldn't normally need these at all as the toolchain should look
|
||||
# here anyway but it doesn't for this setup.py.
|
||||
export \
|
||||
INCLUDE="${ESYSROOT}"/usr/include \
|
||||
LIB="${ESYSROOT}"/usr/$(get_libdir)
|
||||
|
||||
# We have patched in this env var.
|
||||
tc-export PKG_CONFIG
|
||||
}
|
||||
|
||||
src_test() {
|
||||
virtx distutils-r1_src_test
|
||||
}
|
||||
|
||||
python_test() {
|
||||
local EPYTEST_DESELECT=(
|
||||
# TODO (is clipboard unreliable in Xvfb?)
|
||||
Tests/test_imagegrab.py::TestImageGrab::test_grabclipboard
|
||||
)
|
||||
|
||||
"${EPYTHON}" selftest.py --installed || die "selftest failed with ${EPYTHON}"
|
||||
# no:relaxed: pytest-relaxed plugin make our tests fail. deactivate if installed
|
||||
epytest -p no:relaxed || die "Tests failed with ${EPYTHON}"
|
||||
}
|
||||
|
||||
python_install() {
|
||||
python_doheader src/libImaging/*.h
|
||||
distutils-r1_python_install
|
||||
}
|
||||
|
||||
python_install_all() {
|
||||
if use examples ; then
|
||||
docinto example
|
||||
dodoc docs/example/*
|
||||
docompress -x /usr/share/doc/${PF}/example
|
||||
fi
|
||||
distutils-r1_python_install_all
|
||||
}
|
||||
@@ -1,139 +0,0 @@
|
||||
# Copyright 1999-2024 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
DISTUTILS_EXT=1
|
||||
# setuptools wrapper
|
||||
DISTUTILS_USE_PEP517=standalone
|
||||
PYTHON_COMPAT=( python3_{10..12} pypy3 )
|
||||
PYTHON_REQ_USE='tk?,threads(+)'
|
||||
|
||||
inherit distutils-r1 toolchain-funcs virtualx
|
||||
|
||||
MY_PN=Pillow
|
||||
MY_P=${MY_PN}-${PV}
|
||||
|
||||
DESCRIPTION="Python Imaging Library (fork)"
|
||||
HOMEPAGE="
|
||||
https://python-pillow.org/
|
||||
https://github.com/python-pillow/
|
||||
https://pypi.org/project/Pillow/
|
||||
"
|
||||
SRC_URI="
|
||||
https://github.com/python-pillow/Pillow/archive/${PV}.tar.gz
|
||||
-> ${P}.gh.tar.gz
|
||||
"
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
|
||||
LICENSE="HPND"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
|
||||
IUSE="examples imagequant +jpeg jpeg2k lcms test tiff tk truetype webp xcb zlib"
|
||||
REQUIRED_USE="test? ( jpeg jpeg2k lcms tiff truetype )"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
DEPEND="
|
||||
imagequant? ( media-gfx/libimagequant:= )
|
||||
jpeg? ( media-libs/libjpeg-turbo:= )
|
||||
jpeg2k? ( media-libs/openjpeg:2= )
|
||||
lcms? ( media-libs/lcms:2= )
|
||||
tiff? ( media-libs/tiff:=[jpeg,zlib] )
|
||||
truetype? ( media-libs/freetype:2= )
|
||||
webp? ( media-libs/libwebp:= )
|
||||
xcb? ( x11-libs/libxcb )
|
||||
zlib? ( sys-libs/zlib:= )
|
||||
"
|
||||
RDEPEND="
|
||||
${DEPEND}
|
||||
dev-python/olefile[${PYTHON_USEDEP}]
|
||||
"
|
||||
BDEPEND="
|
||||
dev-python/setuptools[${PYTHON_USEDEP}]
|
||||
dev-python/wheel[${PYTHON_USEDEP}]
|
||||
virtual/pkgconfig
|
||||
test? (
|
||||
${RDEPEND}
|
||||
dev-python/defusedxml[${PYTHON_USEDEP}]
|
||||
dev-python/packaging[${PYTHON_USEDEP}]
|
||||
dev-python/pytest[${PYTHON_USEDEP}]
|
||||
dev-python/pytest-timeout[${PYTHON_USEDEP}]
|
||||
|| (
|
||||
media-gfx/imagemagick[png]
|
||||
media-gfx/graphicsmagick[png]
|
||||
)
|
||||
)
|
||||
"
|
||||
|
||||
EPYTEST_DESELECT=(
|
||||
# TODO; incompatible Qt version?
|
||||
Tests/test_qt_image_qapplication.py::test_sanity
|
||||
)
|
||||
|
||||
PATCHES=(
|
||||
# https://github.com/python-pillow/pillow/pull/7594
|
||||
"${FILESDIR}/${P}-olefile-0.47.patch"
|
||||
)
|
||||
|
||||
usepil() {
|
||||
usex "${1}" enable disable
|
||||
}
|
||||
|
||||
python_configure_all() {
|
||||
# It's important that these flags are also passed during the install phase
|
||||
# as well. Make sure of that if you change the lines below. See bug 661308.
|
||||
cat >> setup.cfg <<-EOF || die
|
||||
[build_ext]
|
||||
disable_platform_guessing = True
|
||||
$(usepil truetype)_freetype = True
|
||||
$(usepil jpeg)_jpeg = True
|
||||
$(usepil jpeg2k)_jpeg2000 = True
|
||||
$(usepil lcms)_lcms = True
|
||||
$(usepil tiff)_tiff = True
|
||||
$(usepil imagequant)_imagequant = True
|
||||
$(usepil webp)_webp = True
|
||||
$(usepil webp)_webpmux = True
|
||||
$(usepil xcb)_xcb = True
|
||||
$(usepil zlib)_zlib = True
|
||||
EOF
|
||||
|
||||
# setup.py won't let us add the right toolchain paths but it does
|
||||
# accept additional ones from INCLUDE and LIB so set these. You
|
||||
# wouldn't normally need these at all as the toolchain should look
|
||||
# here anyway but it doesn't for this setup.py.
|
||||
export \
|
||||
INCLUDE="${ESYSROOT}"/usr/include \
|
||||
LIB="${ESYSROOT}"/usr/$(get_libdir)
|
||||
|
||||
# We have patched in this env var.
|
||||
tc-export PKG_CONFIG
|
||||
}
|
||||
|
||||
src_test() {
|
||||
virtx distutils-r1_src_test
|
||||
}
|
||||
|
||||
python_test() {
|
||||
local EPYTEST_DESELECT=(
|
||||
# TODO (is clipboard unreliable in Xvfb?)
|
||||
Tests/test_imagegrab.py::TestImageGrab::test_grabclipboard
|
||||
)
|
||||
|
||||
"${EPYTHON}" selftest.py --installed || die "selftest failed with ${EPYTHON}"
|
||||
# no:relaxed: pytest-relaxed plugin make our tests fail. deactivate if installed
|
||||
epytest -p no:relaxed || die "Tests failed with ${EPYTHON}"
|
||||
}
|
||||
|
||||
python_install() {
|
||||
python_doheader src/libImaging/*.h
|
||||
distutils-r1_python_install
|
||||
}
|
||||
|
||||
python_install_all() {
|
||||
if use examples ; then
|
||||
docinto example
|
||||
dodoc docs/example/*
|
||||
docompress -x /usr/share/doc/${PF}/example
|
||||
fi
|
||||
distutils-r1_python_install_all
|
||||
}
|
||||
@@ -1,134 +0,0 @@
|
||||
# Copyright 1999-2024 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
DISTUTILS_EXT=1
|
||||
# setuptools wrapper
|
||||
DISTUTILS_USE_PEP517=standalone
|
||||
PYTHON_COMPAT=( python3_{10..12} pypy3 )
|
||||
PYTHON_REQ_USE='tk?,threads(+)'
|
||||
|
||||
inherit distutils-r1 toolchain-funcs virtualx
|
||||
|
||||
MY_PN=Pillow
|
||||
MY_P=${MY_PN}-${PV}
|
||||
|
||||
DESCRIPTION="Python Imaging Library (fork)"
|
||||
HOMEPAGE="
|
||||
https://python-pillow.org/
|
||||
https://github.com/python-pillow/Pillow/
|
||||
https://pypi.org/project/pillow/
|
||||
"
|
||||
SRC_URI="
|
||||
https://github.com/python-pillow/Pillow/archive/${PV}.tar.gz
|
||||
-> ${P}.gh.tar.gz
|
||||
"
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
|
||||
LICENSE="HPND"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
|
||||
IUSE="examples imagequant +jpeg jpeg2k lcms test tiff tk truetype webp xcb zlib"
|
||||
REQUIRED_USE="test? ( jpeg jpeg2k lcms tiff truetype )"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
DEPEND="
|
||||
imagequant? ( media-gfx/libimagequant:= )
|
||||
jpeg? ( media-libs/libjpeg-turbo:= )
|
||||
jpeg2k? ( media-libs/openjpeg:2= )
|
||||
lcms? ( media-libs/lcms:2= )
|
||||
tiff? ( media-libs/tiff:=[jpeg,zlib] )
|
||||
truetype? ( media-libs/freetype:2= )
|
||||
webp? ( media-libs/libwebp:= )
|
||||
xcb? ( x11-libs/libxcb )
|
||||
zlib? ( sys-libs/zlib:= )
|
||||
"
|
||||
RDEPEND="
|
||||
${DEPEND}
|
||||
dev-python/olefile[${PYTHON_USEDEP}]
|
||||
"
|
||||
BDEPEND="
|
||||
dev-python/setuptools[${PYTHON_USEDEP}]
|
||||
dev-python/wheel[${PYTHON_USEDEP}]
|
||||
virtual/pkgconfig
|
||||
test? (
|
||||
${RDEPEND}
|
||||
dev-python/defusedxml[${PYTHON_USEDEP}]
|
||||
dev-python/packaging[${PYTHON_USEDEP}]
|
||||
dev-python/pytest[${PYTHON_USEDEP}]
|
||||
dev-python/pytest-timeout[${PYTHON_USEDEP}]
|
||||
|| (
|
||||
media-gfx/imagemagick[png]
|
||||
media-gfx/graphicsmagick[png]
|
||||
)
|
||||
)
|
||||
"
|
||||
|
||||
EPYTEST_DESELECT=(
|
||||
# TODO; incompatible Qt version?
|
||||
Tests/test_qt_image_qapplication.py::test_sanity
|
||||
)
|
||||
|
||||
usepil() {
|
||||
usex "${1}" enable disable
|
||||
}
|
||||
|
||||
python_configure_all() {
|
||||
# It's important that these flags are also passed during the install phase
|
||||
# as well. Make sure of that if you change the lines below. See bug 661308.
|
||||
cat >> setup.cfg <<-EOF || die
|
||||
[build_ext]
|
||||
disable_platform_guessing = True
|
||||
$(usepil truetype)_freetype = True
|
||||
$(usepil jpeg)_jpeg = True
|
||||
$(usepil jpeg2k)_jpeg2000 = True
|
||||
$(usepil lcms)_lcms = True
|
||||
$(usepil tiff)_tiff = True
|
||||
$(usepil imagequant)_imagequant = True
|
||||
$(usepil webp)_webp = True
|
||||
$(usepil webp)_webpmux = True
|
||||
$(usepil xcb)_xcb = True
|
||||
$(usepil zlib)_zlib = True
|
||||
EOF
|
||||
|
||||
# setup.py won't let us add the right toolchain paths but it does
|
||||
# accept additional ones from INCLUDE and LIB so set these. You
|
||||
# wouldn't normally need these at all as the toolchain should look
|
||||
# here anyway but it doesn't for this setup.py.
|
||||
export \
|
||||
INCLUDE="${ESYSROOT}"/usr/include \
|
||||
LIB="${ESYSROOT}"/usr/$(get_libdir)
|
||||
|
||||
# We have patched in this env var.
|
||||
tc-export PKG_CONFIG
|
||||
}
|
||||
|
||||
src_test() {
|
||||
virtx distutils-r1_src_test
|
||||
}
|
||||
|
||||
python_test() {
|
||||
local EPYTEST_DESELECT=(
|
||||
# TODO (is clipboard unreliable in Xvfb?)
|
||||
Tests/test_imagegrab.py::TestImageGrab::test_grabclipboard
|
||||
)
|
||||
|
||||
"${EPYTHON}" selftest.py --installed || die "selftest failed with ${EPYTHON}"
|
||||
# no:relaxed: pytest-relaxed plugin make our tests fail. deactivate if installed
|
||||
epytest -p no:relaxed || die "Tests failed with ${EPYTHON}"
|
||||
}
|
||||
|
||||
python_install() {
|
||||
python_doheader src/libImaging/*.h
|
||||
distutils-r1_python_install
|
||||
}
|
||||
|
||||
python_install_all() {
|
||||
if use examples ; then
|
||||
docinto example
|
||||
dodoc docs/example/*
|
||||
docompress -x /usr/share/doc/${PF}/example
|
||||
fi
|
||||
distutils-r1_python_install_all
|
||||
}
|
||||
Reference in New Issue
Block a user