From d1b6ac0f2fdec97a42619f37e7ab884c5da1167f Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Mon, 15 Jun 2020 23:26:41 +1000 Subject: [PATCH] TuxPaint: bump version --- .../tuxpaint/patches/tuxpaint-0.9.22.patchset | 97 --------------- .../tuxpaint/patches/tuxpaint-0.9.23.patchset | 114 ------------------ media-gfx/tuxpaint/tuxpaint-0.9.22.recipe | 74 ------------ ...t-0.9.23.recipe => tuxpaint-0.9.24.recipe} | 10 +- 4 files changed, 5 insertions(+), 290 deletions(-) delete mode 100644 media-gfx/tuxpaint/patches/tuxpaint-0.9.22.patchset delete mode 100644 media-gfx/tuxpaint/patches/tuxpaint-0.9.23.patchset delete mode 100644 media-gfx/tuxpaint/tuxpaint-0.9.22.recipe rename media-gfx/tuxpaint/{tuxpaint-0.9.23.recipe => tuxpaint-0.9.24.recipe} (87%) diff --git a/media-gfx/tuxpaint/patches/tuxpaint-0.9.22.patchset b/media-gfx/tuxpaint/patches/tuxpaint-0.9.22.patchset deleted file mode 100644 index a15e4ffaa..000000000 --- a/media-gfx/tuxpaint/patches/tuxpaint-0.9.22.patchset +++ /dev/null @@ -1,97 +0,0 @@ -From 4f7259db0df3f771f89cb34ec062a61c6dfcbb9c Mon Sep 17 00:00:00 2001 -From: Jerome Duval -Date: Sat, 30 Aug 2014 20:51:07 +0000 -Subject: applying patch tuxpaint-0.9.22.patch - - -diff --git a/src/fonts.c b/src/fonts.c -index a81a2e6..b1e34aa 100644 ---- a/src/fonts.c -+++ b/src/fonts.c -@@ -966,10 +966,12 @@ static void loadfonts(SDL_Surface * screen, const char *const dir) - status_t result; - 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"); -diff --git a/src/i18n.c b/src/i18n.c -index 4df46be..2e2298e 100644 ---- a/src/i18n.c -+++ b/src/i18n.c -@@ -880,10 +880,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) - { -@@ -974,8 +975,6 @@ printf ("Locale AFTER is: %s\n", setlocale(LC_ALL,NULL));//EP - mysetenv("LANGUAGE", "C"); - } - env_language = strdup(getenv("LANGUAGE")); -- int j = 0; -- char *env_language_lang; - if (*env_language) - { - env_language_lang = strtok(env_language, ":"); --- -1.8.3.4 - - -From 7f502224dfd679b1e207e48a7f7ee35f7cb7b818 Mon Sep 17 00:00:00 2001 -From: Jerome Duval -Date: Sat, 30 Aug 2014 21:07:09 +0000 -Subject: NOSVG seems broken - - -diff --git a/src/tuxpaint.c b/src/tuxpaint.c -index afa90ab..d1b824f 100644 ---- a/src/tuxpaint.c -+++ b/src/tuxpaint.c -@@ -1939,8 +1939,8 @@ static SDL_Surface * load_kpx(char * file); - static SDL_Surface * load_svg(char * file); - static float pick_best_scape(unsigned int orig_w, unsigned int orig_h, - unsigned int max_w, unsigned int max_h); --static SDL_Surface * myIMG_Load_RWops(char * file); - #endif -+static SDL_Surface * myIMG_Load_RWops(char * file); - static SDL_Surface * myIMG_Load(char * file); - static int trash(char * path); - int file_exists(char * path); --- -1.8.3.4 - ---- tuxpaint-0.9.22/Makefile.org 2014-08-31 23:27:39.228327424 +0200 -+++ tuxpaint-0.9.22/Makefile 2014-08-31 23:08:38.221773824 +0200 -@@ -108,7 +108,7 @@ - windows_PREFIX:=/usr/local - osx_PREFIX:=/usr/local - --beos_PREFIX=$(shell finddir B_APPS_DIRECTORY)/TuxPaint -+#beos_PREFIX=$(shell finddir B_APPS_DIRECTORY)/TuxPaint - linux_PREFIX:=/usr/local - PREFIX:=$($(OS)_PREFIX) - -@@ -434,7 +434,7 @@ - - windows_ARCH_INSTALL:= - osx_ARCH_INSTALL:= --beos_ARCH_INSTALL:=install-haiku -+#beos_ARCH_INSTALL:=install-haiku - linux_ARCH_INSTALL:=install-gnome install-kde install-kde-icons - ARCH_INSTALL:=$($(OS)_ARCH_INSTALL) - diff --git a/media-gfx/tuxpaint/patches/tuxpaint-0.9.23.patchset b/media-gfx/tuxpaint/patches/tuxpaint-0.9.23.patchset deleted file mode 100644 index 9e6d29b93..000000000 --- a/media-gfx/tuxpaint/patches/tuxpaint-0.9.23.patchset +++ /dev/null @@ -1,114 +0,0 @@ -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.22.recipe b/media-gfx/tuxpaint/tuxpaint-0.9.22.recipe deleted file mode 100644 index 83d94f6d3..000000000 --- a/media-gfx/tuxpaint/tuxpaint-0.9.22.recipe +++ /dev/null @@ -1,74 +0,0 @@ -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-2010 Bill Kendrick and others" -LICENSE="GNU GPL v2" -REVISION="5" -SOURCE_URI="http://sourceforge.net/projects/tuxpaint/files/tuxpaint/0.9.22/tuxpaint-$portVersion.tar.gz" -CHECKSUM_SHA256="8abd932f8e36fad795bba0290c094c9c221e424c4b9aa8c763b7fb3459cb2be3" -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_1.2 - lib:libSDL_image_1.2 - lib:libSDL_mixer_1.2 - lib:libSDL_ttf_2.0 - lib:libz - " - -BUILD_REQUIRES=" - haiku_devel - devel:libfribidi - devel:libiconv - devel:libintl - devel:libpaper - devel:libpng - devel:libSDL_1.2 - devel:libSDL_image_1.2 - devel:libSDL_mixer_1.2 - devel:libSDL_ttf_2.0 - devel:libz - " -BUILD_PREREQUIRES=" - cmd:gcc - cmd:gperf - cmd:ld - cmd:make - cmd:pkg_config - " - -BUILD() -{ - make $jobArgs FRIBIDI_LIB=-lfribidi PREFIX=$appsDir/TuxPaint -} - -INSTALL() -{ - mkdir -p $appsDir/TuxPaint - - make install DESTDIR=$appsDir/TuxPaint - ln -s $appsDir/TuxPaint/bin/tuxpaint $appsDir/TuxPaint/TuxPaint - - addAppDeskbarSymlink $appsDir/TuxPaint/bin/tuxpaint TuxPaint -} diff --git a/media-gfx/tuxpaint/tuxpaint-0.9.23.recipe b/media-gfx/tuxpaint/tuxpaint-0.9.24.recipe similarity index 87% rename from media-gfx/tuxpaint/tuxpaint-0.9.23.recipe rename to media-gfx/tuxpaint/tuxpaint-0.9.24.recipe index ec40a0f34..828d7d19e 100644 --- a/media-gfx/tuxpaint/tuxpaint-0.9.23.recipe +++ b/media-gfx/tuxpaint/tuxpaint-0.9.24.recipe @@ -5,12 +5,11 @@ 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" +COPYRIGHT="2002-2020 Bill Kendrick and others" LICENSE="GNU GPL v2" -REVISION="2" +REVISION="1" SOURCE_URI="https://downloads.sourceforge.net/tuxpaint/tuxpaint-$portVersion.tar.gz" -CHECKSUM_SHA256="349919c44e0fa252581be6e3242251fb62d20a82c971e99be96d648462bf6926" -PATCHES="tuxpaint-$portVersion.patchset" +CHECKSUM_SHA256="8762572f55f335aaa6329106282bebf171e7305f796fa7b5aad3cd78c5a3a11a" ARCHITECTURES="x86_gcc2 ?x86 x86_64" @@ -41,7 +40,7 @@ BUILD_REQUIRES=" devel:libiconv devel:libintl devel:libpaper - devel:libpng + devel:libpng16 devel:libSDL_1.2 devel:libSDL_image_1.2 devel:libSDL_mixer_1.2 @@ -49,6 +48,7 @@ BUILD_REQUIRES=" devel:libz " BUILD_PREREQUIRES=" + cmd:convert cmd:gcc cmd:gperf cmd:ld