| 1 |
commit: 1b59cc3e262e449fa01587cb2b411a48cc14247b |
| 2 |
Author: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Oct 11 05:43:31 2015 +0000 |
| 4 |
Commit: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Oct 11 05:43:44 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b59cc3e |
| 7 |
|
| 8 |
tidy; keep up with freetype's shifting headers (bug #562734) |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.20.1 |
| 11 |
|
| 12 |
games-arcade/openmortal/files/openmortal-0.7-freetype.patch | 10 +++++----- |
| 13 |
games-arcade/openmortal/files/openmortal-0.7-gcc41.patch | 4 ++-- |
| 14 |
games-arcade/openmortal/openmortal-0.7-r1.ebuild | 8 ++++---- |
| 15 |
3 files changed, 11 insertions(+), 11 deletions(-) |
| 16 |
|
| 17 |
diff --git a/games-arcade/openmortal/files/openmortal-0.7-freetype.patch b/games-arcade/openmortal/files/openmortal-0.7-freetype.patch |
| 18 |
index 4000ca3..3a342c8 100644 |
| 19 |
--- a/games-arcade/openmortal/files/openmortal-0.7-freetype.patch |
| 20 |
+++ b/games-arcade/openmortal/files/openmortal-0.7-freetype.patch |
| 21 |
@@ -1,5 +1,5 @@ |
| 22 |
---- openmortal-0.7/src/sge_tt_text.cpp.old 2014-04-04 21:35:37.275483286 +0300 |
| 23 |
-+++ openmortal-0.7/src/sge_tt_text.cpp 2014-04-04 21:36:08.065359870 +0300 |
| 24 |
+--- openmortal-0.7/src/sge_tt_text.cpp.old |
| 25 |
++++ openmortal-0.7/src/sge_tt_text.cpp |
| 26 |
@@ -37,9 +37,9 @@ |
| 27 |
|
| 28 |
#ifndef _SGE_NOTTF |
| 29 |
@@ -7,9 +7,9 @@ |
| 30 |
-#include <freetype/freetype.h> |
| 31 |
-#include <freetype/ftoutln.h> |
| 32 |
-#include <freetype/ttnameid.h> |
| 33 |
-+#include <freetype.h> |
| 34 |
-+#include <ftoutln.h> |
| 35 |
-+#include <ttnameid.h> |
| 36 |
++#include FT_FREETYPE_H |
| 37 |
++#include FT_OUTLINE_H |
| 38 |
++#include FT_TRUETYPE_IDS_H |
| 39 |
|
| 40 |
/* The structure used to hold glyph information (cached) */ |
| 41 |
struct glyph { |
| 42 |
|
| 43 |
diff --git a/games-arcade/openmortal/files/openmortal-0.7-gcc41.patch b/games-arcade/openmortal/files/openmortal-0.7-gcc41.patch |
| 44 |
index fdba61c..1c10ce2 100644 |
| 45 |
--- a/games-arcade/openmortal/files/openmortal-0.7-gcc41.patch |
| 46 |
+++ b/games-arcade/openmortal/files/openmortal-0.7-gcc41.patch |
| 47 |
@@ -1,5 +1,5 @@ |
| 48 |
---- src/OnlineChat.cpp.old 2006-01-28 14:34:42.000000000 -0700 |
| 49 |
-+++ src/OnlineChat.cpp 2006-01-28 14:34:53.000000000 -0700 |
| 50 |
+--- src/OnlineChat.cpp.old |
| 51 |
++++ src/OnlineChat.cpp |
| 52 |
@@ -56,7 +56,7 @@ |
| 53 |
class CChallengeMenu: public Menu |
| 54 |
{ |
| 55 |
|
| 56 |
diff --git a/games-arcade/openmortal/openmortal-0.7-r1.ebuild b/games-arcade/openmortal/openmortal-0.7-r1.ebuild |
| 57 |
index c24d9f4..9dcc163 100644 |
| 58 |
--- a/games-arcade/openmortal/openmortal-0.7-r1.ebuild |
| 59 |
+++ b/games-arcade/openmortal/openmortal-0.7-r1.ebuild |
| 60 |
@@ -21,20 +21,20 @@ DEPEND="media-libs/libsdl[video] |
| 61 |
media-libs/sdl-net |
| 62 |
>=media-libs/freetype-2.4.0 |
| 63 |
dev-lang/perl" |
| 64 |
-RDEPEND="${DEPEND}" |
| 65 |
+RDEPEND=${DEPEND} |
| 66 |
|
| 67 |
src_prepare() { |
| 68 |
epatch \ |
| 69 |
"${FILESDIR}/${P}"-gcc41.patch \ |
| 70 |
"${FILESDIR}/${P}"-freetype.patch |
| 71 |
- |
| 72 |
+ mv configure.{in,ac} || die |
| 73 |
eautoreconf |
| 74 |
} |
| 75 |
|
| 76 |
src_install() { |
| 77 |
- emake DESTDIR="${D}" install |
| 78 |
+ DOCS="AUTHORS ChangeLog README TODO" \ |
| 79 |
+ default |
| 80 |
newicon data/gfx/icon.png ${PN}.png |
| 81 |
make_desktop_entry ${PN} OpenMortal |
| 82 |
- dodoc AUTHORS ChangeLog README TODO |
| 83 |
prepgamesdirs |
| 84 |
} |
Archives