diff options
Diffstat (limited to 'x11-misc/xplanet')
| -rw-r--r-- | x11-misc/xplanet/Manifest | 3 | ||||
| -rw-r--r-- | x11-misc/xplanet/files/xplanet-1.3.1-freetype_pkgconfig.patch | 40 | ||||
| -rw-r--r-- | x11-misc/xplanet/xplanet-1.3.1-r2.ebuild (renamed from x11-misc/xplanet/xplanet-1.3.1-r1.ebuild) | 59 |
3 files changed, 68 insertions, 34 deletions
diff --git a/x11-misc/xplanet/Manifest b/x11-misc/xplanet/Manifest index de471aadc508..c5371f37df6b 100644 --- a/x11-misc/xplanet/Manifest +++ b/x11-misc/xplanet/Manifest @@ -1,5 +1,6 @@ +AUX xplanet-1.3.1-freetype_pkgconfig.patch 1226 BLAKE2B 36a63ea973ecc20cf04fe9444cf48601478aee18cdb74effbc9e40984209df32a94c0b091c112ab618e43ea1169c3f79d4b36720ad8a193bbade3f3e8749367e SHA512 924c1fbe5851be9619eb77fdce35314a4efa5f65cb09961f03b3af7478764a745a7344031881fc5eeaad206c05a6c554bfb0e4d69d1373b07f019297591cde10 AUX xplanet-1.3.1-giflib.patch 1232 BLAKE2B 6f7e5a1c9388ed1d9cb13e6ec38ee53b0b5a1d2e3aeddab414cb24322582cab457850bfa75c2ef4d7575d9166be2a8f2303a7fb674d155d6ea00786575d471ff SHA512 56547a679361b7adf47191dfa5c011f93f1de288857f93a981c1bcdab6b4bc78c81b568748586f41fe0c49b634e5d7373875c579c0dfc05a5e256200889d7384 AUX xplanet-1.3.1-remove-null-comparison.patch 6773 BLAKE2B 580f2275f40e9c182bcd201906565debd644843ea592f23c62283fb9c9f974ea1bf11e94c793dce24c042b048843165392f065cee37bcea2353527026b29de17 SHA512 a3ac916070eadd2b0dbd33fbe584f5d5d2f621556389f8d0542d591d5b384eb75bfd9e9bd7411b335bfa1e530f638c1c348063a90ebf5ae62ae65995ccb3949d DIST xplanet-1.3.1.tar.gz 1236035 BLAKE2B 71a5f856476e11333f5b97b4f7829c4376c570a44433b5a5ba1cfdf7cc425b1c9b89588cac3e0763e0c641a8b93c43bfc5f724fc3b9e3b5b418cabfa7193e0da SHA512 06ce3187fbd364f4ccee768fceca559690c905c870e2fb25ca32453ce09c564ba3455ec539f1e3da177de23a0611f767b375efe2e10b601d09313c0d068e35e0 -EBUILD xplanet-1.3.1-r1.ebuild 1627 BLAKE2B 2b292c51a77114b277a83e9a774f328a9712de229f0e0164aa99f7358bc4053649ce92a17c335190939705ab641451ff7e0247b4b87aa11b25cdd0c55bca22f1 SHA512 92e275404aedb5a28c77e415040bd05d84337e34062f781a8d54ffa89ef2884305dd0e9c273db4fe29e051c6a767f627085053fe07ea15bdc25f42a412aafdb6 +EBUILD xplanet-1.3.1-r2.ebuild 1566 BLAKE2B 76a39af13814e165a89180997b3ee273ce1a2044dd6fd46c6d57d28630de2e417a92cf7fae1bc0738a6c7275b17a0fc3e4593d73c4b208651689e40d0faab909 SHA512 821fd70b70cc9e8b23a1515bf6860d67094ea731efdd5a92151ddfba6a0e8d6619713bad20f63765d9a8951326687e53421528e06cf3f19ef12b3ea4826044e4 MISC metadata.xml 244 BLAKE2B 226e613f84c971b753a4fa1760c169df3055140c07223abea160b458e3c900cc2c483444e3b365f5b8f89146b1a59d956dfc259934285c864fb7ca09bc1efe4f SHA512 9f1707f688ea67a2670c45acbb02e50e626f82c4552856be0b3ae799133818a757e2f727471f860ebf462ef283ec70a9c21ad295f6fec6300f215dbe131fa623 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 000000000000..534a32e9ef7c --- /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-r2.ebuild index 7fd20ea87c28..ac79390deb72 100644 --- a/x11-misc/xplanet/xplanet-1.3.1-r1.ebuild +++ b/x11-misc/xplanet/xplanet-1.3.1-r2.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 toolchain-funcs 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,32 @@ 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 ) + 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[@]}" +} - econf \ - --with-cspice=no \ - "${myconf[@]}" +src_compile() { + emake AR=$(tc-getAR) } |