[gentoo-commits] repo/gentoo:master commit in: dev-python/pillow/files/, dev-python/pillow/

2024-01-01 Thread Michał Górny 
commit: c66593ad312f60d619d83653f73f158395b8edb7
Author: Michał Górny  gentoo  org>
AuthorDate: Mon Jan  1 12:15:39 2024 +
Commit: Michał Górny  gentoo  org>
CommitDate: Mon Jan  1 12:30:54 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c66593ad

dev-python/pillow: Backport file closing fix for olefile-0.47

Signed-off-by: Michał Górny  gentoo.org>

 .../pillow/files/pillow-10.1.0-olefile-0.47.patch  | 50 ++
 ...illow-10.1.0.ebuild => pillow-10.1.0-r1.ebuild} |  7 ++-
 2 files changed, 56 insertions(+), 1 deletion(-)

diff --git a/dev-python/pillow/files/pillow-10.1.0-olefile-0.47.patch 
b/dev-python/pillow/files/pillow-10.1.0-olefile-0.47.patch
new file mode 100644
index ..e3b6a6473dfc
--- /dev/null
+++ b/dev-python/pillow/files/pillow-10.1.0-olefile-0.47.patch
@@ -0,0 +1,50 @@
+From 0e523d986858e7c0b4acd45ea1c5a3a639e39b4b Mon Sep 17 00:00:00 2001
+From: Andrew Murray 
+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
+

diff --git a/dev-python/pillow/pillow-10.1.0.ebuild 
b/dev-python/pillow/pillow-10.1.0-r1.ebuild
similarity index 96%
rename from dev-python/pillow/pillow-10.1.0.ebuild
rename to dev-python/pillow/pillow-10.1.0-r1.ebuild
index 1e25a3391179..0c65cdff5b1c 100644
--- a/dev-python/pillow/pillow-10.1.0.ebuild
+++ b/dev-python/pillow/pillow-10.1.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -70,6 +70,11 @@ EPYTEST_DESELECT=(
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
 }

[gentoo-commits] repo/gentoo:master commit in: dev-python/pillow/files/, dev-python/pillow/

2020-01-26 Thread David Seifert 
commit: b3b0fd5793cd2be4107c57db406aa4c86f4e639e
Author: David Seifert  gentoo  org>
AuthorDate: Sun Jan 26 13:33:07 2020 +
Commit: David Seifert  gentoo  org>
CommitDate: Sun Jan 26 13:33:07 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3b0fd57

dev-python/pillow: Remove old

Closes: https://github.com/gentoo/gentoo/pull/14447
Package-Manager: Portage-2.3.85, Repoman-2.3.20
Signed-off-by: David Seifert  gentoo.org>

 dev-python/pillow/Manifest |   2 -
 .../pillow/files/pillow-3.4.2-no-scripts.patch |  12 ---
 .../pillow/files/pillow-5.4.1-pkg-config.patch |  28 --
 .../files/pillow-5.4.1-toolchain-paths.patch   |  12 ---
 dev-python/pillow/pillow-3.4.2-r1.ebuild   | 102 
 dev-python/pillow/pillow-5.4.1.ebuild  | 106 -
 6 files changed, 262 deletions(-)

diff --git a/dev-python/pillow/Manifest b/dev-python/pillow/Manifest
index 6fde61b6d7f..aa5451c56ce 100644
--- a/dev-python/pillow/Manifest
+++ b/dev-python/pillow/Manifest
@@ -1,5 +1,3 @@
-DIST Pillow-3.4.2.zip 11042238 BLAKE2B 
334af6eeadb3203b51572eca6ad9c196f3eeac14da0f1aedc351db692b33d413fdf5bc5c8564d2f53c324d9485dbdbda664b75a570b779e24f238c21829b4a39
 SHA512 
5e05206db5bc1b4177384f7e91ee79015c6e1bbdc7c31c997da054391b9b5ec7c1ebdec258a33f598986533894f3324b03d0b4b385b94e72a0517a3437553b39
-DIST pillow-5.4.1.tar.gz 15799745 BLAKE2B 
d9e3851a80a1f94d7292852b9ab806d9a26870795f499bb109a440e64c07112055a4cd382688b977f3c3ae76ed3d6fd38460afff594f964338afa668d288e4de
 SHA512 
20b75ab50df7e9545c76d66ad585922d1f86fbcf8df9d2566882ab8929c3122573b9ec622766523ec46f5e7a98740cc78ff192e3e8f08ab0b77a7f2b033a7f62
 DIST pillow-6.2.1.tar.gz 37405020 BLAKE2B 
bf3592bcc159902acc35899463c8949daf7cc31f03283684dc55d5f1517fdfbc07e1feb73b65b0b9cb4052ee1d5281558b38f9bd08240d0fc5727909b98da158
 SHA512 
ee757ec2b8382d6d56fd0f0cdd4cd36440cc37f05741e27fc661449a16dc7c868966772060adb283de1b1b5ebc49b8eec46e0bdcdad9f5f4d5ebd77feab7ad31
 DIST pillow-6.2.2.tar.gz 37538464 BLAKE2B 
dfd9b81490a8adb4e12ecbf6764e4e27573c9a087877ac37275a9fb42b89f0cd8cab8d7ca0b45c9a00bf38ca5b1d83de68f5fc35ff19031bfcc1495ee3a5f5b7
 SHA512 
0f2c3bfd921247fa11645eadc42e184182a401ccbdb8f10215312e96c8c28f2382f5413b56acd78fab1dffc6fa53cc8588ce960543af65c4769451874c2c918e
 DIST pillow-7.0.0.tar.gz 37880130 BLAKE2B 
