* [gentoo-commits] repo/gentoo:master commit in: dev-python/reportlab/, dev-python/reportlab/files/
@ 2020-01-26 13:33 David Seifert
0 siblings, 0 replies; 3+ messages in thread
From: David Seifert @ 2020-01-26 13:33 UTC (permalink / raw
To: gentoo-commits
commit: 300193b8b0ac5683594ed62351d496df71658df9
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 26 13:32:55 2020 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Jan 26 13:32:55 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=300193b8
dev-python/reportlab: Remove old
Package-Manager: Portage-2.3.85, Repoman-2.3.20
Signed-off-by: David Seifert <soap <AT> gentoo.org>
dev-python/reportlab/Manifest | 1 -
dev-python/reportlab/files/reportlab-no-pip.patch | 12 ----
dev-python/reportlab/reportlab-3.3.0-r2.ebuild | 72 -----------------------
3 files changed, 85 deletions(-)
diff --git a/dev-python/reportlab/Manifest b/dev-python/reportlab/Manifest
index 1308c593f74..154a2080320 100644
--- a/dev-python/reportlab/Manifest
+++ b/dev-python/reportlab/Manifest
@@ -1,3 +1,2 @@
DIST pfbfer-20070710.zip 677333 BLAKE2B 100214476a361a5e5d1f3da0999591345f6e3a3f8c6bc3f6a3e9eca734190c6259758a43302c6e41254d33491fe535eb7d5dd07aa9727c912424bebc31fc18df SHA512 6fd4a5d955464b10d13a7b748703450c1fe120d5ed09e8cfa1b4dfa9c183c59fe001df29433af551796b0df62544b7ddc364f9bb1bdcc2cd300434340ffcc4f2
-DIST reportlab-3.3.0.tar.gz 1959255 BLAKE2B 0acd2d306da7836a2324b9a63c158b1b935cd393f5d1eb62cd15f8f4be6e48dac77807d1635ccafc569a47420dc3f4eec49c3ea3852a5a4241b10f0d73550865 SHA512 a6dbe5db13a9e430855ba8139310d8f04ade221c340467c2e0f5bf60c700f17148069358beb057f1667217a09b71ba1ae3112bd02e7c8de00e53a8f852acb8df
DIST reportlab-3.5.13.tar.gz 2842790 BLAKE2B 1457b5eb18d2f294decd7bbee202f42900a443eb7a31c2af56cc2180154e1bb48c4044c499b14489c23210e78c9bafb3fbbcd0c5a28f1d2e25f57d91dcb48526 SHA512 50afcdb5e844cc7ec5c1cf72ca28556e98ad721dce5b20cfb32fa720d56b221b9bd2662a88ea5647b11306d80e653334635b54165daa02d3062cf9d051bbd24b
diff --git a/dev-python/reportlab/files/reportlab-no-pip.patch b/dev-python/reportlab/files/reportlab-no-pip.patch
deleted file mode 100644
index 332878e24dc..00000000000
--- a/dev-python/reportlab/files/reportlab-no-pip.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/setup.py b/setup.py
---- a/setup.py
-+++ b/setup.py
-@@ -538,7 +538,7 @@
- ],
-
- #this probably only works for setuptools, but distutils seems to ignore it
-- install_requires=['pillow>=2.4.0','pip>=1.4.1', 'setuptools>=2.2'],
-+ install_requires=['pillow>=2.4.0'],
- )
- print()
- print('########## SUMMARY INFO #########')
diff --git a/dev-python/reportlab/reportlab-3.3.0-r2.ebuild b/dev-python/reportlab/reportlab-3.3.0-r2.ebuild
deleted file mode 100644
index 6d6b1de3fa6..00000000000
--- a/dev-python/reportlab/reportlab-3.3.0-r2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_6} ) # Tests crash with pypy
-
-inherit distutils-r1 flag-o-matic prefix
-
-DESCRIPTION="Tools for generating printable PDF documents from any data source"
-HOMEPAGE="http://www.reportlab.com/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz
- http://www.reportlab.com/ftp/fonts/pfbfer-20070710.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples"
-
-RDEPEND="
- <dev-python/pillow-6[tiff,truetype,jpeg(+),${PYTHON_USEDEP}]
- media-libs/libart_lgpl
- sys-libs/zlib
-"
-DEPEND="${RDEPEND}
- >=dev-python/setuptools-2.2[${PYTHON_USEDEP}]
- app-arch/unzip
-"
-
-PATCHES=(
- "${FILESDIR}"/reportlab-no-pip.patch
-)
-
-src_unpack() {
- unpack ${P}.tar.gz
- cd ${P}/src/reportlab/fonts || die
- unpack pfbfer-20070710.zip
-}
-
-python_prepare_all() {
- sed -i \
- -e 's|/usr/local/Acrobat|/opt/Acrobat|g' \
- -e 's|%(HOME)s/fonts|%(HOME)s/.fonts|g' \
- src/reportlab/rl_config.py || die
-
- eprefixify setup.py
- distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
- use doc && emake -C docs html
-}
-
-python_compile() {
- if ! python_is_python3; then
- local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
- fi
- distutils-r1_python_compile
-}
-
-python_test() {
- pushd tests > /dev/null || die
- "${PYTHON}" runAll.py || die "Testing failed with ${EPYTHON}"
- popd > /dev/null || die
-}
-
-python_install_all() {
- use doc && local HTML_DOCS=( docs/build/html/. )
- use examples && local EXAMPLES=( demos/. tools/pythonpoint/demos )
-
- distutils-r1_python_install_all
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/reportlab/, dev-python/reportlab/files/
@ 2020-08-21 23:21 David Seifert
0 siblings, 0 replies; 3+ messages in thread
From: David Seifert @ 2020-08-21 23:21 UTC (permalink / raw
To: gentoo-commits
commit: 420bf4ec987bdb21ac66a246b7912a05b8b0e234
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 21 23:20:41 2020 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Fri Aug 21 23:20:41 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=420bf4ec
dev-python/reportlab: Version bump to 3.5.48
Closes: https://bugs.gentoo.org/738312
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: David Seifert <soap <AT> gentoo.org>
dev-python/reportlab/Manifest | 1 +
.../files/reportlab-3.5.48-usr-lib-LLD.patch | 34 ++++++++++++
dev-python/reportlab/reportlab-3.5.48.ebuild | 63 ++++++++++++++++++++++
3 files changed, 98 insertions(+)
diff --git a/dev-python/reportlab/Manifest b/dev-python/reportlab/Manifest
index 200e6e1d0aa..2585b56ae43 100644
--- a/dev-python/reportlab/Manifest
+++ b/dev-python/reportlab/Manifest
@@ -1,2 +1,3 @@
DIST pfbfer-20070710.zip 677333 BLAKE2B 100214476a361a5e5d1f3da0999591345f6e3a3f8c6bc3f6a3e9eca734190c6259758a43302c6e41254d33491fe535eb7d5dd07aa9727c912424bebc31fc18df SHA512 6fd4a5d955464b10d13a7b748703450c1fe120d5ed09e8cfa1b4dfa9c183c59fe001df29433af551796b0df62544b7ddc364f9bb1bdcc2cd300434340ffcc4f2
DIST reportlab-3.5.42.tar.gz 2883081 BLAKE2B 22f4e7ebc233895a036eeb94c5beb9206be561a8a44895b36291a4f840603a2fec90107ac60e749f99be629202801c63ff67d5034d19b42383f2df12d457104d SHA512 f52717867190bf7812fd566d9ec3044198db809cdd0f53cc9dbfa92503a202540db659369e20bba3de07cd28eb10515d03b85700ac138c9394dc9eed1f08b8f8
+DIST reportlab-3.5.48.tar.gz 2890211 BLAKE2B bf0cde9b9e80459caee37949dc90a777a56da5d2c8e6dde09bddbdac2f2c55031d92b3c7c6346b6f563904525020c0e4f666b5e2effdd761c81412df21ec60eb SHA512 ce31cb7e9e2226cb6d59d446f90c1df94f0f84077d298f7ba862f5c75995afa20fa077b1ee1ab9a145c9276cee0d75fe61237e001ad0e5b96dfb0027adff3db7
diff --git a/dev-python/reportlab/files/reportlab-3.5.48-usr-lib-LLD.patch b/dev-python/reportlab/files/reportlab-3.5.48-usr-lib-LLD.patch
new file mode 100644
index 00000000000..09ae9675eb5
--- /dev/null
+++ b/dev-python/reportlab/files/reportlab-3.5.48-usr-lib-LLD.patch
@@ -0,0 +1,34 @@
+--- a/setup.py
++++ b/setup.py
+@@ -163,22 +163,6 @@
+ if self.L is None:
+ L = []
+ I = []
+- if platform == "cygwin":
+- aDir(L, os.path.join("/usr/lib", "python%s" % sys.version[:3], "config"))
+- elif platform == "darwin":
+- # attempt to make sure we pick freetype2 over other versions
+- aDir(I, "/sw/include/freetype2")
+- aDir(I, "/sw/lib/freetype2/include")
+- # fink installation directories
+- aDir(L, "/sw/lib")
+- aDir(I, "/sw/include")
+- # darwin ports installation directories
+- aDir(L, "/opt/local/lib")
+- aDir(I, "/opt/local/include")
+- aDir(I, "/usr/local/include")
+- aDir(L, "/usr/local/lib")
+- aDir(I, "/usr/include")
+- aDir(L, "/usr/lib")
+ aDir(I, "/usr/include/freetype2")
+ prefix = sysconfig.get_config_var("prefix")
+ if prefix:
+@@ -574,7 +558,7 @@
+ SOURCES,
+ include_dirs=[RENDERPM,LIBART_INC,GT1_DIR]+FT_INC_DIR,
+ define_macros=FT_MACROS+[('LIBART_COMPILATION',None)]+debug_macros+[('LIBART_VERSION',LIBART_VERSION)],
+- library_dirs=[]+FT_LIB_DIR,
++ library_dirs=[],
+
+ # libraries to link against
+ libraries=FT_LIB+LIBART_LIB,
diff --git a/dev-python/reportlab/reportlab-3.5.48.ebuild b/dev-python/reportlab/reportlab-3.5.48.ebuild
new file mode 100644
index 00000000000..b32a1a8b141
--- /dev/null
+++ b/dev-python/reportlab/reportlab-3.5.48.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Tools for generating printable PDF documents from any data source"
+HOMEPAGE="
+ https://www.reportlab.com/
+ https://pypi.org/project/reportlab/
+ https://bitbucket.org/rptlab/reportlab/"
+SRC_URI="
+ mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz
+ https://www.reportlab.com/ftp/fonts/pfbfer-20070710.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+ media-libs/freetype
+ media-libs/libart_lgpl:=
+ sys-libs/zlib:="
+RDEPEND="
+ ${DEPEND}
+ dev-python/pillow[tiff,truetype,jpeg(+),${PYTHON_USEDEP}]"
+BDEPEND="
+ test? ( ${RDEPEND} )
+ app-arch/unzip"
+
+distutils_enable_sphinx docs/source
+
+PATCHES=(
+ # bug 738312, remove -L/usr/lib from link line
+ "${FILESDIR}"/${PN}-3.5.48-usr-lib-LLD.patch
+)
+
+src_unpack() {
+ unpack ${P}.tar.gz
+ cd ${P}/src/reportlab/fonts || die
+ unpack pfbfer-20070710.zip
+}
+
+python_prepare_all() {
+ # tests requiring Internet access
+ sed -i -e 's:test0:_&:' \
+ tests/test_platypus_general.py \
+ tests/test_platypus_images.py || die
+ sed -i -e 's:test9:_&:' tests/test_lib_utils.py || die
+
+ distutils-r1_python_prepare_all
+}
+
+python_test() {
+ pushd tests >/dev/null || die
+ "${EPYTHON}" runAll.py || die "Testing failed with ${EPYTHON}"
+ popd >/dev/null || die
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/reportlab/, dev-python/reportlab/files/
@ 2022-08-23 5:24 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2022-08-23 5:24 UTC (permalink / raw
To: gentoo-commits
commit: 18380f0fba6b34509d936e3f153e775ba8893818
Author: matoro <matoro <AT> users <DOT> noreply <DOT> github <DOT> com>
AuthorDate: Tue Aug 23 03:55:18 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Aug 23 05:23:54 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18380f0f
dev-python/reportlab: revbump 3.6.11-r1, add sparc SIGBUS patch
This actually fixes a real bug that normally only would have manifested
under specific conditions (possibly crafted input file) but was revealed
due to sparc's alignment requirements. Initially misidentified as a
cpython bug [1] but the cpython devs helpfully clarified and pointed in
the right direction [2].
[1] https://github.com/python/cpython/pull/94141
[2] https://github.com/python/cpython/issues/94149
Bug: https://bugs.gentoo.org/857408
Bug: https://bugs.gentoo.org/865051
Closes: https://github.com/gentoo/gentoo/pull/26970
Signed-off-by: Sam James <sam <AT> gentoo.org>
...1-correct-srclen-type-in-gstate__aapixbuf.patch | 37 +++++++++++++
dev-python/reportlab/reportlab-3.6.11-r1.ebuild | 63 ++++++++++++++++++++++
2 files changed, 100 insertions(+)
diff --git a/dev-python/reportlab/files/reportlab-3.6.11-correct-srclen-type-in-gstate__aapixbuf.patch b/dev-python/reportlab/files/reportlab-3.6.11-correct-srclen-type-in-gstate__aapixbuf.patch
new file mode 100644
index 000000000000..20a57efcac66
--- /dev/null
+++ b/dev-python/reportlab/files/reportlab-3.6.11-correct-srclen-type-in-gstate__aapixbuf.patch
@@ -0,0 +1,37 @@
+Note: Upstream development is done in HG, not git; this patch was
+generated using the git mirror at
+https://github.com/MrBitBucket/reportlab-mirror. Attempted to submit to
+reportlab-users mailing list but it rejected my mail server.
+
+From 9ba2380a68e891667a2659e16d0f04ebe0ecfd19 Mon Sep 17 00:00:00 2001
+From: matoro <matoro@users.noreply.github.com>
+Date: Mon, 4 Jul 2022 18:42:18 -0400
+Subject: [PATCH] correct srclen type in gstate__aapixbuf
+
+gstate__aapixbuf calls PyArg_ParseTuple with the format string
+"ddddy#ii|i". Specifically the key "y#" will try to read a bytes-like
+object and its size into two Python variables. The latter of these
+should be of type Py_ssize_t as specified by the C API, but here it is
+incorrectly declared as an int. This was pointed out to me by the
+cpython developers when I mistakenly identified it as a cpython bug and
+submitted a PR there: https://github.com/python/cpython/issues/94149
+---
+ src/rl_addons/renderPM/_renderPM.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/rl_addons/renderPM/_renderPM.c b/src/rl_addons/renderPM/_renderPM.c
+index c8415595..bc77d766 100644
+--- a/src/rl_addons/renderPM/_renderPM.c
++++ b/src/rl_addons/renderPM/_renderPM.c
+@@ -1319,7 +1319,7 @@ static void _reverse_rows_inplace( char *buf, int nrows, int stride)
+
+ static PyObject* gstate__aapixbuf(gstateObject* self, PyObject* args)
+ {
+- int srclen;
++ Py_ssize_t srclen;
+ double ctm[6], dstX, dstY, dstW, dstH;
+ ArtPixBuf src;
+
+--
+2.37.2
+
diff --git a/dev-python/reportlab/reportlab-3.6.11-r1.ebuild b/dev-python/reportlab/reportlab-3.6.11-r1.ebuild
new file mode 100644
index 000000000000..990ad409b8ab
--- /dev/null
+++ b/dev-python/reportlab/reportlab-3.6.11-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Tools for generating printable PDF documents from any data source"
+HOMEPAGE="
+ https://www.reportlab.com/
+ https://pypi.org/project/reportlab/
+"
+SRC_URI="
+ mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz
+ https://www.reportlab.com/ftp/fonts/pfbfer-20070710.zip
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND="
+ media-libs/freetype
+ media-libs/libart_lgpl
+ sys-libs/zlib:=
+"
+RDEPEND="
+ ${DEPEND}
+ dev-python/pillow[tiff,truetype,jpeg(+),${PYTHON_USEDEP}]
+"
+BDEPEND="
+ app-arch/unzip
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.6.9-paths.patch
+ "${FILESDIR}"/${PN}-3.6.11-correct-srclen-type-in-gstate__aapixbuf.patch
+)
+
+distutils_enable_sphinx docs/source
+
+src_unpack() {
+ unpack ${P}.tar.gz
+ cd ${P}/src/reportlab/fonts || die
+ unpack pfbfer-20070710.zip
+}
+
+src_configure() {
+ cat > local-setup.cfg <<-EOF || die
+ [OPTIONS]
+ no-download-t1-files = 1
+ use-system-libart = 1
+ EOF
+}
+
+python_test() {
+ pushd tests >/dev/null || die
+ "${EPYTHON}" runAll.py -v || die "Testing failed with ${EPYTHON}"
+ popd >/dev/null || die
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-08-23 5:24 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-01-26 13:33 [gentoo-commits] repo/gentoo:master commit in: dev-python/reportlab/, dev-python/reportlab/files/ David Seifert
-- strict thread matches above, loose matches on Subject: below --
2020-08-21 23:21 David Seifert
2022-08-23 5:24 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox