From f077c725ef746943ec7902350b30ff569f5995ba Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 8 Nov 2022 09:23:49 +0000 Subject: gentoo auto-resync : 08:11:2022 - 09:23:49 --- games-rpg/Manifest.gz | Bin 8791 -> 8785 bytes games-rpg/freedink-data/Manifest | 6 +-- .../freedink-data-1.08.20170409-r1.ebuild | 25 ----------- .../freedink-data-1.08.20190120.ebuild | 26 +++++++++++ games-rpg/freedink-data/metadata.xml | 3 ++ games-rpg/freedink/Manifest | 9 ++-- .../freedink/files/freedink-108.4-no-windres.patch | 20 --------- games-rpg/freedink/files/freedink-109.6-odr.patch | 14 ++++++ games-rpg/freedink/files/freedink-109.6-sdl.patch | 20 +++++++++ games-rpg/freedink/freedink-108.4-r1.ebuild | 50 --------------------- games-rpg/freedink/freedink-109.6.ebuild | 50 +++++++++++++++++++++ games-rpg/freedink/metadata.xml | 3 ++ 12 files changed, 124 insertions(+), 102 deletions(-) delete mode 100644 games-rpg/freedink-data/freedink-data-1.08.20170409-r1.ebuild create mode 100644 games-rpg/freedink-data/freedink-data-1.08.20190120.ebuild delete mode 100644 games-rpg/freedink/files/freedink-108.4-no-windres.patch create mode 100644 games-rpg/freedink/files/freedink-109.6-odr.patch create mode 100644 games-rpg/freedink/files/freedink-109.6-sdl.patch delete mode 100644 games-rpg/freedink/freedink-108.4-r1.ebuild create mode 100644 games-rpg/freedink/freedink-109.6.ebuild (limited to 'games-rpg') diff --git a/games-rpg/Manifest.gz b/games-rpg/Manifest.gz index 9d1d28efdb44..d4d3dd5aa3ec 100644 Binary files a/games-rpg/Manifest.gz and b/games-rpg/Manifest.gz differ diff --git a/games-rpg/freedink-data/Manifest b/games-rpg/freedink-data/Manifest index 18f3f07796a0..e66a4944c49b 100644 --- a/games-rpg/freedink-data/Manifest +++ b/games-rpg/freedink-data/Manifest @@ -1,3 +1,3 @@ -DIST freedink-data-1.08.20170409.tar.gz 53030350 BLAKE2B cf7eb210ed908aed185b2c3d450492ef4265600ee8a058a4d13396de21ec543b619bca4d1a684edec69c913459489db2f1fe868b51306e52ffdf081d7245cd7d SHA512 8ce6bd0de33da0edd42722c2a7d02aae54a3e8e81fc8e0a4c97d9b2b696e58eb41e05e12b3fc1cd4be72be7bcf799988d50affb3689f3fec8e2e78c878cd4afc -EBUILD freedink-data-1.08.20170409-r1.ebuild 476 BLAKE2B ba2b38fe5a49cc49bf351823522445f05d2bf5508992e13008de09586b5b14a392c36e00c3777c1fa455dfb100895456520f0d06fff2fe7d41521ed92eed45a2 SHA512 454eacbcb959f2c9955aebe9dd8eaf627e45807c4b34c1a4581bc0b6ce62d549ca6787f3726b3e2816da6e0fc5c6b17040c98c0fd3e6d6d7a9fb48c9e4f8dc69 -MISC metadata.xml 254 BLAKE2B 4e6c8e1f126f76233a38aba6f5388488656795cb1d7d4767ccb1349772f5e78d59fc5663d4f1933dbe4633c2fbb90cd1d42d4b4d4f5ededc53653e7df13c7187 SHA512 2b82da849e3b0dec378f3fb497014f5d1dbc7aceb8a1f9d1638e83fe69448b1c5151eb4b1187154d828e4a296609ce5125b40977b2581d95b5588e353ca75135 +DIST freedink-data-1.08.20190120.tar.gz 71473728 BLAKE2B 49e5185258249c4280b9e1c2fb1c882946a7fb267af63236f75ce4dd100c90652102b638652f1bd6bdc524559b42a9ac8d9512af152fd921a055d4dd98f16656 SHA512 918785f736cc6996de3253c12fa2ff1d7efc3f2b21956d83ba9f22fd513f5c510c3ebd2ee04cafc8f77378831cca136ba22c191ccbb9aef49325b7ce8033f062 +EBUILD freedink-data-1.08.20190120.ebuild 467 BLAKE2B c10e3099efc876d9d2a9b53f06ca3935a3a25a28c2e8038203095850dbefcb93fef5237c331afd754cbc400f77225b49901374037e53c348da753530982d78ab SHA512 15d6a4d81bc909761899085edaa982e455f187d49d112628695e23ac685bf4d97fdd0989b9d26dc0e5a33ed6d121c3c3da401f7a6aa6f944a8ac43af55d8ba6c +MISC metadata.xml 329 BLAKE2B d3f677422982fad1395b133436b2c157453c7d7bbffae42e18d775de6e62f20dcc01be18b0d6fdf4b06f37a653c57e2e30cb8b9ebeb70e50c115b85270171710 SHA512 6c94068daef1d67dd794dff0d769c164e04ed72658ed3cbc41a944847a665e6edf7eb0f4733256bb14207f38e2c324efc036ee45c3bc81a98b7926859b1bc30a diff --git a/games-rpg/freedink-data/freedink-data-1.08.20170409-r1.ebuild b/games-rpg/freedink-data/freedink-data-1.08.20170409-r1.ebuild deleted file mode 100644 index 450fa9e04574..000000000000 --- a/games-rpg/freedink-data/freedink-data-1.08.20170409-r1.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="Freedink game data" -HOMEPAGE="http://www.freedink.org/" -SRC_URI="mirror://gnu/freedink/${P}.tar.gz" - -LICENSE="ZLIB - CC-BY-SA-3.0 - CC-BY-3.0 - Free-Art-1.3 - GPL-2+ - GPL-3+ - WTFPL-2 - OAL-1.0.1 - public-domain" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -src_install() { - emake DESTDIR="${D}" DATADIR="/usr/share" install - dodoc README.txt README-REPLACEMENTS.txt -} diff --git a/games-rpg/freedink-data/freedink-data-1.08.20190120.ebuild b/games-rpg/freedink-data/freedink-data-1.08.20190120.ebuild new file mode 100644 index 000000000000..676934e2df39 --- /dev/null +++ b/games-rpg/freedink-data/freedink-data-1.08.20190120.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Freedink game data" +HOMEPAGE="https://www.gnu.org/s/freedink/" +SRC_URI="mirror://gnu/freedink/${P}.tar.gz" + +LICENSE=" + ZLIB + CC-BY-3.0 + CC-BY-SA-3.0 + Free-Art-1.3 + GPL-2+ + GPL-3+ + OAL-1.0.1 + WTFPL-2 + public-domain" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +src_install() { + emake DESTDIR="${D}" DATADIR="${EPREFIX}"/usr/share install + einstalldocs +} diff --git a/games-rpg/freedink-data/metadata.xml b/games-rpg/freedink-data/metadata.xml index 7c730d47817a..6007480bbb0b 100644 --- a/games-rpg/freedink-data/metadata.xml +++ b/games-rpg/freedink-data/metadata.xml @@ -5,4 +5,7 @@ games@gentoo.org Gentoo Games Project + + freedink + diff --git a/games-rpg/freedink/Manifest b/games-rpg/freedink/Manifest index 62bb6ee75bc3..c794b4bb8440 100644 --- a/games-rpg/freedink/Manifest +++ b/games-rpg/freedink/Manifest @@ -1,4 +1,5 @@ -AUX freedink-108.4-no-windres.patch 733 BLAKE2B 165eb162877e49b4d2785ca394da2eb092171ae02f46da822d39405a037f40d28553fb46f5900b4b50f84a3e1abe499ae65198e4b21e7d2bb8771e6ce97cfd67 SHA512 f771f54e93d0ce4233d8f895dba91cfe637abae47d1fccefeb5fea615845c107710b1f7c7ccf30dc2a1ef6bc4ec7ee73ff7bc7914387ca5e97de229457c18802 -DIST freedink-108.4.tar.gz 1897701 BLAKE2B b26129f3e5d17895a08cac9564973e31d6e8e2458ac9a2ed4b00f53cd1b8004073022a8e3f4cf8ded2e44cc4bb73909f021a7c960d219e78aec47b4c4ce7c18e SHA512 1496b6a7826bf694a2919add22a8b4b08a4967d8a7fdebf2d599bd99c7a7ce67de6c2b11124423c7aa1f0feb2e7c03ce1cf00252070182936e7481791dafee61 -EBUILD freedink-108.4-r1.ebuild 1064 BLAKE2B 51675813c9d58c44da48884bd47b6f51373a7f9d05f8118e7ff35ccd582c87cc3326baf3329668b30ab98dfa80f3b746ef66913f45a1e47b88d406ae08123891 SHA512 29b4f5d78125577e2790e6a46b922b2fcf13099c275898f8ee685be2adda84e6d125daafc650f5dd04473e09d3fe744cc332a058664fe21a705a3dd1efbe4a11 -MISC metadata.xml 254 BLAKE2B 4e6c8e1f126f76233a38aba6f5388488656795cb1d7d4767ccb1349772f5e78d59fc5663d4f1933dbe4633c2fbb90cd1d42d4b4d4f5ededc53653e7df13c7187 SHA512 2b82da849e3b0dec378f3fb497014f5d1dbc7aceb8a1f9d1638e83fe69448b1c5151eb4b1187154d828e4a296609ce5125b40977b2581d95b5588e353ca75135 +AUX freedink-109.6-odr.patch 364 BLAKE2B cc28a0cfab8a07dd4bbb29b1f0544003b98dda4da89132befcf191aba3647954a15f54d7e4b942ea45a951f9995f80aad7a64fb8ea06580f3b234ae359f446c6 SHA512 4f3f571e2de1ba3310f61e4a34d9857aec93e9c4a18a9d2c0b0156e6757995a553631f34562328b79c68d6c3a61f8abfb515e23725545f53b2ca1f1650e23192 +AUX freedink-109.6-sdl.patch 737 BLAKE2B f479744cbf91d8b2b5b287fcae1236a85c48898f7fdde8c3e417b26a0ba2fc2befec42934e4729ada78308f5244fdec6203e04034bfb702d6589b801b89e14c9 SHA512 1784d84ea6af2656e6efb009ce24f5b2418f214384b7541658aab64c43ac31f71abd6eaf6bd51e4e8dcf3e08cdb4af11c180fb33d22c89d413e5f858f9320f34 +DIST freedink-109.6.tar.gz 1587238 BLAKE2B dc7892114af6968170ed35771d85fd4d8bef969ee2df9b45b315b8b70f50058f5713e22c657ea48e8297cd15c2401e1749c1660bd59140495eba9bcaaf6bf1fc SHA512 9de4155e65c1af58166e30f3f642fed2111eeff2cfccedcd51ea7715e91795d9c9f89d4fa30a801e9a998b7d734682b7d2588ef1ebaba464764c3c3156b6a7ad +EBUILD freedink-109.6.ebuild 1084 BLAKE2B 5910e229d81c2c9520488d29a237d0066494d26d6888a5adb98f372420694b9b7eb3d71c842239c3607380589e2eea9965115c251f3600133f48a4cb3490de6c SHA512 aa969bded235c06c39601a429f66b41a20203aad513a5ad103a393bf6fc3dadcd6b0441481b61fb574ea26a8c2a934a52f8add7341058e73c0ba395987a59b1e +MISC metadata.xml 329 BLAKE2B d3f677422982fad1395b133436b2c157453c7d7bbffae42e18d775de6e62f20dcc01be18b0d6fdf4b06f37a653c57e2e30cb8b9ebeb70e50c115b85270171710 SHA512 6c94068daef1d67dd794dff0d769c164e04ed72658ed3cbc41a944847a665e6edf7eb0f4733256bb14207f38e2c324efc036ee45c3bc81a98b7926859b1bc30a diff --git a/games-rpg/freedink/files/freedink-108.4-no-windres.patch b/games-rpg/freedink/files/freedink-108.4-no-windres.patch deleted file mode 100644 index 81c72e00dae0..000000000000 --- a/games-rpg/freedink/files/freedink-108.4-no-windres.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/src/Makefile.in -+++ b/src/Makefile.in -@@ -226,7 +226,7 @@ - update_frame.h - am_freedink_OBJECTS = $(am__objects_3) freedink.$(OBJEXT) \ - update_frame.$(OBJEXT) --@HAVE_WINDRES_TRUE@am__objects_4 = woeres.$(OBJEXT) -+#@HAVE_WINDRES_TRUE@am__objects_4 = woeres.$(OBJEXT) - nodist_freedink_OBJECTS = $(am__objects_4) - freedink_OBJECTS = $(am_freedink_OBJECTS) $(nodist_freedink_OBJECTS) - freedink_LDADD = $(LDADD) -@@ -1143,7 +1143,7 @@ - @HAVE_WINDRES_FALSE@WOERES = - - # How do we handle resources embedded in the executable binary? --@HAVE_WINDRES_TRUE@WOERES = woeres.rc -+#@HAVE_WINDRES_TRUE@WOERES = woeres.rc - - # Other projects that use Autotools and support MinGW - # http://sourceforge.net/projects/chocolate-doom (Doom port) diff --git a/games-rpg/freedink/files/freedink-109.6-odr.patch b/games-rpg/freedink/files/freedink-109.6-odr.patch new file mode 100644 index 000000000000..560c3ddc6537 --- /dev/null +++ b/games-rpg/freedink/files/freedink-109.6-odr.patch @@ -0,0 +1,14 @@ +Only ever used as struct FF_Handle *, not seeing why this void is here. +error: 'FastFileOpen' violates the C++ One Definition Rule [-Werror=odr] +--- a/src/fastfile.cpp ++++ b/src/fastfile.cpp +@@ -217,3 +217,3 @@ + +-void * ++struct FF_Handle * + FastFileOpen(char *name) +@@ -254,3 +254,3 @@ + i->len = next_off - i->off; +- return (void*)i; ++ return i; + } diff --git a/games-rpg/freedink/files/freedink-109.6-sdl.patch b/games-rpg/freedink/files/freedink-109.6-sdl.patch new file mode 100644 index 000000000000..f00735d7b377 --- /dev/null +++ b/games-rpg/freedink/files/freedink-109.6-sdl.patch @@ -0,0 +1,20 @@ +For newer sdl2 and sdl2-ttf +https://lists.gnu.org/archive/html/bug-freedink/2019-08/msg00000.html +https://lists.gnu.org/archive/html/bug-freedink/2022-07/msg00001.html +--- a/src/gfx_fonts.cpp ++++ b/src/gfx_fonts.cpp +@@ -295,6 +295,6 @@ + { +- char *familyname = TTF_FontFaceFamilyName(font); ++ const char *familyname = TTF_FontFaceFamilyName(font); + if(familyname) + log_info("The family name of the face in the font is: %s", familyname); +- char *stylename = TTF_FontFaceStyleName(font); ++ const char *stylename = TTF_FontFaceStyleName(font); + if(stylename) +--- a/src/input.cpp ++++ b/src/input.cpp +@@ -93,3 +93,2 @@ + // fake mouse events often are de-centered +- SDL_SetHint(SDL_HINT_ANDROID_SEPARATE_MOUSE_AND_TOUCH, "0"); + diff --git a/games-rpg/freedink/freedink-108.4-r1.ebuild b/games-rpg/freedink/freedink-108.4-r1.ebuild deleted file mode 100644 index 743ce07e7546..000000000000 --- a/games-rpg/freedink/freedink-108.4-r1.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit flag-o-matic - -DESCRIPTION="Dink Smallwood is an adventure/role-playing game, similar to Zelda (2D top view)" -HOMEPAGE="http://www.freedink.org/" -SRC_URI="mirror://gnu/freedink/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND=" - >=media-libs/fontconfig-2.4 - >=media-libs/libsdl-1.2[X,sound,joystick,video] - >=media-libs/sdl-gfx-2.0 - >=media-libs/sdl-image-1.2 - >=media-libs/sdl-mixer-1.2[midi,vorbis,wav] - >=media-libs/sdl-ttf-2.0.9 -" -RDEPEND="${DEPEND} - games-rpg/freedink-data -" -DEPEND="${DEPEND} - dev-libs/check - virtual/pkgconfig - sys-devel/gettext -" -PATCHES=( - "${FILESDIR}"/${PN}-108.4-no-windres.patch -) - -src_prepare() { - default - sed -i \ - -e 's#^datarootdir =.*$#datarootdir = /usr/share#' \ - share/Makefile.in || die - # seems like the code is fragile (bug #559548) - filter-flags - replace-flags -O? -O0 -} - -src_configure() { - econf \ - --disable-embedded-resources \ - --localedir="/usr/share/locale" -} diff --git a/games-rpg/freedink/freedink-109.6.ebuild b/games-rpg/freedink/freedink-109.6.ebuild new file mode 100644 index 000000000000..bec7622f80e2 --- /dev/null +++ b/games-rpg/freedink/freedink-109.6.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit xdg + +DESCRIPTION="Dink Smallwood is an adventure/role-playing game, similar to Zelda (2D top view)" +HOMEPAGE="https://www.gnu.org/s/freedink/" +SRC_URI="mirror://gnu/freedink/${P}.tar.gz" + +LICENSE="GPL-3+ LGPL-2.1+" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +COMMON_DEPEND=" + media-libs/fontconfig + media-libs/libsdl2[joystick,sound,video] + media-libs/sdl2-gfx + media-libs/sdl2-image + media-libs/sdl2-mixer[midi,vorbis,wav] + media-libs/sdl2-ttf" +RDEPEND=" + ${COMMON_DEPEND} + games-rpg/freedink-data" +DEPEND=" + ${COMMON_DEPEND} + media-libs/glm" +BDEPEND=" + sys-devel/gettext + virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${P}-odr.patch + "${FILESDIR}"/${P}-sdl.patch +) + +src_configure() { + local econfargs=( + # TODO? Needs unpackaged cxxtest, but that package (currently) seem + # dead and may not be worth adding just for testing this. + --disable-tests + + # Fails if finds a windres executable + ac_cv_prog_WINDRES= + ac_cv_prog_ac_ct_WINDRES= + ) + + econf "${econfargs[@]}" +} diff --git a/games-rpg/freedink/metadata.xml b/games-rpg/freedink/metadata.xml index 7c730d47817a..6007480bbb0b 100644 --- a/games-rpg/freedink/metadata.xml +++ b/games-rpg/freedink/metadata.xml @@ -5,4 +5,7 @@ games@gentoo.org Gentoo Games Project + + freedink + -- cgit v1.2.3