be940cbdced884c33f2b3979be113b1bc8974814c9532fe80203395184f90eccba1cd9a5017fec1f0c30a21ff06abc46560d5c6d67938dbf640f2e8e08b7e554
 SHA512 
187173a525d4f3f01b4898633263b53a311f337aa7b159c64f79ba8c7006fd44798a058e7cc5d8f1116bad008e4142ff303456692329fe73b0e115ef5c225d73

diff --git a/dev-python/pillow/files/pillow-3.4.2-no-scripts.patch 
b/dev-python/pillow/files/pillow-3.4.2-no-scripts.patch
deleted file mode 100644
index a8aa0ecc0d0..000
--- a/dev-python/pillow/files/pillow-3.4.2-no-scripts.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 5257e748..410ce788 100644
 a/setup.py
-+++ b/setup.py
-@@ -746,7 +746,6 @@ setup(name=NAME,
-   ext_modules=[Extension("PIL._imaging", ["_imaging.c"])],
-   include_package_data=True,
-   packages=find_packages(),
--  scripts=glob.glob("Scripts/*.py"),
-   test_suite='nose.collector',
-   keywords=["Imaging", ],
-   license='Standard PIL License',

diff --git a/dev-python/pillow/files/pillow-5.4.1-pkg-config.patch 
b/dev-python/pillow/files/pillow-5.4.1-pkg-config.patch
deleted file mode 100644
index ec227b3f80a..000
--- a/dev-python/pillow/files/pillow-5.4.1-pkg-config.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -Naur a/setup.py b/setup.py
 a/setup.py 2019-01-06 12:12:16.0 +
-+++ b/setup.py 2019-01-08 23:04:45.574698210 +
-@@ -197,12 +197,13 @@
- 
- def _pkg_config(name):
- try:
-+command = os.environ.get('PKG_CONFIG', 'pkg-config')
- command_libs = [
--'pkg-config',
-+command,
- '--libs-only-L', name,
- ]
- command_cflags = [
--'pkg-config',
-+command,
- '--cflags-only-I', name,
- ]
- if not DEBUG:
-@@ -298,7 +299,7 @@
- _add_directory(include_dirs, "src/libImaging")
- 
- pkg_config = None
--if _cmd_exists('pkg-config'):
-+if _cmd_exists(os.environ.get('PKG_CONFIG', 'pkg-config')):
- pkg_config = _pkg_config
- 
- #

diff --git a/dev-python/pillow/files/pillow-5.4.1-toolchain-paths.patch 
b/dev-python/pillow/files/pillow-5.4.1-toolchain-paths.patch
deleted file mode 100644
index d3e95eef516..000
--- a/dev-python/pillow/files/pillow-5.4.1-toolchain-paths.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur a/setup.py b/setup.py
 a/setup.py 2019-01-08 23:06:33.082873069 +
-+++ b/setup.py 2019-01-08 23:06:47.707165225 +
-@@ -356,7 +356,7 @@
- for d in os.environ[k].split(os.path.pathsep):
-

[gentoo-commits] repo/gentoo:master commit in: dev-python/pillow/files/, dev-python/pillow/

2019-06-05 Thread Virgil Dupras 
commit: 53929708a6f9c829d15bc4d24a3850758ed9619b
Author: Virgil Dupras  gentoo  org>
AuthorDate: Wed Jun  5 11:57:56 2019 +
Commit: Virgil Dupras  gentoo  org>
CommitDate: Wed Jun  5 11:57:56 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53929708

dev-python/pillow: remove old

Signed-off-by: Virgil Dupras  gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11

 dev-python/pillow/Manifest |   1 -
 .../pillow/files/pillow-5.2.0-fix-lib-paths.patch  |  16 
 dev-python/pillow/pillow-5.2.0.ebuild  | 103 -
 3 files changed, 120 deletions(-)

diff --git a/dev-python/pillow/Manifest b/dev-python/pillow/Manifest
index 8ba4bd6a56c..7cabdc3d863 100644
--- a/dev-python/pillow/Manifest
+++ b/dev-python/pillow/Manifest
@@ -1,4 +1,3 @@
 DIST Pillow-3.4.2.zip 11042238 BLAKE2B 
334af6eeadb3203b51572eca6ad9c196f3eeac14da0f1aedc351db692b33d413fdf5bc5c8564d2f53c324d9485dbdbda664b75a570b779e24f238c21829b4a39
 SHA512 
5e05206db5bc1b4177384f7e91ee79015c6e1bbdc7c31c997da054391b9b5ec7c1ebdec258a33f598986533894f3324b03d0b4b385b94e72a0517a3437553b39
-DIST Pillow-5.2.0.tar.gz 14499068 BLAKE2B 
7111eb8e2911cc197b66bbc06a13459484e2c4a1f5037e4bcf702ea350763b2b758cbeef9749aeb29f1ab64d33081131f7e46a3fbb33fee48e70660f8f75eddb
 SHA512 
2f19512d0573bd4696a5b4d54ff21473492f92705d33bd0994ccd085028d209bfb0031e2b95947c1e8fc9d0b0956cdf1f705c1fbaff39390791cac1708bff22c
 DIST pillow-5.4.1.tar.gz 15799745 BLAKE2B 
d9e3851a80a1f94d7292852b9ab806d9a26870795f499bb109a440e64c07112055a4cd382688b977f3c3ae76ed3d6fd38460afff594f964338afa668d288e4de
 SHA512 
20b75ab50df7e9545c76d66ad585922d1f86fbcf8df9d2566882ab8929c3122573b9ec622766523ec46f5e7a98740cc78ff192e3e8f08ab0b77a7f2b033a7f62
 DIST pillow-6.0.0.tar.gz 29205509 BLAKE2B 
83e2d1abeea468b7bf344ea5003940b14d6c69649e02a954c0b3810fc5d77288c361fb40747171176d29843848d802b783a2b0c0de15476462f17f15552298fa
 SHA512 
c5fbe1432d576fe4a70a15fa7a70a446ccbcb247fbd4c3605917fa26a6345eb9319c0153dba7637d521c358963f2f06f525219aa1af1502da2565d54dceef4c5

diff --git a/dev-python/pillow/files/pillow-5.2.0-fix-lib-paths.patch 
b/dev-python/pillow/files/pillow-5.2.0-fix-lib-paths.patch
deleted file mode 100644
index b73681831a6..000
--- a/dev-python/pillow/files/pillow-5.2.0-fix-lib-paths.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 761d552c..c4a55092 100755
 a/setup.py
-+++ b/setup.py
-@@ -435,6 +435,11 @@ class pil_build_ext(build_ext):
- _add_directory(include_dirs,
-os.path.join(best_path, 'include'))
- 
-+# The logic above fails in many cases (such as pypy builds) and we fix
-+# it here by making sure we look in standard places first.
-+library_dirs = ['/usr/lib64', '/usr/lib'] + library_dirs
-+include_dirs = ['/usr/include'] + include_dirs
-+
- #
- # insert new dirs *before* default libs, to avoid conflicts
- # between Python PYD stub libs and real libraries

diff --git a/dev-python/pillow/pillow-5.2.0.ebuild 
b/dev-python/pillow/pillow-5.2.0.ebuild
deleted file mode 100644
index 3eb0933a358..000
--- a/dev-python/pillow/pillow-5.2.0.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
-PYTHON_REQ_USE='tk?,threads(+)'
-
-inherit distutils-r1 virtualx
-
-MY_PN=Pillow
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Python Imaging Library (fork)"
-HOMEPAGE="https://python-pillow.org/;
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="HPND"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples imagequant jpeg jpeg2k lcms test tiff tk truetype webp zlib"
-
-REQUIRED_USE="test? ( jpeg tiff )"
-
-RDEPEND="
-   dev-python/olefile[${PYTHON_USEDEP}]
-   imagequant? ( media-gfx/libimagequant:0 )
-   jpeg? ( virtual/jpeg:0 )
-   jpeg2k? ( media-libs/openjpeg:2= )
-   lcms? ( media-libs/lcms:2= )
-   tiff? ( media-libs/tiff:0=[jpeg,zlib] )
-   truetype? ( media-libs/freetype:2= )
-   webp? ( media-libs/libwebp:0= )
-   zlib? ( sys-libs/zlib:0= )"
-DEPEND="${RDEPEND}
-   dev-python/setuptools[${PYTHON_USEDEP}]
-   doc? (
-   dev-python/sphinx[${PYTHON_USEDEP}]
-   dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-   )
-   test? (
-   https://github.com/python-pillow/Pillow/pull/3272 is merged.
-   MAX_CONCURRENCY=1 distutils-r1_python_compile
-}
-
-python_compile_all() {
-   use doc && emake -C docs html
-}
-
-python_test() {
-   "${PYTHON}" selftest.py --installed || die "selftest failed with 
${EPYTHON}"
-   # no:relaxed: pytest-relaxed plugin make our tests fail. deactivate if 
installed
-   virtx pytest -vx Tests/test_*.py -p no:relaxed
-}
-

[gentoo-commits] repo/gentoo:master commit in: dev-python/pillow/files/, dev-python/pillow/

2018-10-01 Thread Virgil Dupras 
commit: 3f782b122d0ef16c14b25510dca3050acbd51c33
Author: Virgil Dupras  gentoo  org>
AuthorDate: Mon Oct  1 18:45:00 2018 +
Commit: Virgil Dupras  gentoo  org>
CommitDate: Mon Oct  1 18:45:56 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f782b12

dev-python/pillow: remove old

Signed-off-by: Virgil Dupras  gentoo.org>
Package-Manager: Portage-2.3.50, Repoman-2.3.11

 dev-python/pillow/Manifest |   1 -
 .../pillow-4.3.0-freetype2.9-test-metrics.patch|  12 ---
 dev-python/pillow/files/pillow-4.3.0-no-qt.patch   |  30 --
 .../pillow/files/pillow-4.3.0-no-scripts.patch |  12 ---
 dev-python/pillow/pillow-4.3.0-r2.ebuild   |  95 --
 dev-python/pillow/pillow-4.3.0-r3.ebuild   | 106 -
 6 files changed, 256 deletions(-)

diff --git a/dev-python/pillow/Manifest b/dev-python/pillow/Manifest
index 39808e9ddae..550e53d9fe8 100644
--- a/dev-python/pillow/Manifest
+++ b/dev-python/pillow/Manifest
@@ -1,4 +1,3 @@
 DIST Pillow-3.4.2.zip 11042238 BLAKE2B 
334af6eeadb3203b51572eca6ad9c196f3eeac14da0f1aedc351db692b33d413fdf5bc5c8564d2f53c324d9485dbdbda664b75a570b779e24f238c21829b4a39
 SHA512 
5e05206db5bc1b4177384f7e91ee79015c6e1bbdc7c31c997da054391b9b5ec7c1ebdec258a33f598986533894f3324b03d0b4b385b94e72a0517a3437553b39
-DIST Pillow-4.3.0.tar.gz 13874155 BLAKE2B 
c2258efe2727adeb7ba370fe30ef9bbabe952a1f6690e7904352884951e648d2c0e2037143b7c71a802ea1a04a2f7827a001621480036e43f6c01a96de3edcf7
 SHA512 
5811252802bd01ac86157235d42138685e746723df48b67ec7c7ebd3f172532b40cf86ca9d3d792e82f03986303a084bf3491c0d511dc068dea1bc631afdeabb
 DIST Pillow-5.2.0.tar.gz 14499068 BLAKE2B 
7111eb8e2911cc197b66bbc06a13459484e2c4a1f5037e4bcf702ea350763b2b758cbeef9749aeb29f1ab64d33081131f7e46a3fbb33fee48e70660f8f75eddb
 SHA512 
2f19512d0573bd4696a5b4d54ff21473492f92705d33bd0994ccd085028d209bfb0031e2b95947c1e8fc9d0b0956cdf1f705c1fbaff39390791cac1708bff22c
 DIST Pillow-5.3.0.tar.gz 15553718 BLAKE2B 
df93d136fb5a5ea3021a757edea5dfa7b3fc1f7a71b0f64f1d1d11b95a5dafffad98d3f7b28d5e7c07b1c93d154c9c73a688f37771587c91fb7bfb6956079375
 SHA512 
0596207069a87a645f7694b19ea5100d753dbb7553148fa5982b073e4e1163b5bd83ddf8b1c783a90a0b718576f08d3f15352f2742d46a425cf639de2409c4ab

diff --git 
a/dev-python/pillow/files/pillow-4.3.0-freetype2.9-test-metrics.patch 
b/dev-python/pillow/files/pillow-4.3.0-freetype2.9-test-metrics.patch
deleted file mode 100644
index 211ef7ac58d..000
--- a/dev-python/pillow/files/pillow-4.3.0-freetype2.9-test-metrics.patch
+++ /dev/null
@@ -1,12 +0,0 @@
 a/Tests/test_imagefont.py
-+++ b/Tests/test_imagefont.py
-@@ -58,6 +58,9 @@ class TestImageFont(PillowTestCase):
- ('2', '8'): {'multiline': 6.2,
-  'textsize': 2.5,
-  'getters': (12, 16)},
-+('2', '9'): {'multiline': 6.2,
-+ 'textsize': 2.5,
-+ 'getters': (12, 16)},
- 'Default': {'multiline': 0.5,
- 'textsize': 0.5,
- 'getters': (12, 16)},

diff --git a/dev-python/pillow/files/pillow-4.3.0-no-qt.patch 
b/dev-python/pillow/files/pillow-4.3.0-no-qt.patch
deleted file mode 100644
index 231c605b834..000
--- a/dev-python/pillow/files/pillow-4.3.0-no-qt.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/PIL/ImageQt.py b/PIL/ImageQt.py
-index 36b4e1eb..ddde2cd9 100644
 a/PIL/ImageQt.py
-+++ b/PIL/ImageQt.py
-@@ -20,24 +20,7 @@ from . import Image
- from ._util import isPath
- from io import BytesIO
- 
--qt_is_installed = True
--qt_version = None
--try:
--from PyQt5.QtGui import QImage, qRgba, QPixmap
--from PyQt5.QtCore import QBuffer, QIODevice
--qt_version = '5'
--except (ImportError, RuntimeError):
--try:
--from PyQt4.QtGui import QImage, qRgba, QPixmap
--from PyQt4.QtCore import QBuffer, QIODevice
--qt_version = '4'
--except (ImportError, RuntimeError):
--try:
--from PySide.QtGui import QImage, qRgba, QPixmap
--from PySide.QtCore import QBuffer, QIODevice
--qt_version = 'side'
--except ImportError:
--qt_is_installed = False
-+qt_is_installed = False
- 
- 
- def rgb(r, g, b, a=255):

diff --git a/dev-python/pillow/files/pillow-4.3.0-no-scripts.patch 
b/dev-python/pillow/files/pillow-4.3.0-no-scripts.patch
deleted file mode 100644
index c30b00d54d7..000
--- a/dev-python/pillow/files/pillow-4.3.0-no-scripts.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-https://bugs.gentoo.org/562682
-
 a/setup.py
-+++ b/setup.py
-@@ -779,7 +779,6 @@ try:
-   ext_modules=[Extension("PIL._imaging", ["_imaging.c"])],
-   include_package_data=True,
-   packages=find_packages(),
--  scripts=glob.glob("Scripts/*.py"),
-   install_requires=['olefile'],
-   test_suite='nose.collector',
-

[gentoo-commits] repo/gentoo:master commit in: dev-python/pillow/files/, dev-python/pillow/

2018-09-07 Thread Virgil Dupras 
commit: 33875ec2cd5306aad166cb0e5202f6342c3a2f95
Author: Virgil Dupras  gentoo  org>
AuthorDate: Fri Sep  7 18:43:59 2018 +
Commit: Virgil Dupras  gentoo  org>
CommitDate: Fri Sep  7 18:45:31 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33875ec2

dev-python/pillow: re-support pypy

pypy support had been dropped in pillow 4.3 ebuild and is being
re-introduced now. Tests pass.

This required a little bit of library path fiddling in setup.py, the
root cause of it being that `sysconfig.get_config_var('prefix')` under
pypy doesn't return the same thing as with CPython. This fiddling was
required if we wanted to keep the --disable-platform-guessing flag.

I tried not to break the fix that was done in bug 661830.

I've tried pypy3, but not all tests passed. I didn't investigate further
(I'm just trying to return to pre-4.3 levels so that we can stabilize)

Bug: https://bugs.gentoo.org/661830
Closes: https://bugs.gentoo.org/608620
Package-Manager: Portage-2.3.49, Repoman-2.3.10

 dev-python/pillow/files/pillow-5.2.0-fix-lib-paths.patch | 16 
 dev-python/pillow/files/pillow-5.2.0-no-usr-lib.patch| 12 
 dev-python/pillow/pillow-5.2.0.ebuild|  4 ++--
 3 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/dev-python/pillow/files/pillow-5.2.0-fix-lib-paths.patch 
b/dev-python/pillow/files/pillow-5.2.0-fix-lib-paths.patch
new file mode 100644
index 000..b73681831a6
--- /dev/null
+++ b/dev-python/pillow/files/pillow-5.2.0-fix-lib-paths.patch
@@ -0,0 +1,16 @@
+diff --git a/setup.py b/setup.py
+index 761d552c..c4a55092 100755
+--- a/setup.py
 b/setup.py
+@@ -435,6 +435,11 @@ class pil_build_ext(build_ext):
+ _add_directory(include_dirs,
+os.path.join(best_path, 'include'))
+ 
++# The logic above fails in many cases (such as pypy builds) and we fix
++# it here by making sure we look in standard places first.
++library_dirs = ['/usr/lib64', '/usr/lib'] + library_dirs
++include_dirs = ['/usr/include'] + include_dirs
++
+ #
+ # insert new dirs *before* default libs, to avoid conflicts
+ # between Python PYD stub libs and real libraries

diff --git a/dev-python/pillow/files/pillow-5.2.0-no-usr-lib.patch 
b/dev-python/pillow/files/pillow-5.2.0-no-usr-lib.patch
deleted file mode 100644
index 4b6cc50eaf5..000
--- a/dev-python/pillow/files/pillow-5.2.0-no-usr-lib.patch
+++ /dev/null
@@ -1,12 +0,0 @@
 a/setup.py 2018-07-22 22:09:23.840195059 +0300
-+++ a/setup.py 2018-07-22 22:11:43.400626135 +0300
-@@ -258,9 +258,8 @@ 
- _add_directory(library_dirs, d)
- 
- prefix = sysconfig.get_config_var("prefix")
- if prefix:
--_add_directory(library_dirs, os.path.join(prefix, "lib"))
- _add_directory(include_dirs, os.path.join(prefix, "include"))
- 
- #
- # add platform directories

diff --git a/dev-python/pillow/pillow-5.2.0.ebuild 
b/dev-python/pillow/pillow-5.2.0.ebuild
index 406d711de0d..04ae4108561 100644
--- a/dev-python/pillow/pillow-5.2.0.ebuild
+++ b/dev-python/pillow/pillow-5.2.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
 PYTHON_REQ_USE='tk?,threads(+)'
 
 inherit distutils-r1 virtualx
@@ -47,7 +47,7 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
-   "${FILESDIR}/${PN}-5.2.0-no-usr-lib.patch"
+   "${FILESDIR}/${PN}-5.2.0-fix-lib-paths.patch"
 )
 
 python_configure_all() {

[gentoo-commits] repo/gentoo:master commit in: dev-python/pillow/files/, dev-python/pillow/

2018-08-04 Thread Virgil Dupras 
commit: 482a89fd8f11d1d04e5a1b49dacb92c53c11ca4b
Author: Virgil Dupras  gentoo  org>
AuthorDate: Sat Aug  4 19:10:23 2018 +
Commit: Virgil Dupras  gentoo  org>
CommitDate: Sat Aug  4 19:11:32 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=482a89fd

dev-python/pillow: add qt5 USE flag

Pillow has a Qt compatibility layer that is enabled depending on whether
PyQt is installed or not. Letting this happen can lead to unexpected
problems, so we add support for the qt5 flag to explicitly enable Qt
support. When the flag is disabled, we forcibly disable Qt support
through patching.

Bug: https://bugs.gentoo.org/662236
Package-Manager: Portage-2.3.44, Repoman-2.3.10

 dev-python/pillow/files/pillow-4.3.0-no-qt.patch |  30 +++
 dev-python/pillow/pillow-4.3.0-r3.ebuild | 106 +++
 2 files changed, 136 insertions(+)

diff --git a/dev-python/pillow/files/pillow-4.3.0-no-qt.patch 
b/dev-python/pillow/files/pillow-4.3.0-no-qt.patch
new file mode 100644
index 000..231c605b834
--- /dev/null
+++ b/dev-python/pillow/files/pillow-4.3.0-no-qt.patch
@@ -0,0 +1,30 @@
+diff --git a/PIL/ImageQt.py b/PIL/ImageQt.py
+index 36b4e1eb..ddde2cd9 100644
+--- a/PIL/ImageQt.py
 b/PIL/ImageQt.py
+@@ -20,24 +20,7 @@ from . import Image
+ from ._util import isPath
+ from io import BytesIO
+ 
+-qt_is_installed = True
+-qt_version = None
+-try:
+-from PyQt5.QtGui import QImage, qRgba, QPixmap
+-from PyQt5.QtCore import QBuffer, QIODevice
+-qt_version = '5'
+-except (ImportError, RuntimeError):
+-try:
+-from PyQt4.QtGui import QImage, qRgba, QPixmap
+-from PyQt4.QtCore import QBuffer, QIODevice
+-qt_version = '4'
+-except (ImportError, RuntimeError):
+-try:
+-from PySide.QtGui import QImage, qRgba, QPixmap
+-from PySide.QtCore import QBuffer, QIODevice
+-qt_version = 'side'
+-except ImportError:
+-qt_is_installed = False
++qt_is_installed = False
+ 
+ 
+ def rgb(r, g, b, a=255):

diff --git a/dev-python/pillow/pillow-4.3.0-r3.ebuild 
b/dev-python/pillow/pillow-4.3.0-r3.ebuild
new file mode 100644
index 000..a799e79a1d3
--- /dev/null
+++ b/dev-python/pillow/pillow-4.3.0-r3.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_REQ_USE='tk?,threads(+)'
+
+inherit distutils-r1 eutils virtualx
+
+MY_PN=Pillow
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Python Imaging Library (fork)"
+HOMEPAGE="https://python-pillow.org/;
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="HPND"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples imagequant jpeg jpeg2k lcms qt5 test tiff tk truetype webp 
zlib"
+
+REQUIRED_USE="test? ( jpeg tiff )"
+
+RDEPEND="
+   dev-python/olefile[${PYTHON_USEDEP}]
+   imagequant? ( media-gfx/libimagequant:0 )
+   jpeg? ( virtual/jpeg:0 )
+   jpeg2k? ( media-libs/openjpeg:2= )
+   lcms? ( media-libs/lcms:2= )
+   qt5? ( dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] )
+   tiff? ( media-libs/tiff:0=[jpeg,zlib] )
+   truetype? ( media-libs/freetype:2= )
+   webp? ( media-libs/libwebp:0= )
+   zlib? ( sys-libs/zlib:0= )"
+DEPEND="${RDEPEND}
+   dev-python/setuptools[${PYTHON_USEDEP}]
+   doc? (
+   dev-python/sphinx[${PYTHON_USEDEP}]
+   dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+   )
+   test? (
+   dev-python/nose[${PYTHON_USEDEP}]
+   media-gfx/imagemagick[png]
+   )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+   "${FILESDIR}"/pillow-4.3.0-no-scripts.patch
+   # can be removed at v5, patch already uptream. See bug 593816.
+   "${FILESDIR}"/pillow-4.3.0-freetype2.9-test-metrics.patch
+)
+
+src_prepare() {
+   if ! use qt5; then
+   # When we don't use qt5, we want to forcibly disable it by 
patching it
+   # out. Otherwise, we might encounter unexpected problems like in
+   # bug #662236
+   eapply "${FILESDIR}/${PN}-4.3.0-no-qt.patch"
+   fi
+   eapply_user
+}
+
+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.
+   mydistutilsargs=(
+   build_ext
+   --disable-platform-guessing
+   $(use_enable truetype freetype)
+   $(use_enable jpeg)
+   $(use_enable jpeg2k jpeg2000)
+   $(use_enable lcms)
+   $(use_enable tiff)
+   $(use_enable imagequant)
+   $(use_enable webp)
+   $(use_enable webp webpmux)
+   $(use_enable zlib)
+   )
+}
+
+python_compile_all() {
+   use doc && emake -C

[gentoo-commits] repo/gentoo:master commit in: dev-python/pillow/files/, dev-python/pillow/

2018-07-26 Thread Virgil Dupras 
commit: 1849bbe7d01f7bc9fb0fa115d5d63deaebb23c33
Author: Virgil Dupras  gentoo  org>
AuthorDate: Fri Jul 27 02:58:03 2018 +
Commit: Virgil Dupras  gentoo  org>
CommitDate: Fri Jul 27 02:58:54 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1849bbe7

dev-python/pillow: fix link warnings

Apply patch to remove spurious /usr/lib prepend to linking flags that
generates linking warnings in certain situations.

Reported-By: Alexander Tsoy
Closes: https://bugs.gentoo.org/661830
Package-Manager: Portage-2.3.43, Repoman-2.3.10

 dev-python/pillow/files/pillow-5.2.0-no-usr-lib.patch | 12 
 dev-python/pillow/pillow-5.2.0.ebuild |  4 
 2 files changed, 16 insertions(+)

diff --git a/dev-python/pillow/files/pillow-5.2.0-no-usr-lib.patch 
b/dev-python/pillow/files/pillow-5.2.0-no-usr-lib.patch
new file mode 100644
index 000..4b6cc50eaf5
--- /dev/null
+++ b/dev-python/pillow/files/pillow-5.2.0-no-usr-lib.patch
@@ -0,0 +1,12 @@
+--- a/setup.py 2018-07-22 22:09:23.840195059 +0300
 a/setup.py 2018-07-22 22:11:43.400626135 +0300
+@@ -258,9 +258,8 @@ 
+ _add_directory(library_dirs, d)
+ 
+ prefix = sysconfig.get_config_var("prefix")
+ if prefix:
+-_add_directory(library_dirs, os.path.join(prefix, "lib"))
+ _add_directory(include_dirs, os.path.join(prefix, "include"))
+ 
+ #
+ # add platform directories

diff --git a/dev-python/pillow/pillow-5.2.0.ebuild 
b/dev-python/pillow/pillow-5.2.0.ebuild
index b63542786fe..8e603d65c53 100644
--- a/dev-python/pillow/pillow-5.2.0.ebuild
+++ b/dev-python/pillow/pillow-5.2.0.ebuild
@@ -46,6 +46,10 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${MY_P}"
 
+PATCHES=(
+   "${FILESDIR}/${PN}-5.2.0-no-usr-lib.patch"
+)
+
 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.

[gentoo-commits] repo/gentoo:master commit in: dev-python/pillow/files/, dev-python/pillow/

2015-10-25 Thread Justin Lecher 
commit: bf899db504819b910205d5146ad862df8fae9582
Author: Justin Lecher  gentoo  org>
AuthorDate: Sun Oct 25 08:25:24 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Sun Oct 25 09:24:01 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf899db5

dev-python/pillow: Backport fix for tiff image color detection

Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=563986

Package-Manager: portage-2.2.23
Signed-off-by: Justin Lecher  gentoo.org>

 .../pillow-3.0.0-backport-tiff-color-fix.patch |  39 
 dev-python/pillow/pillow-3.0.0-r1.ebuild   | 101 +
 2 files changed, 140 insertions(+)

diff --git a/dev-python/pillow/files/pillow-3.0.0-backport-tiff-color-fix.patch 
b/dev-python/pillow/files/pillow-3.0.0-backport-tiff-color-fix.patch
new file mode 100644
index 000..b5b5201
--- /dev/null
+++ b/dev-python/pillow/files/pillow-3.0.0-backport-tiff-color-fix.patch
@@ -0,0 +1,39 @@
+From e0cb8f945e22d4f714f1c1de3aa04b3db39c5679 Mon Sep 17 00:00:00 2001
+From: wiredfool 
+Date: Sat, 3 Oct 2015 22:46:01 +0100
+Subject: [PATCH] Flatten sampleformat to initial value, fixes #1466
+
+---
+ PIL/TiffImagePlugin.py |   9 +++--
+ Tests/images/copyleft.tiff | Bin 0 -> 7926 bytes
+ Tests/test_file_tiff.py|   5 +
+ 3 files changed, 12 insertions(+), 2 deletions(-)
+ create mode 100644 Tests/images/copyleft.tiff
+
+diff --git a/PIL/TiffImagePlugin.py b/PIL/TiffImagePlugin.py
+index 1f97422..a84d017 100644
+--- a/PIL/TiffImagePlugin.py
 b/PIL/TiffImagePlugin.py
+@@ -180,8 +180,6 @@
+ (MM, 2, (1,), 1, (8, 8, 8, 8), (2,)): ("RGBA", "RGBA"),
+ (II, 2, (1,), 1, (8, 8, 8, 8), (999,)): ("RGBA", "RGBA"),  # Corel Draw 10
+ (MM, 2, (1,), 1, (8, 8, 8, 8), (999,)): ("RGBA", "RGBA"),  # Corel Draw 10
+-(II, 2, (1, 1, 1, 1), 1, (8, 8, 8, 8), (1,)): ("RGBA", "RGBA"),  # OSX 
Grab
+-(MM, 2, (1, 1, 1, 1), 1, (8, 8, 8, 8), (1,)): ("RGBA", "RGBA"),  # OSX 
Grab
+ (II, 3, (1,), 1, (1,), ()): ("P", "P;1"),
+ (MM, 3, (1,), 1, (1,), ()): ("P", "P;1"),
+ (II, 3, (1,), 2, (1,), ()): ("P", "P;1R"),
+@@ -967,6 +965,13 @@ def _setup(self):
+ print("- size:", self.size)
+ 
+ format = self.tag_v2.get(SAMPLEFORMAT, (1,))
++if len(format) > 1 and max(format) == min(format) == 1:
++# SAMPLEFORMAT is properly per band, so an RGB image will
++# be (1,1,1).  But, we don't support per band pixel types,
++# and anything more than one band is a uint8. So, just
++# take the first element. Revisit this if adding support
++# for more exotic images.
++format = (1,)
+ 
+ # mode: check photometric interpretation and bits per pixel
+ key = (

diff --git a/dev-python/pillow/pillow-3.0.0-r1.ebuild 
b/dev-python/pillow/pillow-3.0.0-r1.ebuild
new file mode 100644
index 000..4d53a59
--- /dev/null
+++ b/dev-python/pillow/pillow-3.0.0-r1.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy )
+PYTHON_REQ_USE='tk?'
+
+inherit distutils-r1 eutils virtualx
+
+MY_PN=Pillow
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Python Imaging Library (fork)"
+HOMEPAGE="https://github.com/python-imaging/Pillow 
https://pypi.python.org/pypi/Pillow;
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.zip"
+
+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 jpeg2k lcms test tiff tk truetype webp zlib"
+
+REQUIRED_USE="test? ( jpeg tiff )"
+
+RDEPEND="
+   jpeg? ( virtual/jpeg:0 )
+   jpeg2k? ( media-libs/openjpeg:2= )
+   lcms? ( media-libs/lcms:2= )
+   tiff? ( media-libs/tiff:0= )
+   truetype? ( media-libs/freetype:2= )
+   webp? ( media-libs/libwebp:0= )
+   zlib? ( sys-libs/zlib:0= )"
+DEPEND="${RDEPEND}
+   app-arch/unzip
+   dev-python/setuptools[${PYTHON_USEDEP}]
+   doc? (
+   dev-python/sphinx[${PYTHON_USEDEP}]
+   dev-python/sphinx-better-theme[${PYTHON_USEDEP}]
+   >=dev-python/sphinx_rtd_theme-0.1[${PYTHON_USEDEP}]
+

[gentoo-commits] repo/gentoo:master commit in: dev-python/pillow/files/, dev-python/pillow/

2015-10-02 Thread Justin Lecher 
commit: ca1659a740ddbe6eadc815c260cc567511080adc
Author: Justin Lecher  gentoo  org>
AuthorDate: Fri Oct  2 09:08:56 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Fri Oct  2 09:41:19 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca1659a7

dev-python/pillow: Version Bump

Package-Manager: portage-2.2.22
Signed-off-by: Justin Lecher  gentoo.org>

 dev-python/pillow/Manifest   |  1 +
 dev-python/pillow/files/pillow-3.0.0-tests.patch | 63 
 dev-python/pillow/pillow-3.0.0.ebuild| 93 
 3 files changed, 157 insertions(+)

diff --git a/dev-python/pillow/Manifest b/dev-python/pillow/Manifest
index 441f129..6d875ae 100644
--- a/dev-python/pillow/Manifest
+++ b/dev-python/pillow/Manifest
@@ -1,3 +1,4 @@
 DIST Pillow-2.8.1.zip 9275663 SHA256 
4363b52527c263e77f5b18c3dfffd15ae454edf0c4457197ecbe29863a651938 SHA512 
75c0cfb53530549a2bac66cc3457747c239779233c64fe944fa661e7401acd915700e0dfd74e13c93d96afb9b50a112f09cbaea49205e83d8797e832a52534e4
 WHIRLPOOL 
e71a39be415c2b83b7d554af7ad86652c08594c302344c919352a64ca48cfc7c1a88ca8dacccdacb283d8a42ad14cd3cb230c2900a9f11dc31ad20e203d6596d
 DIST Pillow-2.8.2.zip 9402887 SHA256 
57a900c2f30e53ed054adad401ab69643d9ab21e3acb0a647749a168e4e24446 SHA512 
2bc1e17cb65d5e953e30ea1606dbf79059d51f60ff5c2b000869fc2d9f93f8bbf5cf41b0147fc83974c48341cc68df6964d3d8203e0d6cc6a45ede95f3e0bc2f
 WHIRLPOOL 
4b5ad1db34427a161ce1885a858df72e4aaffd61b5bf9010702803874f44391678d228f71777fca058f424c6ac6208e8c3d7421eeff88c42bb6df94d1d13d771
 DIST Pillow-2.9.0.zip 9612840 SHA256 
d1db8dfed77547076037d589b598e04f2cbc1a7835d3d3f137bf20c8994854d5 SHA512 
d06371fbe67eca66229cdec7896423f55c9335be50698168c7bf4f4635352454b2f946eae90b404c68d6b939ec1d7353916d32bc9964d5b8986b8098381d5180
 WHIRLPOOL 
c664fec07c6634cad37791375fb1cb38b0edd542d93e099703dbc520e0d54125a1f00f205bbcdb8493df4dfd05ae1c2088ba305f23e66f0cc3e309f446c44fa5
+DIST Pillow-3.0.0.zip 9947593 SHA256 
0024fce578547a3da92579a163bae09b1d9f0baf3cd8e4a893dc6c11e4e624bb SHA512 
59dd809160743d2740dfe64743dc674bb4cb6395914048d0d555ccacc7fee1c8f3a114ec39142b5495a0162a74acaadf7ad66694f97c7f221ccffe19cd656928
 WHIRLPOOL 
0fe2c9af2557278cc855ec7ddb4cfd944fbd1fc3cb2a614e84bd1dfa0c8ba243e60bda863b0b254098bcc7510d62953dbccf1fce88996011327f1059df0b69fb

diff --git a/dev-python/pillow/files/pillow-3.0.0-tests.patch 
b/dev-python/pillow/files/pillow-3.0.0-tests.patch
new file mode 100644
index 000..b2228ea
--- /dev/null
+++ b/dev-python/pillow/files/pillow-3.0.0-tests.patch
@@ -0,0 +1,63 @@
+ Tests/test_imagefont.py | 7 +++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/Tests/test_imagefont.py b/Tests/test_imagefont.py
+index dd22344..d0a0826 100644
+--- a/Tests/test_imagefont.py
 b/Tests/test_imagefont.py
+@@ -112,6 +112,7 @@ try:
+ self.assert_image_equal(img_path, img_filelike)
+ self._clean()
+ 
++@unittest.skip("https://github.com/python-pillow/Pillow/issues/1259;)
+ def test_textsize_equal(self):
+ im = Image.new(mode='RGB', size=(300, 100))
+ draw = ImageDraw.Draw(im)
+@@ -126,6 +127,7 @@ try:
+ target_img = Image.open(target)
+ self.assert_image_similar(im, target_img, .5)
+ 
++@unittest.skip("https://github.com/python-pillow/Pillow/issues/1259;)
+ def test_render_multiline(self):
+ im = Image.new(mode='RGB', size=(300, 100))
+ draw = ImageDraw.Draw(im)
+@@ -145,6 +147,7 @@ try:
+ # at epsilon = ~38.
+ self.assert_image_similar(im, target_img, .5)
+ 
++@unittest.skip("https://github.com/python-pillow/Pillow/issues/1259;)
+ def test_render_multiline_text(self):
+ ttf = ImageFont.truetype(FONT_PATH, FONT_SIZE)
+ 
+@@ -200,6 +203,7 @@ try:
+  draw.multiline_textsize("longest line\nline",
+  font=ttf)[0])
+ 
++@unittest.skip("https://github.com/python-pillow/Pillow/issues/1259;)
+ def test_multiline_spacing(self):
+ ttf = ImageFont.truetype(FONT_PATH, FONT_SIZE)
+ 
+@@ -255,6 +259,7 @@ try:
+ # Check boxes a and b are same size
+ self.assertEqual(box_size_a, box_size_b)
+ 
++@unittest.skip("https://github.com/python-pillow/Pillow/issues/1456;)
+ def test_rotated_transposed_font_get_mask(self):
+ # Arrange
+ text = "mask this"
+@@ -269,6 +274,7 @@ try:
+ # Assert
+ self.assertEqual(mask.size, (13, 108))
+ 
++@unittest.skip("https://github.com/python-pillow/Pillow/issues/1456;)
+ def test_unrotated_transposed_font_get_mask(self):
+ # Arrange
+ text = "mask this"
+@@ -316,6 +322,7 @@ try:
+ # Assert
+ self.assertEqual(offset, (0, 3))
+ 
++