From a5f0600563c9ef2b5eab97e7b2e5118c1fa34b47 Mon Sep 17 00:00:00 2001 From: Toyam Cox Date: Tue, 8 Sep 2020 00:23:37 -0400 Subject: [PATCH 1/3] ETL: update to 1.3.16. --- srcpkgs/ETL/template | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/srcpkgs/ETL/template b/srcpkgs/ETL/template index 7b8b01956c3..72d2238c8eb 100644 --- a/srcpkgs/ETL/template +++ b/srcpkgs/ETL/template @@ -1,13 +1,18 @@ # Template file for 'ETL' pkgname=ETL -reverts="1.3.11_1" -version=1.2.2 -revision=2 -archs=noarch +version=1.3.16 +revision=1 build_style=gnu-configure +wrksrc="synfig-${version}" +build_wrksrc=ETL +hostmakedepends="automake" short_desc="Extended Template Library" maintainer="Diogo Leal " 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/archive/v${version}.tar.gz" +checksum=69113f9e45ccd2e216b2ddeb8a9eb007a9b9c1f9f65032da911b5ef21aa3c3fc + +pre_configure() { + autoreconf -fi +} From f828c1fce85b2e2f7ae45e1e80e1d470f5d67a67 Mon Sep 17 00:00:00 2001 From: Toyam Cox Date: Tue, 8 Sep 2020 00:23:40 -0400 Subject: [PATCH 2/3] synfig: update to 1.3.16. --- .../synfig/patches/libxml-no-c-linkage.patch | 13 ------------ srcpkgs/synfig/template | 21 +++++++++++++------ 2 files changed, 15 insertions(+), 19 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 - #include "gradient.h" - #include -- --extern "C" { - #include --} - - #endif - diff --git a/srcpkgs/synfig/template b/srcpkgs/synfig/template index a4a11942dc9..321464644bc 100644 --- a/srcpkgs/synfig/template +++ b/srcpkgs/synfig/template @@ -1,22 +1,31 @@ # Template file for 'synfig' pkgname=synfig -version=1.2.2 -revision=7 +version=1.3.16 +revision=1 build_style=gnu-configure +build_wrksrc=synfig-core configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib" -hostmakedepends="boost-build ImageMagick pkg-config intltool" -makedepends="ETL gettext-devel libxml++-devel mlt-devel +hostmakedepends="boost-build ImageMagick pkg-config intltool automake tar libtool" +makedepends="ETL gettext-devel libxml++-devel mlt-devel libltdl-devel libmng-devel boost-build boost-devel libopenexr-devel ffmpeg-devel" depends="ImageMagick" short_desc="CLI 2D vector and timeline-based animation software" maintainer="Diogo Leal " 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/archive/v${version}.tar.gz" +checksum=69113f9e45ccd2e216b2ddeb8a9eb007a9b9c1f9f65032da911b5ef21aa3c3fc CXXFLAGS="-std=c++11 -DHAVE_LOCALE_H=1" +pre_configure() { + libtoolize --ltdl --copy --force + autopoint --force + AUTOPOINT='intltoolize --automake --copy' autoreconf --force --install --verbose + sed 's/itlocaledir = $(prefix)\/$(DATADIRNAME)\/locale/itlocaledir = $(datarootdir)\/locale/' < po/Makefile.in.in > po/Makefile.in.in.tmp + mv -f po/Makefile.in.in.tmp po/Makefile.in.in +} + synfig-devel_package() { depends="${sourcepkg}>=${version}_${revision} libopenexr-devel libxml++-devel mlt-devel" From 0db9d9904a4b7441ba8dd751e76015b46686482a Mon Sep 17 00:00:00 2001 From: Toyam Cox Date: Tue, 8 Sep 2020 00:23:43 -0400 Subject: [PATCH 3/3] synfigstudio: update to 1.3.16. --- .../patches/musl-accessperms.patch | 26 ------------------- srcpkgs/synfigstudio/template | 22 +++++++++++----- 2 files changed, 16 insertions(+), 32 deletions(-) delete mode 100644 srcpkgs/synfigstudio/patches/musl-accessperms.patch diff --git a/srcpkgs/synfigstudio/patches/musl-accessperms.patch b/srcpkgs/synfigstudio/patches/musl-accessperms.patch deleted file mode 100644 index 7dbbcdb2e12..00000000000 --- a/srcpkgs/synfigstudio/patches/musl-accessperms.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- src/gui/app.cpp.orig 2017-09-09 05:03:59.000000000 +0200 -+++ src/gui/app.cpp 2017-11-13 07:17:16.769223845 +0100 -@@ -153,6 +153,10 @@ - - #endif - -+#ifndef ACCESSPERMS -+# define ACCESSPERMS (S_IRWXU|S_IRWXG|S_IRWXO) /* 0777 */ -+#endif -+ - /* === U S I N G =========================================================== */ - - using namespace std; ---- src/gui/autorecover.cpp.orig 2017-09-08 11:51:26.000000000 +0200 -+++ src/gui/autorecover.cpp 2017-11-13 07:21:41.550697678 +0100 -@@ -75,6 +75,10 @@ - - #endif - -+#ifndef ACCESSPERMS -+# define ACCESSPERMS (S_IRWXU|S_IRWXG|S_IRWXO) /* 0777 */ -+#endif -+ - /* === U S I N G =========================================================== */ - - using namespace std; diff --git a/srcpkgs/synfigstudio/template b/srcpkgs/synfigstudio/template index a4d76569dbf..aa2781e4c76 100644 --- a/srcpkgs/synfigstudio/template +++ b/srcpkgs/synfigstudio/template @@ -1,18 +1,20 @@ # Template file for 'synfigstudio' pkgname=synfigstudio -version=1.2.2 -revision=4 +version=1.3.16 +revision=1 build_style=gnu-configure +wrksrc="synfig-${version}" +build_wrksrc=synfig-studio configure_args="--disable-update-mimedb" -hostmakedepends="pkg-config intltool gettext" +hostmakedepends="pkg-config intltool gettext-devel libtool automake" makedepends="ETL synfig-devel gtkmm-devel libltdl-devel boost-devel" short_desc="Vector based 2D animation studio" maintainer="newbluemoon " 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 +distfiles="https://github.com/synfig/synfig/archive/v${version}.tar.gz" +checksum=69113f9e45ccd2e216b2ddeb8a9eb007a9b9c1f9f65032da911b5ef21aa3c3fc +python_version=3 #unverified CXXFLAGS="-Wno-deprecated-copy" if [ -n "$CROSS_BUILD" ]; then @@ -20,6 +22,14 @@ if [ -n "$CROSS_BUILD" ]; then hostmakedepends+=" synfig" fi +pre_configure() { + libtoolize --ltdl --copy --force + autopoint --force + AUTOPOINT='intltoolize --automake --copy' autoreconf --force --install --verbose + sed 's/itlocaledir = $(prefix)\/$(DATADIRNAME)\/locale/itlocaledir = $(datarootdir)\/locale/' < po/Makefile.in.in > po/Makefile.in.in.tmp + mv -f po/Makefile.in.in.tmp po/Makefile.in.in +} + synfigstudio-devel_package() { depends="${sourcepkg}>=${version}_${revision}" short_desc+=" - development files"