[gentoo-commits] repo/gentoo:master commit in: games-rpg/freedink/, games-rpg/freedink/files/
commit: 92561523ab995f58eec490f9da3962ad661b9e2f
Author: Ionen Wolkens gentoo org>
AuthorDate: Tue Nov 8 00:58:19 2022 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Tue Nov 8 05:36:54 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92561523
games-rpg/freedink: add 109.6
Now uses SDL2.
ebuild changes:
* EAPI6->8
* fix licenses wrt bug #880183 (minus public-domain, binreloc.c
is not in this version)
* update HOMEPAGE, old domain seems dead
* tentatively drop -O? -> -O0 replace-flags, many changes including
using C++ and hopefully is not relevant anymore (or at least, I can
load save games even with -O3)
-> also drop filter-flags, it had no arguments and was no-op
(likely was meant to be strip-flags)
* change windres workaround to not need a patch
(note it gives a misleading error about lacking Ogg support, but
if look at debug output it successfully finds Ogg differently)
Closes: https://bugs.gentoo.org/880183
Signed-off-by: Ionen Wolkens gentoo.org>
games-rpg/freedink/Manifest | 1 +
games-rpg/freedink/files/freedink-109.6-odr.patch | 14 +++
games-rpg/freedink/files/freedink-109.6-sdl.patch | 20 +
games-rpg/freedink/freedink-109.6.ebuild | 50 +++
4 files changed, 85 insertions(+)
diff --git a/games-rpg/freedink/Manifest b/games-rpg/freedink/Manifest
index 8dda84256cf9..56d7ac3ac4e8 100644
--- a/games-rpg/freedink/Manifest
+++ b/games-rpg/freedink/Manifest
@@ -1 +1,2 @@
DIST freedink-108.4.tar.gz 1897701 BLAKE2B
b26129f3e5d17895a08cac9564973e31d6e8e2458ac9a2ed4b00f53cd1b8004073022a8e3f4cf8ded2e44cc4bb73909f021a7c960d219e78aec47b4c4ce7c18e
SHA512
1496b6a7826bf694a2919add22a8b4b08a4967d8a7fdebf2d599bd99c7a7ce67de6c2b11124423c7aa1f0feb2e7c03ce1cf00252070182936e7481791dafee61
+DIST freedink-109.6.tar.gz 1587238 BLAKE2B
dc7892114af6968170ed35771d85fd4d8bef969ee2df9b45b315b8b70f50058f5713e22c657ea48e8297cd15c2401e1749c1660bd59140495eba9bcaaf6bf1fc
SHA512
9de4155e65c1af58166e30f3f642fed2111eeff2cfccedcd51ea7715e91795d9c9f89d4fa30a801e9a998b7d734682b7d2588ef1ebaba464764c3c3156b6a7ad
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 ..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 ..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/msg0.html
+https://lists.gnu.org/archive/html/bug-freedink/2022-07/msg1.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-109.6.ebuild
b/games-rpg/freedink/freedink-109.6.ebuild
new file mode 100644
index ..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
[gentoo-commits] repo/gentoo:master commit in: games-rpg/freedink/
commit: dba9a9202588bd47f82fb47b0a165cbc3b6ce603 Author: Ionen Wolkens gentoo org> AuthorDate: Mon Nov 7 23:44:08 2022 + Commit: Ionen Wolkens gentoo org> CommitDate: Tue Nov 8 05:36:53 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dba9a920 games-rpg/freedink: add savannah upstream metadata Signed-off-by: Ionen Wolkens gentoo.org> games-rpg/freedink/metadata.xml | 3 +++ 1 file changed, 3 insertions(+) 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 @@ ga...@gentoo.org Gentoo Games Project + + freedink +
[gentoo-commits] repo/gentoo:master commit in: games-rpg/freedink/, games-rpg/freedink/files/
commit: 862a879b14190394ffd43f5b77b44f1bc17cd185
Author: Ionen Wolkens gentoo org>
AuthorDate: Tue Nov 8 05:26:39 2022 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Tue Nov 8 05:36:54 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=862a879b
games-rpg/freedink: drop 108.4-r1
EAPI6, sdl1, and is buggy requiring -O0
Signed-off-by: Ionen Wolkens gentoo.org>
games-rpg/freedink/Manifest| 1 -
.../freedink/files/freedink-108.4-no-windres.patch | 20 -
games-rpg/freedink/freedink-108.4-r1.ebuild| 50 --
3 files changed, 71 deletions(-)
diff --git a/games-rpg/freedink/Manifest b/games-rpg/freedink/Manifest
index 56d7ac3ac4e8..8204bf5f2698 100644
--- a/games-rpg/freedink/Manifest
+++ b/games-rpg/freedink/Manifest
@@ -1,2 +1 @@
-DIST freedink-108.4.tar.gz 1897701 BLAKE2B
b26129f3e5d17895a08cac9564973e31d6e8e2458ac9a2ed4b00f53cd1b8004073022a8e3f4cf8ded2e44cc4bb73909f021a7c960d219e78aec47b4c4ce7c18e
SHA512
1496b6a7826bf694a2919add22a8b4b08a4967d8a7fdebf2d599bd99c7a7ce67de6c2b11124423c7aa1f0feb2e7c03ce1cf00252070182936e7481791dafee61
DIST freedink-109.6.tar.gz 1587238 BLAKE2B
dc7892114af6968170ed35771d85fd4d8bef969ee2df9b45b315b8b70f50058f5713e22c657ea48e8297cd15c2401e1749c1660bd59140495eba9bcaaf6bf1fc
SHA512
9de4155e65c1af58166e30f3f642fed2111eeff2cfccedcd51ea7715e91795d9c9f89d4fa30a801e9a998b7d734682b7d2588ef1ebaba464764c3c3156b6a7ad
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..
--- 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/freedink-108.4-r1.ebuild
b/games-rpg/freedink/freedink-108.4-r1.ebuild
deleted file mode 100644
index 743ce07e7546..
--- 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"
-}
[gentoo-commits] repo/gentoo:master commit in: games-rpg/freedink-data/
commit: c0e80b57840b619c7f0c4eb9bcfe18b7aeaad681
Author: Ionen Wolkens gentoo org>
AuthorDate: Tue Nov 8 00:22:07 2022 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Tue Nov 8 05:36:53 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0e80b57
games-rpg/freedink-data: add 1.08.20190120
* EAPI6->8
* update HOMEPAGE, old domain seems dead
* fix prefix
* use einstalldocs (gets changelog/news)
Signed-off-by: Ionen Wolkens gentoo.org>
games-rpg/freedink-data/Manifest | 1 +
.../freedink-data-1.08.20190120.ebuild | 26 ++
2 files changed, 27 insertions(+)
diff --git a/games-rpg/freedink-data/Manifest b/games-rpg/freedink-data/Manifest
index 1afe075e64d0..d41ab800a48d 100644
--- a/games-rpg/freedink-data/Manifest
+++ b/games-rpg/freedink-data/Manifest
@@ -1 +1,2 @@
DIST freedink-data-1.08.20170409.tar.gz 53030350 BLAKE2B
cf7eb210ed908aed185b2c3d450492ef4265600ee8a058a4d13396de21ec543b619bca4d1a684edec69c913459489db2f1fe868b51306e52ffdf081d7245cd7d
SHA512
8ce6bd0de33da0edd42722c2a7d02aae54a3e8e81fc8e0a4c97d9b2b696e58eb41e05e12b3fc1cd4be72be7bcf799988d50affb3689f3fec8e2e78c878cd4afc
+DIST freedink-data-1.08.20190120.tar.gz 71473728 BLAKE2B
49e5185258249c4280b9e1c2fb1c882946a7fb267af63236f75ce4dd100c90652102b638652f1bd6bdc524559b42a9ac8d9512af152fd921a055d4dd98f16656
SHA512
918785f736cc6996de3253c12fa2ff1d7efc3f2b21956d83ba9f22fd513f5c510c3ebd2ee04cafc8f77378831cca136ba22c191ccbb9aef49325b7ce8033f062
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 ..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
+}
[gentoo-commits] repo/gentoo:master commit in: games-rpg/freedink-data/
commit: b54e5cc20efd8a8b5fd96ec92360d75c12c688ae
Author: Ionen Wolkens gentoo org>
AuthorDate: Tue Nov 8 05:27:28 2022 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Tue Nov 8 05:36:53 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b54e5cc2
games-rpg/freedink-data: drop 1.08.20170409-r1
Signed-off-by: Ionen Wolkens gentoo.org>
games-rpg/freedink-data/Manifest | 1 -
.../freedink-data-1.08.20170409-r1.ebuild | 25 --
2 files changed, 26 deletions(-)
diff --git a/games-rpg/freedink-data/Manifest b/games-rpg/freedink-data/Manifest
index d41ab800a48d..216dab32038f 100644
--- a/games-rpg/freedink-data/Manifest
+++ b/games-rpg/freedink-data/Manifest
@@ -1,2 +1 @@
-DIST freedink-data-1.08.20170409.tar.gz 53030350 BLAKE2B
cf7eb210ed908aed185b2c3d450492ef4265600ee8a058a4d13396de21ec543b619bca4d1a684edec69c913459489db2f1fe868b51306e52ffdf081d7245cd7d
SHA512
8ce6bd0de33da0edd42722c2a7d02aae54a3e8e81fc8e0a4c97d9b2b696e58eb41e05e12b3fc1cd4be72be7bcf799988d50affb3689f3fec8e2e78c878cd4afc
DIST freedink-data-1.08.20190120.tar.gz 71473728 BLAKE2B
49e5185258249c4280b9e1c2fb1c882946a7fb267af63236f75ce4dd100c90652102b638652f1bd6bdc524559b42a9ac8d9512af152fd921a055d4dd98f16656
SHA512
918785f736cc6996de3253c12fa2ff1d7efc3f2b21956d83ba9f22fd513f5c510c3ebd2ee04cafc8f77378831cca136ba22c191ccbb9aef49325b7ce8033f062
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..
--- 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
-}
[gentoo-commits] repo/gentoo:master commit in: games-rpg/freedink-data/
commit: cc820922100dab587aa19360ccc486a66c9f053d Author: Ionen Wolkens gentoo org> AuthorDate: Mon Nov 7 23:44:14 2022 + Commit: Ionen Wolkens gentoo org> CommitDate: Tue Nov 8 05:36:53 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc820922 games-rpg/freedink-data: add savannah upstream metadata Signed-off-by: Ionen Wolkens gentoo.org> games-rpg/freedink-data/metadata.xml | 3 +++ 1 file changed, 3 insertions(+) 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 @@ ga...@gentoo.org Gentoo Games Project + + freedink +
[gentoo-commits] repo/gentoo:master commit in: games-rpg/freedink-data/
commit: 5f989e2c30bba9d6065eb2b657ebd775b593c2ca
Author: Ionen Wolkens gentoo org>
AuthorDate: Wed Jun 23 00:33:12 2021 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Wed Jun 23 02:22:37 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f989e2c
games-rpg/freedink-data: drop 1.08.20140901-r1
Signed-off-by: Ionen Wolkens gentoo.org>
games-rpg/freedink-data/Manifest | 1 -
.../freedink-data-1.08.20140901-r1.ebuild | 26 --
2 files changed, 27 deletions(-)
diff --git a/games-rpg/freedink-data/Manifest b/games-rpg/freedink-data/Manifest
index 963635f07a0..1afe075e64d 100644
--- a/games-rpg/freedink-data/Manifest
+++ b/games-rpg/freedink-data/Manifest
@@ -1,2 +1 @@
-DIST freedink-data-1.08.20140901.tar.gz 51303165 BLAKE2B
28c225cf12b2bdcf0cf4cccb773e39055c756f0d031d851e697b2a47b8d82781b43ac31ae88245e67582be74fed8a67b20498d8e61231bb4106cc1a679b9ac18
SHA512
cdaa50610ed7e365967f6a84f6d540295ccc85bf4d11b882b49c6b97abe2b375be9880afc1e8ea31cdf22a24365d09861b9f4d1d522cc1ae685f7a8b6b4cad82
DIST freedink-data-1.08.20170409.tar.gz 53030350 BLAKE2B
cf7eb210ed908aed185b2c3d450492ef4265600ee8a058a4d13396de21ec543b619bca4d1a684edec69c913459489db2f1fe868b51306e52ffdf081d7245cd7d
SHA512
8ce6bd0de33da0edd42722c2a7d02aae54a3e8e81fc8e0a4c97d9b2b696e58eb41e05e12b3fc1cd4be72be7bcf799988d50affb3689f3fec8e2e78c878cd4afc
diff --git a/games-rpg/freedink-data/freedink-data-1.08.20140901-r1.ebuild
b/games-rpg/freedink-data/freedink-data-1.08.20140901-r1.ebuild
deleted file mode 100644
index 4d58cc6494f..000
--- a/games-rpg/freedink-data/freedink-data-1.08.20140901-r1.ebuild
+++ /dev/null
@@ -1,26 +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"
-IUSE=""
-
-src_install() {
- emake DESTDIR="${D}" DATADIR="/usr/share" install
- dodoc README.txt README-REPLACEMENTS.txt
-}
[gentoo-commits] repo/gentoo:master commit in: games-rpg/freedink-data/
commit: ad4db1f1f56c9f58a50c11a60f0fb4ffe80cdaab
Author: Ulrich Müller gentoo org>
AuthorDate: Fri May 14 11:42:09 2021 +
Commit: Ulrich Müller gentoo org>
CommitDate: Wed May 19 21:07:38 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad4db1f1
games-rpg/freedink-data: Update LICENSE to Free-Art-1.3
Also update GPL-2 and GPL-3 labels to their "or later" variants.
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Ulrich Müller gentoo.org>
games-rpg/freedink-data/freedink-data-1.08.20140901-r1.ebuild | 8
...1.08.20170409.ebuild => freedink-data-1.08.20170409-r1.ebuild} | 8
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/games-rpg/freedink-data/freedink-data-1.08.20140901-r1.ebuild
b/games-rpg/freedink-data/freedink-data-1.08.20140901-r1.ebuild
index 3a8d887e4dd..4d58cc6494f 100644
--- a/games-rpg/freedink-data/freedink-data-1.08.20140901-r1.ebuild
+++ b/games-rpg/freedink-data/freedink-data-1.08.20140901-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,9 +10,9 @@ SRC_URI="mirror://gnu/freedink/${P}.tar.gz"
LICENSE="ZLIB
CC-BY-SA-3.0
CC-BY-3.0
- FreeArt
- GPL-2
- GPL-3
+ Free-Art-1.3
+ GPL-2+
+ GPL-3+
WTFPL-2
OAL-1.0.1
public-domain"
diff --git a/games-rpg/freedink-data/freedink-data-1.08.20170409.ebuild
b/games-rpg/freedink-data/freedink-data-1.08.20170409-r1.ebuild
similarity index 85%
rename from games-rpg/freedink-data/freedink-data-1.08.20170409.ebuild
rename to games-rpg/freedink-data/freedink-data-1.08.20170409-r1.ebuild
index 61874259e09..450fa9e0457 100644
--- a/games-rpg/freedink-data/freedink-data-1.08.20170409.ebuild
+++ b/games-rpg/freedink-data/freedink-data-1.08.20170409-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,9 +10,9 @@ SRC_URI="mirror://gnu/freedink/${P}.tar.gz"
LICENSE="ZLIB
CC-BY-SA-3.0
CC-BY-3.0
- FreeArt
- GPL-2
- GPL-3
+ Free-Art-1.3
+ GPL-2+
+ GPL-3+
WTFPL-2
OAL-1.0.1
public-domain"
[gentoo-commits] repo/gentoo:master commit in: games-rpg/freedink-data/
commit: 2a92b2e11d8286fd1b0a6a1c7d5d05fdd4b1f7b1
Author: Jeroen Roovers gentoo org>
AuthorDate: Fri Jun 8 10:06:15 2018 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Fri Jun 8 10:08:02 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a92b2e1
games-rpg/freedink-data: Version 1.08.20170409.
Package-Manager: Portage-2.3.40, Repoman-2.3.9
games-rpg/freedink-data/Manifest | 1 +
.../freedink-data-1.08.20170409.ebuild | 25 ++
2 files changed, 26 insertions(+)
diff --git a/games-rpg/freedink-data/Manifest b/games-rpg/freedink-data/Manifest
index 2f47285b27a..963635f07a0 100644
--- a/games-rpg/freedink-data/Manifest
+++ b/games-rpg/freedink-data/Manifest
@@ -1 +1,2 @@
DIST freedink-data-1.08.20140901.tar.gz 51303165 BLAKE2B
28c225cf12b2bdcf0cf4cccb773e39055c756f0d031d851e697b2a47b8d82781b43ac31ae88245e67582be74fed8a67b20498d8e61231bb4106cc1a679b9ac18
SHA512
cdaa50610ed7e365967f6a84f6d540295ccc85bf4d11b882b49c6b97abe2b375be9880afc1e8ea31cdf22a24365d09861b9f4d1d522cc1ae685f7a8b6b4cad82
+DIST freedink-data-1.08.20170409.tar.gz 53030350 BLAKE2B
cf7eb210ed908aed185b2c3d450492ef4265600ee8a058a4d13396de21ec543b619bca4d1a684edec69c913459489db2f1fe868b51306e52ffdf081d7245cd7d
SHA512
8ce6bd0de33da0edd42722c2a7d02aae54a3e8e81fc8e0a4c97d9b2b696e58eb41e05e12b3fc1cd4be72be7bcf799988d50affb3689f3fec8e2e78c878cd4afc
diff --git a/games-rpg/freedink-data/freedink-data-1.08.20170409.ebuild
b/games-rpg/freedink-data/freedink-data-1.08.20170409.ebuild
new file mode 100644
index 000..61874259e09
--- /dev/null
+++ b/games-rpg/freedink-data/freedink-data-1.08.20170409.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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
+ FreeArt
+ 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
+}
[gentoo-commits] repo/gentoo:master commit in: games-rpg/freedink/
commit: c80f46a5bc05e0ae5d195195ceaee8f63c19ec6b
Author: Jeroen Roovers gentoo org>
AuthorDate: Fri Jun 8 10:07:18 2018 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Fri Jun 8 10:08:05 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c80f46a5
games-rpg/freedink: Remove games-rpg/freedink-data version constraint
Package-Manager: Portage-2.3.40, Repoman-2.3.9
games-rpg/freedink/freedink-108.4-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/games-rpg/freedink/freedink-108.4-r1.ebuild
b/games-rpg/freedink/freedink-108.4-r1.ebuild
index fdee2e4308c..743ce07e754 100644
--- a/games-rpg/freedink/freedink-108.4-r1.ebuild
+++ b/games-rpg/freedink/freedink-108.4-r1.ebuild
@@ -22,7 +22,7 @@ DEPEND="
>=media-libs/sdl-ttf-2.0.9
"
RDEPEND="${DEPEND}
- ~games-rpg/freedink-data-1.08.20140901
+ games-rpg/freedink-data
"
DEPEND="${DEPEND}
dev-libs/check
[gentoo-commits] repo/gentoo:master commit in: games-rpg/freedink/files/, games-rpg/freedink/
commit: 719d0a86872604000f21d9f2cef0c4c4be3ba5e6
Author: Jeroen Roovers gentoo org>
AuthorDate: Fri Jun 8 09:58:11 2018 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Fri Jun 8 10:07:57 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=719d0a86
games-rpg/freedink: Fix windres related compile error.
Package-Manager: Portage-2.3.40, Repoman-2.3.9
.../freedink/files/freedink-108.4-no-windres.patch | 20
games-rpg/freedink/freedink-108.4-r1.ebuild | 3 +++
2 files changed, 23 insertions(+)
diff --git a/games-rpg/freedink/files/freedink-108.4-no-windres.patch
b/games-rpg/freedink/files/freedink-108.4-no-windres.patch
new file mode 100644
index 000..81c72e00dae
--- /dev/null
+++ b/games-rpg/freedink/files/freedink-108.4-no-windres.patch
@@ -0,0 +1,20 @@
+--- 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/freedink-108.4-r1.ebuild
b/games-rpg/freedink/freedink-108.4-r1.ebuild
index a40e9cd65da..fdee2e4308c 100644
--- a/games-rpg/freedink/freedink-108.4-r1.ebuild
+++ b/games-rpg/freedink/freedink-108.4-r1.ebuild
@@ -29,6 +29,9 @@ DEPEND="${DEPEND}
virtual/pkgconfig
sys-devel/gettext
"
+PATCHES=(
+ "${FILESDIR}"/${PN}-108.4-no-windres.patch
+)
src_prepare() {
default
[gentoo-commits] repo/gentoo:master commit in: games-rpg/freedink-data/
commit: b4f062cad75230397dc98d88766f32863f4742b6
Author: Pacho Ramos gentoo org>
AuthorDate: Tue May 1 17:40:40 2018 +
Commit: Pacho Ramos gentoo org>
CommitDate: Tue May 1 19:35:22 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4f062ca
games-rpg/freedink-data: Stop using games.eclass
Package-Manager: Portage-2.3.31, Repoman-2.3.9
.../freedink-data-1.08.20140901-r1.ebuild | 26 ++
1 file changed, 26 insertions(+)
diff --git a/games-rpg/freedink-data/freedink-data-1.08.20140901-r1.ebuild
b/games-rpg/freedink-data/freedink-data-1.08.20140901-r1.ebuild
new file mode 100644
index 000..3a8d887e4dd
--- /dev/null
+++ b/games-rpg/freedink-data/freedink-data-1.08.20140901-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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
+ FreeArt
+ GPL-2
+ GPL-3
+ WTFPL-2
+ OAL-1.0.1
+ public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+src_install() {
+ emake DESTDIR="${D}" DATADIR="/usr/share" install
+ dodoc README.txt README-REPLACEMENTS.txt
+}
[gentoo-commits] repo/gentoo:master commit in: games-rpg/freedink/
commit: edeab382f868f6ae5e43ffbd034eb8d2b14b32d7
Author: Pacho Ramos gentoo org>
AuthorDate: Tue May 1 17:36:50 2018 +
Commit: Pacho Ramos gentoo org>
CommitDate: Tue May 1 19:35:17 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=edeab382
games-rpg/freedink: Drop old
Package-Manager: Portage-2.3.31, Repoman-2.3.9
games-rpg/freedink/freedink-108.4.ebuild | 57
1 file changed, 57 deletions(-)
diff --git a/games-rpg/freedink/freedink-108.4.ebuild
b/games-rpg/freedink/freedink-108.4.ebuild
deleted file mode 100644
index f9fb99c364f..000
--- a/games-rpg/freedink/freedink-108.4.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit flag-o-matic games
-
-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-1.08.20140901"
-DEPEND="${DEPEND}
- dev-libs/check
- virtual/pkgconfig
- sys-devel/gettext"
-
-src_prepare() {
- 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() {
- egamesconf \
- --disable-embedded-resources \
- --localedir="/usr/share/locale"
-}
-
-src_install() {
- default
- dodoc TROUBLESHOOTING
- prepgamesdirs
-}
-
-pkg_postinst() {
- games_pkg_postinst
- einfo
- elog "optional dependencies:"
- elog " games-util/dfarc (dmod installer and frontend)"
- einfo
-}
[gentoo-commits] repo/gentoo:master commit in: games-rpg/freedink-data/
commit: 7d7258eccb7951cabdef79a21084ec38d066da9d
Author: Pacho Ramos gentoo org>
AuthorDate: Tue May 1 17:40:49 2018 +
Commit: Pacho Ramos gentoo org>
CommitDate: Tue May 1 19:35:24 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d7258ec
games-rpg/freedink-data: Drop old
Package-Manager: Portage-2.3.31, Repoman-2.3.9
.../freedink-data-1.08.20140901.ebuild | 29 --
1 file changed, 29 deletions(-)
diff --git a/games-rpg/freedink-data/freedink-data-1.08.20140901.ebuild
b/games-rpg/freedink-data/freedink-data-1.08.20140901.ebuild
deleted file mode 100644
index 4ba62c136c2..000
--- a/games-rpg/freedink-data/freedink-data-1.08.20140901.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit games
-
-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
- FreeArt
- GPL-2
- GPL-3
- WTFPL-2
- OAL-1.0.1
- public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-src_install() {
- emake DESTDIR="${D}" DATADIR="${GAMES_DATADIR}" install
- dodoc README.txt README-REPLACEMENTS.txt
- prepgamesdirs
-}
[gentoo-commits] repo/gentoo:master commit in: games-rpg/freedink/
commit: cd2871a0297f5a647741030912f03a7496b12b94
Author: Michael Sterrett gentoo org>
AuthorDate: Thu Sep 3 18:04:25 2015 +
Commit: Michael Sterrett gentoo org>
CommitDate: Thu Sep 3 18:04:37 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd2871a0
seems like the code is fragile (bug #559548) so drop down to very conservative
CFLAGS
Package-Manager: portage-2.2.20.1
games-rpg/freedink/freedink-108.4.ebuild | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/games-rpg/freedink/freedink-108.4.ebuild
b/games-rpg/freedink/freedink-108.4.ebuild
index 8d47573..dafba42 100644
--- a/games-rpg/freedink/freedink-108.4.ebuild
+++ b/games-rpg/freedink/freedink-108.4.ebuild
@@ -3,7 +3,7 @@
# $Id$
EAPI=5
-inherit games
+inherit flag-o-matic games
DESCRIPTION="Dink Smallwood is an adventure/role-playing game, similar to
Zelda (2D top view)"
HOMEPAGE="http://www.freedink.org/";
@@ -32,6 +32,9 @@ src_prepare() {
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() {
