From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9D97E1581EE for ; Thu, 27 Mar 2025 23:05:01 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 859EC3431C0 for ; Thu, 27 Mar 2025 23:05:01 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 8E0151104AE; Thu, 27 Mar 2025 23:04:57 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 7F7381104AD for ; Thu, 27 Mar 2025 23:04:57 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 294B13431AA for ; Thu, 27 Mar 2025 23:04:57 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 83DB6271C for ; Thu, 27 Mar 2025 23:04:55 +0000 (UTC) From: "James Le Cuirot" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "James Le Cuirot" Message-ID: <1743116671.f8a64c4ed3cf2530a1934a10a19d9d848d20feae.chewi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-fps/freedoom-data/files/, games-fps/freedoom-data/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-fps/freedoom-data/Manifest games-fps/freedoom-data/files/freedoom-data-0.12.1-Python-PIL-10.0.0-support.patch games-fps/freedoom-data/freedoom-data-0.12.1-r1.ebuild X-VCS-Directories: games-fps/freedoom-data/files/ games-fps/freedoom-data/ X-VCS-Committer: chewi X-VCS-Committer-Name: James Le Cuirot X-VCS-Revision: f8a64c4ed3cf2530a1934a10a19d9d848d20feae X-VCS-Branch: master Date: Thu, 27 Mar 2025 23:04:55 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 057a477b-217f-4280-ac09-6043294cfcc9 X-Archives-Hash: 80c317c77aba37f8ffdaaee728ffe1e1 commit: f8a64c4ed3cf2530a1934a10a19d9d848d20feae Author: James Le Cuirot gentoo org> AuthorDate: Thu Mar 27 22:51:45 2025 +0000 Commit: James Le Cuirot gentoo org> CommitDate: Thu Mar 27 23:04:31 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8a64c4e games-fps/freedoom-data: Drop old 0.12.1-r1 Signed-off-by: James Le Cuirot gentoo.org> games-fps/freedoom-data/Manifest | 1 - ...oom-data-0.12.1-Python-PIL-10.0.0-support.patch | 43 ---------------- .../freedoom-data/freedoom-data-0.12.1-r1.ebuild | 60 ---------------------- 3 files changed, 104 deletions(-) diff --git a/games-fps/freedoom-data/Manifest b/games-fps/freedoom-data/Manifest index c48c7388d3a2..2c62ed6ab9ad 100644 --- a/games-fps/freedoom-data/Manifest +++ b/games-fps/freedoom-data/Manifest @@ -1,2 +1 @@ -DIST freedoom-0.12.1.tar.gz 18405081 BLAKE2B a508d9ce924ff10640d6017302864869efff474c89fe20a866082b565a1ce65182483a5a692c9ce3329b81472ae9e4fee4ac2511670ecb5dd06ccf81930ac70d SHA512 7db65b039ce98593a86a19b46efe629b85a339c4c020750c3abb95d226fca484c63686ab8c88ecc1e16e86a6aca3b8c7952d85103e0f3db07cc7204fa528daf2 DIST freedoom-0.13.0.tar.gz 18520091 BLAKE2B c3ad97bab73b3275ae604f4fef7459b5688f1c5fc63336475c34b6c22a56118c3558ad9859ac80d7abc97426a48e5f2b92ac9e02def11f9f0f7f1a2ef76629a5 SHA512 70dd124eee028bbf9aad29b17603c2c4c23e5280219d84a9ffa95417b601cfda33ddf44b6aa991e60194120cfd37110c1c888a5f80d4028e9625377c21f8d7a4 diff --git a/games-fps/freedoom-data/files/freedoom-data-0.12.1-Python-PIL-10.0.0-support.patch b/games-fps/freedoom-data/files/freedoom-data-0.12.1-Python-PIL-10.0.0-support.patch deleted file mode 100644 index 333bff6d2598..000000000000 --- a/games-fps/freedoom-data/files/freedoom-data-0.12.1-Python-PIL-10.0.0-support.patch +++ /dev/null @@ -1,43 +0,0 @@ -https://bugs.gentoo.org/909548 -https://github.com/freedoom/freedoom/issues/1015 -https://github.com/freedoom/freedoom/pull/1027 - -From d64ddc6ea90406e21b4b93f5a1e7f99abfaac0d9 Mon Sep 17 00:00:00 2001 -From: Steven Elliott -Date: Sun, 16 Jul 2023 14:52:04 -0400 -Subject: [PATCH] create_caption: Python PIL 10.0.0 support (#1027) - -To support Python PIL 10.0.0 this change uses newer API textbbox() when -available, and older API textsize() when not. ---- - graphics/text/create_caption | 17 +++++++++++++++-- - 1 file changed, 15 insertions(+), 2 deletions(-) - -diff --git a/graphics/text/create_caption b/graphics/text/create_caption -index 7ddbd8d66..22bc0507d 100755 ---- a/graphics/text/create_caption -+++ b/graphics/text/create_caption -@@ -18,8 +18,21 @@ background_image.load() - background_image = background_image.convert("RGBA") - image = Image.new("RGBA", background_image.size, (0, 0, 0, 0)) - draw = ImageDraw.Draw(image) --txt1_size = draw.textsize(txt1, font=font) --txt2_size = draw.textsize(txt2, font=font) -+ -+# Getting the text size is tricky since for newer PIL, such as 10.0.0, only -+# textbbox() is supported, but for older PIL, such 7.2.0, only textsize() -+# is supported. The solution is to default to the newer API, but fallback to -+# the older one when it is not available. -+try: -+ # This newer API returns a four item tuple. The "xy" kwarg is returned in -+ # the first two items, and last two items is the size needed, but with "xy" -+ # added, so passing "(0, 0)" returns the size needed. -+ txt1_size = draw.textbbox(xy=(0, 0), text=txt1, font=font)[2:] -+ txt2_size = draw.textbbox(xy=(0, 0), text=txt2, font=font)[2:] -+except: -+ # This older API simply returns the size needed. -+ txt1_size = draw.textsize(txt1, font=font) -+ txt2_size = draw.textsize(txt2, font=font) - - draw.text( - (5, int(image.height - txt1_size[1] - 5)), diff --git a/games-fps/freedoom-data/freedoom-data-0.12.1-r1.ebuild b/games-fps/freedoom-data/freedoom-data-0.12.1-r1.ebuild deleted file mode 100644 index 14d73d3f3fd6..000000000000 --- a/games-fps/freedoom-data/freedoom-data-0.12.1-r1.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{10..12} ) - -inherit prefix python-any-r1 xdg - -DESCRIPTION="Game resources for Freedoom: Phase 1+2" -HOMEPAGE="https://freedoom.github.io" -SRC_URI="https://github.com/freedoom/freedoom/archive/v${PV}.tar.gz -> freedoom-${PV}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" - -BDEPEND=" - $(python_gen_any_dep 'dev-python/pillow[${PYTHON_USEDEP},zlib]') - app-text/asciidoc - games-util/deutex[png]" - -PATCHES=( - "${FILESDIR}"/${PN}-0.12.1-Python-PIL-10.0.0-support.patch -) - -S="${WORKDIR}/freedoom-${PV}" - -DOOMWADPATH=share/doom - -python_check_deps() { - has_version -b "dev-python/pillow[${PYTHON_USEDEP},zlib]" -} - -src_prepare() { - xdg_src_prepare - - hprefixify dist/freedoom -} - -src_compile() { - emake wads/freedoom{1,2}.wad \ - freedoom{1,2}.6 \ - {NEWS,README}.html -} - -src_install() { - emake install-freedoom \ - prefix="${ED}/usr/" \ - bindir="bin/" \ - docdir="share/doc/${PF}" \ - mandir="share/man/" \ - waddir="${DOOMWADPATH}/" -} - -pkg_postinst() { - xdg_pkg_postinst - - elog "Freedoom WAD files installed into ${EPREFIX}/usr/${DOOMWADPATH} directory." -}