tuxtype2, bump version (#6766)

2026-04-08 21:00:05 +02:00 · 2022-03-26 13:32:26 +01:00
parent 280e4be736
commit 2feb108880
5 changed files with 93 additions and 169 deletions
--- a/games-kids/tuxtype/patches/tuxtype2-1.5.2.patchset
+++ b/games-kids/tuxtype/patches/tuxtype2-1.5.2.patchset
@@ -1,22 +0,0 @@
-From 9302351c44be86f3f98169f88f908498454da575 Mon Sep 17 00:00:00 2001
-From: begasus <begasus@gmail.com>
-Date: Fri, 29 Jul 2016 17:02:01 +0200
-Subject: disable fullscreen for Haiku
-
-
-diff --git a/tuxtype/main.c b/tuxtype/main.c
-index 3673634..96f4a5d 100644
--- a/tuxtype/main.c
-+++ b/tuxtype/main.c
-@@ -41,6 +41,8 @@ int main(int argc, char *argv[])
- 
- 	#ifdef WIN32
- 		video_flags = (SDL_HWSURFACE);
-+	#elif defined (__HAIKU__)
-+		video_flags = (SDL_HWPALETTE);
- 	#else
- 		video_flags = (SDL_FULLSCREEN | SDL_HWSURFACE);
- 	#endif
-- 
-2.7.0
-
--- a/games-kids/tuxtype/patches/tuxtype2-1.8.0.patchset
+++ b/games-kids/tuxtype/patches/tuxtype2-1.8.0.patchset
@@ -1,58 +0,0 @@
-From e4bd43d84f59bdb531ce6ced52978ecb2c784d60 Mon Sep 17 00:00:00 2001
-From: begasus <begasus@gmail.com>
-Date: Sat, 22 Apr 2017 10:23:26 +0200
-Subject: No need to redefine scandir, fix gettext version mismatch
-
-
-diff --git a/configure.ac b/configure.ac
-index c3af730..81aef5b 100644
--- a/configure.ac
-+++ b/configure.ac
-@@ -23,7 +23,7 @@ AC_SUBST(NAME_VERSION)
- # To link gettext library
- AC_GNU_SOURCE
- AM_GNU_GETTEXT
-AM_GNU_GETTEXT_VERSION([0.17])
-+AM_GNU_GETTEXT_VERSION([0.19])
- AM_GNU_GETTEXT_INTL_SUBDIR
- 
- # ----------------------------------------------------------------------
-diff --git a/src/scandir.h b/src/scandir.h
-index 3347cce..ef1cb6f 100644
--- a/src/scandir.h
-+++ b/src/scandir.h
-@@ -19,7 +19,7 @@
- #define dirent direct
- #endif
- 
-#if defined(__BEOS__) || defined(__HAIKU__) || (defined(__sun) && defined(__SVR4)) || defined(WIN32)
-+#if defined(__BEOS__) || (defined(__sun) && defined(__SVR4)) || defined(WIN32)
- extern int alphasort(const void *d1, const void *d2);
- extern int scandir(const char *dirname, struct dirent ***namelist, int (*sdfilter)(struct dirent *), int (*dcomp)(const void *, const void *));
- #endif
-- 
-2.7.0
-
-
-From 2a2941bcc0b06c18d24718ee97b152112e9dec5f Mon Sep 17 00:00:00 2001
-From: begasus <begasus@gmail.com>
-Date: Sat, 22 Apr 2017 13:38:50 +0200
-Subject: disable fullscreen on start-up
-
-
-diff --git a/src/globals.h b/src/globals.h
-index 6b00214..0d19b48 100644
--- a/src/globals.h
-+++ b/src/globals.h
-@@ -107,7 +107,7 @@ typedef struct game_option_type{
- #define GAME_FONT_SIZE	20
- #define DEFAULT_LOCALE	        "en_US.UTF-8"
- #define DEFAULT_USE_ENGLISH 1
-#define DEFAULT_FULLSCREEN 1
-+#define DEFAULT_FULLSCREEN 0
- #define DEFAULT_SYS_SOUND 1
- #define DEFAULT_SFX_VOLUME 100
- #define DEFAULT_MUS_VOLUME 100
-- 
-2.7.0
-
--- a/games-kids/tuxtype/patches/tuxtype2-1.8.3.patchset
+++ b/games-kids/tuxtype/patches/tuxtype2-1.8.3.patchset
@@ -0,0 +1,68 @@
+From ddbe92ca9677cf39a137badcbc4bf7bb47c05900 Mon Sep 17 00:00:00 2001
+From: begasus <begasus@gmail.com>
+Date: Fri, 25 Mar 2022 19:30:25 +0000
+Subject: Don't use fullscreen on launch
+
+
+diff --git a/src/globals.h b/src/globals.h
+index 25efba9..0b02cc1 100644
+--- a/src/globals.h
+++ b/src/globals.h
+@@ -119,7 +119,7 @@ typedef struct game_option_type{
+ #define GAME_FONT_SIZE	20
+ #define DEFAULT_LOCALE	        "en_US.UTF-8"
+ #define DEFAULT_USE_ENGLISH 1
+-#define DEFAULT_FULLSCREEN 1
+#define DEFAULT_FULLSCREEN 0
+ #define DEFAULT_SYS_SOUND 1
+ #define DEFAULT_SFX_VOLUME 100
+ #define DEFAULT_MUS_VOLUME 100
+-- 
+2.30.2
+
+
+From 76e2287a935e2f0f90a4a516f50ca1cb8cf0b941 Mon Sep 17 00:00:00 2001
+From: begasus <begasus@gmail.com>
+Date: Fri, 25 Mar 2022 19:31:29 +0000
+Subject: No need to redefine scandir on Haiku
+
+
+diff --git a/src/scandir.h b/src/scandir.h
+index 1c5a47b..3373ede 100644
+--- a/src/scandir.h
+++ b/src/scandir.h
+@@ -44,7 +44,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ #define dirent direct
+ #endif
+ 
+-#if defined(__BEOS__) || defined(__HAIKU__) || (defined(__sun) && defined(__SVR4)) || defined(WIN32)
+#if defined(__BEOS__) || (defined(__sun) && defined(__SVR4)) || defined(WIN32)
+ extern int alphasort(const void *d1, const void *d2);
+ extern int scandir(const char *dirname, struct dirent ***namelist, int (*sdfilter)(struct dirent *), int (*dcomp)(const void *, const void *));
+ #endif
+-- 
+2.30.2
+
+
+From 6ad93aa96e7e0bea5bbd87ec7b336086a670fafa Mon Sep 17 00:00:00 2001
+From: begasus <begasus@gmail.com>
+Date: Fri, 25 Mar 2022 19:32:53 +0000
+Subject: Drop useless chown (from upstream)
+
+
+diff --git a/Makefile.am b/Makefile.am
+index 923f58d..ee9e44d 100644
+--- a/Makefile.am
+++ b/Makefile.am
+@@ -48,8 +48,6 @@ install-data-hook:
+ # Global sites for game state data (e.g. /var/games/tuxtype):
+ 	$(MKDIR_P) -m 2755 $(DESTDIR)$(pkglocalstatedir)
+ 	$(MKDIR_P) -m 2755 $(DESTDIR)$(pkglocalstatedir)/words
+-#	chown root:games $(DESTDIR)$(pkglocalstatedir)
+-	chown root:games $(DESTDIR)$(pkglocalstatedir)/words
+ 
+ 
+ uninstall-hook:
+-- 
+2.30.2
+
--- a/games-kids/tuxtype/tuxtype2-1.5.2.recipe
+++ b/games-kids/tuxtype/tuxtype2-1.5.2.recipe
@@ -1,75 +0,0 @@
-SUMMARY="Tux4Kids' typing tutor for kids"
-DESCRIPTION="TuxType2 is an educational typing tutor for kids starring Tux, \
-the Linux penguin. This educational game comes with two different games for \
-practicing typing, and having a great time doing it."
-HOMEPAGE="https://sourceforge.net/projects/tuxtype/"
-COPYRIGHT="2000-2009 Sam Hart"
-LICENSE="GNU GPL v2"
-REVISION="6"
-SOURCE_URI="https://sf.net/projects/tuxtype/files/OldFiles/tuxtype2-1.5.2.tar.gz"
-CHECKSUM_SHA256="d9552a3fe8367f14358e01d47aeb2603c6891fe0ec2e73414c541d91f0466d5d"
-PATCHES="tuxtype2-$portVersion.patchset"
-ADDITIONAL_FILES="tuxtype2.rdef"
-
-ARCHITECTURES="all !x86_gcc2"
-SECONDARY_ARCHITECTURES="x86"
-
-PROVIDES="
-	tuxtype2$secondaryArchSuffix
-	app:TuxType2$secondaryArchSuffix
-	"
-REQUIRES="
-	haiku$secondaryArchSuffix
-	lib:libcrypto$secondaryArchSuffix
-	lib:libSDL_1.2$secondaryArchSuffix
-	lib:libSDL_image_1.2$secondaryArchSuffix
-	lib:libSDL_mixer_1.2$secondaryArchSuffix
-	lib:libSDL_ttf_2.0$secondaryArchSuffix
-	"
-
-BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel
-	devel:libcrypto$secondaryArchSuffix
-	devel:libSDL_1.2$secondaryArchSuffix
-	devel:libSDL_image_1.2$secondaryArchSuffix
-	devel:libSDL_mixer_1.2$secondaryArchSuffix
-	devel:libSDL_ttf_2.0$secondaryArchSuffix
-	"
-BUILD_PREREQUIRES="
-	cmd:aclocal
-	cmd:autoconf
-	cmd:cmake
-	cmd:gcc$secondaryArchSuffix
-	cmd:libtoolize$secondaryArchSuffix
-	cmd:make
-	cmd:pkg_config$secondaryArchSuffix
-	"
-
-BUILD()
-{
-	autoreconf -vfi
-	./configure --prefix=$appsDir/TuxTyping
-	make $jobArgs
-}
-
-INSTALL()
-{
-	mkdir -p $appsDir/TuxTyping
-	make install
-
-	local MAJOR="`echo "$portVersion" | cut -d. -f1`"
-	local MIDDLE="`echo "$portVersion" | cut -d. -f2`"
-	local MINOR="`echo "$portVersion" | cut -d. -f3`"
-	sed \
-		-e "s|@MAJOR@|$MAJOR|" \
-		-e "s|@MIDDLE@|$MIDDLE|" \
-		-e "s|@MINOR@|$MINOR|" \
-		$portDir/additional-files/tuxtype2.rdef > tuxtype2.rdef
-
-	addResourcesToBinaries tuxtype2.rdef \
-		$appsDir/TuxTyping/bin/tuxtype2
-
-	mv $appsDir/TuxTyping/bin/tuxtype2 $appsDir/TuxTyping/TuxType2
-	rm -r $appsDir/TuxTyping/bin
-	addAppDeskbarSymlink $appsDir/TuxTyping/TuxType2
-}
--- a/games-kids/tuxtype/tuxtype2-1.8.3.recipe
+++ b/games-kids/tuxtype/tuxtype2-1.8.3.recipe
@@ -2,19 +2,23 @@ SUMMARY="Tux4Kids' typing tutor for kids"
 DESCRIPTION="TuxType2 is an educational typing tutor for kids starring Tux, \
 the Linux penguin. This educational game comes with two different games for \
 practicing typing, and having a great time doing it."
-HOMEPAGE="https://sourceforge.net/projects/tuxtype/"
-COPYRIGHT="2000-2009 Sam Hart"
+HOMEPAGE="https://www.tux4kids.com/tuxtyping.html"
+COPYRIGHT="2000-2014 Sam Hart, Jesse D. Andrews
+	2014 David Bruce"
 LICENSE="GNU GPL v2"
-REVISION="3"
-SOURCE_URI="https://sf.net/projects/tuxtype/files/tuxtype-source/TuxType%201.8.0%20-%20Source/tuxtype_w_fonts-1.8.0.tar.gz"
-CHECKSUM_SHA256="40b0926a2e96df7023be69a4224295c45a99027b049dcbcf222a33ffa3dc121d"
-SOURCE_DIR="tuxtype_w_fonts-$portVersion"
+REVISION="1"
+SOURCE_URI="https://github.com/tux4kids/tuxtype/archive/refs/tags/upstream/$portVersion.tar.gz"
+CHECKSUM_SHA256="c1abea756ad8fa1e9217f9dea63e7de5fe536022c6984dc438c65d9a1afb92bb"
+SOURCE_DIR="tuxtype-upstream-$portVersion"
 PATCHES="tuxtype2-$portVersion.patchset"
-ADDITIONAL_FILES="tuxtype2.rdef"
+ADDITIONAL_FILES="create-tuxtype-directories.sh
+	tuxtype2.rdef"

 ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"

+POST_INSTALL_SCRIPTS="$relativePostInstallDir/create-tuxtype-directories.sh"
+
 PROVIDES="
 	tuxtype2$secondaryArchSuffix
 	app:TuxType2$secondaryArchSuffix
@@ -26,7 +30,9 @@ REQUIRES="
 	lib:libSDL_1.2$secondaryArchSuffix
 	lib:libSDL_image_1.2$secondaryArchSuffix
 	lib:libSDL_mixer_1.2$secondaryArchSuffix
+	lib:libSDL_net_1.2$secondaryArchSuffix
 	lib:libSDL_pango$secondaryArchSuffix
+	lib:libt4k_common$secondaryArchSuffix
 	lib:libxml2$secondaryArchSuffix
 	"

@@ -37,7 +43,9 @@ BUILD_REQUIRES="
 	devel:libSDL_1.2$secondaryArchSuffix
 	devel:libSDL_image_1.2$secondaryArchSuffix
 	devel:libSDL_mixer_1.2$secondaryArchSuffix
+	devel:libSDL_net_1.2$secondaryArchSuffix
 	devel:libSDL_pango$secondaryArchSuffix
+	devel:libt4k_common$secondaryArchSuffix
 	devel:libxml2$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
@@ -55,17 +63,19 @@ BUILD_PREREQUIRES="
 BUILD()
 {
 	autoreconf -vfi
-	LDFLAGS="-liconv" ./configure --prefix=$appsDir/TuxTyping \
+	LDFLAGS="-liconv" runConfigure --omit-dirs binDir \
+		./configure --bindir=$appsDir \
 		--without-rsvg
 	make $jobArgs
 }

 INSTALL()
 {
-	mkdir -p $appsDir/TuxTyping
-
 	make install

+	mkdir -p $postInstallDir
+	cp -f $portDir/additional-files/create-tuxtype-directories.sh $postInstallDir
+
 	local MAJOR="`echo "$portVersion" | cut -d. -f1`"
 	local MIDDLE="`echo "$portVersion" | cut -d. -f2`"
 	local MINOR="`echo "$portVersion" | cut -d. -f3`"
@@ -76,10 +86,11 @@ INSTALL()
 		$portDir/additional-files/tuxtype2.rdef > tuxtype2.rdef

 	addResourcesToBinaries tuxtype2.rdef \
-		$appsDir/TuxTyping/bin/tuxtype
+		$appsDir/tuxtype

-	mv $appsDir/TuxTyping/bin/tuxtype $appsDir/TuxTyping/TuxType2
-	rm -r $appsDir/TuxTyping/bin
+	mv $appsDir/tuxtype $appsDir/TuxType2

-	addAppDeskbarSymlink $appsDir/TuxTyping/TuxType2
+	rm -rf $prefix/share
+
+	addAppDeskbarSymlink $appsDir/TuxType2
 }