From 16f6266c927e118a3271adaefb872f18ec149614 Mon Sep 17 00:00:00 2001
From: ImperatorStorm <imperatorstorm11@protonmail.com>
Date: Mon, 25 Nov 2024 19:39:37 -0600
Subject: [PATCH] upgpkg: aseprite 1.3.10.1-3 Fix build

---
 .SRCINFO                  |  4 +++-
 PKGBUILD                  | 19 +++++++++++++++----
 fix-shared-tinyxml2.patch | 24 ++++++++++++++++++++++++
 3 files changed, 42 insertions(+), 5 deletions(-)
 create mode 100644 fix-shared-tinyxml2.patch

diff --git a/.SRCINFO b/.SRCINFO
index 9f72792..e46a943 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = aseprite
 	pkgdesc = Create animated sprites and pixel art
 	pkgver = 1.3.10.1
-	pkgrel = 1
+	pkgrel = 3
 	url = https://www.aseprite.org/
 	arch = x86_64
 	license = LicenseRef-Aseprite-EULA
@@ -42,6 +42,7 @@ pkgbase = aseprite
 	source = shared-libwebp.patch
 	source = shared-skia-deps.patch
 	source = optional-pixman.patch
+	source = fix-shared-tinyxml2.patch
 	sha256sums = 8eea1db7f3465c5d1442c19599de53ab6d69431767ffa320459f5c3ff8cc80b4
 	sha256sums = 8d76c1ad3693e1fc019eb14d806082148eb4ed7d601474aeeaae601b05a9b3ad
 	sha256sums = 8b14e36939e930de581e95abf0591645aa0fcfd47161cf88b062917dbaaef7f9
@@ -50,5 +51,6 @@ pkgbase = aseprite
 	sha256sums = 0f8adb959d7000697af453d6cf5aaf9984b74868008382aad541d2c29871c751
 	sha256sums = eb9f544e68b41b5cb1a9ab7a6648db51587e67e94f1a452cb5a84f3d224bf5d0
 	sha256sums = c2d14f9738a96a9db3695c00ac3d14b1312b6a595b151bd56e19422c86517654
+	sha256sums = ba02fc060dc930cfd66a8903a5d8a59f981753bdf416e91cc77a48c56c86aea3
 
 pkgname = aseprite
diff --git a/PKGBUILD b/PKGBUILD
index b31c3fe..f1ecf25 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,7 +12,7 @@ pkgname=aseprite
 pkgver=1.3.10.1
 _skiaver=m102
 _skiahash=861e4743af
-pkgrel=1
+pkgrel=3
 pkgdesc='Create animated sprites and pixel art'
 arch=('x86_64')
 url="https://www.aseprite.org/"
@@ -49,7 +49,8 @@ source=("https://github.com/aseprite/aseprite/releases/download/v$pkgver/Aseprit
         # Based on https://patch-diff.githubusercontent.com/raw/aseprite/aseprite/pull/2523.patch
         shared-libwebp.patch
         shared-skia-deps.patch
-        optional-pixman.patch)
+        optional-pixman.patch
+        fix-shared-tinyxml2.patch)
 noextract=("Aseprite-v$pkgver-Source.zip"
            "skia-$_skiaver.tar.gz") # Don't extract Aseprite or skia sources at the root
 sha256sums=('8eea1db7f3465c5d1442c19599de53ab6d69431767ffa320459f5c3ff8cc80b4'
@@ -59,8 +60,9 @@ sha256sums=('8eea1db7f3465c5d1442c19599de53ab6d69431767ffa320459f5c3ff8cc80b4'
             '89cd28a5a90ee9dd42e85866b6f954bde526068d94311b0730a62f00f9cfffdb'
             '0f8adb959d7000697af453d6cf5aaf9984b74868008382aad541d2c29871c751'
             'eb9f544e68b41b5cb1a9ab7a6648db51587e67e94f1a452cb5a84f3d224bf5d0'
-            'c2d14f9738a96a9db3695c00ac3d14b1312b6a595b151bd56e19422c86517654')
-
+            'c2d14f9738a96a9db3695c00ac3d14b1312b6a595b151bd56e19422c86517654'
+            'ba02fc060dc930cfd66a8903a5d8a59f981753bdf416e91cc77a48c56c86aea3')
+_debug="true"
 prepare() {
 	# Extract Aseprite's sources
 	mkdir -p aseprite
@@ -69,15 +71,24 @@ prepare() {
 	mkdir -p skia
 	bsdtar xf skia-$_skiaver.tar.gz  --strip-components=1 -C skia
 	# Fix up Aseprite's desktop integration
+	[[ -n $_debug ]] && echo desktop.patch
 	env -C aseprite patch -tp1 <desktop.patch
 	# Allow using more shared libs
+	[[ -n $_debug ]] && echo shared-fmt.patch
 	env -C aseprite patch -tp1 <shared-fmt.patch
+	[[ -n $_debug ]] && echo shared-libarchive.patch
 	env -C aseprite patch -tp1 <shared-libarchive.patch
+	[[ -n $_debug ]] && echo shared-libwebp.patch
 	env -C aseprite patch -tp1 <shared-libwebp.patch
+	[[ -n $_debug ]] && echo shared-pixman.patch
 	env -C aseprite patch -tp1 <optional-pixman.patch
 	# Their "FindSkia" module forcefully tries to use Skia's FreeType and HarfBuzz,
 	# but we don't clone those because we use the shared ones. Avoid overwriting the settings instead.
+	[[ -n $_debug ]] && echo shared-skia-deps.patch
 	env -C aseprite patch -tp1 <shared-skia-deps.patch
+	# TinyEXIF cannot find tinyxml2 otherwise
+	[[ -n $_debug ]] && echo fix-shared-tinyxml2.patch
+	env -C aseprite/third_party/TinyEXIF patch -tp1 <fix-shared-tinyxml2.patch
 }
 
 build() {
diff --git a/fix-shared-tinyxml2.patch b/fix-shared-tinyxml2.patch
new file mode 100644
index 0000000..240770e
--- /dev/null
+++ b/fix-shared-tinyxml2.patch
@@ -0,0 +1,24 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 674dbd6..1ba8329 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -3,6 +3,8 @@ cmake_minimum_required(VERSION 3.1)
+ project(TinyEXIF)
+ include(GNUInstallDirs)
+ 
++find_package(tinyxml2 REQUIRED)
++
+ #CMAKE_BUILD_TOOL
+ 
+ ################################
+@@ -141,6 +143,10 @@ if(BUILD_STATIC_LIBS)
+ 		endif()
+ 	endif()
+ 
++	# export targets for find_package config mode
++	export(TARGETS TinyEXIFstatic
++			FILE ${CMAKE_BINARY_DIR}/${CMAKE_PROJECT_NAME}Targets.cmake)
++
+ 	install(TARGETS TinyEXIFstatic
+ 			EXPORT ${CMAKE_PROJECT_NAME}Targets
+ 			RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}