From bf12f11efb29be752762a046cc148a677d67493a Mon Sep 17 00:00:00 2001 From: newbluemoon Date: Fri, 6 Aug 2021 09:50:35 +0200 Subject: [PATCH 1/3] ETL: update to 1.4.2 --- srcpkgs/ETL/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/ETL/template b/srcpkgs/ETL/template index 2cc7ce21461e..0a395b6e296a 100644 --- a/srcpkgs/ETL/template +++ b/srcpkgs/ETL/template @@ -1,6 +1,6 @@ # Template file for 'ETL' pkgname=ETL -version=1.4.1 +version=1.4.2 revision=1 build_style=gnu-configure hostmakedepends="pkg-config" @@ -10,4 +10,4 @@ maintainer="Diogo Leal " license="GPL-2.0-or-later" homepage="http://www.synfig.org/" distfiles="https://github.com/synfig/synfig/releases/download/v${version}/ETL-${version}.tar.gz" -checksum=ecb61942da60dca8e623af8ad03656897d10b03296e8907dd3c6c296390a074c +checksum=e54192d284df16305ddfdfcc5bdfe93e139e6db5bc283dd4bab2413ebbead7c7 From a2dfda194cef3643ab9f32046688526d09a8235f Mon Sep 17 00:00:00 2001 From: newbluemoon Date: Fri, 6 Aug 2021 09:50:58 +0200 Subject: [PATCH 2/3] synfig: update to 1.4.2 --- srcpkgs/synfig/patches/cflags-cxxflags.patch | 29 ++++++++++++++++++++ srcpkgs/synfig/template | 6 ++-- 2 files changed, 32 insertions(+), 3 deletions(-) create mode 100644 srcpkgs/synfig/patches/cflags-cxxflags.patch diff --git a/srcpkgs/synfig/patches/cflags-cxxflags.patch b/srcpkgs/synfig/patches/cflags-cxxflags.patch new file mode 100644 index 000000000000..d0c1b2280fde --- /dev/null +++ b/srcpkgs/synfig/patches/cflags-cxxflags.patch @@ -0,0 +1,29 @@ +Prevent synfig from filtering out the compiler’s '-g' option to produce debug +information. + +--- a/configure 2021-07-28 17:11:56.000000000 +0200 ++++ b/configure 2021-08-09 21:35:13.846748903 +0200 +@@ -19613,8 +19613,8 @@ + ;; + no|*) + debug_flags="-DNDEBUG" +- CXXFLAGS="`echo $CXXFLAGS | sed 's:-g[a-z-]*\s::g' | sed 's:-g[a-z-]*$::'` $debug_flags" +- CFLAGS="`echo $CFLAGS | sed 's:-g[a-z-]*\s::g' | sed 's:-g[a-z-]*$::'` $debug_flags" ++ CXXFLAGS="$CXXFLAGS $debug_flags" ++ CFLAGS="$CFLAGS $debug_flags" + ;; + esac + +--- a/m4/subs.m4 2021-07-12 17:45:48.000000000 +0200 ++++ b/m4/subs.m4 2021-08-09 21:39:39.014802968 +0200 +@@ -85,8 +85,8 @@ + ;; + no|*) + debug_flags="-DNDEBUG" +- CXXFLAGS="`echo $CXXFLAGS | sed 's:-g[[a-z-]]*\s::g' | sed 's:-g[[a-z-]]*$::'` $debug_flags" +- CFLAGS="`echo $CFLAGS | sed 's:-g[[a-z-]]*\s::g' | sed 's:-g[[a-z-]]*$::'` $debug_flags" ++ CXXFLAGS="$CXXFLAGS $debug_flags" ++ CFLAGS="$CFLAGS $debug_flags" + ;; + esac + diff --git a/srcpkgs/synfig/template b/srcpkgs/synfig/template index d36db2d1ea6e..87416c4a1731 100644 --- a/srcpkgs/synfig/template +++ b/srcpkgs/synfig/template @@ -1,11 +1,11 @@ # Template file for 'synfig' pkgname=synfig -version=1.4.1 +version=1.4.2 revision=1 build_style=gnu-configure 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 +makedepends="ETL gettext-devel libxml++-devel mlt-devel libmagick-devel libmng-devel boost-build boost-devel libopenexr-devel ffmpeg-devel" depends="ImageMagick" short_desc="CLI 2D vector and timeline-based animation software" @@ -13,7 +13,7 @@ maintainer="Diogo Leal " license="GPL-2.0-or-later" homepage="http://www.synfig.org/" distfiles="https://github.com/synfig/synfig/releases/download/v${version}/synfig-${version}.tar.gz" -checksum=f90f1dcff1a409bbe2bfbb2cf42b7019cf735bec3223722db2feba6e198d1bc1 +checksum=e66688b908ab2f05f87cc5a364f958a1351f101ccab3b3ade33a926453002f4e CXXFLAGS="-std=c++11 -DHAVE_LOCALE_H=1" From 6a19dcec147aa8bda62169935ce3fcae10b765a5 Mon Sep 17 00:00:00 2001 From: newbluemoon Date: Fri, 6 Aug 2021 09:51:27 +0200 Subject: [PATCH 3/3] synfigstudio: update to 1.4.2 --- .../patches/cflags-cxxflags.patch | 29 +++++++++++++++++++ .../synfigstudio/patches/fix-test-crash.patch | 19 ++++++++++++ srcpkgs/synfigstudio/template | 14 ++++----- 3 files changed, 53 insertions(+), 9 deletions(-) create mode 100644 srcpkgs/synfigstudio/patches/cflags-cxxflags.patch create mode 100644 srcpkgs/synfigstudio/patches/fix-test-crash.patch diff --git a/srcpkgs/synfigstudio/patches/cflags-cxxflags.patch b/srcpkgs/synfigstudio/patches/cflags-cxxflags.patch new file mode 100644 index 000000000000..d70d2a23f7f4 --- /dev/null +++ b/srcpkgs/synfigstudio/patches/cflags-cxxflags.patch @@ -0,0 +1,29 @@ +Prevent synfigstudio from filtering out the compiler’s '-g' option to produce debug +information. + +--- synfigstudio-1.4.2.orig/configure ++++ synfigstudio-1.4.2/configure +@@ -18015,8 +18015,8 @@ fi + ;; + no|*) + debug_flags="-DNDEBUG" +- CXXFLAGS="`echo $CXXFLAGS | sed 's:-g[a-z-]*\s::g' | sed 's:-g[a-z-]*$::'` $debug_flags" +- CFLAGS="`echo $CFLAGS | sed 's:-g[a-z-]*\s::g' | sed 's:-g[a-z-]*$::'` $debug_flags" ++ CFLAGS="$CFLAGS -DNDEBUG" ++ CXXFLAGS="$CXXFLAGS -DNDEBUG" + ;; + esac + +--- synfigstudio-1.4.2.orig/m4/subs.m4 ++++ synfigstudio-1.4.2/m4/subs.m4 +@@ -83,8 +83,8 @@ AC_DEFUN([AC_ARG_DEBUG], + ;; + no|*) + debug_flags="-DNDEBUG" +- CXXFLAGS="`echo $CXXFLAGS | sed 's:-g[[a-z-]]*\s::g' | sed 's:-g[[a-z-]]*$::'` $debug_flags" +- CFLAGS="`echo $CFLAGS | sed 's:-g[[a-z-]]*\s::g' | sed 's:-g[[a-z-]]*$::'` $debug_flags" ++ CXXFLAGS="$CXXFLAGS -DNDEBUG" ++ CFLAGS="$CFLAGS -DNDEBUG" + ;; + esac + diff --git a/srcpkgs/synfigstudio/patches/fix-test-crash.patch b/srcpkgs/synfigstudio/patches/fix-test-crash.patch new file mode 100644 index 000000000000..651b3bc245b8 --- /dev/null +++ b/srcpkgs/synfigstudio/patches/fix-test-crash.patch @@ -0,0 +1,19 @@ +Fix a crash when running tests. Source: +https://github.com/synfig/synfig/pull/2265 +https://github.com/synfig/synfig/commit/61a290b1aaf58366149662ae0ad224127711aea8 + +--- a/src/synfigapp/actions/layerduplicate.cpp 2021-07-12 17:45:50.000000000 +0200 ++++ b/src/synfigapp/actions/layerduplicate.cpp 2021-08-15 11:52:47.878894610 +0200 +@@ -417,7 +417,11 @@ + + auto cloned_layer = layer_pair.second; + +- for(auto iter=cloned_layer->dynamic_param_list().cbegin();iter!=cloned_layer->dynamic_param_list().cend();++iter) ++ // disconnect_dynamic_param/connect_dynamic_param can change dynamic_param_list() while iterating ++ // which makes iter invalid, so we create a copy of dynamic_param_list() first ++ auto param_list = cloned_layer->dynamic_param_list(); ++ ++ for (auto iter=param_list.cbegin();iter!=param_list.cend();++iter) + { + for (const auto& vn_pair : cloned_valuenode_map) { + if (iter->second == vn_pair.first) { diff --git a/srcpkgs/synfigstudio/template b/srcpkgs/synfigstudio/template index 3e40a99fb28c..359882fb1915 100644 --- a/srcpkgs/synfigstudio/template +++ b/srcpkgs/synfigstudio/template @@ -1,24 +1,20 @@ # Template file for 'synfigstudio' pkgname=synfigstudio -version=1.4.1 +version=1.4.2 revision=1 build_style=gnu-configure configure_args="--disable-update-mimedb" -hostmakedepends="pkg-config intltool gettext" +hostmakedepends="pkg-config intltool gettext synfig" 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/" +homepage="https://www.synfig.org/" distfiles="https://github.com/synfig/synfig/releases/download/v${version}/synfigstudio-${version}.tar.gz" -checksum=af9a9b0064064907ae24a693b607dcba633a8a2cd45fa1357f61c035efd6020e +checksum=4e86d4d8def6675fc92855a411795cc4062a1669cda82535d18b48a68b4d5497 python_version=3 CXXFLAGS="-Wno-deprecated-copy -DHAVE_LOCALE_H=1" - -if [ -n "$CROSS_BUILD" ]; then - # uses synfig to create some icons - hostmakedepends+=" synfig" -fi +export DATADIRNAME=share synfigstudio-devel_package() { depends="${sourcepkg}>=${version}_${revision}"