commit: 7ea6ed882e442b212b20b0ae62c73935dd719682 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Wed Nov 29 08:44:49 2023 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Wed Nov 29 08:44:49 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ea6ed88
dev-python/pycairo: Remove old Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> dev-python/pycairo/Manifest | 2 - dev-python/pycairo/files/pycairo-1.25.0-init.patch | 43 ------------ dev-python/pycairo/pycairo-1.24.0.ebuild | 61 ----------------- dev-python/pycairo/pycairo-1.25.0.ebuild | 77 ---------------------- 4 files changed, 183 deletions(-) diff --git a/dev-python/pycairo/Manifest b/dev-python/pycairo/Manifest index 0ad1ac076892..7ef49d2916a7 100644 --- a/dev-python/pycairo/Manifest +++ b/dev-python/pycairo/Manifest @@ -1,3 +1 @@ -DIST pycairo-1.24.0.tar.gz 344850 BLAKE2B f1469254ccfcb96ee5e39af49fcae575717e2f0e9a3dc74a13408306b5c94f4557a9c6d6a448541cb1f6dd27781e484b37d5ea9f230dc87f9d3370fac31dfdba SHA512 bbc160bc9c3c9365018c680f6a69347bc222cdaec10ea48d18aedd0341048df74973d3299d783662adf02b414874824660da10943d88f64c30451d3fdccc63fb -DIST pycairo-1.25.0.tar.gz 347794 BLAKE2B d05c1f505059c181d176b533ff4753e90888189160b1904531da4d9e9b784976442acb8c848be48d23e04f1fd07fef88a05b374c833ecee1c0b0e2881dadd4d0 SHA512 f34df509d36fbc739e8ddb40e2ead473db6970eacb7a2b0ccad8b82fd41a5daa25c89a5d34e7f2b2b70c4bf74e4e9d87465414aa414280e0aa7a4787b05712da DIST pycairo-1.25.1.tar.gz 347088 BLAKE2B ba4eedaf47e514bd7c3ad5ea738d099428958988a708255f59df48372d112d0195fe746be03de56aa25ccce9c2366b8898fcdd568b427372d0340c5edd550a5c SHA512 f2b93a09cbe9cd7c2885794ff58a48df6cf59fbe2dbeabf7c6e9d99e68c71ac220abc866ac0d756c7ffb3f821ef63b65dbb8963f0bf7d5bd21ee0efb800e7b23 diff --git a/dev-python/pycairo/files/pycairo-1.25.0-init.patch b/dev-python/pycairo/files/pycairo-1.25.0-init.patch deleted file mode 100644 index cc670618a261..000000000000 --- a/dev-python/pycairo/files/pycairo-1.25.0-init.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 1ef1ea2f0ba3854309114a2395734c34a1e158d8 Mon Sep 17 00:00:00 2001 -From: Tycho Andersen <[email protected]> -Date: Mon, 16 Oct 2023 20:01:52 -0600 -Subject: [PATCH] module: reorder cairo script surface initialization - -PyType_Ready() expects subclasses to be initialized after base classes. -Since ScriptSurface inherits from Surface, Surface must be initialized -first. - -This causes a segfault in pypy3.10, and the fix was suggested here: - -https://foss.heptapod.net/pypy/pypy/-/issues/4017#note_332375 - -This fixes the seg fault for me. - -Signed-off-by: Tycho Andersen <[email protected]> ---- - cairo/cairomodule.c | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/cairo/cairomodule.c b/cairo/cairomodule.c -index 0026a0e..f27330f 100644 ---- a/cairo/cairomodule.c -+++ b/cairo/cairomodule.c -@@ -210,6 +210,9 @@ PYCAIRO_MODINIT_FUNC PyInit__cairo(void) - if (PyType_Ready(&PycairoTextExtents_Type) < 0) - return NULL; - -+ if (PyType_Ready(&PycairoSurface_Type) < 0) -+ return NULL; -+ - #ifdef CAIRO_HAS_SCRIPT_SURFACE - if (PyType_Ready(&PycairoScriptDevice_Type) < 0) - return NULL; -@@ -223,8 +226,6 @@ PYCAIRO_MODINIT_FUNC PyInit__cairo(void) - if (PyType_Ready(&PycairoScaledFont_Type) < 0) - return NULL; - -- if (PyType_Ready(&PycairoSurface_Type) < 0) -- return NULL; - #ifdef CAIRO_HAS_IMAGE_SURFACE - if (PyType_Ready(&PycairoImageSurface_Type) < 0) - return NULL; diff --git a/dev-python/pycairo/pycairo-1.24.0.ebuild b/dev-python/pycairo/pycairo-1.24.0.ebuild deleted file mode 100644 index e700120bce9f..000000000000 --- a/dev-python/pycairo/pycairo-1.24.0.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_EXT=1 -PYTHON_COMPAT=( python3_{10..12} pypy3 ) -PYTHON_REQ_USE="threads(+)" - -inherit distutils-r1 - -DESCRIPTION="Python bindings for the cairo library" -HOMEPAGE=" - https://www.cairographics.org/pycairo/ - https://github.com/pygobject/pycairo/ - https://pypi.org/project/pycairo/ -" -SRC_URI=" - https://github.com/pygobject/${PN}/releases/download/v${PV}/${P}.tar.gz -" - -LICENSE="|| ( LGPL-2.1 MPL-1.1 )" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" -IUSE="examples" - -BDEPEND=" - virtual/pkgconfig - test? ( - dev-python/hypothesis[${PYTHON_USEDEP}] - ) -" -RDEPEND=" - >=x11-libs/cairo-1.15.10[svg(+)] -" -DEPEND=" - ${RDEPEND} - x11-base/xorg-proto -" - -distutils_enable_sphinx docs \ - dev-python/sphinx-rtd-theme -distutils_enable_tests pytest - -python_test() { - esetup.py build_tests - epytest -} - -python_install() { - distutils-r1_python_install \ - install_pkgconfig --pkgconfigdir="${EPREFIX}/usr/$(get_libdir)/pkgconfig" -} - -python_install_all() { - if use examples; then - dodoc -r examples - fi - - distutils-r1_python_install_all -} diff --git a/dev-python/pycairo/pycairo-1.25.0.ebuild b/dev-python/pycairo/pycairo-1.25.0.ebuild deleted file mode 100644 index 566314d24f35..000000000000 --- a/dev-python/pycairo/pycairo-1.25.0.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_EXT=1 -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..12} pypy3 ) -PYTHON_REQ_USE="threads(+)" - -inherit distutils-r1 - -DESCRIPTION="Python bindings for the cairo library" -HOMEPAGE=" - https://www.cairographics.org/pycairo/ - https://github.com/pygobject/pycairo/ - https://pypi.org/project/pycairo/ -" -SRC_URI=" - https://github.com/pygobject/${PN}/releases/download/v${PV}/${P}.tar.gz -" - -LICENSE="|| ( LGPL-2.1 MPL-1.1 )" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" -IUSE="examples" - -BDEPEND=" - virtual/pkgconfig - test? ( - dev-python/hypothesis[${PYTHON_USEDEP}] - ) -" -RDEPEND=" - >=x11-libs/cairo-1.15.10[svg(+)] -" -DEPEND=" - ${RDEPEND} - x11-base/xorg-proto -" - -distutils_enable_sphinx docs \ - dev-python/sphinx-rtd-theme -distutils_enable_tests pytest - -PATCHES=( - "${FILESDIR}/${P}-init.patch" -) - -python_test() { - esetup.py build_tests - epytest -} - -python_install() { - distutils-r1_python_install - - # we need to pass --root via install command, sigh - cat > "${T}/distutils-extra.cfg" <<-EOF || die - [install] - root = ${D} - EOF - local -x DIST_EXTRA_CONFIG=${T}/distutils-extra.cfg - esetup.py \ - install_pkgconfig --pkgconfigdir="${EPREFIX}/usr/$(get_libdir)/pkgconfig" -} - -python_install_all() { - if use examples; then - dodoc -r examples - fi - - distutils-r1_python_install_all - - insinto /usr/include/pycairo - newins cairo/pycairo.h py3cairo.h -}
