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 +
