| 1 |
commit: 6ff9c7b1c8ea7ff9468efd8c5f8d9cd1166e4221 |
| 2 |
Author: Stefan Strogin <steils <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Aug 1 12:20:11 2019 +0000 |
| 4 |
Commit: Stefan Strogin <steils <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Aug 1 12:27:59 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ff9c7b1 |
| 7 |
|
| 8 |
games-strategy/scorched3d: use pkg-config instead of freetype-config |
| 9 |
|
| 10 |
And use relative paths for dosym. |
| 11 |
|
| 12 |
Closes: https://bugs.gentoo.org/689990 |
| 13 |
Package-Manager: Portage-2.3.69, Repoman-2.3.16 |
| 14 |
Signed-off-by: Stefan Strogin <steils <AT> gentoo.org> |
| 15 |
|
| 16 |
.../scorched3d/files/scorched3d-44-freetype.patch | 65 +++++++--------------- |
| 17 |
games-strategy/scorched3d/scorched3d-44-r2.ebuild | 8 +-- |
| 18 |
2 files changed, 24 insertions(+), 49 deletions(-) |
| 19 |
|
| 20 |
diff --git a/games-strategy/scorched3d/files/scorched3d-44-freetype.patch b/games-strategy/scorched3d/files/scorched3d-44-freetype.patch |
| 21 |
index e4717972d81..37aa0436eb4 100644 |
| 22 |
--- a/games-strategy/scorched3d/files/scorched3d-44-freetype.patch |
| 23 |
+++ b/games-strategy/scorched3d/files/scorched3d-44-freetype.patch |
| 24 |
@@ -1,45 +1,20 @@ |
| 25 |
---- a/acinclude.m4 |
| 26 |
-+++ b/acinclude.m4 |
| 27 |
-@@ -437,7 +437,7 @@ |
| 28 |
- if test "$FT2_CONFIG" = "no" ; then |
| 29 |
- no_ft=yes |
| 30 |
- else |
| 31 |
-- FT2_CFLAGS=`$FT2_CONFIG $ft_config_args --cflags` |
| 32 |
-+ FT2_CFLAGS="`$FT2_CONFIG $ft_config_args --cflags` `$FT2_CONFIG $ft_config_args --cflags | sed -e 's:freetype2:freetype2/freetype:'`" |
| 33 |
- FT2_LIBS=`$FT2_CONFIG $ft_config_args --libs` |
| 34 |
- ft_config_major_version=`$FT2_CONFIG $ft_config_args --version | \ |
| 35 |
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` |
| 36 |
---- a/src/client/GLEXT/GLFont2dFreeType.h |
| 37 |
-+++ b/src/client/GLEXT/GLFont2dFreeType.h |
| 38 |
-@@ -23,10 +23,10 @@ |
| 39 |
- |
| 40 |
- #include <GLEXT/GLFont2dStorage.h> |
| 41 |
- #include <ft2build.h> |
| 42 |
--#include <freetype/freetype.h> |
| 43 |
--#include <freetype/ftglyph.h> |
| 44 |
--#include <freetype/ftoutln.h> |
| 45 |
--#include <freetype/fttrigon.h> |
| 46 |
-+#include <freetype.h> |
| 47 |
-+#include <ftglyph.h> |
| 48 |
-+#include <ftoutln.h> |
| 49 |
-+#include <fttrigon.h> |
| 50 |
- #include <string> |
| 51 |
- |
| 52 |
- class GLFont2dFreeType |
| 53 |
---- a/src/launcher/wxdialogs/TrueTypeFont.h |
| 54 |
-+++ b/src/launcher/wxdialogs/TrueTypeFont.h |
| 55 |
-@@ -25,10 +25,10 @@ |
| 56 |
- #include <wx/image.h> |
| 57 |
- #include <ft2build.h> |
| 58 |
- #include <string> |
| 59 |
--#include <freetype/freetype.h> |
| 60 |
--#include <freetype/ftglyph.h> |
| 61 |
--#include <freetype/ftoutln.h> |
| 62 |
--#include <freetype/fttrigon.h> |
| 63 |
-+#include <freetype.h> |
| 64 |
-+#include <ftglyph.h> |
| 65 |
-+#include <ftoutln.h> |
| 66 |
-+#include <fttrigon.h> |
| 67 |
- |
| 68 |
- class TrueTypeFont |
| 69 |
- { |
| 70 |
+diff --git a/configure-ft.m4 b/configure-ft.m4 |
| 71 |
+index d27678ca..ce369bf4 100644 |
| 72 |
+--- a/configure-ft.m4 |
| 73 |
++++ b/configure-ft.m4 |
| 74 |
+@@ -1,14 +1,2 @@ |
| 75 |
+ dnl Check for FreeType2 |
| 76 |
+-AC_CHECK_FT2(7.0.1, ftype=1) |
| 77 |
+-if test "$ftype" != 1; then |
| 78 |
+- AC_MSG_ERROR([ |
| 79 |
+- FreeType2 must be installed on your system |
| 80 |
+- but freetype-config couldn't be found. |
| 81 |
+- Please check that freetype-config is in the path, the directory |
| 82 |
+- where the freetype libraries are installed (returned by |
| 83 |
+- 'freetype-config --libs' command) is in LD_LIBRARY_PATH or |
| 84 |
+- equivalent variable and freetype version is 7.0.1 or above |
| 85 |
+- Try http://www.freetype.org to download freetype. |
| 86 |
+- ]) |
| 87 |
+-fi |
| 88 |
+- |
| 89 |
++PKG_CHECK_MODULES(FT2, freetype2 >= 7.0.1) |
| 90 |
|
| 91 |
diff --git a/games-strategy/scorched3d/scorched3d-44-r2.ebuild b/games-strategy/scorched3d/scorched3d-44-r2.ebuild |
| 92 |
index 6cd098e970d..384864e070c 100644 |
| 93 |
--- a/games-strategy/scorched3d/scorched3d-44-r2.ebuild |
| 94 |
+++ b/games-strategy/scorched3d/scorched3d-44-r2.ebuild |
| 95 |
@@ -1,4 +1,4 @@ |
| 96 |
-# Copyright 1999-2017 Gentoo Foundation |
| 97 |
+# Copyright 1999-2019 Gentoo Authors |
| 98 |
# Distributed under the terms of the GNU General Public License v2 |
| 99 |
|
| 100 |
EAPI=6 |
| 101 |
@@ -85,9 +85,9 @@ src_install() { |
| 102 |
|
| 103 |
# remove bundled fonts |
| 104 |
rm "${ED%/}"/usr/share/${PN}/data/fonts/* || die |
| 105 |
- dosym /usr/share/fonts/dejavu/DejaVuSans.ttf /usr/share/${PN}/data/fonts/dejavusans.ttf |
| 106 |
- dosym /usr/share/fonts/dejavu/DejaVuSansCondensed-Bold.ttf /usr/share/${PN}/data/fonts/dejavusconbd.ttf |
| 107 |
- dosym /usr/share/fonts/dejavu/DejaVuSansMono-Bold.ttf /usr/share/${PN}/data/fonts/dejavusmobd.ttf |
| 108 |
+ dosym ../../../fonts/dejavu/DejaVuSans.ttf /usr/share/${PN}/data/fonts/dejavusans.ttf |
| 109 |
+ dosym ../../../fonts/dejavu/DejaVuSansCondensed-Bold.ttf /usr/share/${PN}/data/fonts/dejavusconbd.ttf |
| 110 |
+ dosym ../../../fonts/dejavu/DejaVuSansMono-Bold.ttf /usr/share/${PN}/data/fonts/dejavusmobd.ttf |
| 111 |
|
| 112 |
if ! use dedicated; then |
| 113 |
newicon data/images/tank-old.bmp ${PN}.bmp |
Archives