| 1 |
commit: 16eb17fdaf41e561b228d0aaf50981f28c7496f4 |
| 2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jul 16 06:43:13 2018 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jul 16 06:43:28 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16eb17fd |
| 7 |
|
| 8 |
games-strategy/freeciv: Minor patch improvement. |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.42, Repoman-2.3.9 |
| 11 |
|
| 12 |
.../files/freeciv-2.5.11-freetype_pkgconfig.patch | 19 ++++++++++++++++--- |
| 13 |
1 file changed, 16 insertions(+), 3 deletions(-) |
| 14 |
|
| 15 |
diff --git a/games-strategy/freeciv/files/freeciv-2.5.11-freetype_pkgconfig.patch b/games-strategy/freeciv/files/freeciv-2.5.11-freetype_pkgconfig.patch |
| 16 |
index b41411c8a16..d2b321dde27 100644 |
| 17 |
--- a/games-strategy/freeciv/files/freeciv-2.5.11-freetype_pkgconfig.patch |
| 18 |
+++ b/games-strategy/freeciv/files/freeciv-2.5.11-freetype_pkgconfig.patch |
| 19 |
@@ -1,4 +1,4 @@ |
| 20 |
-From fe3eaf658c256a1ee1aac645c004625e9f345421 Mon Sep 17 00:00:00 2001 |
| 21 |
+From f2eafd087a20b4236c1f2f1324e8644cb5055bf9 Mon Sep 17 00:00:00 2001 |
| 22 |
From: Lars Wendler <polynomial-c@g.o> |
| 23 |
Date: Wed, 16 May 2018 20:41:22 +0200 |
| 24 |
Subject: [PATCH] Use pkg-config to find freetype |
| 25 |
@@ -6,11 +6,24 @@ Subject: [PATCH] Use pkg-config to find freetype |
| 26 |
As of freetype-2.9.1 the freetype-config script no longer gets installed |
| 27 |
by default. |
| 28 |
--- |
| 29 |
+ Makefile.am | 1 - |
| 30 |
m4/freetype2.m4 | 194 ----------------------------------------------- |
| 31 |
m4/sdl-client.m4 | 2 +- |
| 32 |
- 2 files changed, 1 insertion(+), 195 deletions(-) |
| 33 |
+ 3 files changed, 1 insertion(+), 196 deletions(-) |
| 34 |
delete mode 100644 m4/freetype2.m4 |
| 35 |
|
| 36 |
+diff --git a/Makefile.am b/Makefile.am |
| 37 |
+index 5d5a187d47..51791433ab 100644 |
| 38 |
+--- a/Makefile.am |
| 39 |
++++ b/Makefile.am |
| 40 |
+@@ -64,7 +64,6 @@ EXTRA_DIST = autogen.sh \ |
| 41 |
+ m4/fcdb-postgres.m4 \ |
| 42 |
+ m4/fcdb-sqlite3.m4 \ |
| 43 |
+ m4/features.m4 \ |
| 44 |
+- m4/freetype2.m4 \ |
| 45 |
+ m4/gettimeofday.m4 \ |
| 46 |
+ m4/ggz.m4 \ |
| 47 |
+ m4/freeciv-gettext.m4 \ |
| 48 |
diff --git a/m4/freetype2.m4 b/m4/freetype2.m4 |
| 49 |
deleted file mode 100644 |
| 50 |
index 3d0ecb3554..0000000000 |
| 51 |
@@ -225,5 +238,5 @@ index 095cd0b287..015d948d95 100644 |
| 52 |
gui_sdl_cflags="$gui_sdl_cflags $FT2_CFLAGS" |
| 53 |
gui_sdl_libs="$gui_sdl_libs $FT2_LIBS" |
| 54 |
-- |
| 55 |
-2.17.0 |
| 56 |
+2.18.0 |
Archives