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 53A091580E0 for ; Tue, 28 Jan 2025 06:23:21 +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 3814F3434F2 for ; Tue, 28 Jan 2025 06:23:21 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 7D0C1110471; Tue, 28 Jan 2025 06:23:16 +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) server-digest SHA256) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 787D3110471 for ; Tue, 28 Jan 2025 06:23:16 +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 2C70F34324E for ; Tue, 28 Jan 2025 06:23:16 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 836F9232D for ; Tue, 28 Jan 2025 06:23:14 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1738045372.311c55ab295f4003573160d1117e7ed3c9a90d95.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-util/grfcodec/files/, games-util/grfcodec/, ... X-VCS-Repository: repo/gentoo X-VCS-Files: games-util/grfcodec/Manifest games-util/grfcodec/files/6.0.6_p20210310/0001-Remove-brittle-apWrapper-code.patch games-util/grfcodec/files/6.0.6_p20210310/0002-Fix-ODR-violations.patch games-util/grfcodec/files/grfcodec-6.0.6_p20230811-action-5.patch games-util/grfcodec/grfcodec-6.0.6_p20210310-r1.ebuild games-util/grfcodec/grfcodec-6.0.6_p20230811-r1.ebuild X-VCS-Directories: games-util/grfcodec/ games-util/grfcodec/files/6.0.6_p20210310/ games-util/grfcodec/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 311c55ab295f4003573160d1117e7ed3c9a90d95 X-VCS-Branch: master Date: Tue, 28 Jan 2025 06:23:14 +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: d7bf22d1-111e-4f63-8803-baabd62046cf X-Archives-Hash: 4b7495571296b84ea1970ad81a4a2f2f commit: 311c55ab295f4003573160d1117e7ed3c9a90d95 Author: Sam James gentoo org> AuthorDate: Tue Jan 28 06:20:12 2025 +0000 Commit: Sam James gentoo org> CommitDate: Tue Jan 28 06:22:52 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=311c55ab games-util/grfcodec: drop 6.0.6_p20210310-r1, 6.0.6_p20230811-r1 Signed-off-by: Sam James gentoo.org> games-util/grfcodec/Manifest | 2 - .../0001-Remove-brittle-apWrapper-code.patch | 144 --------------------- .../6.0.6_p20210310/0002-Fix-ODR-violations.patch | 63 --------- .../files/grfcodec-6.0.6_p20230811-action-5.patch | 30 ----- .../grfcodec/grfcodec-6.0.6_p20210310-r1.ebuild | 40 ------ .../grfcodec/grfcodec-6.0.6_p20230811-r1.ebuild | 46 ------- 6 files changed, 325 deletions(-) diff --git a/games-util/grfcodec/Manifest b/games-util/grfcodec/Manifest index ff37c9457ef7..4d4c483c3536 100644 --- a/games-util/grfcodec/Manifest +++ b/games-util/grfcodec/Manifest @@ -1,3 +1 @@ -DIST grfcodec-6.0.6_p20210310.tar.gz 205795 BLAKE2B 24d803e208b2fc465ae71611c0c0fb2737bfa8c5a28375bc08a6220581d7b07bb2f2a390e2ddb7f4beb8a80951862473919d41bce83364af70b6dc646f0f3f8e SHA512 10f4ec28c69d87e397f0fb5b497dbefce8fcd826731d3a0a864cbbd333b7df188ab0087445644ad245aeff65a8b6563dfdfa657ac1a2248e56e296c01f7d58a8 -DIST grfcodec-6.0.6_p20230811.tar.gz 205324 BLAKE2B 00d36b6785d00edec061cc0f0a695225a78c487bc66c4521f0f3da1050304bc382ed78d1df8dff8602b35b167505388ad993c46f01ac39960c131a6f5c7264eb SHA512 95a883636720ad1fdd0a2e17cba60b6cde15b5fe0337cfe2330db75d60e9a2bdb1dea3c06bb8f8acace8989b6abaf6d1845b30c5bc5f6c76f34e5aa76f36ddd4 DIST grfcodec-6.1.0-source.tar.xz 170688 BLAKE2B e9ce6ca4984e319abd5c1fd53473b1257b2b98b0948b5bef5e6275e29b50243981bf7fc837b190b37b2bb12d2ac9aecbb8595150eedb029f1d7ae64053668475 SHA512 9129e0f38b151e11c90585e0fe966e042ad08ec90f800ee80f749865aed6c72c733639b8d02ecd613409f2a0ae6d1f72fa1d3524f7c450a0f06ff42ee170f16f diff --git a/games-util/grfcodec/files/6.0.6_p20210310/0001-Remove-brittle-apWrapper-code.patch b/games-util/grfcodec/files/6.0.6_p20210310/0001-Remove-brittle-apWrapper-code.patch deleted file mode 100644 index e702f00160ce..000000000000 --- a/games-util/grfcodec/files/6.0.6_p20210310/0001-Remove-brittle-apWrapper-code.patch +++ /dev/null @@ -1,144 +0,0 @@ -From 9e928c98c8ad0767607bc421b14ac289cdc6e536 Mon Sep 17 00:00:00 2001 -From: David Seifert -Date: Sat, 8 Oct 2022 16:29:43 +0200 -Subject: [PATCH 1/2] Remove brittle `apWrapper` code - -* This causes issues on musl, and generally doesn't make the - code any simpler, while also creating lots of opportunities - for undefined behavior. - -Bug: https://bugs.gentoo.org/715910 ---- - src/messages.cpp | 14 ++++++++++---- - src/sanity.cpp | 4 +++- - src/sanity_defines.h | 23 ----------------------- - src/strings.cpp | 9 +++++---- - 4 files changed, 18 insertions(+), 32 deletions(-) - -diff --git a/src/messages.cpp b/src/messages.cpp -index 385f217..3794f66 100644 ---- a/src/messages.cpp -+++ b/src/messages.cpp -@@ -60,8 +60,11 @@ void ManualConsoleMessages(){ - } - - string mysprintf(const char*str,...){ -- WrapAp(str); -- return myvsprintf(str,ap); -+ va_list ap; -+ va_start(ap, str); -+ string result = myvsprintf(str,ap); -+ va_end(ap); -+ return result; - } - - #if defined DEBUG || defined _DEBUG -@@ -69,8 +72,11 @@ static RenumMessageId curMessage; - #endif - - string IssueMessage(int minSan,RenumMessageId id,...){ -- WrapAp(id); -- return vIssueMessage(minSan,id,ap); -+ va_list ap; -+ va_start(ap, id); -+ string result = vIssueMessage(minSan,id,ap); -+ va_end(ap); -+ return result; - } - - string vIssueMessage(int minSan,RenumMessageId id,va_list& arg_ptr){ -diff --git a/src/sanity.cpp b/src/sanity.cpp -index 844d840..0793a63 100644 ---- a/src/sanity.cpp -+++ b/src/sanity.cpp -@@ -151,13 +151,15 @@ void Before8(int action){ - } - - bool CheckLength(int alen,int elen,RenumMessageId message,...){ -- WrapAp(message); -+ va_list ap; -+ va_start(ap, message); - if(alenelen) - vIssueMessage(WARNING2,message,ap); -+ va_end(ap); - return false; - } - -diff --git a/src/sanity_defines.h b/src/sanity_defines.h -index d094f21..47f9c5f 100644 ---- a/src/sanity_defines.h -+++ b/src/sanity_defines.h -@@ -22,7 +22,6 @@ - #ifndef _RENUM_SANITY_DEFS_H_INCLUDED_ - #define _RENUM_SANITY_DEFS_H_INCLUDED_ - --#include - #include "message_mgr.h" - - bool CheckLength(int,int,RenumMessageId,...); -@@ -70,26 +69,4 @@ typedef auto_array Guintp; - type&operator[](uint x){return _p[x];}\ - type operator[](uint x)const{return _p[x];}\ - --class apWrapper{ --private: -- va_list _ap; --public: -- ~apWrapper(){va_end(_ap);} -- operator va_list&(){return _ap;} -- operator const va_list&()const{return _ap;} --#ifdef __va_copy -- va_list&operator=(va_list&ap){ -- __va_copy(_ap,ap); -- return _ap; -- } --#else -- va_list const&operator=(va_list const&ap){ -- return _ap=ap; -- } --#endif --}; --#define WrapAp(v)\ -- apWrapper ap;\ -- va_start((va_list&)ap,v); -- - #endif//_RENUM_SANITY_DEFS_H_INCLUDED_ -diff --git a/src/strings.cpp b/src/strings.cpp -index 2512734..e184825 100644 ---- a/src/strings.cpp -+++ b/src/strings.cpp -@@ -23,6 +23,7 @@ - #include - #include - #include -+#include - - using namespace std; - -@@ -396,15 +397,15 @@ static const uchar stackSize[]={0,1,2,2,4,2,8}; - - string MakeStack(int items,...){ - string ret; -- WrapAp(items); -+ va_list ap; -+ va_start(ap, items); - uint item; - for(int i=0;i -Date: Sat, 8 Oct 2022 16:29:44 +0200 -Subject: [PATCH 2/2] Fix ODR violations -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -* When compiling with `-flto`, ODR violations pop up: - - src/escapes.h:98:1: error: type ‘struct esc’ violates the C++ One Definition Rule [-Werror=odr] - 98 | START_ESCAPES() - | ^ - src/escapes.h:98:1: note: a different type is defined in another translation unit - 98 | START_ESCAPES() - | ^ - src/escapes.h:98:1: note: the first difference of corresponding definitions is field ‘additional’ - 98 | START_ESCAPES() - | ^ - src/escapes.h:98:1: note: a type with different number of fields is defined in another translation unit - 98 | START_ESCAPES() - | ^ - - by wrapping the `struct esc` definitions in unnamed namespaces, we can avoid running afoul of ODR. - -Bug: https://bugs.gentoo.org/859310 ---- - src/escapes.h | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/src/escapes.h b/src/escapes.h -index 91da82f..d3d2bea 100644 ---- a/src/escapes.h -+++ b/src/escapes.h -@@ -8,6 +8,7 @@ - #ifndef GRFCODEC - - #define START_ESCAPES()\ -+ namespace {\ - const struct esc{\ - char byte;\ - char*str;\ -@@ -30,6 +31,7 @@ - #else /* GRFCODEC */ - - #define START_ESCAPES()\ -+ namespace {\ - const struct esc{\ - char byte;\ - char*str;\ -@@ -59,7 +61,8 @@ - #endif /* GRFCODEC */ - - #define END_ESCAPES() };\ -- static const unsigned int num_esc=sizeof(escapes)/sizeof(escapes[0]); -+ static const unsigned int num_esc=sizeof(escapes)/sizeof(escapes[0]);\ -+ } - - #ifdef GRFCODEC - --- -2.38.0 - diff --git a/games-util/grfcodec/files/grfcodec-6.0.6_p20230811-action-5.patch b/games-util/grfcodec/files/grfcodec-6.0.6_p20230811-action-5.patch deleted file mode 100644 index 333c9f5ed2e9..000000000000 --- a/games-util/grfcodec/files/grfcodec-6.0.6_p20230811-action-5.patch +++ /dev/null @@ -1,30 +0,0 @@ -Bug: https://bugs.gentoo.org/912189 -Upstream: https://github.com/OpenTTD/grfcodec/pull/23 - -From de32367a6896c9f310fa48929e29643beaa08af4 Mon Sep 17 00:00:00 2001 -From: Matthew Smith -Date: Sun, 13 Aug 2023 09:30:01 +0100 -Subject: [PATCH] data: Fix Action5 table - -The alternative sprite counts were added into the action 5 table, but -the counts were not updated. This caused all of the types defined after -type 0x09 to be mis-read. - -Fixes: d5a7b850bcef30c0bfd17ceeb4a18c431770f468 ---- a/src/data.cpp -+++ b/src/data.cpp -@@ -170,9 +170,9 @@ NDF_HEADER(0x04, 17), - /*06*/ OFFSET, OPTIONS(2), 0x4A, 0x5A, - /*07*/ OPTIONS(1), 0x5D, - /*08*/ OFFSET, OPTIONS(1), 0x41, --/*09*/ OFFSET, OPTIONS(1), 0x06, 0x12, -+/*09*/ OFFSET, OPTIONS(2), 0x06, 0x12, - /*0A*/ OFFSET | RECOLOUR | WORD, OPTIONS(1), W(0x100), --/*0B*/ OFFSET, OPTIONS(1), 0x71, 0x77, -+/*0B*/ OFFSET, OPTIONS(2), 0x71, 0x77, - /*0C*/ OPTIONS(1), 0x85, - /*0D*/ OPTIONS(2), 0x10, 0x12, - /*0E*/ MIXED, OPTIONS(1), 0x00, --- -2.41.0 - diff --git a/games-util/grfcodec/grfcodec-6.0.6_p20210310-r1.ebuild b/games-util/grfcodec/grfcodec-6.0.6_p20210310-r1.ebuild deleted file mode 100644 index 90d01d7a6794..000000000000 --- a/games-util/grfcodec/grfcodec-6.0.6_p20210310-r1.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake vcs-snapshot - -COMMIT=045774dee7cab1a618a3e0d9b39bff78a12b6efa - -DESCRIPTION="A suite of programs to modify openttd/Transport Tycoon Deluxe's GRF files" -HOMEPAGE="https://github.com/OpenTTD/grfcodec" -SRC_URI="https://github.com/OpenTTD/grfcodec/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" - -RDEPEND="media-libs/libpng:=" -DEPEND="${RDEPEND} - dev-libs/boost" - -PATCHES=( "${FILESDIR}"/${PV} ) - -src_configure() { - local mycmakeargs=( - # Make sure we don't use git by accident. - # Build system does not care much if it's - # executed successfully and populates - # YEARS / VERSION with empty values. - -DGIT_EXECUTABLE=/bin/do-not-use-git-executable - ) - - cmake_src_configure -} - -src_install() { - dobin "${BUILD_DIR}"/{grfcodec,grfid,grfstrip,nforenum} - doman docs/*.1 - dodoc changelog.txt docs/*.txt -} diff --git a/games-util/grfcodec/grfcodec-6.0.6_p20230811-r1.ebuild b/games-util/grfcodec/grfcodec-6.0.6_p20230811-r1.ebuild deleted file mode 100644 index 600aa5d3e4a8..000000000000 --- a/games-util/grfcodec/grfcodec-6.0.6_p20230811-r1.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake vcs-snapshot - -COMMIT=d5a7b850bcef30c0bfd17ceeb4a18c431770f468 - -DESCRIPTION="A suite of programs to modify openttd/Transport Tycoon Deluxe's GRF files" -HOMEPAGE="https://github.com/OpenTTD/grfcodec" -SRC_URI="https://github.com/OpenTTD/grfcodec/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" - -RDEPEND="media-libs/libpng:=" -DEPEND="${RDEPEND} - dev-libs/boost" - -PATCHES=( - # Bug #894648 - "${FILESDIR}"/${P}-no-fortify-source.patch - - # Bug #912189 - "${FILESDIR}"/${P}-action-5.patch -) - -src_configure() { - local mycmakeargs=( - # Make sure we don't use git by accident. - # Build system does not care much if it's - # executed successfully and populates - # YEARS / VERSION with empty values. - -DGIT_EXECUTABLE=/bin/do-not-use-git-executable - ) - - cmake_src_configure -} - -src_install() { - dobin "${BUILD_DIR}"/{grfcodec,grfid,grfstrip,nforenum} - doman docs/*.1 - dodoc changelog.txt docs/*.txt -}