From 3e70dd890fe12d1f747162e39e4f5d37471e6ce1 Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Fri, 18 Oct 2024 14:02:50 +0200
Subject: [PATCH] libresprite, revbump, cleanup/fix launching (#11223)

---
 .../additional-files/setup-data.sh            |  4 +-
 .../libresprite/libresprite-1.1~git.recipe    | 22 ++++----
 .../patches/libresprite-1.1~git.patchset      | 50 ++++++++++++++++++-
 3 files changed, 60 insertions(+), 16 deletions(-)

diff --git a/media-gfx/libresprite/additional-files/setup-data.sh b/media-gfx/libresprite/additional-files/setup-data.sh
index 35ce3421b..ca69cde71 100644
--- a/media-gfx/libresprite/additional-files/setup-data.sh
+++ b/media-gfx/libresprite/additional-files/setup-data.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
 
-mkdir -r /boot/home/config/settings/libresprite/data
-cp -r /boot/system/data/libresprite/* /boot/home/config/settings/libresprite/data/
+mkdir -r /boot/home/config/settings/libresprite
+cp -r /boot/system/data/libresprite/data /boot/home/config/settings/libresprite
diff --git a/media-gfx/libresprite/libresprite-1.1~git.recipe b/media-gfx/libresprite/libresprite-1.1~git.recipe
index 0791e41b4..d0d1aa0c4 100644
--- a/media-gfx/libresprite/libresprite-1.1~git.recipe
+++ b/media-gfx/libresprite/libresprite-1.1~git.recipe
@@ -4,7 +4,7 @@ HOMEPAGE="https://libresprite.github.io"
 COPYRIGHT="2001-2016 David Capello and Aseprite contributors
 	2016-2024 LibreSprite contributors"
 LICENSE="GNU GPL v2"
-REVISION="1"
+REVISION="2"
 srcGitRev="c99d3666b17ff731824e3eccc79cf3ec48564ad5"
 SOURCE_URI="https://github.com/LibreSprite/LibreSprite/archive/$srcGitRev.zip"
 CHECKSUM_SHA256="29c4e8013b2f25ce47b01a6b3890e1b7cd575a6b7c475f055b716de0e9a66c90"
@@ -82,7 +82,6 @@ BUILD_REQUIRES="
 	devel:libSDL2_image_2.0$secondaryArchSuffix
 	devel:libtinyxml2$secondaryArchSuffix
 	devel:libv8$secondaryArchSuffix
-	devel:libx11$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
@@ -102,21 +101,20 @@ BUILD()
 	ln -sfr ../../sources-5/flic-$srcGitRev_5/ ./src/flic
 	ln -sfr ../../sources-6/observable-$srcGitRev_6/ ./src/observable
 	ln -sfr ../../sources-7/undo-$srcGitRev_7/ ./src/undo
-	mkdir -p build
-	cd build
-	cmake -G Ninja .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX:PATH=$prefix
-	ninja libresprite
+
+	cmake -Bbuild -S. -G Ninja \
+		-DCMAKE_BUILD_TYPE=Release \
+		-DCMAKE_INSTALL_PREFIX=$prefix \
+		-DCMAKE_EXE_LINKER_FLAGS=-lnetwork
+	ninja -Cbuild libresprite
 }
 
 INSTALL()
 {
-	cd build
-	ninja install libresprite
-	rm -r $prefix/share
-	mkdir -p $dataDir && mkdir -p $dataDir/libresprite/ mkdir -p $appsDir
-	cp -r bin/data $dataDir/libresprite/
-	ln -sfr $prefix/bin/libresprite $appsDir/libresprite
+	ninja -Cbuild install libresprite
+
 	addAppDeskbarSymlink $prefix/bin/libresprite LibreSprite
+
 	mkdir -p $postInstallDir
 	cp -f $portDir/additional-files/setup-data.sh $postInstallDir
 	chmod a+rx "$postInstallDir/setup-data.sh"
diff --git a/media-gfx/libresprite/patches/libresprite-1.1~git.patchset b/media-gfx/libresprite/patches/libresprite-1.1~git.patchset
index 35a31100a..3b6d5f978 100644
--- a/media-gfx/libresprite/patches/libresprite-1.1~git.patchset
+++ b/media-gfx/libresprite/patches/libresprite-1.1~git.patchset
@@ -1,4 +1,4 @@
-From 62c9e45f22374e5364767d5c6b2c36681a790f3f Mon Sep 17 00:00:00 2001
+From 041dd83bc762c99cacd5c8f5d3eee4319e511ce6 Mon Sep 17 00:00:00 2001
 From: sabcha1 <slozoviz@gmail.com>
 Date: Sat, 8 Jun 2024 20:24:00 +0000
 Subject: libresprite: initial port
@@ -45,5 +45,51 @@ index c79c4af..a7c83cc 100644
  
              child->m_filename = fullfn;
 -- 
-2.45.1
+2.45.2
+
+
+From f905692038c1603d38e38aa17467a4284dc99ab5 Mon Sep 17 00:00:00 2001
+From: Begasus <begasus@gmail.com>
+Date: Fri, 18 Oct 2024 11:08:09 +0200
+Subject: Fix data install path
+
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 8474998..277a675 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -154,7 +154,7 @@ install(TARGETS libresprite
+   RUNTIME DESTINATION bin)
+ 
+ install(DIRECTORY ../data
+-  DESTINATION share/libresprite)
++  DESTINATION data/libresprite)
+ else()
+   add_custom_target(libresprite DEPENDS app-lib)
+ endif()
+-- 
+2.45.2
+
+
+From d4632d7b1f34c450f2d176dd4181311338b6d802 Mon Sep 17 00:00:00 2001
+From: Begasus <begasus@gmail.com>
+Date: Fri, 18 Oct 2024 11:45:05 +0200
+Subject: Fix opening documentation etc from the application menu
+
+
+diff --git a/src/base/launcher.cpp b/src/base/launcher.cpp
+index 6523236..f76f3ac 100644
+--- a/src/base/launcher.cpp
++++ b/src/base/launcher.cpp
+@@ -92,7 +92,7 @@ bool open_file(const std::string& file)
+   ret = win32_shell_execute(L"open",
+                             base::from_utf8(file).c_str(), NULL);
+ 
+-#elif __APPLE__
++#elif __APPLE__ || __HAIKU__
+ 
+   ret = std::system(("open \"" + file + "\"").c_str());
+ 
+-- 
+2.45.2