From 6564e516ca8437190e1ff4491e4dd81173082b6a Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Sun, 16 Jul 2023 20:51:31 +0200 Subject: [PATCH] tuxpaint et all, bump version to 0.9.31~rc1 (#9041) --- ...cipe => tuxpaint_config-0.0.22~rc1.recipe} | 23 ++++++++++++++----- ...cipe => tuxpaint_stamps-2023.07.13.recipe} | 4 ++-- ...9.30.recipe => tuxpaint-0.9.31~rc1.recipe} | 9 +++++--- 3 files changed, 25 insertions(+), 11 deletions(-) rename media-gfx/tuxpaint-config/{tuxpaint_config-0.0.21.recipe => tuxpaint_config-0.0.22~rc1.recipe} (73%) rename media-gfx/tuxpaint-stamps/{tuxpaint_stamps-2023.05.19.recipe => tuxpaint_stamps-2023.07.13.recipe} (84%) rename media-gfx/tuxpaint/{tuxpaint-0.9.30.recipe => tuxpaint-0.9.31~rc1.recipe} (90%) diff --git a/media-gfx/tuxpaint-config/tuxpaint_config-0.0.21.recipe b/media-gfx/tuxpaint-config/tuxpaint_config-0.0.22~rc1.recipe similarity index 73% rename from media-gfx/tuxpaint-config/tuxpaint_config-0.0.21.recipe rename to media-gfx/tuxpaint-config/tuxpaint_config-0.0.22~rc1.recipe index 5112ef1ae..9675b497f 100644 --- a/media-gfx/tuxpaint-config/tuxpaint_config-0.0.21.recipe +++ b/media-gfx/tuxpaint-config/tuxpaint_config-0.0.22~rc1.recipe @@ -8,9 +8,9 @@ HOMEPAGE="http://www.tuxpaint.org/" COPYRIGHT="2002-2023 Bill Kendrick and others" LICENSE="GNU GPL v2" REVISION="1" -SOURCE_URI="https://sourceforge.net/projects/tuxpaint/files/tuxpaint-config/$portVersion/tuxpaint-config-$portVersion.tar.gz" -CHECKSUM_SHA256="5287de38944c302a7eaa069c8f5de635b95d82912e6cdf195c66366bf3431ae8" -SOURCE_DIR="tuxpaint-config-$portVersion" +SOURCE_URI="https://sourceforge.net/projects/tuxpaint/files/tuxpaint-config/${portVersion/\~rc1/-beta}/tuxpaint-config-${portVersion/\~/-}.tar.gz" +CHECKSUM_SHA256="8c63eb04ceb6f3e152864b0c836c810edbc2aa6fb38bc8d21ee064aa9c6d8029" +SOURCE_DIR="tuxpaint-config-${portVersion/\~/-}" ADDITIONAL_FILES="tuxpaint_config.rdef.in" ARCHITECTURES="all !x86_gcc2" @@ -22,6 +22,13 @@ PROVIDES=" " REQUIRES=" haiku$secondaryArchSuffix + lib:libfontconfig$secondaryArchSuffix + lib:libfreetype$secondaryArchSuffix + lib:libglib_2.0$secondaryArchSuffix + lib:libgobject_2.0$secondaryArchSuffix + lib:libharfbuzz$secondaryArchSuffix + lib:libpango_1.0$secondaryArchSuffix + lib:libpangoft2_1.0$secondaryArchSuffix lib:libfltk$secondaryArchSuffix lib:libintl$secondaryArchSuffix lib:libpaper$secondaryArchSuffix @@ -33,6 +40,7 @@ BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel devel:libfltk$secondaryArchSuffix devel:libintl$secondaryArchSuffix + devel:libpangoft2_1.0$secondaryArchSuffix devel:libpaper$secondaryArchSuffix devel:libunibreak$secondaryArchSuffix " @@ -42,7 +50,6 @@ BUILD_PREREQUIRES=" cmd:pkg_config$secondaryArchSuffix " - BUILD() { make haiku PREFIX=$prefix DATA_PREFIX=$dataDir DOC_PREFIX=$docDir \ @@ -55,7 +62,7 @@ INSTALL() MAN_PREFIX=$manDir LOCALE_PREFIX=$dataDir/locale install # remove not needed files - rm -rf $prefix/{share,X11R6} + rm -rf $prefix/{include,share,X11R6} rm -rf $dataDir/images local MAJOR="`echo "$portVersion" | cut -d. -f1`" @@ -75,5 +82,9 @@ INSTALL() addResourcesToBinaries tuxpaint_config.rdef $prefix/bin/tuxpaint-config - addAppDeskbarSymlink $prefix/bin/tuxpaint-config "Tux Paint Config" + # Add a symlink to the Desktop applets directory in Deskbar + desktopPrefsDir="$dataDir/deskbar/menu/Preferences" + mkdir -p "$desktopPrefsDir" + ln -s $prefix/bin/tuxpaint-config "$desktopPrefsDir" + mv $desktopPrefsDir/tuxpaint-config $desktopPrefsDir/"Tux Paint Config" } diff --git a/media-gfx/tuxpaint-stamps/tuxpaint_stamps-2023.05.19.recipe b/media-gfx/tuxpaint-stamps/tuxpaint_stamps-2023.07.13.recipe similarity index 84% rename from media-gfx/tuxpaint-stamps/tuxpaint_stamps-2023.05.19.recipe rename to media-gfx/tuxpaint-stamps/tuxpaint_stamps-2023.07.13.recipe index 606b739dd..911eb26e1 100644 --- a/media-gfx/tuxpaint-stamps/tuxpaint_stamps-2023.05.19.recipe +++ b/media-gfx/tuxpaint-stamps/tuxpaint_stamps-2023.07.13.recipe @@ -8,8 +8,8 @@ HOMEPAGE="http://www.tuxpaint.org/" COPYRIGHT="2002-2023 Bill Kendrick and others" LICENSE="GNU GPL v2" REVISION="1" -SOURCE_URI="https://sourceforge.net/projects/tuxpaint/files/tuxpaint-stamps/${portVersion//./-}/tuxpaint-stamps-$portVersion.tar.gz" -CHECKSUM_SHA256="21944b6c19133518eeed6b84bde3fdda741ef0aa2a833c4cb1de4fdabdc12244" +SOURCE_URI="https://sourceforge.net/projects/tuxpaint/files/tuxpaint-stamps/2023-07-XX-beta/tuxpaint-stamps-$portVersion.tar.gz" +CHECKSUM_SHA256="ab9a8f694c5ab8bbc38702a9c8b867b4b6a0da179e3b69a430e8690c2fcd2f1a" SOURCE_DIR="tuxpaint-stamps-$portVersion" ARCHITECTURES="any" diff --git a/media-gfx/tuxpaint/tuxpaint-0.9.30.recipe b/media-gfx/tuxpaint/tuxpaint-0.9.31~rc1.recipe similarity index 90% rename from media-gfx/tuxpaint/tuxpaint-0.9.30.recipe rename to media-gfx/tuxpaint/tuxpaint-0.9.31~rc1.recipe index 8f25d5c66..d68d47d6f 100644 --- a/media-gfx/tuxpaint/tuxpaint-0.9.30.recipe +++ b/media-gfx/tuxpaint/tuxpaint-0.9.31~rc1.recipe @@ -7,9 +7,10 @@ encouraging cartoon mascot who guides children as they use the program." HOMEPAGE="http://www.tuxpaint.org/" COPYRIGHT="2002-2023 Bill Kendrick and others" LICENSE="GNU GPL v2" -REVISION="2" -SOURCE_URI="https://sourceforge.net/projects/tuxpaint/files/tuxpaint/$portVersion/tuxpaint-$portVersion.tar.gz" -CHECKSUM_SHA256="c60ac9cc67b041a45e5b7828eda11d50f846a467b485db2c84d628e74a5fe1b1" +REVISION="1" +SOURCE_URI="https://sourceforge.net/projects/tuxpaint/files/tuxpaint/${portVersion/\~rc1/-beta}/tuxpaint-${portVersion/\~/-}.tar.gz" +CHECKSUM_SHA256="eac9fcda9fae64652c68d5c514b4ee4a07417911fd6b7cb4c5ab2d3c74d29ab0" +SOURCE_DIR="tuxpaint-${portVersion/\~/-}" ARCHITECTURES="all !x86_gcc2" SECONDARY_ARCHITECTURES="x86" @@ -25,6 +26,8 @@ PROVIDES=" REQUIRES=" haiku$secondaryArchSuffix lib:libcairo$secondaryArchSuffix + lib:libfontconfig$secondaryArchSuffix + lib:libfreetype$secondaryArchSuffix lib:libfribidi$secondaryArchSuffix lib:libgdk_pixbuf_2.0$secondaryArchSuffix lib:libgio_2.0$secondaryArchSuffix