[PR PATCH] azpainter: update to 2.1.6

[ndowens <ndowens@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 313 bytes --]

There is a new pull request by ndowens against master on the void-packages repository

https://github.com/ndowens/void-packages azpainter
https://github.com/void-linux/void-packages/pull/26831

azpainter: update to 2.1.6


A patch file from https://github.com/void-linux/void-packages/pull/26831.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-azpainter-26831.patch --]
[-- Type: text/x-diff, Size: 3731 bytes --]

From a1947e3eee2fde6f3bd2d648d3c1d4943c47d758 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Mon, 30 Nov 2020 09:49:40 -0600
Subject: [PATCH] azpainter: update to 2.1.6

---
 .../patches/0001-fix-configure-error.patch    | 39 +++++++++++++++++++
 srcpkgs/azpainter/patches/cross.patch         | 11 ------
 srcpkgs/azpainter/template                    | 22 ++++++-----
 3 files changed, 51 insertions(+), 21 deletions(-)
 create mode 100644 srcpkgs/azpainter/patches/0001-fix-configure-error.patch
 delete mode 100644 srcpkgs/azpainter/patches/cross.patch

diff --git a/srcpkgs/azpainter/patches/0001-fix-configure-error.patch b/srcpkgs/azpainter/patches/0001-fix-configure-error.patch
new file mode 100644
index 00000000000..00ecc7e64ef
--- /dev/null
+++ b/srcpkgs/azpainter/patches/0001-fix-configure-error.patch
@@ -0,0 +1,39 @@
+From 460cd59bcc0735ca4e1f4e14b59f4e3459c2044d Mon Sep 17 00:00:00 2001
+From: Nathan Owens <ndowens@artixlinux.org>
+Date: Mon, 30 Nov 2020 09:44:57 -0600
+Subject: [PATCH] fix configure error
+
+---
+ configure | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git configure configure
+index cb9a9f6..06e65e0 100755
+--- configure
++++ configure
+@@ -203,9 +203,6 @@ for opt;do
+ 		cf_check_lib=no ;;
+ 	*=*)
+ 		eval "$opt" ;;
+-	*)
+-		echo "unknown option: $opt"
+-		exit 1 ;;
+ 	esac
+ done
+ 
+-- 
+2.29.2
+
+diff --git configure configure
+index 06e65e0..b10aed0 100755
+--- configure
++++ configure
+@@ -201,8 +201,6 @@ for opt;do
+ 		cf_docdir=$tmp1 ;;
+ 	--no-check-lib)
+ 		cf_check_lib=no ;;
+-	*=*)
+-		eval "$opt" ;;
+ 	esac
+ done
+ 
diff --git a/srcpkgs/azpainter/patches/cross.patch b/srcpkgs/azpainter/patches/cross.patch
deleted file mode 100644
index b9066c40797..00000000000
--- a/srcpkgs/azpainter/patches/cross.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.ac.orig
-+++ configure.ac
-@@ -30,7 +30,7 @@
- 	[AC_DEFINE([HAVE_PTHREAD_H], [1], [pthread.h])],
- 	AC_MSG_ERROR(pthread.h not found))
- 
--AC_CHECK_FILE("$freetype_dir/ft2build.h",,AC_MSG_ERROR([(freetype) ft2build.h not found]))
-+
- AC_CHECK_HEADER([fontconfig/fontconfig.h],,AC_MSG_ERROR(fontconfig.h not found))
- AC_CHECK_HEADER([zlib.h],,AC_MSG_ERROR(zlib.h not found))
- AC_CHECK_HEADER([png.h],,AC_MSG_ERROR(png.h not found))
diff --git a/srcpkgs/azpainter/template b/srcpkgs/azpainter/template
index 22d9741d7ca..89672495cbf 100644
--- a/srcpkgs/azpainter/template
+++ b/srcpkgs/azpainter/template
@@ -1,20 +1,22 @@
 # Template file for 'azpainter'
 pkgname=azpainter
-version=2.1.5
+version=2.1.6
 revision=1
 build_style=gnu-configure
-hostmakedepends="automake"
-makedepends="fontconfig-devel libXi-devel libjpeg-turbo-devel"
+hostmakedepends="libpng-devel libjpeg-turbo-devel libXi-devel
+ fontconfig-devel"
+makedepends="$hostmakedepends"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="Full-color painting software for illustration drawing"
 maintainer="Alexander Mamay <alexander@mamay.su>"
 license="GPL-3.0-or-later"
-homepage="https://osdn.net/projects/azpainter/"
-distfiles="https://dotsrc.dl.osdn.net/osdn/azpainter/71988/azpainter-${version}.tar.xz"
-checksum=de96d3f33c7de53ff2ad1cd13be98d4bd595c86d1b75e21f509afd56e5cd9dc7
+homepage="https://github.com/Symbian9/azpainter"
+distfiles="https://github.com/Symbian9/azpainter/releases/download/v${version}/${pkgname}-${version}.tar.xz"
+checksum=85f3f935e76b420f2e5e272514368fdfbe4c25c01daa1e161ac28a6e1edb0d2c
 
-CPPFLAGS="-I${XBPS_CROSS_BASE}/usr/include/freetype2"
-
-pre_configure() {
-	autoreconf -fi
+pre_build() {
+	vsed -e 's|CFLAGS :=|override CFLAGS =|' \
+		-e "/CC/s|:= gcc|= ${XBPS_CROSS_TRIPLET}-gcc|" \
+		-e 's|LDFLAGS :=|override LDFLAGS =|' \
+		-i Makefile -i mlib/Makefile
 }