1 |
commit: 979beea22f428225b0fccf740f0db25013c5948b |
2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Dec 29 21:43:49 2016 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Dec 29 21:45:54 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=979beea2 |
7 |
|
8 |
games-puzzle/xye: Version bump to 0.12.2 |
9 |
|
10 |
Gentoo-bug: 600298 |
11 |
* EAPI=6 |
12 |
* Remove games.eclass |
13 |
|
14 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
15 |
|
16 |
games-puzzle/xye/Manifest | 1 + |
17 |
.../xye/files/xye-0.12.2-fix-buildsystem.patch | 45 ++++++++++++++++++++++ |
18 |
games-puzzle/xye/files/xye-0.12.2-fix-c++14.patch | 14 +++++++ |
19 |
.../xye/files/xye-0.12.2-fix-desktop-file.patch | 18 +++++++++ |
20 |
games-puzzle/xye/xye-0.12.2.ebuild | 43 +++++++++++++++++++++ |
21 |
5 files changed, 121 insertions(+) |
22 |
|
23 |
diff --git a/games-puzzle/xye/Manifest b/games-puzzle/xye/Manifest |
24 |
index 135c83d..179165b 100644 |
25 |
--- a/games-puzzle/xye/Manifest |
26 |
+++ b/games-puzzle/xye/Manifest |
27 |
@@ -1 +1,2 @@ |
28 |
DIST xye-0.12.1.tar.gz 2850776 SHA256 bbeb3265b0795f14deb2851b4a3bda7dde9b07d624a7ca5fb88cd7acabcf3967 SHA512 aadafdb7b8e0546435838279c2929803be8dde00f3f3c08668c35d0a8ccf5bad511e65629e3f7261140edcf0980d19fda2be1401593ac4c0410beede542e857b WHIRLPOOL 7a1aa2708361b4eddb266037af35e6915852ba1a5037fcfebd95c0a8caab54209ca1c9e3827acecff64772fd15b077f5cded64a50b5820abd7b3cde937bbc2e0 |
29 |
+DIST xye-0.12.2.tar.gz 2860290 SHA256 5d7c04f37d6b4a1821594512c7ddbc8189f968e08ecfd5af55231302f2f917d8 SHA512 a31d922e0a0660d269d30430fbaf1d00924b0271db697f3cbc89b78815e597e11743bd9018fbf3f2f9e7561ad3469e9cca28687efaae7fc6dcba40ada2b5effa WHIRLPOOL 0f4d9105435adab0055cdd8966aa542fd0a231203562bd96ff8b2dff275675233ec1ca541f93e23787d8bf610cb29430f0b97e9f447ba63a695127e670788fc4 |
30 |
|
31 |
diff --git a/games-puzzle/xye/files/xye-0.12.2-fix-buildsystem.patch b/games-puzzle/xye/files/xye-0.12.2-fix-buildsystem.patch |
32 |
new file mode 100644 |
33 |
index 00000000..c96d42e |
34 |
--- /dev/null |
35 |
+++ b/games-puzzle/xye/files/xye-0.12.2-fix-buildsystem.patch |
36 |
@@ -0,0 +1,45 @@ |
37 |
+Fix build system to respect correct paths |
38 |
+and install files in correct paths. |
39 |
+ |
40 |
+--- a/Makefile.am |
41 |
++++ b/Makefile.am |
42 |
+@@ -4,13 +4,11 @@ |
43 |
+ |
44 |
+ |
45 |
+ bin_PROGRAMS = xye |
46 |
+-xye_LDFLAGS = |
47 |
+ |
48 |
++doc_DATA = NEWS ChangeLog AUTHORS |
49 |
++html_DATA = ReadMe.html |
50 |
+ |
51 |
+-docedir = $(datadir)/@PACKAGE@ |
52 |
+-doce_DATA = ReadMe.html NEWS ChangeLog AUTHORS |
53 |
+- |
54 |
+-levelsdir= $(datadir)/@PACKAGE@/levels |
55 |
++levelsdir= $(datadir)/$(PACKAGE)/levels |
56 |
+ levels_DATA = levels/5levels.xye \ |
57 |
+ levels/levels.xye \ |
58 |
+ levels/logo.xye \ |
59 |
+@@ -25,12 +23,10 @@ |
60 |
+ levels/xyester.xye \ |
61 |
+ levels/SuperJustin.xye |
62 |
+ |
63 |
+-resdir= $(datadir)/@PACKAGE@/res |
64 |
++resdir= $(datadir)/$(PACKAGE)/res |
65 |
+ res_DATA = res/default.xml \ |
66 |
+ res/xye.png \ |
67 |
+ res/xye_luminosity.png \ |
68 |
+-res/DejaVuSans.ttf \ |
69 |
+-res/DejaVuSans-Bold.ttf \ |
70 |
+ res/fon.bmp \ |
71 |
+ res/fon_bold.bmp \ |
72 |
+ res/clean40.xml \ |
73 |
+@@ -103,7 +99,7 @@ |
74 |
+ src/skins.cpp \ |
75 |
+ src/skins.h |
76 |
+ |
77 |
+-EXTRA_DIST = ${EXTRA_DIST1} ${xye_SOURCES} ${res_DATA} ${levels_DATA} ${doce_DATA} |
78 |
++EXTRA_DIST = ${EXTRA_DIST1} ${xye_SOURCES} ${res_DATA} ${levels_DATA} |
79 |
+ |
80 |
+ DEFS=@data_path_flag@ |
81 |
+ |
82 |
|
83 |
diff --git a/games-puzzle/xye/files/xye-0.12.2-fix-c++14.patch b/games-puzzle/xye/files/xye-0.12.2-fix-c++14.patch |
84 |
new file mode 100644 |
85 |
index 00000000..f2083b8 |
86 |
--- /dev/null |
87 |
+++ b/games-puzzle/xye/files/xye-0.12.2-fix-c++14.patch |
88 |
@@ -0,0 +1,14 @@ |
89 |
+Add explicit cast to silence C++14 -Wnarrowing conversion warnings. |
90 |
+See also: https://bugs.gentoo.org/show_bug.cgi?id=600298 |
91 |
+ |
92 |
+--- a/src/xsb_level.cpp |
93 |
++++ b/src/xsb_level.cpp |
94 |
+@@ -784,7 +784,7 @@ |
95 |
+ |
96 |
+ bool FromXyeDFS(int* mem, unsigned char x, unsigned char y) |
97 |
+ { |
98 |
+- static const unsigned char dx[4] = {0,0,-1,1}, dy[4] = {-1,1,0,0}; |
99 |
++ static const unsigned char dx[4] = {0,0,(unsigned char)-1,1}, dy[4] = {(unsigned char)-1,1,0,0}; |
100 |
+ int &res = mem[y*XYE_HORZ+x]; |
101 |
+ if( res==0) |
102 |
+ { |
103 |
|
104 |
diff --git a/games-puzzle/xye/files/xye-0.12.2-fix-desktop-file.patch b/games-puzzle/xye/files/xye-0.12.2-fix-desktop-file.patch |
105 |
new file mode 100644 |
106 |
index 00000000..99558ef |
107 |
--- /dev/null |
108 |
+++ b/games-puzzle/xye/files/xye-0.12.2-fix-desktop-file.patch |
109 |
@@ -0,0 +1,18 @@ |
110 |
+Fix .desktop file to comply with FDO specifications. |
111 |
+ |
112 |
+--- a/xye.desktop |
113 |
++++ b/xye.desktop |
114 |
+@@ -4,11 +4,11 @@ |
115 |
+ Encoding=UTF-8 |
116 |
+ Exec=xye |
117 |
+ Type=Application |
118 |
+-Categories=Application;Game;PuzzleGame |
119 |
++Categories=Game |
120 |
+ Name=Xye |
121 |
+ GenericName=Xye |
122 |
+ Comment=Solve puzzles and action challenges in order to get all the gems in the room. |
123 |
+ Terminal=false |
124 |
+ StartupNotify=false |
125 |
+-Icon=xye.png |
126 |
++Icon=xye |
127 |
+ MimeType=application/xye-xml |
128 |
|
129 |
diff --git a/games-puzzle/xye/xye-0.12.2.ebuild b/games-puzzle/xye/xye-0.12.2.ebuild |
130 |
new file mode 100644 |
131 |
index 00000000..3759062 |
132 |
--- /dev/null |
133 |
+++ b/games-puzzle/xye/xye-0.12.2.ebuild |
134 |
@@ -0,0 +1,43 @@ |
135 |
+# Copyright 1999-2016 Gentoo Foundation |
136 |
+# Distributed under the terms of the GNU General Public License v2 |
137 |
+# $Id$ |
138 |
+ |
139 |
+EAPI=6 |
140 |
+ |
141 |
+inherit autotools |
142 |
+ |
143 |
+DESCRIPTION="Free version of the classic game Kye" |
144 |
+HOMEPAGE="http://xye.sourceforge.net/" |
145 |
+SRC_URI="mirror://sourceforge/xye/${P}.tar.gz" |
146 |
+ |
147 |
+LICENSE="ZLIB" |
148 |
+SLOT="0" |
149 |
+KEYWORDS="~amd64 ~x86" |
150 |
+IUSE="" |
151 |
+ |
152 |
+RDEPEND=" |
153 |
+ media-fonts/dejavu |
154 |
+ media-libs/libsdl[video] |
155 |
+ media-libs/sdl-ttf |
156 |
+ media-libs/sdl-image[png]" |
157 |
+DEPEND="${RDEPEND}" |
158 |
+ |
159 |
+PATCHES=( |
160 |
+ "${FILESDIR}"/${PN}-0.12.2-fix-buildsystem.patch |
161 |
+ "${FILESDIR}"/${PN}-0.12.2-fix-c++14.patch |
162 |
+ "${FILESDIR}"/${PN}-0.12.2-fix-desktop-file.patch |
163 |
+) |
164 |
+ |
165 |
+src_prepare() { |
166 |
+ default |
167 |
+ mv configure.{in,ac} || die |
168 |
+ eautoreconf |
169 |
+} |
170 |
+ |
171 |
+src_install() { |
172 |
+ default |
173 |
+ |
174 |
+ # create symlinks for previously bundled fonts |
175 |
+ dosym /usr/share/fonts/dejavu/DejaVuSans.ttf /usr/share/${PN}/res/DejaVuSans.ttf |
176 |
+ dosym /usr/share/fonts/dejavu/DejaVuSans-Bold.ttf /usr/share/${PN}/res/DejaVuSans-Bold.ttf |
177 |
+} |