From b553e1c17c16a77492517988231e934345b4c2c4 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Fri, 10 Mar 2023 16:42:05 +0100 Subject: [PATCH] opentoonz: add deskbar link and a vector icon --- .../opentoonz/opentoonz-1.7.0~git.recipe | 12 ++++++- .../patches/opentoonz-1.7.0~git.patchset | 35 +++++++++++++++++++ 2 files changed, 46 insertions(+), 1 deletion(-) diff --git a/media-gfx/opentoonz/opentoonz-1.7.0~git.recipe b/media-gfx/opentoonz/opentoonz-1.7.0~git.recipe index f932046c0..a37688625 100644 --- a/media-gfx/opentoonz/opentoonz-1.7.0~git.recipe +++ b/media-gfx/opentoonz/opentoonz-1.7.0~git.recipe @@ -7,12 +7,13 @@ Studio Ghibli (http://www.ghibli.jp/) over many years of production." HOMEPAGE="https://github.com/opentoonz/opentoonz/" COPYRIGHT="2016-2018, DWANGO Co., Ltd." LICENSE="BSD (3-clause)" -REVISION="3" +REVISION="4" srcGitRev="79abc3c572f9ec45b8a1c08d822bc36aecbe06bd" SOURCE_URI="${HOMEPAGE}archive/$srcGitRev.tar.gz" CHECKSUM_SHA256="705b3d4488cafc55536281d982257be76ceb035b985242b7b38dee076b06370b" SOURCE_DIR="opentoonz-$srcGitRev" PATCHES="opentoonz-$portVersion.patchset" +ADDITIONAL_FILES="opentoonz.rdef" ARCHITECTURES="all !x86_gcc2" SECONDARY_ARCHITECTURES="x86" @@ -118,4 +119,13 @@ INSTALL() ninja -C toonz/build install rm -rf $prefix/share + + settype -t application/x-vnd.Be-elfexecutable $prefix/bin/opentoonz + + rc $portDir/additional-files/opentoonz.rdef + resattr -o $prefix/bin/opentoonz $portDir/additional-files/opentoonz.rsrc + addResourcesToBinaries $portDir/additional-files/opentoonz.rdef $prefix/bin/OpenToonz + + addAppDeskbarSymlink $prefix/bin/opentoonz OpenToonz + } diff --git a/media-gfx/opentoonz/patches/opentoonz-1.7.0~git.patchset b/media-gfx/opentoonz/patches/opentoonz-1.7.0~git.patchset index d76094e78..aa757d311 100644 --- a/media-gfx/opentoonz/patches/opentoonz-1.7.0~git.patchset +++ b/media-gfx/opentoonz/patches/opentoonz-1.7.0~git.patchset @@ -596,3 +596,38 @@ index 9b71873..ca4e52c 100644 -- 2.37.3 + + +From 0738c0b8ad1a7e3fa8b08f887031ae072247f9eb Mon Sep 17 00:00:00 2001 +From: Jerome Duval +Date: Fri, 10 Mar 2023 16:39:26 +0100 +Subject: Haiku: startup script behavior for the Deskbar menu + + +diff --git a/toonz/sources/toonz/CMakeLists.txt b/toonz/sources/toonz/CMakeLists.txt +index d3aee49..b709014 100644 +--- a/toonz/sources/toonz/CMakeLists.txt ++++ b/toonz/sources/toonz/CMakeLists.txt +@@ -667,7 +667,8 @@ elseif(BUILD_ENV_UNIXLIKE AND NOT BUILD_TARGET_WIN) + # and sets the library preload path. + file(WRITE ${CMAKE_BINARY_DIR}/bin/opentoonz + "#!/bin/sh +-OPENTOONZ_BASE=\$(dirname \"\$0\")/.. ++OPENTOONZ_SCRIPT=\$(readlink -f \"\$0\") ++OPENTOONZ_BASE=\$(dirname \"\$OPENTOONZ_SCRIPT\")/.. + + if [ ! -d \$HOME/.config/OpenToonz ]; then + mkdir -p \$HOME/.config/OpenToonz +@@ -703,7 +704,7 @@ fi + + export ${PRELOAD_VARIABLE}=\${OPENTOONZ_BASE}/lib/opentoonz:\${${PRELOAD_VARIABLE}} + +-exec \$OPENTOONZ_BASE/bin/OpenToonz \"\$@\" ++\$OPENTOONZ_BASE/bin/OpenToonz \"\$@\" & + ") + # only needed for executing without installing + execute_process(COMMAND chmod +x ${CMAKE_BINARY_DIR}/bin/opentoonz) +-- +2.37.3 + +