From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 17986158089 for ; Tue, 3 Oct 2023 00:13:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5774B2BC01E; Tue, 3 Oct 2023 00:13:45 +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 pigeon.gentoo.org (Postfix) with ESMTPS id 37B4E2BC01E for ; Tue, 3 Oct 2023 00:13:45 +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 0D544335C67 for ; Tue, 3 Oct 2023 00:13:44 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 795CD930 for ; Tue, 3 Oct 2023 00:13:42 +0000 (UTC) From: "Conrad Kostecki" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Conrad Kostecki" Message-ID: <1696292014.bba1c8a8c402298a48bf67e9eb76ba61c951915f.conikost@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-fps/eduke32/files/, games-fps/eduke32/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-fps/eduke32/eduke32-20230926.10459.ebuild games-fps/eduke32/files/eduke32-20190820.8043-search-duke3d-path.patch games-fps/eduke32/files/eduke32-20230926.10459-search-duke3d-path.patch X-VCS-Directories: games-fps/eduke32/ games-fps/eduke32/files/ X-VCS-Committer: conikost X-VCS-Committer-Name: Conrad Kostecki X-VCS-Revision: bba1c8a8c402298a48bf67e9eb76ba61c951915f X-VCS-Branch: master Date: Tue, 3 Oct 2023 00:13:42 +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: bd30002b-a5ea-4e00-b491-e721f92e2cdb X-Archives-Hash: 7446ae1decb0749dc4f3109ee12a97f7 commit: bba1c8a8c402298a48bf67e9eb76ba61c951915f Author: Conrad Kostecki gentoo org> AuthorDate: Tue Oct 3 00:12:55 2023 +0000 Commit: Conrad Kostecki gentoo org> CommitDate: Tue Oct 3 00:13:34 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bba1c8a8 games-fps/eduke32: fix patch Bug: https://bugs.gentoo.org/913354 Signed-off-by: Conrad Kostecki gentoo.org> games-fps/eduke32/eduke32-20230926.10459.ebuild | 2 +- .../files/eduke32-20190820.8043-search-duke3d-path.patch | 11 ----------- .../files/eduke32-20230926.10459-search-duke3d-path.patch | 11 +++++++++++ 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/games-fps/eduke32/eduke32-20230926.10459.ebuild b/games-fps/eduke32/eduke32-20230926.10459.ebuild index 388719401c0c..4f27ffafa2d1 100644 --- a/games-fps/eduke32/eduke32-20230926.10459.ebuild +++ b/games-fps/eduke32/eduke32-20230926.10459.ebuild @@ -77,9 +77,9 @@ BDEPEND=" PDEPEND="duke3d? ( games-fps/duke3d-data )" PATCHES=( - "${FILESDIR}/${PN}-20190820.8043-search-duke3d-path.patch" "${FILESDIR}/${PN}-20200505.8904-gcc10.patch" "${FILESDIR}/${PN}-20220204.9957-log-to-tmpdir.patch" + "${FILESDIR}/${PN}-20230926.10459-search-duke3d-path.patch" ) src_unpack() { diff --git a/games-fps/eduke32/files/eduke32-20190820.8043-search-duke3d-path.patch b/games-fps/eduke32/files/eduke32-20190820.8043-search-duke3d-path.patch deleted file mode 100644 index c35af40c749e..000000000000 --- a/games-fps/eduke32/files/eduke32-20190820.8043-search-duke3d-path.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/source/duke3d/src/common.cpp 2018-04-12 23:03:47.000000000 +0200 -+++ b/source/duke3d/src/common.cpp 2018-05-11 00:04:36.590712915 +0200 -@@ -794,6 +794,8 @@ - - addsearchpath("/usr/share/games/jfduke3d"); - addsearchpath("/usr/local/share/games/jfduke3d"); -+ addsearchpath("/usr/share/games/duke3d"); -+ addsearchpath("/usr/share/duke3d"); - addsearchpath("/usr/share/games/eduke32"); - addsearchpath("/usr/local/share/games/eduke32"); - #elif defined EDUKE32_OSX diff --git a/games-fps/eduke32/files/eduke32-20230926.10459-search-duke3d-path.patch b/games-fps/eduke32/files/eduke32-20230926.10459-search-duke3d-path.patch new file mode 100644 index 000000000000..0bb66794b401 --- /dev/null +++ b/games-fps/eduke32/files/eduke32-20230926.10459-search-duke3d-path.patch @@ -0,0 +1,11 @@ +--- a/source/duke3d/src/common.cpp ++++ b/source/duke3d/src/common.cpp +@@ -642,6 +642,8 @@ + + addsearchpath("/usr/share/games/jfduke3d"); + addsearchpath("/usr/local/share/games/jfduke3d"); ++ addsearchpath("/usr/share/games/duke3d"); ++ addsearchpath("/usr/share/duke3d"); + addsearchpath("/usr/share/games/" APPBASENAME); + addsearchpath("/usr/local/share/games/" APPBASENAME); + addsearchpath("/app/extensions/extra");