diff --git a/media-gfx/tuxpaint/patches/tuxpaint-0.9.23.patchset b/media-gfx/tuxpaint/patches/tuxpaint-0.9.23.patchset new file mode 100644 index 000000000..9e6d29b93 --- /dev/null +++ b/media-gfx/tuxpaint/patches/tuxpaint-0.9.23.patchset @@ -0,0 +1,114 @@ +From dbc302a19c823e1c7b119549d3157ed3cc7c27d6 Mon Sep 17 00:00:00 2001 +From: begasus +Date: Tue, 11 Sep 2018 07:46:33 +0200 +Subject: set correct paths to NONPACKAGED_FONTS_DIRECTORY + + +diff --git a/src/fonts.c b/src/fonts.c +index d6a5ad5..f7290e9 100644 +--- a/src/fonts.c ++++ b/src/fonts.c +@@ -970,10 +970,12 @@ static void loadfonts(SDL_Surface * screen, const char *const dir) + + result = find_directory(B_SYSTEM_FONTS_DIRECTORY, volume, false, buffer, sizeof(buffer)); + loadfonts(screen, buffer); +- result = find_directory(B_COMMON_FONTS_DIRECTORY, volume, false, buffer, sizeof(buffer)); ++ result = find_directory(B_SYSTEM_NONPACKAGED_FONTS_DIRECTORY, volume, false, buffer, sizeof(buffer)); + loadfonts(screen, buffer); + result = find_directory(B_USER_FONTS_DIRECTORY, volume, false, buffer, sizeof(buffer)); + loadfonts(screen, buffer); ++ result = find_directory(B_USER_NONPACKAGED_FONTS_DIRECTORY, volume, false, buffer, sizeof(buffer)); ++ loadfonts(screen, buffer); + #elif defined(__APPLE__) + loadfonts(screen, "/System/Library/Fonts"); + loadfonts(screen, "/Library/Fonts"); +-- +2.16.4 + + +From 69d3a45aa741d1524ff4d546df97a30433119598 Mon Sep 17 00:00:00 2001 +From: begasus +Date: Tue, 11 Sep 2018 14:30:49 +0200 +Subject: gcc2 fixes + + +diff --git a/src/i18n.c b/src/i18n.c +index 57eb7da..2b0801f 100644 +--- a/src/i18n.c ++++ b/src/i18n.c +@@ -984,9 +984,11 @@ static int set_current_language(const char *restrict locale_choice) MUST_CHECK; + static int set_current_language(const char *restrict loc) + { + int i; ++ int j = 0; + int y_nudge = 0; + char *oldloc; + char *env_language; ++ char *env_language_lang; + + + if (strlen(loc) > 0) +@@ -1081,8 +1083,6 @@ static int set_current_language(const char *restrict loc) + mysetenv("LANGUAGE", "C"); + } + env_language = strdup(getenv("LANGUAGE")); +- int j = 0; +- char *env_language_lang; + + if (*env_language) + { +diff --git a/src/tuxpaint.c b/src/tuxpaint.c +index fd64d88..2d8c9c0 100644 +--- a/src/tuxpaint.c ++++ b/src/tuxpaint.c +@@ -19711,6 +19711,7 @@ static int do_color_sel(void) + int done, chose; + int back_left, back_top; + int color_sel_x, color_sel_y; ++ int want_animated_popups = 1; + SDL_Surface *tmp_btn_up, *tmp_btn_down; + + Uint32(*getpixel_tmp_btn_up) (SDL_Surface *, int, int); +@@ -19731,7 +19732,6 @@ static int do_color_sel(void) + + /* FIXME this is the first step to make animated popups optional, + to be removed from here when implemented in a more general way */ +- int want_animated_popups = 1; + + hide_blinking_cursor(); + +-- +2.16.4 + + +From 191985449de945c74f575ef33efca25edbd74350 Mon Sep 17 00:00:00 2001 +From: Jerome Duval +Date: Sat, 30 Aug 2014 20:51:07 +0000 +Subject: don't use BeOS install directions for Haiku + + +diff --git a/Makefile b/Makefile +index c1dc400..d8d07a5 100644 +--- a/Makefile ++++ b/Makefile +@@ -131,7 +131,7 @@ ARCH_HEADERS:=$($(OS)_ARCH_HEADERS) + # For macOS, the prefix is relative to DESTDIR. + windows_PREFIX:=/usr/local + osx_PREFIX:=Resources +-beos_PREFIX=$(shell finddir B_APPS_DIRECTORY)/TuxPaint ++#beos_PREFIX=$(shell finddir B_APPS_DIRECTORY)/TuxPaint + linux_PREFIX:=/usr/local + PREFIX:=$($(OS)_PREFIX) + +@@ -462,7 +462,7 @@ trans: + + windows_ARCH_INSTALL:= + osx_ARCH_INSTALL:=install-macbundle TuxPaint.dmg +-beos_ARCH_INSTALL:=install-haiku ++#beos_ARCH_INSTALL:=install-haiku + linux_ARCH_INSTALL:=install-kde install-kde-icons + ARCH_INSTALL:=$($(OS)_ARCH_INSTALL) + +-- +2.16.4 + diff --git a/media-gfx/tuxpaint/tuxpaint-0.9.23.recipe b/media-gfx/tuxpaint/tuxpaint-0.9.23.recipe new file mode 100644 index 000000000..b11918e9c --- /dev/null +++ b/media-gfx/tuxpaint/tuxpaint-0.9.23.recipe @@ -0,0 +1,72 @@ +SUMMARY="Drawing program designed for young children" +DESCRIPTION="Tux Paint is a free, award-winning drawing program for children \ +ages 3 to 12 (for example, preschool and K-6). Tux Paint is used \ +in schools and around the world as a computer literacy drawing activity. \ +It combines an easy-to-use interface, fun sound effects, and an \ +encouraging cartoon mascot who guides children as they use the program." +HOMEPAGE="http://www.tuxpaint.org/" +COPYRIGHT="2002-2018 Bill Kendrick and others" +LICENSE="GNU GPL v2" +REVISION="1" +SOURCE_URI="https://downloads.sourceforge.net/tuxpaint/tuxpaint-$portVersion.tar.gz" +CHECKSUM_SHA256="349919c44e0fa252581be6e3242251fb62d20a82c971e99be96d648462bf6926" +PATCHES="tuxpaint-$portVersion.patchset" + +ARCHITECTURES="x86_gcc2 ?x86 x86_64" + +USER_SETTINGS_FILES=" + settings/TuxPaint directory + " + +PROVIDES=" + tuxpaint = $portVersion + " +REQUIRES=" + haiku + lib:libfribidi + lib:libiconv + lib:libintl + lib:libpaper + lib:libpng16 + lib:libsdl + lib:libSDL_image + lib:libSDL_mixer + lib:libSDL_ttf + lib:libz + " + +BUILD_REQUIRES=" + haiku_devel + devel:libfribidi + devel:libiconv + devel:libintl + devel:libpaper + devel:libpng + devel:libsdl + devel:libSDL_image + devel:libSDL_mixer + devel:libSDL_ttf + devel:libz + " +BUILD_PREREQUIRES=" + cmd:gcc + cmd:gperf + cmd:ld + cmd:make + cmd:pkg_config + " + +BUILD() +{ + make $jobArgs PREFIX=$appsDir/TuxPaint +} + +INSTALL() +{ + mkdir -p $appsDir/TuxPaint + + make install PREFIX=$appsDir/TuxPaint + ln -s $appsDir/TuxPaint/bin/tuxpaint $appsDir/TuxPaint/TuxPaint + + addAppDeskbarSymlink $appsDir/TuxPaint/bin/tuxpaint TuxPaint +}