Github messages for voidlinux
 help / color / mirror / Atom feed
From: newbluemoon <newbluemoon@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] synfig + synfigstudio: update to 1.4.2
Date: Tue, 10 Aug 2021 15:49:31 +0200	[thread overview]
Message-ID: <20210810134931.LwEKyZhqBebP-PS5vfbvkWccNg_JDHrHbZl6e8i7BgI@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-32358@inbox.vuxu.org>

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

There is an updated 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/32358

synfig + synfigstudio: update to 1.4.2
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


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

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

From 2ed310b465b82ce2e866ce08f7fce461ff5a4a57 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
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 <diogo@diogoleal.com>"
 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 5f0950d805a84e7b3a3e213258c828cb49e21991 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
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                      |  4 +--
 2 files changed, 31 insertions(+), 2 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..bae3a4672dae 100644
--- a/srcpkgs/synfig/template
+++ b/srcpkgs/synfig/template
@@ -1,6 +1,6 @@
 # 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"
@@ -13,7 +13,7 @@ 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}/synfig-${version}.tar.gz"
-checksum=f90f1dcff1a409bbe2bfbb2cf42b7019cf735bec3223722db2feba6e198d1bc1
+checksum=e66688b908ab2f05f87cc5a364f958a1351f101ccab3b3ade33a926453002f4e
 
 CXXFLAGS="-std=c++11 -DHAVE_LOCALE_H=1"
 

From 2ad5039db0e9138b683b5ea0edcb7d559ed64328 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Fri, 6 Aug 2021 09:51:27 +0200
Subject: [PATCH 3/3] synfigstudio: update to 1.4.2

---
 .../patches/cflags-cxxflags.patch             | 29 +++++++++++++++++++
 srcpkgs/synfigstudio/template                 | 14 ++++-----
 2 files changed, 34 insertions(+), 9 deletions(-)
 create mode 100644 srcpkgs/synfigstudio/patches/cflags-cxxflags.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/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 <blaumolch@mailbox.org>"
 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}"

  parent reply	other threads:[~2021-08-10 13:49 UTC|newest]

Thread overview: 36+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-08-06  8:03 [PR PATCH] " newbluemoon
2021-08-06 20:17 ` newbluemoon
2021-08-06 20:22 ` ericonr
2021-08-06 20:25 ` newbluemoon
2021-08-06 20:51 ` newbluemoon
2021-08-06 21:21 ` ericonr
2021-08-07  8:32 ` newbluemoon
2021-08-07 10:43 ` sgn
2021-08-07 14:42 ` sgn
2021-08-08 19:44 ` newbluemoon
2021-08-09 11:37 ` sgn
2021-08-09 11:44 ` [PR REVIEW] " sgn
2021-08-09 14:17 ` sgn
2021-08-09 14:17 ` sgn
2021-08-09 15:20 ` sgn
2021-08-09 15:23 ` sgn
2021-08-09 20:27 ` [PR PATCH] [Updated] " newbluemoon
2021-08-09 20:35 ` [PR REVIEW] " newbluemoon
2021-08-10  2:58 ` sgn
2021-08-10 13:49 ` newbluemoon [this message]
2021-10-12 13:39 ` [PR PATCH] [Updated] " newbluemoon
2021-10-12 13:46 ` newbluemoon
2021-10-12 19:07 ` [PR REVIEW] " ericonr
2021-10-12 19:09 ` ericonr
2021-10-13 17:48 ` newbluemoon
2021-10-13 17:50 ` newbluemoon
2021-11-14  7:09 ` ericonr
2021-11-14  9:26 ` newbluemoon
2021-11-14 18:33 ` ericonr
2021-11-15 10:32 ` [PR PATCH] [Updated] " newbluemoon
2021-11-15 10:54 ` [PR REVIEW] " newbluemoon
2021-11-15 10:55 ` newbluemoon
2021-11-15 11:13 ` [PR PATCH] [Updated] " newbluemoon
2021-11-15 11:17 ` newbluemoon
2021-11-15 15:58 ` [PR REVIEW] " newbluemoon
2021-11-16 12:22 ` [PR PATCH] [Merged]: " ericonr

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210810134931.LwEKyZhqBebP-PS5vfbvkWccNg_JDHrHbZl6e8i7BgI@z \
    --to=newbluemoon@users.noreply.github.com \
    --cc=ml@inbox.vuxu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).