From 4560a667661e7895bc2cf30f457c602a32d2af9e Mon Sep 17 00:00:00 2001
From: MURAMATSU Atsushi <amura@tomato.sakura.ne.jp>
Date: Thu, 21 Apr 2022 02:27:54 +0900
Subject: [PATCH] update to official azpainter v3.0.5

---
 x11-packages/azpainter/build.sh       | 44 ++++++++++++++++++++-------
 x11-packages/azpainter/no-librt.patch | 20 +++++-------
 2 files changed, 41 insertions(+), 23 deletions(-)

diff --git a/x11-packages/azpainter/build.sh b/x11-packages/azpainter/build.sh
index 01f4a4022..ad89dc171 100644
--- a/x11-packages/azpainter/build.sh
+++ b/x11-packages/azpainter/build.sh
@@ -1,22 +1,44 @@
-TERMUX_PKG_HOMEPAGE=https://github.com/Symbian9/azpainter
-TERMUX_PKG_DESCRIPTION="Full color painting software for Unix-like systems for illustration drawing (unofficial)"
+TERMUX_PKG_HOMEPAGE=https://gitlab.com/azelpg/azpainter
+TERMUX_PKG_DESCRIPTION="Full color painting software for Unix-like systems for illustration drawing"
 TERMUX_PKG_LICENSE="GPL-3.0"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION=1:2.1.6
-TERMUX_PKG_REVISION=14
-TERMUX_PKG_SRCURL=https://github.com/Symbian9/azpainter/releases/download/v${TERMUX_PKG_VERSION:2}/azpainter-${TERMUX_PKG_VERSION:2}.tar.xz
-TERMUX_PKG_SHA256=85f3f935e76b420f2e5e272514368fdfbe4c25c01daa1e161ac28a6e1edb0d2c
-TERMUX_PKG_DEPENDS="fontconfig, hicolor-icon-theme, libandroid-shmem, libjpeg-turbo, libxfixes, libxi"
+TERMUX_PKG_VERSION=1:3.0.5
+TERMUX_PKG_AUTO_UPDATE=true
+TERMUX_PKG_SRCURL=https://gitlab.com/azelpg/azpainter/-/archive/v${TERMUX_PKG_VERSION:2}/azpainter-${TERMUX_PKG_VERSION:2}.tar.bz2
+TERMUX_PKG_SHA256=e40f2d0fc104d7097097cf38b50852587d0031cc9ecefff03d0ee8cbefaee399
+TERMUX_PKG_DEPENDS="libandroid-shmem, iconv, fontconfig, freetype, hicolor-icon-theme, libxfixes, libxi, libxcursor, libpng, libjpeg-turbo, libtiff, libwebp"
 TERMUX_PKG_BUILD_IN_SRC=true
-
 TERMUX_PKG_RM_AFTER_INSTALL="
 share/icons/hicolor/icon-theme.cache
+share/mime/XMLnamespaces
+share/mime/aliases
+share/mime/generic-icons
+share/mime/globs
+share/mime/globs2
+share/mime/icons
+share/mime/magic
+share/mime/mime.cache
+share/mime/subclasses
+share/mime/treemagic
+share/mime/types
+share/mime/version
 "
 
 termux_step_configure() {
-	sed -i "s/LDFLAGS :=/LDFLAGS +=/" Makefile.in
+	termux_setup_ninja
 	./configure --prefix="$TERMUX_PREFIX" \
 		CC="$CC" \
-		CFLAGS="$CFLAGS" \
-		LIBS="-landroid-shmem"
+		CFLAGS="$CPPFLAGS $CFLAGS" \
+		LDFLAGS="$LDFLAGS" \
+		LIBS="-liconv -landroid-shmem"
+}
+
+termux_step_make() {
+	cd build
+	ninja
+}
+
+termux_step_make_install() {
+	cd build
+	ninja install
 }
diff --git a/x11-packages/azpainter/no-librt.patch b/x11-packages/azpainter/no-librt.patch
index ee5ac4688..bce103ae3 100644
--- a/x11-packages/azpainter/no-librt.patch
+++ b/x11-packages/azpainter/no-librt.patch
@@ -1,14 +1,10 @@
-diff -uNr azpainter-2.1.6/configure azpainter-2.1.6.mod/configure
---- azpainter-2.1.6/configure	2020-04-21 02:27:27.000000000 +0300
-+++ azpainter-2.1.6.mod/configure	2020-04-27 17:23:13.316609232 +0300
-@@ -245,10 +245,6 @@
+--- azpainter-v3.0.5/configure.orig	2022-03-21 11:06:20.000000000 +0900
++++ azpainter-v3.0.5/configure	2022-04-21 02:00:04.000000000 +0900
+@@ -344,7 +344,6 @@
  
- fc_check_command_err $cf_make
- 
--if test $cf_os = linux;then
--	LIBS_ADD=`fc_add_string "$LIBS_ADD" "-lrt"`
--fi
--
- #-------------
- # compiler
+ fc_check_sharedlib "iconv"
  
+-fc_check_funclink rt "clock_gettime"
+ fc_check_lib libpng "libpng" "" "-lpng -lz" "png.h" "" "libpng-dev or libpng-devel or libpng or png" ""
+ fc_check_lib zlib "zlib" "" "" "zlib.h" "" "zlib1g-dev or zlib-devel or zlib" ""
+ fc_check_lib libjpeg "libjpeg" "" "-ljpeg" "stdio.h jpeglib.h" "" "libjpeg-dev or libjpeg-devel or libjpeg-turbo or jpeg-turbo" ""