[PR PATCH] synfig/synfigstudio/ETL: update to 1.4.0

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

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

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

https://github.com/newbluemoon/void-packages synfig
https://github.com/void-linux/void-packages/pull/26410

synfig/synfigstudio/ETL: update to 1.4.0
New stable release, supersedes #24755, tested briefly on x86_64-musl with some examples, no segfault anymore on startup. Also successfully built for x86_64, armv7l, i686.

@Vaelatern @diogoleal 

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

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

From da917dd38135582dc549db700fa8cf32a2eb3167 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Sun, 15 Nov 2020 19:37:22 +0100
Subject: [PATCH 1/3] ETL: update to 1.4.0

---
 srcpkgs/ETL/template | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/ETL/template b/srcpkgs/ETL/template
index 8559214be80..df0ac12f4d4 100644
--- a/srcpkgs/ETL/template
+++ b/srcpkgs/ETL/template
@@ -1,12 +1,11 @@
 # Template file for 'ETL'
 pkgname=ETL
-reverts="1.3.11_1"
-version=1.2.2
-revision=3
+version=1.4.0
+revision=1
 build_style=gnu-configure
 short_desc="Extended Template Library"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="GPL-2.0-or-later"
 homepage="http://www.synfig.org/"
-distfiles="https://github.com/synfig/synfig/releases/download/v${version}/source-ETL-${version}.tar.gz"
-checksum=0dc19c5a6c9e964054ca3af6dacd6ab0c198d78071cfab2aebac178afe454d8b
+distfiles="https://github.com/synfig/synfig/releases/download/v${version}/ETL-${version}.tar.gz"
+checksum=d43396c0ac356114713469216a9257247c2588d5475590a46db63cf201d1a011

From ce8a5e67bf076f2f3f06c4e0e9da94f1b8e0ab90 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Sun, 15 Nov 2020 19:36:13 +0100
Subject: [PATCH 2/3] synfig: update to 1.4.0

---
 srcpkgs/synfig/patches/libxml-no-c-linkage.patch | 13 -------------
 srcpkgs/synfig/template                          | 10 +++++-----
 2 files changed, 5 insertions(+), 18 deletions(-)
 delete mode 100644 srcpkgs/synfig/patches/libxml-no-c-linkage.patch

diff --git a/srcpkgs/synfig/patches/libxml-no-c-linkage.patch b/srcpkgs/synfig/patches/libxml-no-c-linkage.patch
deleted file mode 100644
index e32182c2baa..00000000000
--- a/srcpkgs/synfig/patches/libxml-no-c-linkage.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/synfig/savecanvas.cpp	2018-09-08 08:07:57.000000000 +0200
-+++ src/synfig/savecanvas.cpp	2020-07-28 13:33:42.369091915 +0200
-@@ -70,10 +70,7 @@
- #include <ETL/stringf>
- #include "gradient.h"
- #include <errno.h>
--
--extern "C" {
- #include <libxml/tree.h>
--}
- 
- #endif
- 
diff --git a/srcpkgs/synfig/template b/srcpkgs/synfig/template
index a4a11942dc9..699f885674b 100644
--- a/srcpkgs/synfig/template
+++ b/srcpkgs/synfig/template
@@ -1,7 +1,7 @@
 # Template file for 'synfig'
 pkgname=synfig
-version=1.2.2
-revision=7
+version=1.4.0
+revision=1
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib"
 hostmakedepends="boost-build ImageMagick pkg-config intltool"
@@ -12,8 +12,8 @@ short_desc="CLI 2D vector and timeline-based animation software"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="GPL-2.0-or-later"
 homepage="http://www.synfig.org/"
-distfiles="https://github.com/synfig/synfig/releases/download/v${version}/source-synfig-${version}.tar.gz"
-checksum=5f5f7b33483041165f9a63fe4d95eb815971c7444569e574206f6964e83cc2ef
+distfiles="https://github.com/synfig/synfig/releases/download/v${version}/synfig-${version}.tar.gz"
+checksum=7f36d57eba9dc959e1deae89e6908585a08db7f2d9399915a46a9eff33080c9c
 
 CXXFLAGS="-std=c++11 -DHAVE_LOCALE_H=1"
 
@@ -25,6 +25,6 @@ synfig-devel_package() {
 		vmove usr/bin/synfig-config
 		vmove usr/include
 		vmove usr/lib/pkgconfig
-		vmove usr/lib/*.so
+		vmove "usr/lib/*.so"
 	}
 }

From 828717dc65381ee1c9f2e70cb6f0da0b51644c46 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Sun, 15 Nov 2020 19:37:01 +0100
Subject: [PATCH 3/3] synfigstudio: update to 1.4.0

---
 srcpkgs/synfigstudio/template | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/synfigstudio/template b/srcpkgs/synfigstudio/template
index a4d76569dbf..ee2eaa3c377 100644
--- a/srcpkgs/synfigstudio/template
+++ b/srcpkgs/synfigstudio/template
@@ -1,7 +1,7 @@
 # Template file for 'synfigstudio'
 pkgname=synfigstudio
-version=1.2.2
-revision=4
+version=1.4.0
+revision=1
 build_style=gnu-configure
 configure_args="--disable-update-mimedb"
 hostmakedepends="pkg-config intltool gettext"
@@ -10,10 +10,10 @@ short_desc="Vector based 2D animation studio"
 maintainer="newbluemoon <blaumolch@mailbox.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.synfig.org/"
-distfiles="https://github.com/synfig/synfig/releases/download/v${version}/source-synfigstudio-${version}.tar.gz"
-checksum=76fa37998af634cf694f9b5bdfcb90220bc88f8527df117d9282a39fe01489e2
-python_version=2 #unverified
-CXXFLAGS="-Wno-deprecated-copy"
+distfiles="https://github.com/synfig/synfig/releases/download/v${version}/synfigstudio-${version}.tar.gz"
+checksum=ca1eb1a3e2264c57974a576d1995e005079d96cee19d3dffaacded72c93fbd56
+python_version=3
+CXXFLAGS="-Wno-deprecated-copy -DHAVE_LOCALE_H=1"
 
 if [ -n "$CROSS_BUILD" ]; then
 	# uses synfig to create some icons
@@ -25,6 +25,6 @@ synfigstudio-devel_package() {
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
-		vmove usr/lib/*.so
+		vmove "usr/lib/*.so"
 	}
 }