TuxType2, bump version (#1284)

This commit is contained in:
Schrijvers Luc
2017-04-22 22:24:16 +02:00
committed by waddlesplash
parent 2a90d90d5d
commit 0f731b936f
2 changed files with 143 additions and 0 deletions

View File

@@ -0,0 +1,58 @@
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

View File

@@ -0,0 +1,85 @@
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://tux4kids.alioth.debian.org/"
COPYRIGHT="2000-2009 Sam Hart"
LICENSE="GNU GPL v2"
REVISION="1"
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"
ADDITIONAL_FILES="tuxtype2.rdef"
PATCHES="tuxtype2-$portVersion.patchset"
ARCHITECTURES="!x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86"
PROVIDES="
tuxtype2$secondaryArchSuffix
app:TuxType2$secondaryArchSuffix
"
REQUIRES="
haiku$secondaryArchSuffix
lib:libiconv$secondaryArchSuffix
lib:libintl$secondaryArchSuffix
lib:libsdl$secondaryArchSuffix
lib:libsdl_image$secondaryArchSuffix
lib:libsdl_mixer$secondaryArchSuffix
lib:libsdl_pango$secondaryArchSuffix
lib:libxml2$secondaryArchSuffix
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
devel:libiconv$secondaryArchSuffix
devel:libintl$secondaryArchSuffix
devel:libsdl$secondaryArchSuffix
devel:libsdl_image$secondaryArchSuffix
devel:libsdl_mixer$secondaryArchSuffix
devel:libsdl_pango$secondaryArchSuffix
devel:libxml2$secondaryArchSuffix
"
BUILD_PREREQUIRES="
cmd:aclocal
cmd:autoconf
cmd:awk
cmd:bison
cmd:find
cmd:gcc$secondaryArchSuffix
cmd:ld$secondaryArchSuffix
cmd:make
cmd:pkg_config$secondaryArchSuffix
"
BUILD()
{
autoreconf -vfi
LDFLAGS="-liconv" ./configure --prefix=$appsDir/TuxTyping \
--without-rsvg
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/tuxtype
mv $appsDir/TuxTyping/bin/tuxtype $appsDir/TuxTyping/TuxType2
rm -r $appsDir/TuxTyping/bin
addAppDeskbarSymlink $appsDir/TuxTyping/TuxType2
}