diff options
Diffstat (limited to 'games-puzzle/enigma')
| -rw-r--r-- | games-puzzle/enigma/Manifest | 7 | ||||
| -rw-r--r-- | games-puzzle/enigma/enigma-1.21-r2.ebuild | 74 | ||||
| -rw-r--r-- | games-puzzle/enigma/files/enigma-1.21-build.patch | 110 | ||||
| -rw-r--r-- | games-puzzle/enigma/files/enigma-1.21-gcc6.patch | 25 | ||||
| -rw-r--r-- | games-puzzle/enigma/metadata.xml | 11 |
5 files changed, 227 insertions, 0 deletions
diff --git a/games-puzzle/enigma/Manifest b/games-puzzle/enigma/Manifest new file mode 100644 index 000000000000..c4a37168601e --- /dev/null +++ b/games-puzzle/enigma/Manifest @@ -0,0 +1,7 @@ +AUX enigma-1.21-build.patch 3543 SHA256 adf8008b557e08d37cb5dc898284f1c2ea714fe87d0644bf9cbe43841cde7a79 SHA512 accfb31abaadbee476961f38cc2f76a1fceac4befbf4721d4e08061a3509d05f2e534b4f8f69f1765e082a4ed4f70ccbba0c73c4479a49ee1cfde4c1ae1cdcc4 WHIRLPOOL 787501c1e36ed53026dff7d4eafc4d805e3d649681f80e224c99cc8ed304b8caa6b8dc6896f0eb313f5b569ed35a35dde09fb63a98c5e58c9e608dfc95451032 +AUX enigma-1.21-gcc6.patch 927 SHA256 c2cd9035630ff3deab2880a4f4da0417acf5f7fba6190663658d7aad5c2834c7 SHA512 d0eb1f356370431e3b3b96c7fa3a56ca52ed15fa94286d1b5075ba8a4b4b349deb676479bd8e045a7463f65a3885c44aab90166549850e19c510d606aed2e746 WHIRLPOOL 47a27ed65bb67441b0a4cab48292611d904d64db4394fa7d4dbed823f5b4b0c6ea5f0681136e0da933a71fa7dceca855f3b9785bbc4ffebc40ec716462d54332 +DIST enigma-1.21.tar.gz 56409951 SHA256 d872cf067d8eb560d3bb1cb17245814bc56ac3953ae1f12e2229c8eb6f82ce01 SHA512 0cca56a193f0f416e0fde02caf2e30b61eef506b6c62e151ff575f5c130f1e2e778d77149007b114ebaeec3a3e793434328555cb5190954a0ae13ed6cee229f0 WHIRLPOOL 9583eaacd75c7a3cf5af172d1209771b599e6f8b0fed2b7ea6b0a76ccc2743615d47ac3199f56dd1e39203afc09a43d9aa5d8d879e38502b47d4b77274217b87 +EBUILD enigma-1.21-r2.ebuild 1574 SHA256 fb9fa956c80b2193a81646cbf3f74e1f175a7c4f0d93a2c1c54e8d03a782f01e SHA512 f9f3511bc0c5ba153cd7acb1f2c377593ae0ff226a51596cd1524ed7f929c79db7ecd0e10fae0284ef7d30276aa8d1ef4a5d369e253af89dc492a40d1d36bfbf WHIRLPOOL 201c149772ebc1c1ce96e2b227e7fe3854ad0e729c4b9e0e0ec7468da87d55b6f9e83b771d586e52ee702a2f01378782a27619102e71850efc6557b367605ed9 +MISC ChangeLog 3633 SHA256 4dcd978ecbac1f541a0f04b60ab92d6ee8aaac4aa998ecade0c46adbed6be914 SHA512 486e91fdff9771ce579059fe468373ebb718c1f1e55375bcee0a0d59ce7364804af6f9c4a59fcdb3f3c8e879fa3cee68948dfc6b434a669a0e1174063ecd5854 WHIRLPOOL 79bb0a69ef79ff9e6b356ed90979640ac1bb7bcd28c88cfdcf117727ddbbb64ed67696d8033a61148727fabbe955456dc544a6570fe16eb01f725a9ef2911bbe +MISC ChangeLog-2015 9534 SHA256 4c13145d776aed3c7e02154ac308b2ba2c60046bdea119d09712832223ba94a0 SHA512 b7004988b8d7078d41f5c73c06b4f05897c2fb95dd4554246b7055d2de55a1433ad6ba4ca7cfd049255b791392f7fb8ad55f68ba07f37db46eb7ea4d5471e33a WHIRLPOOL e82d7c5be79228310917c44e694fbf1abcc6a1c9ee3ea09386c19e304af4af70ade29ac29e0ce15ab77e563e0f4f187147635dc255fcb752e4e726c3f2fc3b92 +MISC metadata.xml 334 SHA256 05d32a23437f8d95de3119c2a6fb88c1f47f6cb4d3250894675a3546cc9c4e52 SHA512 885fc4263252767f8861f2d45dc11a319cb5b0a7a9eccdf073a0433ba4908d97f7a590a96ae542372e53f16780a41cee4ee80556c0cedffbf34f6e4bcadeacc6 WHIRLPOOL 633153ac122624f8251884971bd1b633a84331d49fc3e94138944fa493f8026068666a7843d1dc3bc58f894d3afc57ce0addc6181f64db4c65f7e64a5f4a5ec9 diff --git a/games-puzzle/enigma/enigma-1.21-r2.ebuild b/games-puzzle/enigma/enigma-1.21-r2.ebuild new file mode 100644 index 000000000000..af0c5543f041 --- /dev/null +++ b/games-puzzle/enigma/enigma-1.21-r2.ebuild @@ -0,0 +1,74 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 +inherit autotools eutils gnome2-utils games + +DESCRIPTION="puzzle game similar to Oxyd" +HOMEPAGE="http://www.nongnu.org/enigma/" +SRC_URI="mirror://sourceforge/enigma-game/${P}.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="nls" + +COMMON_DEPS="media-libs/sdl-ttf + media-libs/libsdl[video] + media-libs/sdl-mixer + media-libs/sdl-image[jpeg,png] + media-libs/libpng:0= + sys-libs/zlib + net-misc/curl + || ( >=dev-libs/xerces-c-3[icu] >=dev-libs/xerces-c-3[-icu,-iconv] ) + net-libs/enet:= + nls? ( virtual/libintl )" +DEPEND="${COMMON_DEPS} + sys-devel/gettext" +RDEPEND="${COMMON_DEPS} + media-fonts/dejavu + x11-misc/xdg-utils" + +src_prepare() { + cp /usr/share/gettext/config.rpath . + epatch "${FILESDIR}"/${P}-build.patch \ + "${FILESDIR}"/${P}-gcc6.patch + sed -i \ + -e "s:DOCDIR:\"/usr/share/doc/${P}/html\":" \ + src/main.cc || die + eautoreconf +} + +src_configure() { + egamesconf \ + --with-system-enet \ + $(use_enable nls) +} + +src_install() { + DOCS="ACKNOWLEDGEMENTS AUTHORS CHANGES README doc/HACKING" \ + default + dosym \ + /usr/share/fonts/dejavu/DejaVuSansCondensed.ttf \ + "${GAMES_DATADIR}"/${PN}/fonts/DejaVuSansCondensed.ttf + dosym \ + /usr/share/fonts/dejavu/DejaVuSans.ttf \ + "${GAMES_DATADIR}"/${PN}/fonts/vera_sans.ttf + dohtml -r doc/* + doman doc/enigma.6 + prepgamesdirs +} + +pkg_preinst() { + games_pkg_preinst + gnome2_icon_savelist +} + +pkg_postinst() { + games_pkg_postinst + gnome2_icon_cache_update +} + +pkg_postrm() { + gnome2_icon_cache_update +} diff --git a/games-puzzle/enigma/files/enigma-1.21-build.patch b/games-puzzle/enigma/files/enigma-1.21-build.patch new file mode 100644 index 000000000000..6d5e91ca76e4 --- /dev/null +++ b/games-puzzle/enigma/files/enigma-1.21-build.patch @@ -0,0 +1,110 @@ +diff -ru enigma-1.21.orig/Makefile.am enigma-1.21/Makefile.am +--- enigma-1.21.orig/Makefile.am 2014-12-19 16:26:06.000000000 -0500 ++++ enigma-1.21/Makefile.am 2015-02-06 18:20:22.239518323 -0500 +@@ -3,12 +3,9 @@ + # tools -> lib-src/lua + # src -> tools, lib-src + # +-SUBDIRS = m4 lib-src tools intl src data doc po etc ++SUBDIRS = m4 lib-src tools intl src data po etc + EXTRA_DIST = enigma CHANGES ACKNOWLEDGEMENTS + +-docdir = @datadir@/doc/enigma +-doc_DATA = README CHANGES COPYING ACKNOWLEDGEMENTS +- + ACLOCAL_AMFLAGS = -I m4 + + .PHONY: tolua +diff -ru enigma-1.21.orig/configure.ac enigma-1.21/configure.ac +--- enigma-1.21.orig/configure.ac 2014-12-19 16:26:06.000000000 -0500 ++++ enigma-1.21/configure.ac 2015-02-06 18:20:22.282516643 -0500 +@@ -342,7 +342,6 @@ + CXXFLAGS="$CXXFLAGS -O2 -ffast-math -fomit-frame-pointer" + AC_MSG_RESULT(yes) + else +- CXXFLAGS="$CXXFLAGS -g" + AC_MSG_RESULT(no) + fi + +diff -ru enigma-1.21.orig/etc/Makefile.am enigma-1.21/etc/Makefile.am +--- enigma-1.21.orig/etc/Makefile.am 2014-12-19 16:26:05.000000000 -0500 ++++ enigma-1.21/etc/Makefile.am 2015-02-06 18:25:44.131945494 -0500 +@@ -1,18 +1,18 @@ + # if !MINGW32 + # Comply with xdg icon theme specification +-icondir = $(prefix)/share/icons/hicolor/48x48/apps ++icondir = /usr/share/icons/hicolor/48x48/apps + icon_DATA = enigma.png + + # Backwards-compatible global search location for images +-pixmapdir = $(prefix)/share/pixmaps ++pixmapdir = /usr/share/pixmaps + pixmap_DATA = enigma.png + + # Install .desktop file in xdg standard location +-desktopdir = $(prefix)/share/applications ++desktopdir = /usr/share/applications + desktop_DATA = enigma.desktop + + # Install AppData file +-appdatadir = $(prefix)/share/appdata ++appdatadir = /usr/share/appdata + dist_appdata_DATA = enigma.appdata.xml + # endif !MINGW32 + +diff -ru enigma-1.21.orig/etc/enigma.desktop enigma-1.21/etc/enigma.desktop +--- enigma-1.21.orig/etc/enigma.desktop 2014-12-19 16:26:05.000000000 -0500 ++++ enigma-1.21/etc/enigma.desktop 2015-02-06 18:20:22.282516643 -0500 +@@ -1,5 +1,5 @@ + [Desktop Entry] +-Version=1.21 ++Version=1.0 + Name=Enigma + Name[be]=Enigma + Name[cs]=Enigma +@@ -44,5 +44,5 @@ + StartupNotify=false + Icon=enigma + Type=Application +-Categories=Application;Game;PuzzleGame; ++Categories=Game;X-PuzzleGame; + +diff -ru enigma-1.21.orig/po/Makefile.in.in enigma-1.21/po/Makefile.in.in +--- enigma-1.21.orig/po/Makefile.in.in 2014-12-19 16:26:06.000000000 -0500 ++++ enigma-1.21/po/Makefile.in.in 2015-02-06 18:20:22.283516604 -0500 +@@ -25,12 +25,12 @@ + exec_prefix = @exec_prefix@ + datarootdir = @datarootdir@ + datadir = @datadir@ +-localedir = $(datadir)/locale ++localedir = /usr/share/locale + gettextsrcdir = $(datadir)/gettext/po + + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ +-MKINSTALLDIRS = @MKINSTALLDIRS@ ++MKINSTALLDIRS = $(top_srcdir)/mkinstalldirs + #install_sh@ -d + mkinstalldirs = $(SHELL) $(MKINSTALLDIRS) + +diff -ru enigma-1.21.orig/src/Makefile.am enigma-1.21/src/Makefile.am +--- enigma-1.21.orig/src/Makefile.am 2014-12-19 16:24:38.000000000 -0500 ++++ enigma-1.21/src/Makefile.am 2015-02-06 18:20:22.283516604 -0500 +@@ -12,7 +12,7 @@ + CXXFLAGS = @CXXFLAGS@\ + -DSYSTEM_DATA_DIR=\"$(datadir)/enigma\" \ + -DDOCDIR=\"$(docdir)\" \ +- -DLOCALEDIR=\"$(localedir_enigma)\" \ ++ -DLOCALEDIR=\"/usr/share/locale\" \ + -I$(top_srcdir)/lib-src/zipios++ \ + -I$(top_builddir)/lib-src/zipios++ \ + -I$(top_srcdir)/lib-src/lua \ +@@ -440,7 +440,7 @@ + + else # not MINGW32 + +- localedir_enigma := $(datadir)/locale ++ localedir_enigma := /usr/share/locale + mingw_ldadd = + + endif diff --git a/games-puzzle/enigma/files/enigma-1.21-gcc6.patch b/games-puzzle/enigma/files/enigma-1.21-gcc6.patch new file mode 100644 index 000000000000..fd72dbc89065 --- /dev/null +++ b/games-puzzle/enigma/files/enigma-1.21-gcc6.patch @@ -0,0 +1,25 @@ +Bug: https://bugs.gentoo.org/610778 + +From e0f31f63ba4252ced7128d3ceec2bc668e8681f4 Mon Sep 17 00:00:00 2001 +From: Legimet <legimet.calc@gmail.com> +Date: Sat, 13 Aug 2016 23:41:27 -0400 +Subject: [PATCH] Fix build error with GCC 6, caused by comparing + basic_ifstream to NULL + +--- + src/lev/Proxy.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/lev/Proxy.cc b/src/lev/Proxy.cc +index 6d58c0ba..69f54a20 100644 +--- a/src/lev/Proxy.cc ++++ b/src/lev/Proxy.cc +@@ -933,7 +933,7 @@ namespace enigma { namespace lev { + } else if (haveLocalCopy) { + // plain file + basic_ifstream<char> ifs(absExtPath.c_str(), ios::binary | ios::in); +- if (ifs != NULL) ++ if (ifs) + Readfile(ifs, extCode); + else + haveLocalCopy = false; diff --git a/games-puzzle/enigma/metadata.xml b/games-puzzle/enigma/metadata.xml new file mode 100644 index 000000000000..31c04074be24 --- /dev/null +++ b/games-puzzle/enigma/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>games@gentoo.org</email> + <name>Gentoo Games Project</name> + </maintainer> + <upstream> + <remote-id type="sourceforge">enigma-game</remote-id> + </upstream> +</pkgmetadata> |