commit: 17d912ff9ad0a450e9250e8224866ca172926b60 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> AuthorDate: Tue May 4 13:25:36 2021 +0000 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> CommitDate: Tue May 4 13:35:40 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17d912ff
x11-misc/xplanet: Revbump to fix freetype detection Bumped to EAPI-7 Overhauled src_configure function Closes: https://bugs.gentoo.org/788136 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> .../files/xplanet-1.3.1-freetype_pkgconfig.patch | 40 +++++++++++++++ x11-misc/xplanet/xplanet-1.3.1-r1.ebuild | 57 +++++++++------------- 2 files changed, 63 insertions(+), 34 deletions(-) diff --git a/x11-misc/xplanet/files/xplanet-1.3.1-freetype_pkgconfig.patch b/x11-misc/xplanet/files/xplanet-1.3.1-freetype_pkgconfig.patch new file mode 100644 index 00000000000..534a32e9ef7 --- /dev/null +++ b/x11-misc/xplanet/files/xplanet-1.3.1-freetype_pkgconfig.patch @@ -0,0 +1,40 @@ +https://bugs.gentoo.org/788136 + +--- xplanet-1.3.1/acinclude.m4 ++++ xplanet-1.3.1/acinclude.m4 +@@ -48,23 +48,22 @@ + + AC_DEFUN([AC_FIND_FREETYPE], + [ +- ++PKG_PROG_PKG_CONFIG + AC_ARG_WITH(freetype,AC_HELP_STRING([--with-freetype],[Enable Freetype support for TrueType fonts (YES)])) + + have_freetype='no' +-if test "$with_freetype" != 'no'; then +- AC_PATH_PROG(FREETYPE_CONFIG, freetype-config, no) +- if test "$FREETYPE_CONFIG" = no; then +- AC_MSG_WARN(*** Xplanet will be built without freetype support ***) +- else +- FREETYPE_CFLAGS="`$FREETYPE_CONFIG --cflags` -I`$FREETYPE_CONFIG --prefix`/include" +- FREETYPE_LIBS=`$FREETYPE_CONFIG --libs` +- AC_SUBST(FREETYPE_CFLAGS) +- AC_SUBST(FREETYPE_LIBS) +- AC_DEFINE(HAVE_LIBFREETYPE,,Define if you have freetype) ++AS_IF([test "$with_freetype" != 'no'], [ ++ PKG_CHECK_MODULES([FREETYPE], [freetype2], [ ++ AC_DEFINE([HAVE_LIBFREETYPE],,[Define if you have freetype]) + have_freetype='yes' +- fi +-fi ++ ], [ ++ AS_IF([test "$with_freetype" != 'yes'], [ ++ AC_MSG_WARN(*** Xplanet will be built without freetype support ***) ++ ], [ ++ AC_MSG_ERROR(*** freetype support requested but not found ***) ++ ]) ++ ]) ++]) + ]) + + AC_DEFUN([AC_FIND_PANGO], diff --git a/x11-misc/xplanet/xplanet-1.3.1-r1.ebuild b/x11-misc/xplanet/xplanet-1.3.1-r1.ebuild index 7fd20ea87c2..1eef6008ea9 100644 --- a/x11-misc/xplanet/xplanet-1.3.1-r1.ebuild +++ b/x11-misc/xplanet/xplanet-1.3.1-r1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -inherit flag-o-matic +EAPI=7 +inherit autotools flag-o-matic DESCRIPTION="Render images of the earth into the X root window" HOMEPAGE="http://xplanet.sourceforge.net/"; @@ -32,8 +32,8 @@ RDEPEND=" x11-libs/libXt ) " -DEPEND=" - ${RDEPEND} +DEPEND="${RDEPEND}" +BDEPEND=" truetype? ( virtual/pkgconfig ) X? ( x11-base/xorg-proto ) " @@ -41,39 +41,28 @@ DEPEND=" PATCHES=( "${FILESDIR}"/${P}-giflib.patch "${FILESDIR}"/${P}-remove-null-comparison.patch + "${FILESDIR}"/${P}-freetype_pkgconfig.patch #788136 ) +src_prepare() { + default + eautoreconf #788136 +} + src_configure() { # econf says 'checking pnm.h presence... no' use png && append-cppflags -I"${EPREFIX}"/usr/include/netpbm - local myconf=() - - use X \ - && myconf+=( --with-x --with-xscreensaver ) \ - || myconf+=( --with-x=no --with-xscreensaver=no ) - - use gif \ - && myconf+=( --with-gif ) \ - || myconf+=( --with-gif=no ) - - use jpeg \ - && myconf+=( --with-jpeg ) \ - || myconf+=( --with-jpeg=no ) - - use tiff \ - && myconf+=( --with-tiff ) \ - || myconf+=( --with-tiff=no ) - - use png \ - && myconf+=( --with-png --with-pnm ) \ - || myconf+=( --with-png=no --with-pnm=no ) - - use truetype \ - && myconf+=( --with-freetype --with-pango ) \ - || myconf+=( --with-freetype=no --with-pango=no ) - - econf \ - --with-cspice=no \ - "${myconf[@]}" + local myconf=( + --with-freetype$(usex truetype '' '=no') + --with-gif$(usex gif '' '=no') + --with-jpeg$(usex jpeg '' '=no') + --with-pango$(usex truetype '' '=no') + --with-png$(usex png '' '=no') + --with-pnm$(usex png '' '=no') + --with-tiff$(usex tiff '' '=no') + --with-x$(usex X '' '=no') + --with-xscreensaver$(usex X '' '=no') + ) + econf --with-cspice=no "${myconf[@]}" }
