1 |
commit: 5b5f4cc8dc131511fda89d87b8458707c4d1b1c0 |
2 |
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Jun 10 10:19:35 2021 +0000 |
4 |
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jun 10 11:51:42 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b5f4cc8 |
7 |
|
8 |
games-kids/tuxtype: fix missing text, force pango, tidy |
9 |
|
10 |
Removed unused t4k-common dep given this package hasn't been migrated |
11 |
to use it yet (upstream snapshot only has work-in-progress support). |
12 |
|
13 |
This means needed to bring the t4k-common fix for missing text here. |
14 |
|
15 |
Removed IUSE: |
16 |
- svg: this is only work-in-progress code with no real use for now |
17 |
- pango: sdl-ttf code is seeing neglect and upstream only really |
18 |
use/test sdl-pango, forcing brings this in-line with t4k-common |
19 |
and allows to remove bundled fonts. |
20 |
|
21 |
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> |
22 |
|
23 |
.../tuxtype/files/tuxtype-1.8.3-missing-text.patch | 15 +++++ |
24 |
games-kids/tuxtype/tuxtype-1.8.3-r2.ebuild | 67 ++++++++++++++++++++++ |
25 |
2 files changed, 82 insertions(+) |
26 |
|
27 |
diff --git a/games-kids/tuxtype/files/tuxtype-1.8.3-missing-text.patch b/games-kids/tuxtype/files/tuxtype-1.8.3-missing-text.patch |
28 |
new file mode 100644 |
29 |
index 00000000000..9553cfa8984 |
30 |
--- /dev/null |
31 |
+++ b/games-kids/tuxtype/files/tuxtype-1.8.3-missing-text.patch |
32 |
@@ -0,0 +1,15 @@ |
33 |
+Fix some missing (transparent) text with libsdl-1.2.15_p20210224. |
34 |
+Same issue as t4k-common-0.1.1 given tuxtype shares the same |
35 |
+code and wasn't migrated to support the separate library yet. |
36 |
+--- a/src/SDL_extras.c |
37 |
++++ b/src/SDL_extras.c |
38 |
+@@ -1297,3 +1297,3 @@ |
39 |
+ /* Use color key for eventual transparency: */ |
40 |
+- color_key = SDL_MapRGB(bg->format, 01, 01, 01); |
41 |
++ color_key = SDL_MapRGBA(bg->format, 01, 01, 01, 0xff); |
42 |
+ SDL_FillRect(bg, NULL, color_key); |
43 |
+@@ -1344,3 +1344,3 @@ |
44 |
+ SDL_SetColorKey(bg, SDL_SRCCOLORKEY|SDL_RLEACCEL, color_key); |
45 |
+- out = SDL_DisplayFormatAlpha(bg); |
46 |
++ out = SDL_DisplayFormat(bg); |
47 |
+ SDL_FreeSurface(bg); |
48 |
|
49 |
diff --git a/games-kids/tuxtype/tuxtype-1.8.3-r2.ebuild b/games-kids/tuxtype/tuxtype-1.8.3-r2.ebuild |
50 |
new file mode 100644 |
51 |
index 00000000000..55d2d6b8927 |
52 |
--- /dev/null |
53 |
+++ b/games-kids/tuxtype/tuxtype-1.8.3-r2.ebuild |
54 |
@@ -0,0 +1,67 @@ |
55 |
+# Copyright 1999-2021 Gentoo Authors |
56 |
+# Distributed under the terms of the GNU General Public License v2 |
57 |
+ |
58 |
+EAPI=7 |
59 |
+ |
60 |
+inherit autotools desktop optfeature |
61 |
+ |
62 |
+DESCRIPTION="Typing tutorial with lots of eye-candy" |
63 |
+HOMEPAGE="https://www.tux4kids.com/" |
64 |
+SRC_URI="https://github.com/tux4kids/${PN}/archive/upstream/${PV}.tar.gz -> ${P}.tar.gz" |
65 |
+S="${WORKDIR}/${PN}-upstream-${PV}" |
66 |
+ |
67 |
+LICENSE="CC-BY-3.0 CC-BY-SA-3.0 GPL-3+ public-domain" |
68 |
+SLOT="0" |
69 |
+KEYWORDS="~amd64 ~x86" |
70 |
+ |
71 |
+RDEPEND=" |
72 |
+ acct-group/gamestat |
73 |
+ media-libs/libsdl[video] |
74 |
+ media-libs/sdl-image[jpeg,png] |
75 |
+ media-libs/sdl-mixer |
76 |
+ media-libs/sdl-pango" |
77 |
+DEPEND="${RDEPEND}" |
78 |
+BDEPEND="virtual/pkgconfig" |
79 |
+ |
80 |
+PATCHES=( |
81 |
+ "${FILESDIR}"/${P}-games-group.patch |
82 |
+ "${FILESDIR}"/${P}-missing-text.patch |
83 |
+) |
84 |
+ |
85 |
+src_prepare() { |
86 |
+ default |
87 |
+ |
88 |
+ eautoreconf |
89 |
+} |
90 |
+ |
91 |
+src_configure() { |
92 |
+ local econfargs=( |
93 |
+ # these are a placeholder for future features, i.e. not useful for now |
94 |
+ --without-rsvg |
95 |
+ --without-sdlnet |
96 |
+ ) |
97 |
+ econf "${econfargs[@]}" |
98 |
+} |
99 |
+ |
100 |
+src_install() { |
101 |
+ emake DESTDIR="${D}" install # skip einstalldocs, wrong files |
102 |
+ |
103 |
+ keepdir /etc/${PN} /var/lib/${PN} |
104 |
+ |
105 |
+ fowners :gamestat /var/lib/${PN} /usr/bin/${PN} |
106 |
+ fperms g+s /usr/bin/${PN} |
107 |
+ fperms 660 /var/lib/${PN} |
108 |
+ |
109 |
+ newicon icon.png ${PN}.png |
110 |
+ domenu ${PN}.desktop |
111 |
+ |
112 |
+ # bundled fonts are unused if sdl-pango is enabled |
113 |
+ rm -r "${ED}"/usr/share/${PN}/fonts || die |
114 |
+ rm "${ED}"/usr/share/doc/${PF}/{ABOUT-NLS,COPYING,OFL,INSTALL} || die |
115 |
+ rmdir "${ED}"/var/lib/${PN}/words || die |
116 |
+} |
117 |
+ |
118 |
+pkg_postinst() { |
119 |
+ # mod detection fails if using modplug over mikmod |
120 |
+ optfeature "music support" "media-libs/sdl-mixer[mod,mikmod,vorbis]" |
121 |
+} |