diff --git a/media-gfx/drawpile/additional-files/Drawpile.iom b/media-gfx/drawpile/additional-files/Drawpile.iom index d916834ef..7f03d3a83 100644 Binary files a/media-gfx/drawpile/additional-files/Drawpile.iom and b/media-gfx/drawpile/additional-files/Drawpile.iom differ diff --git a/media-gfx/drawpile/additional-files/Drawpile.rdef b/media-gfx/drawpile/additional-files/Drawpile.rdef deleted file mode 100644 index 453867976..000000000 --- a/media-gfx/drawpile/additional-files/Drawpile.rdef +++ /dev/null @@ -1,24 +0,0 @@ - -resource app_signature "application/x-vnd.Drawpile"; - -resource vector_icon { - $"6E6369660B033595C60366B6E00366B5E00366B5E00366B5E003000100050005" - $"00032C1A010200140261FFFF0105010B02044030C34530BC3A30304030BC3A30" - $"C3454050BC3A50C34550504050C34550BC3A064BA2AA2442859929628A2A5A69" - $"28A2FB5A59E92A3A323C3D333F3440353F363E373D363B373A393C3D383E4039" - $"3A3C3E3C3D3F3B40423A43423941384037354134334042344335443738453946" - $"3A473B463C3F474148494A4C404D3F4E503E3D4F3B4E39384D37364C354B344B" - $"344C344A354935483549354734463447344533443243414040313F3E3C3A3239" - $"33383337323834363535363438320A0F42364234413340324031423244324633" - $"46344535453644374337433842370A21473C473B483A49394839483848374936" - $"4935483449344A334B354C364D374E384E394F3B4F3C503D503E4F3F4E3E4C3E" - $"4B3D4A3D493D483E473E463F453E453D463C061F53606AAA6A96502947404741" - $"473F484040494A4C41424D434F425043454F464E484D494C4A4B4B494C484D4C" - $"474B4A48464745444543424541474002044030C34530BC3A30304030BC3A30C3" - $"454050BC3A50C34550504050C34550BC3A0A042E44433E443E2F450A042E4444" - $"3F443F2F450A0533422C432A472F4633440A0533422C432A472F46334400000A" - $"0A000100000A010101000A020102000A030103000A040104000A050205061240" - $"3B7B000000000000403660C3C91CC3AF8501178202040A05010712C03B0836D6" - $"4AB6CFCDC035EE4C2BD24C2A5E01178202040A090108201F200A09010802BFEC" - $"BD3B16B2BB16B2BFECBD4C362F4BE83A0A0A0000" -}; diff --git a/media-gfx/drawpile/additional-files/Drawpile.rdef.in b/media-gfx/drawpile/additional-files/Drawpile.rdef.in new file mode 100644 index 000000000..ded386f86 --- /dev/null +++ b/media-gfx/drawpile/additional-files/Drawpile.rdef.in @@ -0,0 +1,43 @@ + +resource app_flags B_MULTIPLE_LAUNCH; + +resource app_version { + major = @MAJOR@, + middle = @MIDDLE@, + minor = @MINOR@, + + variety = B_APPV_FINAL, + internal = 0, + + short_info = "Drawpile", + long_info = "@LONG_INFO@" +}; + +resource app_signature "@APP_SIGNATURE@"; + +resource vector_icon { + $"6E6369660C033595C60366B6E00366B5E00366B5E00366B5E003000100050005" + $"00032C1A010200140261FFFF01033BA98404005B0C02044030C34530BC3A3030" + $"4030BC3A30C3454050BC3A50C34550504050C34550BC3A064BA2AA2442859929" + $"628A2A5A6928A2FB5A59E92A3A323C3D333F3440353F363E373D363B373A393C" + $"3D383E40393A3C3E3C3D3F3B40423A4342394138403735413433404234433544" + $"37384539463A473B463C3F474148494A4C404D3F4E503E3D4F3B4E39384D3736" + $"4C354B344B344C344A354935483549354734463447344533443243414040313F" + $"3E3C3A323933383337323834363535363438320A0F4236423441334032403142" + $"324432463346344535453644374337433842370A21473C473B483A4939483948" + $"38483749364935483449344A334B354C364D374E384E394F3B4F3C503D503E4F" + $"3F4E3E4C3E4B3D4A3D493D483E473E463F453E453D463C061F53606AAA6A9650" + $"2947404741473F484040494A4C41424D434F425043454F464E484D494C4A4B4B" + $"494C484D4C474B4A48464745444543424541474002044030C34530BC3A303040" + $"30BC3A30C3454050BC3A50C34550504050C34550BC3A0A042E44433E443E2F45" + $"0A042E44443F443F2F450A0533422C432A472F4633440A0533422C432A472F46" + $"3344000002044030C34530BC3A30304030BC3A30C3454050BC3A50C345505040" + $"50C34550BC3A0A0A0B010B024167130000000000003F1DDDC8353B48AC230A00" + $"01000240BB1300000000000040D9CDC6D276C75F640A0101010240BB13000000" + $"00000040D9CDC6D276C75F640A0201020240BB1300000000000040D9CDC6D276" + $"C75F640A0301030240BB1300000000000040D9CDC6D276C75F640A0401040240" + $"BB1300000000000040D9CDC6D276C75F640A0502050612410C4B000000000000" + $"41274FC80EA1C857CE01178202040A05010712C10BAE3805A0B7D6CEC126AC4C" + $"9C9A4CAA4501178202040A0901080240BB1300000000000040D9CDC729D8C75F" + $"640A09010802C0ADED3C3386BC1BCDC0CC124CAAC14C5CEF" +}; diff --git a/media-gfx/drawpile/drawpile-2.0.10.recipe b/media-gfx/drawpile/drawpile-2.0.10.recipe deleted file mode 100644 index 2e192ffcd..000000000 --- a/media-gfx/drawpile/drawpile-2.0.10.recipe +++ /dev/null @@ -1,77 +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-2018 Calle Laakkonen" -LICENSE="GNU GPL v3" -REVISION="2" -SOURCE_URI="https://github.com/drawpile/Drawpile/archive/$portVersion.tar.gz" -CHECKSUM_SHA256="0ff79e9f95ca02ff016eed3118a83ca62e80a1ca93fe11e3fb8ecd22c1fe37a9" -SOURCE_FILENAME="Drawpile-$portVersion.tar.gz" -SOURCE_DIR="Drawpile-$portVersion" -ADDITIONAL_FILES="Drawpile.rdef" - -ARCHITECTURES="!x86_gcc2 ?x86 x86_64" -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 - 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:make - cmd:pkg_config$secondaryArchSuffix - " - -BUILD() -{ - mkdir -p build && cd build - cmake .. -DCMAKE_EXE_LINKER_FLAGS=-lnetwork -DTESTS=on - make $jobArgs -} - -INSTALL() -{ - mkdir -p $appsDir/Drawpile - cp ./build/bin/drawpile $appsDir/Drawpile/Drawpile - cp ./build/bin/drawpile-srv $appsDir/Drawpile/drawpile-srv - addResourcesToBinaries $portDir/additional-files/Drawpile.rdef \ - $appsDir/Drawpile/Drawpile - addAppDeskbarSymlink $appsDir/Drawpile/Drawpile -} - -TEST() -{ - make -C build test -} diff --git a/media-gfx/drawpile/drawpile-2.1.12.recipe b/media-gfx/drawpile/drawpile-2.1.17.recipe similarity index 70% rename from media-gfx/drawpile/drawpile-2.1.12.recipe rename to media-gfx/drawpile/drawpile-2.1.17.recipe index cca649a2d..c010767ca 100644 --- a/media-gfx/drawpile/drawpile-2.1.12.recipe +++ b/media-gfx/drawpile/drawpile-2.1.17.recipe @@ -2,16 +2,18 @@ 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-2019 Calle Laakkonen" +COPYRIGHT="2006-2020 Calle Laakkonen" LICENSE="GNU GPL v3" REVISION="1" SOURCE_URI="https://github.com/drawpile/Drawpile/archive/$portVersion.tar.gz" -CHECKSUM_SHA256="1c60db2188ba9cefd1ec157acb3d80d292b7952a029661e892497d5d18ea1fbe" +CHECKSUM_SHA256="67e569856ca5031dadd349f17e5185e93d42020f560016540fc32b5b52653a2f" SOURCE_FILENAME="Drawpile-$portVersion.tar.gz" SOURCE_DIR="Drawpile-$portVersion" +PATCHES="drawpile-$portVersion.patchset" +ADDITIONAL_FILES="Drawpile.rdef.in" ARCHITECTURES="!x86_gcc2 ?x86 x86_64" -SECONDARY_ARCHITECTURES="?x86" +SECONDARY_ARCHITECTURES="x86" PROVIDES=" drawpile$secondaryArchSuffix = $portVersion @@ -34,8 +36,7 @@ REQUIRES=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - extra_cmake_modules$secondaryArchSuffix - qt5_tools$secondaryArchSuffix + extra_cmake_modules$secondaryArchSuffix >= 5.65 devel:libarchive$secondaryArchSuffix devel:libgif$secondaryArchSuffix devel:libKF5Archive$secondaryArchSuffix @@ -51,6 +52,7 @@ BUILD_PREREQUIRES=" cmd:cmake cmd:g++$secondaryArchSuffix cmd:ld$secondaryArchSuffix + cmd:lrelease$secondaryArchSuffix cmd:make cmd:pkg_config$secondaryArchSuffix " @@ -66,10 +68,25 @@ BUILD() INSTALL() { - # TODO Add a rdef icon for Drawpile 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 } diff --git a/media-gfx/drawpile/patches/drawpile-2.1.17.patchset b/media-gfx/drawpile/patches/drawpile-2.1.17.patchset new file mode 100644 index 000000000..46f1d0298 --- /dev/null +++ b/media-gfx/drawpile/patches/drawpile-2.1.17.patchset @@ -0,0 +1,45 @@ +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 +