From 6b0375851b3ab4a8405d8a23d92f6caf16700448 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Thu, 14 Oct 2021 21:05:10 +0200
Subject: [PATCH 1/2] common/build-helper/qmake.sh: also quote flags in

native builds
---
 common/build-helper/qmake.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/common/build-helper/qmake.sh b/common/build-helper/qmake.sh
index d2a38703b300..7d768e45033a 100644
--- a/common/build-helper/qmake.sh
+++ b/common/build-helper/qmake.sh
@@ -66,7 +66,8 @@ _EOF
 	# makes sense together with the qmake build-helper
 	# and not to interfere with e.g. the qmake build-style
 	#
-	# XXX: Intentionally quote {C,CXX,LD}FLAGS here but not in native.
+	# XXX: Intentionally quote {C,CXX,LD}FLAGS here and
+	#      {C,CXX}FLAGS in native.
 	# - Cross Build:
 	#   + base flags will be picked up from QMAKE_{C,CXX,LD}FLAGS
 	#   + hardening flags will be picked up from environment variables
@@ -91,8 +92,8 @@ exec /usr/lib/qt5/bin/qmake \
 	LIB=/usr/lib \
 	QMAKE_CC=$CC QMAKE_CXX=$CXX \
 	QMAKE_LINK=$CXX QMAKE_LINK_C=$CC \
-	QMAKE_CFLAGS+="${CFLAGS}" \
-	QMAKE_CXXFLAGS+="${CXXFLAGS}" \
+	QMAKE_CFLAGS+="\${CFLAGS}" \
+	QMAKE_CXXFLAGS+="\${CXXFLAGS}" \
 	QMAKE_LFLAGS+="${LDFLAGS}" \
 	CONFIG+=no_qt_rpath
 _EOF

From d413de49e6435726d197f26634709734066b25d3 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Thu, 14 Oct 2021 21:02:25 +0200
Subject: [PATCH 2/2] gmic: update to 2.9.9

---
 srcpkgs/gmic-krita    |  1 +
 srcpkgs/gmic/template | 47 ++++++++++++++++++++++++++++++++++++-------
 2 files changed, 41 insertions(+), 7 deletions(-)
 create mode 120000 srcpkgs/gmic-krita

diff --git a/srcpkgs/gmic-krita b/srcpkgs/gmic-krita
new file mode 120000
index 000000000000..433883885ce6
--- /dev/null
+++ b/srcpkgs/gmic-krita
@@ -0,0 +1 @@
+gmic
\ No newline at end of file
diff --git a/srcpkgs/gmic/template b/srcpkgs/gmic/template
index 6d6f4ec13ba2..8c1fa6962d8d 100644
--- a/srcpkgs/gmic/template
+++ b/srcpkgs/gmic/template
@@ -1,7 +1,8 @@
 # Template file for 'gmic'
 pkgname=gmic
-version=2.8.0
+version=2.9.9
 revision=1
+_zart_hash=939cf381c5871e506aabd066037acf2b55143c1d
 build_wrksrc="src"
 build_style=gnu-makefile
 build_helper=qmake
@@ -13,20 +14,39 @@ short_desc="GREYC's Magic for Image Computing (image processing framework)"
 maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"
 license="CECILL-2.1"
 homepage="http://gmic.eu/"
-distfiles="http://gmic.eu/files/source/gmic_${version}.tar.gz"
-checksum=d1ca5c726f7570af3a6f0bca27eeb66ef1e6a1b6a17bdaeaf0d59be40b9cd075
+distfiles="http://gmic.eu/files/source/gmic_${version}.tar.gz
+ https://github.com/c-koi/zart/archive/${_zart_hash}.tar.gz"
+checksum="9f053338752ec96a6b619718037767682c5fd58e2471c08f3740fdb070605bc0
+ eec47cc9b572cb3e3c26b424381948e12161e129f3d0d3ceca87ff4a8f99fe5d"
 disable_parallel_build="yes"
 
+post_extract() {
+	mv ../zart-${_zart_hash} zart
+}
+
 post_patch() {
-	vsed -i -e "s,-I[\$](USR),-I$XBPS_CROSS_BASE/usr,g" Makefile
-	# Fix library names for openexr-2.4.0
-	vsed -i Makefile -e "s;-lIlmImf -lHalf;-lIlmImf-2_4 -lHalf-2_4;"
+	vsed -i Makefile -e "s,-I[\$](USR),-I$XBPS_CROSS_BASE/usr,g"
+	vsed -i Makefile -e "s/-Ofast/-O2/g"
+	# uses gimptool-2.0 to determine PLUGINDIR which fails in cross builds
+	vsed -i Makefile -e "s,^PLUGINDIR = .*,PLUGINDIR = /usr/lib/gimp/2\.0/plug-ins,g"
+	vsed -i ../gmic-qt/gmic_qt.pro -e "s/-Ofast/-O2/g"
 	# Not supported on ppc but we already compile for baselines
 	case "$XBPS_TARGET_MACHINE" in
 		ppc*) vsed -i Makefile -e 's;-mtune=generic;;' ;;
 	esac
 }
 
+do_build() {
+	make CC="$CC" CXX="$CXX" LD="$LD" AR="$AR" RANLIB="$RANLIB" \
+		CPP="$CPP" AS="$AS" OBJCOPY="$OBJCOPY" OBJDUMP="$OBJDUMP" \
+		CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" LDFLAGS="$LDFLAGS" \
+		cli lib libc
+
+	for _target in gimp krita gmic_qt zart; do
+		make $_target
+	done
+}
+
 post_install() {
 	vlicense ../COPYING
 }
@@ -38,18 +58,31 @@ gmic-gimp_package() {
 		vmove usr/lib/gimp
 	}
 }
+
+gmic-krita_package() {
+	short_desc+=" - Krita plugin"
+	depends="krita ${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/bin/gmic_krita_qt
+	}
+}
+
 gmic-zart_package() {
 	short_desc+=" - ZArt tool"
 	depends="${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/bin/zart
+		vmove usr/share/applications/zart.desktop
+		vmove usr/share/icons/hicolor/48x48/apps/zart.png
+		vmove usr/share/icons/hicolor/scalable/apps/zart.svg
 	}
 }
+
 gmic-devel_package() {
 	short_desc+=" - development files"
 	depends="${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
-		vmove usr/lib/*.so
+		vmove "usr/lib/*.so"
 	}
 }