commit: efba46500654a6498b16e88fbbcf2fd35bb111e8 Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> AuthorDate: Sun Dec 21 11:45:30 2025 +0000 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> CommitDate: Sun Dec 21 11:45:30 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=efba4650
games-engines/zoom: Find libXft with pkg-config rather than xft-config Closes: https://bugs.gentoo.org/967824 Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org> games-engines/zoom/files/zoom-1.1.5-xft-config.patch | 15 +++++++++++++++ games-engines/zoom/zoom-1.1.5-r2.ebuild | 17 +++++++++++++++-- 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/games-engines/zoom/files/zoom-1.1.5-xft-config.patch b/games-engines/zoom/files/zoom-1.1.5-xft-config.patch new file mode 100644 index 000000000000..892bd43f9c6d --- /dev/null +++ b/games-engines/zoom/files/zoom-1.1.5-xft-config.patch @@ -0,0 +1,15 @@ +--- a/configure.in ++++ b/configure.in +@@ -356,10 +356,10 @@ + + # If Xft is installed, then there will be a xft-config file on the current path + AC_MSG_CHECKING([for xft-config]) +- XFTCONFIG=`which xft-config` ++ XFTCONFIG="${PKG_CONFIG:-pkg-config} xft" + XFT_CFLAGS="" + XFT_LIBS="" +- if test -x ${XFTCONFIG}; then ++ if ${XFTCONFIG} --exists; then + AC_MSG_RESULT([$XFTCONFIG]) + XFT_CFLAGS=`${XFTCONFIG} --cflags` + XFT_LIBS=`${XFTCONFIG} --libs` diff --git a/games-engines/zoom/zoom-1.1.5-r2.ebuild b/games-engines/zoom/zoom-1.1.5-r2.ebuild index c9571f5e7179..5ec55ab944ab 100644 --- a/games-engines/zoom/zoom-1.1.5-r2.ebuild +++ b/games-engines/zoom/zoom-1.1.5-r2.ebuild @@ -1,8 +1,10 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 +inherit autotools + DESCRIPTION="Fast, clean, modern Z-code interpreter for X" HOMEPAGE="https://www.logicalshift.co.uk/unix/zoom/"; SRC_URI="https://www.logicalshift.co.uk/unix/zoom/${P}.tar.gz"; @@ -20,8 +22,19 @@ RDEPEND="!net-im/zoom[zoom-symlink(+)] DEPEND="${RDEPEND} dev-lang/perl x11-base/xorg-proto" +BDEPEND=" + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}"/${P}-gcc7.patch + "${FILESDIR}"/${P}-xft-config.patch +) -PATCHES=( "${FILESDIR}"/${P}-gcc7.patch ) +src_prepare() { + default + AT_M4DIR="m4" eautoreconf +} src_install() { default
