* [gentoo-commits] repo/gentoo:master commit in: games-puzzle/xye/files/, games-puzzle/xye/
@ 2016-12-29 21:46 David Seifert
0 siblings, 0 replies; 2+ messages in thread
From: David Seifert @ 2016-12-29 21:46 UTC (permalink / raw
To: gentoo-commits
commit: 979beea22f428225b0fccf740f0db25013c5948b
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 29 21:43:49 2016 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Thu Dec 29 21:45:54 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=979beea2
games-puzzle/xye: Version bump to 0.12.2
Gentoo-bug: 600298
* EAPI=6
* Remove games.eclass
Package-Manager: Portage-2.3.3, Repoman-2.3.1
games-puzzle/xye/Manifest | 1 +
.../xye/files/xye-0.12.2-fix-buildsystem.patch | 45 ++++++++++++++++++++++
games-puzzle/xye/files/xye-0.12.2-fix-c++14.patch | 14 +++++++
.../xye/files/xye-0.12.2-fix-desktop-file.patch | 18 +++++++++
games-puzzle/xye/xye-0.12.2.ebuild | 43 +++++++++++++++++++++
5 files changed, 121 insertions(+)
diff --git a/games-puzzle/xye/Manifest b/games-puzzle/xye/Manifest
index 135c83d..179165b 100644
--- a/games-puzzle/xye/Manifest
+++ b/games-puzzle/xye/Manifest
@@ -1 +1,2 @@
DIST xye-0.12.1.tar.gz 2850776 SHA256 bbeb3265b0795f14deb2851b4a3bda7dde9b07d624a7ca5fb88cd7acabcf3967 SHA512 aadafdb7b8e0546435838279c2929803be8dde00f3f3c08668c35d0a8ccf5bad511e65629e3f7261140edcf0980d19fda2be1401593ac4c0410beede542e857b WHIRLPOOL 7a1aa2708361b4eddb266037af35e6915852ba1a5037fcfebd95c0a8caab54209ca1c9e3827acecff64772fd15b077f5cded64a50b5820abd7b3cde937bbc2e0
+DIST xye-0.12.2.tar.gz 2860290 SHA256 5d7c04f37d6b4a1821594512c7ddbc8189f968e08ecfd5af55231302f2f917d8 SHA512 a31d922e0a0660d269d30430fbaf1d00924b0271db697f3cbc89b78815e597e11743bd9018fbf3f2f9e7561ad3469e9cca28687efaae7fc6dcba40ada2b5effa WHIRLPOOL 0f4d9105435adab0055cdd8966aa542fd0a231203562bd96ff8b2dff275675233ec1ca541f93e23787d8bf610cb29430f0b97e9f447ba63a695127e670788fc4
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
new file mode 100644
index 00000000..c96d42e
--- /dev/null
+++ b/games-puzzle/xye/files/xye-0.12.2-fix-buildsystem.patch
@@ -0,0 +1,45 @@
+Fix build system to respect correct paths
+and install files in correct paths.
+
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -4,13 +4,11 @@
+
+
+ bin_PROGRAMS = xye
+-xye_LDFLAGS =
+
++doc_DATA = NEWS ChangeLog AUTHORS
++html_DATA = ReadMe.html
+
+-docedir = $(datadir)/@PACKAGE@
+-doce_DATA = ReadMe.html NEWS ChangeLog AUTHORS
+-
+-levelsdir= $(datadir)/@PACKAGE@/levels
++levelsdir= $(datadir)/$(PACKAGE)/levels
+ levels_DATA = levels/5levels.xye \
+ levels/levels.xye \
+ levels/logo.xye \
+@@ -25,12 +23,10 @@
+ levels/xyester.xye \
+ levels/SuperJustin.xye
+
+-resdir= $(datadir)/@PACKAGE@/res
++resdir= $(datadir)/$(PACKAGE)/res
+ res_DATA = res/default.xml \
+ res/xye.png \
+ res/xye_luminosity.png \
+-res/DejaVuSans.ttf \
+-res/DejaVuSans-Bold.ttf \
+ res/fon.bmp \
+ res/fon_bold.bmp \
+ res/clean40.xml \
+@@ -103,7 +99,7 @@
+ src/skins.cpp \
+ src/skins.h
+
+-EXTRA_DIST = ${EXTRA_DIST1} ${xye_SOURCES} ${res_DATA} ${levels_DATA} ${doce_DATA}
++EXTRA_DIST = ${EXTRA_DIST1} ${xye_SOURCES} ${res_DATA} ${levels_DATA}
+
+ DEFS=@data_path_flag@
+
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
new file mode 100644
index 00000000..f2083b8
--- /dev/null
+++ b/games-puzzle/xye/files/xye-0.12.2-fix-c++14.patch
@@ -0,0 +1,14 @@
+Add explicit cast to silence C++14 -Wnarrowing conversion warnings.
+See also: https://bugs.gentoo.org/show_bug.cgi?id=600298
+
+--- a/src/xsb_level.cpp
++++ b/src/xsb_level.cpp
+@@ -784,7 +784,7 @@
+
+ bool FromXyeDFS(int* mem, unsigned char x, unsigned char y)
+ {
+- static const unsigned char dx[4] = {0,0,-1,1}, dy[4] = {-1,1,0,0};
++ static const unsigned char dx[4] = {0,0,(unsigned char)-1,1}, dy[4] = {(unsigned char)-1,1,0,0};
+ int &res = mem[y*XYE_HORZ+x];
+ if( res==0)
+ {
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
new file mode 100644
index 00000000..99558ef
--- /dev/null
+++ b/games-puzzle/xye/files/xye-0.12.2-fix-desktop-file.patch
@@ -0,0 +1,18 @@
+Fix .desktop file to comply with FDO specifications.
+
+--- a/xye.desktop
++++ b/xye.desktop
+@@ -4,11 +4,11 @@
+ Encoding=UTF-8
+ Exec=xye
+ Type=Application
+-Categories=Application;Game;PuzzleGame
++Categories=Game
+ Name=Xye
+ GenericName=Xye
+ Comment=Solve puzzles and action challenges in order to get all the gems in the room.
+ Terminal=false
+ StartupNotify=false
+-Icon=xye.png
++Icon=xye
+ MimeType=application/xye-xml
diff --git a/games-puzzle/xye/xye-0.12.2.ebuild b/games-puzzle/xye/xye-0.12.2.ebuild
new file mode 100644
index 00000000..3759062
--- /dev/null
+++ b/games-puzzle/xye/xye-0.12.2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="Free version of the classic game Kye"
+HOMEPAGE="http://xye.sourceforge.net/"
+SRC_URI="mirror://sourceforge/xye/${P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ media-fonts/dejavu
+ media-libs/libsdl[video]
+ media-libs/sdl-ttf
+ media-libs/sdl-image[png]"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.12.2-fix-buildsystem.patch
+ "${FILESDIR}"/${PN}-0.12.2-fix-c++14.patch
+ "${FILESDIR}"/${PN}-0.12.2-fix-desktop-file.patch
+)
+
+src_prepare() {
+ default
+ mv configure.{in,ac} || die
+ eautoreconf
+}
+
+src_install() {
+ default
+
+ # create symlinks for previously bundled fonts
+ dosym /usr/share/fonts/dejavu/DejaVuSans.ttf /usr/share/${PN}/res/DejaVuSans.ttf
+ dosym /usr/share/fonts/dejavu/DejaVuSans-Bold.ttf /usr/share/${PN}/res/DejaVuSans-Bold.ttf
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-puzzle/xye/files/, games-puzzle/xye/
@ 2017-09-30 2:30 Michael Palimaka
0 siblings, 0 replies; 2+ messages in thread
From: Michael Palimaka @ 2017-09-30 2:30 UTC (permalink / raw
To: gentoo-commits
commit: a660f57a3be4b7ed7bcdb42c23961e973d42b62a
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 30 02:30:02 2017 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Sep 30 02:30:34 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a660f57a
games-puzzle/xye: remove 0.12.1
Package-Manager: Portage-2.3.8, Repoman-2.3.3
games-puzzle/xye/Manifest | 1 -
games-puzzle/xye/files/xye-0.12.1-gcc47.patch | 22 ---------------
games-puzzle/xye/xye-0.12.1.ebuild | 40 ---------------------------
3 files changed, 63 deletions(-)
diff --git a/games-puzzle/xye/Manifest b/games-puzzle/xye/Manifest
index 179165bae00..04735744778 100644
--- a/games-puzzle/xye/Manifest
+++ b/games-puzzle/xye/Manifest
@@ -1,2 +1 @@
-DIST xye-0.12.1.tar.gz 2850776 SHA256 bbeb3265b0795f14deb2851b4a3bda7dde9b07d624a7ca5fb88cd7acabcf3967 SHA512 aadafdb7b8e0546435838279c2929803be8dde00f3f3c08668c35d0a8ccf5bad511e65629e3f7261140edcf0980d19fda2be1401593ac4c0410beede542e857b WHIRLPOOL 7a1aa2708361b4eddb266037af35e6915852ba1a5037fcfebd95c0a8caab54209ca1c9e3827acecff64772fd15b077f5cded64a50b5820abd7b3cde937bbc2e0
DIST xye-0.12.2.tar.gz 2860290 SHA256 5d7c04f37d6b4a1821594512c7ddbc8189f968e08ecfd5af55231302f2f917d8 SHA512 a31d922e0a0660d269d30430fbaf1d00924b0271db697f3cbc89b78815e597e11743bd9018fbf3f2f9e7561ad3469e9cca28687efaae7fc6dcba40ada2b5effa WHIRLPOOL 0f4d9105435adab0055cdd8966aa542fd0a231203562bd96ff8b2dff275675233ec1ca541f93e23787d8bf610cb29430f0b97e9f447ba63a695127e670788fc4
diff --git a/games-puzzle/xye/files/xye-0.12.1-gcc47.patch b/games-puzzle/xye/files/xye-0.12.1-gcc47.patch
deleted file mode 100644
index 04414abc6a2..00000000000
--- a/games-puzzle/xye/files/xye-0.12.1-gcc47.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- src/editorsave.cpp.old
-+++ src/editorsave.cpp
-@@ -642,7 +642,8 @@
- file << "<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>\n";
- file << "<pack>\n<name>"<< stripXML(editorboard::filetitle) <<"</name><author>"<< stripXML(editorboard::author) <<"</author>\n<description>"<< stripXML(editorboard::description) <<"</description>\n";
-
-- for (int i=first; i<editorboard::CountLevels(); i++) {
-+ int i;
-+ for (i=first; i<editorboard::CountLevels(); i++) {
- editorboard::LoadLevelNumber(board, i);
- file << "\n<level>\n";
- file << "<title>"<< stripXML(board->title) <<"</title>\n";
---- src/gen.cpp.old
-+++ src/gen.cpp
-@@ -21,6 +21,7 @@
- #include<cstdio>
- #include<iostream>
- #include<fstream>
-+#include <unistd.h>
-
- const float F_RAND_MAX = (float)(RAND_MAX);
-
diff --git a/games-puzzle/xye/xye-0.12.1.ebuild b/games-puzzle/xye/xye-0.12.1.ebuild
deleted file mode 100644
index 1d9e9f8ef24..00000000000
--- a/games-puzzle/xye/xye-0.12.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils games
-
-DESCRIPTION="Free version of the classic game Kye"
-HOMEPAGE="http://xye.sourceforge.net/"
-SRC_URI="mirror://sourceforge/xye/${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="media-libs/libsdl[video]
- media-libs/sdl-ttf
- media-libs/sdl-image[png]
- media-fonts/dejavu"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-gcc47.patch
- sed -i -e '/^xye_LDFLAGS/d' Makefile.am || die
- eautoreconf
-}
-
-src_install() {
- dogamesbin "${PN}"
- insinto "${GAMES_DATADIR}/${PN}"
- doins -r levels res
- rm -f "${D}${GAMES_DATADIR}/${PN}"/res/DejaVuSans*
- dosym /usr/share/fonts/dejavu/DejaVuSans.ttf "${GAMES_DATADIR}/${PN}"/res/DejaVuSans.ttf
- dosym /usr/share/fonts/dejavu/DejaVuSans-Bold.ttf "${GAMES_DATADIR}/${PN}"/res/DejaVuSans-Bold.ttf
- dodoc AUTHORS ChangeLog README NEWS
- dohtml ReadMe.html
- doicon xye.svg
- make_desktop_entry ${PN} Xye
- prepgamesdirs
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-09-30 2:30 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-12-29 21:46 [gentoo-commits] repo/gentoo:master commit in: games-puzzle/xye/files/, games-puzzle/xye/ David Seifert
-- strict thread matches above, loose matches on Subject: below --
2017-09-30 2:30 Michael Palimaka
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox