From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1579022-garchives=archives.gentoo.org@lists.gentoo.org>
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 CD069158015
for <garchives@archives.gentoo.org>; Tue, 12 Dec 2023 14:08:02 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id F0B302BC017;
Tue, 12 Dec 2023 14:08:01 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(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 pigeon.gentoo.org (Postfix) with ESMTPS id DB51E2BC017
for <gentoo-commits@lists.gentoo.org>; Tue, 12 Dec 2023 14:08:01 +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))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 1E39C33BE18
for <gentoo-commits@lists.gentoo.org>; Tue, 12 Dec 2023 14:08:01 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 9B7DE119
for <gentoo-commits@lists.gentoo.org>; Tue, 12 Dec 2023 14:07:59 +0000 (UTC)
From: "Petr Vaněk" <arkamar@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Petr Vaněk" <arkamar@gentoo.org>
Message-ID: <1702390047.0c523bee351da584ede413328675090afbb7a337.arkamar@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: games-arcade/abe/, games-arcade/abe/files/
X-VCS-Repository: repo/gentoo
X-VCS-Files: games-arcade/abe/abe-1.1-r1.ebuild games-arcade/abe/abe-1.1-r2.ebuild games-arcade/abe/files/abe-1.1-no-x-check.patch
X-VCS-Directories: games-arcade/abe/ games-arcade/abe/files/
X-VCS-Committer: arkamar
X-VCS-Committer-Name: Petr Vaněk
X-VCS-Revision: 0c523bee351da584ede413328675090afbb7a337
X-VCS-Branch: master
Date: Tue, 12 Dec 2023 14:07:59 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 40b3efad-e6e1-43b8-b341-ce9e7863372a
X-Archives-Hash: 8801f557b7eb2c6792a3221594be4504
commit: 0c523bee351da584ede413328675090afbb7a337
Author: Petr Vaněk <arkamar <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 10 07:50:29 2023 +0000
Commit: Petr Vaněk <arkamar <AT> gentoo <DOT> org>
CommitDate: Tue Dec 12 14:07:27 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c523bee
games-arcade/abe: update configuration phase
Original configure script contains problematic detections which fail
with modern compilers. Moreover, the X detection is removed because the
game uses only libsdl and there is no need to link with any X library.
Closes: https://bugs.gentoo.org/883287
Closes: https://bugs.gentoo.org/898794
Signed-off-by: Petr Vaněk <arkamar <AT> gentoo.org>
.../abe/{abe-1.1-r1.ebuild => abe-1.1-r2.ebuild} | 11 +++++---
games-arcade/abe/files/abe-1.1-no-x-check.patch | 29 ++++++++++++++++++++++
2 files changed, 37 insertions(+), 3 deletions(-)
diff --git a/games-arcade/abe/abe-1.1-r1.ebuild b/games-arcade/abe/abe-1.1-r2.ebuild
similarity index 78%
rename from games-arcade/abe/abe-1.1-r1.ebuild
rename to games-arcade/abe/abe-1.1-r2.ebuild
index 4dbe4a24dfaa..20d29934e37b 100644
--- a/games-arcade/abe/abe-1.1-r1.ebuild
+++ b/games-arcade/abe/abe-1.1-r2.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-inherit desktop toolchain-funcs
+inherit autotools desktop toolchain-funcs
DESCRIPTION="Scrolling, platform-jumping, key-collecting, ancient pyramid exploring game"
HOMEPAGE="https://abe.sourceforge.net/"
@@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~x86"
RDEPEND="
media-libs/libsdl[sound,video]
media-libs/sdl-mixer[vorbis]
- x11-libs/libXi"
+"
DEPEND="${RDEPEND}"
PATCHES=(
@@ -26,12 +26,17 @@ PATCHES=(
"${FILESDIR}"/${P}-doublefree.patch
"${FILESDIR}"/${P}-format.patch
"${FILESDIR}"/${P}-format-security.patch
+ "${FILESDIR}"/${P}-no-x-check.patch
)
src_prepare() {
default
- sed -i '/^TR_CFLAGS/d;/^TR_CXXFLAGS/d' configure || die
+ sed -i '/^TR_CFLAGS/d;/^TR_CXXFLAGS/d' configure.in || die
+
+ # original configure contains problematic detections with modern compilers
+ # see #883287, #898794
+ eautoreconf
}
src_configure() {
diff --git a/games-arcade/abe/files/abe-1.1-no-x-check.patch b/games-arcade/abe/files/abe-1.1-no-x-check.patch
new file mode 100644
index 000000000000..a02eaa4b898c
--- /dev/null
+++ b/games-arcade/abe/files/abe-1.1-no-x-check.patch
@@ -0,0 +1,29 @@
+Remove check for X.
+
+The game uses only SDL library. There is no need to check for X.
+
+diff --git a/configure.in b/configure.in
+index 2270cb4..f0a93c6 100644
+--- a/configure.in
++++ b/configure.in
+@@ -98,17 +98,6 @@ if test "x$is_win32" = "xyes" ; then
+ TR_LIBS="$TR_LIBS -luser32 -lgdi32"
+ fi
+
+-dnl --------------------------------------------------------------------------
+-dnl Check for X
+-dnl Note that we only need libs (so that glut links properly on all systems).
+-dnl --------------------------------------------------------------------------
+-if test "x$is_win32" = "xno" ; then
+- AC_PATH_XTRA
+- if test "x$no_x" = "x" ; then
+- TR_LIBS="$X_PRE_LIBS $X_LIBS -lX11 -lXi -lXext -lXmu -lXt $X_EXTRA_LIBS $TR_LIBS"
+- fi
+-fi
+-
+ dnl --------------------------------------------------------------------------
+ dnl Check for some common libraries
+ dnl --------------------------------------------------------------------------
+--
+2.41.0
+