commit: 6ff9c7b1c8ea7ff9468efd8c5f8d9cd1166e4221 Author: Stefan Strogin <steils <AT> gentoo <DOT> org> AuthorDate: Thu Aug 1 12:20:11 2019 +0000 Commit: Stefan Strogin <steils <AT> gentoo <DOT> org> CommitDate: Thu Aug 1 12:27:59 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ff9c7b1
games-strategy/scorched3d: use pkg-config instead of freetype-config And use relative paths for dosym. Closes: https://bugs.gentoo.org/689990 Package-Manager: Portage-2.3.69, Repoman-2.3.16 Signed-off-by: Stefan Strogin <steils <AT> gentoo.org> .../scorched3d/files/scorched3d-44-freetype.patch | 65 +++++++--------------- games-strategy/scorched3d/scorched3d-44-r2.ebuild | 8 +-- 2 files changed, 24 insertions(+), 49 deletions(-) diff --git a/games-strategy/scorched3d/files/scorched3d-44-freetype.patch b/games-strategy/scorched3d/files/scorched3d-44-freetype.patch index e4717972d81..37aa0436eb4 100644 --- a/games-strategy/scorched3d/files/scorched3d-44-freetype.patch +++ b/games-strategy/scorched3d/files/scorched3d-44-freetype.patch @@ -1,45 +1,20 @@ ---- a/acinclude.m4 -+++ b/acinclude.m4 -@@ -437,7 +437,7 @@ - if test "$FT2_CONFIG" = "no" ; then - no_ft=yes - else -- FT2_CFLAGS=`$FT2_CONFIG $ft_config_args --cflags` -+ FT2_CFLAGS="`$FT2_CONFIG $ft_config_args --cflags` `$FT2_CONFIG $ft_config_args --cflags | sed -e 's:freetype2:freetype2/freetype:'`" - FT2_LIBS=`$FT2_CONFIG $ft_config_args --libs` - ft_config_major_version=`$FT2_CONFIG $ft_config_args --version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` ---- a/src/client/GLEXT/GLFont2dFreeType.h -+++ b/src/client/GLEXT/GLFont2dFreeType.h -@@ -23,10 +23,10 @@ - - #include <GLEXT/GLFont2dStorage.h> - #include <ft2build.h> --#include <freetype/freetype.h> --#include <freetype/ftglyph.h> --#include <freetype/ftoutln.h> --#include <freetype/fttrigon.h> -+#include <freetype.h> -+#include <ftglyph.h> -+#include <ftoutln.h> -+#include <fttrigon.h> - #include <string> - - class GLFont2dFreeType ---- a/src/launcher/wxdialogs/TrueTypeFont.h -+++ b/src/launcher/wxdialogs/TrueTypeFont.h -@@ -25,10 +25,10 @@ - #include <wx/image.h> - #include <ft2build.h> - #include <string> --#include <freetype/freetype.h> --#include <freetype/ftglyph.h> --#include <freetype/ftoutln.h> --#include <freetype/fttrigon.h> -+#include <freetype.h> -+#include <ftglyph.h> -+#include <ftoutln.h> -+#include <fttrigon.h> - - class TrueTypeFont - { +diff --git a/configure-ft.m4 b/configure-ft.m4 +index d27678ca..ce369bf4 100644 +--- a/configure-ft.m4 ++++ b/configure-ft.m4 +@@ -1,14 +1,2 @@ + dnl Check for FreeType2 +-AC_CHECK_FT2(7.0.1, ftype=1) +-if test "$ftype" != 1; then +- AC_MSG_ERROR([ +- FreeType2 must be installed on your system +- but freetype-config couldn't be found. +- Please check that freetype-config is in the path, the directory +- where the freetype libraries are installed (returned by +- 'freetype-config --libs' command) is in LD_LIBRARY_PATH or +- equivalent variable and freetype version is 7.0.1 or above +- Try http://www.freetype.org to download freetype. +- ]) +-fi +- ++PKG_CHECK_MODULES(FT2, freetype2 >= 7.0.1) diff --git a/games-strategy/scorched3d/scorched3d-44-r2.ebuild b/games-strategy/scorched3d/scorched3d-44-r2.ebuild index 6cd098e970d..384864e070c 100644 --- a/games-strategy/scorched3d/scorched3d-44-r2.ebuild +++ b/games-strategy/scorched3d/scorched3d-44-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -85,9 +85,9 @@ src_install() { # remove bundled fonts rm "${ED%/}"/usr/share/${PN}/data/fonts/* || die - dosym /usr/share/fonts/dejavu/DejaVuSans.ttf /usr/share/${PN}/data/fonts/dejavusans.ttf - dosym /usr/share/fonts/dejavu/DejaVuSansCondensed-Bold.ttf /usr/share/${PN}/data/fonts/dejavusconbd.ttf - dosym /usr/share/fonts/dejavu/DejaVuSansMono-Bold.ttf /usr/share/${PN}/data/fonts/dejavusmobd.ttf + dosym ../../../fonts/dejavu/DejaVuSans.ttf /usr/share/${PN}/data/fonts/dejavusans.ttf + dosym ../../../fonts/dejavu/DejaVuSansCondensed-Bold.ttf /usr/share/${PN}/data/fonts/dejavusconbd.ttf + dosym ../../../fonts/dejavu/DejaVuSansMono-Bold.ttf /usr/share/${PN}/data/fonts/dejavusmobd.ttf if ! use dedicated; then newicon data/images/tank-old.bmp ${PN}.bmp
