diff --git a/media-gfx/drawpile/drawpile-2.1.17.recipe b/media-gfx/drawpile/drawpile-2.1.17.recipe deleted file mode 100644 index b704f2ede..000000000 --- a/media-gfx/drawpile/drawpile-2.1.17.recipe +++ /dev/null @@ -1,96 +0,0 @@ -SUMMARY="A collaborative drawing program" -DESCRIPTION="Drawpile is a drawing program that lets you share \ -the canvas with other users in real time." -HOMEPAGE="https://drawpile.net/" -COPYRIGHT="2006-2020 Calle Laakkonen" -LICENSE="GNU GPL v3" -REVISION="1" -SOURCE_URI="https://github.com/drawpile/Drawpile/archive/$portVersion.tar.gz" -CHECKSUM_SHA256="67e569856ca5031dadd349f17e5185e93d42020f560016540fc32b5b52653a2f" -SOURCE_FILENAME="Drawpile-$portVersion.tar.gz" -SOURCE_DIR="Drawpile-$portVersion" -PATCHES="drawpile-$portVersion.patchset" -ADDITIONAL_FILES="Drawpile.rdef.in" - -ARCHITECTURES="all !x86_gcc2 ?x86" -SECONDARY_ARCHITECTURES="x86" - -PROVIDES=" - drawpile$secondaryArchSuffix = $portVersion - app:Drawpile = $portVersion - " -REQUIRES=" - haiku$secondaryArchSuffix - lib:libgif$secondaryArchSuffix - lib:libKF5Archive$secondaryArchSuffix - lib:libminiupnpc$secondaryArchSuffix - lib:libQt5Core$secondaryArchSuffix - lib:libQt5Gui$secondaryArchSuffix - lib:libQt5Multimedia$secondaryArchSuffix - lib:libQt5Network$secondaryArchSuffix - lib:libQt5Sql$secondaryArchSuffix - lib:libQt5Svg$secondaryArchSuffix - lib:libQt5Widgets$secondaryArchSuffix - lib:libsodium$secondaryArchSuffix - " - -BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel - extra_cmake_modules$secondaryArchSuffix >= 5.65 - devel:libarchive$secondaryArchSuffix - devel:libgif$secondaryArchSuffix - devel:libKF5Archive$secondaryArchSuffix - devel:libminiupnpc$secondaryArchSuffix - devel:libQt5Core$secondaryArchSuffix - devel:libQt5Gui$secondaryArchSuffix - devel:libQt5Network$secondaryArchSuffix - devel:libQt5WebKit$secondaryArchSuffix - devel:libsodium$secondaryArchSuffix - devel:libz$secondaryArchSuffix - " -BUILD_PREREQUIRES=" - cmd:cmake - cmd:g++$secondaryArchSuffix - cmd:ld$secondaryArchSuffix - cmd:lrelease$secondaryArchSuffix - cmd:make - cmd:pkg_config$secondaryArchSuffix - " - -BUILD() -{ - mkdir -p build && cd build - cmake .. -DCMAKE_EXE_LINKER_FLAGS=-lnetwork -DTESTS=on \ - -DECM_DIR=/system/data/cmake/Modules/ECM/cmake \ - -DECM_MKSPECS_INSTALL_DIR=$dataDir/Qt5/mkspecs - make $jobArgs -} - -INSTALL() -{ - mkdir -p $appsDir/Drawpile - cp ./build/bin/drawpile $appsDir/Drawpile/Drawpile - cp ./build/bin/drawpile-srv $appsDir/Drawpile/drawpile-srv - - local APP_SIGNATURE="application/x-vnd.drawpile" - local MAJOR="`echo "$portVersion" | cut -d. -f1`" - local MIDDLE="`echo "$portVersion" | cut -d. -f2`" - local MINOR="`echo "$portVersion" | cut -d. -f3`" - local LONG_INFO="$SUMMARY" - sed \ - -e "s|@APP_SIGNATURE@|$APP_SIGNATURE|" \ - -e "s|@MAJOR@|$MAJOR|" \ - -e "s|@MIDDLE@|$MIDDLE|" \ - -e "s|@MINOR@|$MINOR|" \ - -e "s|@LONG_INFO@|$LONG_INFO|" \ - $portDir/additional-files/Drawpile.rdef.in > Drawpile.rdef - - addResourcesToBinaries Drawpile.rdef $appsDir/Drawpile/Drawpile - - addAppDeskbarSymlink $appsDir/Drawpile/Drawpile -} - -TEST() -{ - make -C build test -} diff --git a/media-gfx/drawpile/drawpile-2.2.2.recipe b/media-gfx/drawpile/drawpile-2.2.2.recipe new file mode 100644 index 000000000..cd63b91de --- /dev/null +++ b/media-gfx/drawpile/drawpile-2.2.2.recipe @@ -0,0 +1,129 @@ +SUMMARY="A collaborative drawing program" +DESCRIPTION="Drawpile is a drawing program that lets you share \ +the canvas with other users in real time." +HOMEPAGE="https://drawpile.net/" +COPYRIGHT="2014-2025 Drawpile Contributors + 2006-2020 Calle Laakkonen" +LICENSE="GNU GPL v3" +REVISION="1" +SOURCE_URI="https://github.com/drawpile/Drawpile/archive/$portVersion.tar.gz" +CHECKSUM_SHA256="159fc433b21ac3f82388a4b45853f2ed13fbb47b7dd57874bf4e41f44f801969" +SOURCE_FILENAME="Drawpile-$portVersion.tar.gz" +SOURCE_DIR="Drawpile-$portVersion" +PATCHES="drawpile-$portVersion.patchset" +ADDITIONAL_FILES="Drawpile.rdef.in" + +ARCHITECTURES="all !x86_gcc2 ?x86" +SECONDARY_ARCHITECTURES="x86" + +PROVIDES=" + drawpile$secondaryArchSuffix = $portVersion + app:Drawpile = $portVersion + cmd:dprectool = $portVersion + cmd:drawpile_cmd = $portVersion + cmd:drawpile_timelapse = $portVersion + " +REQUIRES=" + haiku$secondaryArchSuffix + lib:libavcodec$secondaryArchSuffix + lib:libavfilter$secondaryArchSuffix + lib:libavformat$secondaryArchSuffix + lib:libavutil$secondaryArchSuffix + lib:libGL$secondaryArchSuffix + lib:libopenal$secondaryArchSuffix + lib:libQt6Core$secondaryArchSuffix + lib:libqt6keychain$secondaryArchSuffix + lib:libQt6Gui$secondaryArchSuffix + lib:libQt6Multimedia$secondaryArchSuffix + lib:libQt6Network$secondaryArchSuffix + lib:libQt6OpenGL$secondaryArchSuffix + lib:libQt6Sql$secondaryArchSuffix + lib:libQt6Svg$secondaryArchSuffix + lib:libQt6WebSockets$secondaryArchSuffix + lib:libQt6Widgets$secondaryArchSuffix + lib:libQt6Xml$secondaryArchSuffix + lib:libsodium$secondaryArchSuffix + lib:libswscale$secondaryArchSuffix + lib:libwebp$secondaryArchSuffix + lib:libwebpmux$secondaryArchSuffix + lib:libwebpdemux$secondaryArchSuffix + lib:libz$secondaryArchSuffix + lib:libzip$secondaryArchSuffix + " + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel + qt6_translations + qt6_tools${secondaryArchSuffix}_devel + devel:libavcodec$secondaryArchSuffix >= 60 + devel:libavfilter$secondaryArchSuffix >= 9 + devel:libavformat$secondaryArchSuffix >= 60 + devel:libavutil$secondaryArchSuffix >= 58 + devel:libQt6Core$secondaryArchSuffix + devel:libqt6keychain$secondaryArchSuffix + devel:libQt6Svg$secondaryArchSuffix + devel:libQt6Multimedia$secondaryArchSuffix + devel:libQt6WebSockets$secondaryArchSuffix + devel:libsodium$secondaryArchSuffix + devel:libswscale$secondaryArchSuffix >= 7 + devel:libwebp$secondaryArchSuffix + devel:libzip$secondaryArchSuffix + " +BUILD_PREREQUIRES=" + cmd:cargo + cmd:cmake + cmd:g++$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:make + cmd:pkg_config$secondaryArchSuffix + " + +BUILD() +{ + cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \ + $cmakeDirArgs \ + -DCMAKE_INSTALL_BINDIR=$appsDir \ + -DDISABLE_UPDATE_CHECK_DEFAULT=ON \ + -Dlconvert=`finddir B_SYSTEM_LIB_DIRECTORY`${secondaryArchSubDir}/Qt6/lconvert \ + -DTOOLS=ON \ + -DTESTS=ON \ + -Wno-dev + + make -C build $jobArgs +} + +INSTALL() +{ + make -C build install + + mv $appsDir/drawpile $appsDir/Drawpile + + # move cli tools to $prefix/bin + mkdir -p $prefix/bin + mv $appsDir/{dprectool,drawpile-cmd,drawpile-timelapse} $prefix/bin + + # cleanup + rm -rf $dataDir/{applications,icons,metainfo} + + local APP_SIGNATURE="application/x-vnd.drawpile" + local MAJOR="`echo "$portVersion" | cut -d. -f1`" + local MIDDLE="`echo "$portVersion" | cut -d. -f2`" + local MINOR="`echo "$portVersion" | cut -d. -f3`" + local LONG_INFO="$SUMMARY" + sed \ + -e "s|@APP_SIGNATURE@|$APP_SIGNATURE|" \ + -e "s|@MAJOR@|$MAJOR|" \ + -e "s|@MIDDLE@|$MIDDLE|" \ + -e "s|@MINOR@|$MINOR|" \ + -e "s|@LONG_INFO@|$LONG_INFO|" \ + $portDir/additional-files/Drawpile.rdef.in > Drawpile.rdef + + addResourcesToBinaries Drawpile.rdef $appsDir/Drawpile + + addAppDeskbarSymlink $appsDir/Drawpile +} + +TEST() +{ + make -C build test +} diff --git a/media-gfx/drawpile/patches/drawpile-2.1.17.patchset b/media-gfx/drawpile/patches/drawpile-2.1.17.patchset deleted file mode 100644 index 46f1d0298..000000000 --- a/media-gfx/drawpile/patches/drawpile-2.1.17.patchset +++ /dev/null @@ -1,45 +0,0 @@ -From b04504ffad768cde8602704feef8b3867d7ce169 Mon Sep 17 00:00:00 2001 -From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Tue, 16 Jun 2020 20:32:24 +1000 -Subject: Fixes for Qt 5.15 - - -diff --git a/src/desktop/bundled/QtColorWidgets/color_wheel.cpp b/src/desktop/bundled/QtColorWidgets/color_wheel.cpp -index c7b1c47..c8db4fc 100644 ---- a/src/desktop/bundled/QtColorWidgets/color_wheel.cpp -+++ b/src/desktop/bundled/QtColorWidgets/color_wheel.cpp -@@ -28,6 +28,7 @@ - #include - #include - #include -+#include - #include "color_utils.hpp" - - namespace color_widgets { -diff --git a/src/desktop/widgets/colorbutton.cpp b/src/desktop/widgets/colorbutton.cpp -index 2d668fd..4463551 100644 ---- a/src/desktop/widgets/colorbutton.cpp -+++ b/src/desktop/widgets/colorbutton.cpp -@@ -28,6 +28,7 @@ - #include - #include - #include -+#include - - namespace widgets { - -diff --git a/src/desktop/widgets/popupmessage.h b/src/desktop/widgets/popupmessage.h -index a165d45..4405e63 100644 ---- a/src/desktop/widgets/popupmessage.h -+++ b/src/desktop/widgets/popupmessage.h -@@ -20,6 +20,7 @@ - #define POPUPMESSAGE_H - - #include -+#include - - class QTextDocument; - class QTimer; --- -2.26.0 - diff --git a/media-gfx/drawpile/patches/drawpile-2.2.2.patchset b/media-gfx/drawpile/patches/drawpile-2.2.2.patchset new file mode 100644 index 000000000..10c04c3a7 --- /dev/null +++ b/media-gfx/drawpile/patches/drawpile-2.2.2.patchset @@ -0,0 +1,35 @@ +From 9ae21b2ce57c9bd3aad655912bf257f312875057 Mon Sep 17 00:00:00 2001 +From: Luc Schrijvers +Date: Tue, 3 Jun 2025 13:05:37 +0200 +Subject: Add Haiku to known platforms + + +diff --git a/src/drawdance/libcommon/dpcommon/common.h b/src/drawdance/libcommon/dpcommon/common.h +index 49187c8..d47aab4 100644 +--- a/src/drawdance/libcommon/dpcommon/common.h ++++ b/src/drawdance/libcommon/dpcommon/common.h +@@ -41,6 +41,8 @@ + # define DP_PLATFORM "darwin" + # elif defined(__linux__) + # define DP_PLATFORM "linux" ++# elif defined(__HAIKU__) ++# define DP_PLATFORM "haiku" + # else + # error "unknown platform" + # endif +diff --git a/src/drawdance/libimpex/dpimpex/save.c b/src/drawdance/libimpex/dpimpex/save.c +index 98222b6..456e315 100644 +--- a/src/drawdance/libimpex/dpimpex/save.c ++++ b/src/drawdance/libimpex/dpimpex/save.c +@@ -884,7 +884,7 @@ DP_SaveResult DP_save(DP_CanvasState *cs, DP_DrawContext *dc, + #if defined(_WIN32) + # define PREFERRED_PATH_SEPARATOR "\\" + # define POSSIBLE_PATH_SEPARATORS "\\/" +-#elif defined(__EMSCRIPTEN__) || defined(__APPLE__) || defined(__linux__) ++#elif defined(__EMSCRIPTEN__) || defined(__APPLE__) || defined(__linux__) || defined(__HAIKU__) + # define PREFERRED_PATH_SEPARATOR "/" + # define POSSIBLE_PATH_SEPARATORS "/" + #else +-- +2.48.1 +