-
Notifications
You must be signed in to change notification settings - Fork 2.1k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
synfig + synfigstudio: update to 1.4.2 #32358
Conversation
The test passes on x86_64 and my local i686-musl build. So it might not be musl specific. |
Please do :) I bet on thread stack size, if the test binary is threaded :p |
Here you go:
|
I tried to increase the stack size via |
Yeah segfault is in the main thread, so it would seem to be something else. |
I opened an issue at synfig: synfig/synfig#2259 |
Hm, |
srcpkgs/synfigstudio/patches/cflags-cxxflags.patch | 26 ++++++++++++++++++++++
1 file changed, 26 insertions(+)
diff --git a/srcpkgs/synfigstudio/patches/cflags-cxxflags.patch b/srcpkgs/synfigstudio/patches/cflags-cxxflags.patch
new file mode 100644
index 0000000000..85d84ff60a
--- /dev/null
+++ b/srcpkgs/synfigstudio/patches/cflags-cxxflags.patch
@@ -0,0 +1,26 @@
+--- 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
+ |
@sgn Thanks for noticing and the patch! I’ll add it. |
Look like a use-after-free somewhere.
|
0652dcb
to
2ad5039
Compare
A fix for the failing test was merged upstream, I added it as a patch, because there is no new release with it, yet. |
Prevent synfig from filtering out the compiler’s '-g' option to produce debug | ||
information. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do you think this has a chance of being upstreamed? It's really unfortunate that we have to carry a patch at all :(
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We can try! :) I’ll ask upstream.
# uses synfig to create some icons | ||
hostmakedepends+=" synfig" | ||
fi | ||
export DATADIRNAME=share |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If synfigstudio needed this, chances are so does synfig
. Both install locale files.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I’ll have a look into it.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ping?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sorry, I haven’t forgotten about it but just didn’t get to it. Something else came always up. ;) I’ll try to checkit today or tomorrow.
And regarding upstreaming the patch to not filter out the -g
option: I asked upstream, but got no answer so far.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No worries :)
Just making sure it isn't lost.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
On my system synfig shows it’s messages according to my locale and the build log shows
-DLOCALEDIR=\"/usr/share/locale\"
.
So exporting DATADIRNAME
doesn’t seem to be necessary.
Edit:
While synfig’s configure
just has localedir="$datadir/locale"
synfigstudio uses LOCALEDIR=${prefix}/${DATADIRNAME}/locale
which breaks things.
So I think it’s good to go.
Added |
General
Have the results of the proposed changes been tested?