gnash: fix build with pangox-compat #79385
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
We should probably mark pango with |
|
I do not even see any pango mentions in the source code itself. |
|
It looks like they added pango in the past for static linking against GTK but forgot to make the check static only. And it should be unnecessary with pkg-config anyway. |
|
The following patch seems to be sufficient: diff --git a/macros/pango.m4 b/macros/pango.m4
index 96f0457e2..6f24eb2a2 100644
--- a/macros/pango.m4
+++ b/macros/pango.m4
@@ -34,7 +34,7 @@ AC_DEFUN([GNASH_PATH_PANGO],
if test x$windows = xyes; then
pango_pkg=pangowin32
else
- pango_pkg=pangox
+ pango_pkg=pango
fi
if test x$cross_compiling = xno; then
Probably easier than cleaning up the build system of the pango cruft. |
I don't know how I missed that. I even modified that script to print more information... |
--- a/pkgs/misc/gnash/default.nix
+++ b/pkgs/misc/gnash/default.nix
@@ -100,6 +100,13 @@ stdenv.mkDerivation {
url = "https://savannah.gnu.org/patch/download.php?file_id=47859";
sha256 = "0aimayzgi5065gkcfcr8d5lkd9c0471q7dqmln42hjzq847n6d5y";
})
+
+ # Fix build with modern Pango
+ # https://savannah.gnu.org/bugs/index.php?57759
+ (fetchpatch {
+ url = "https://savannah.gnu.org/file/0001-Do-not-depend-on-pangox.patch?file_id=48366";
+ sha256 = "02x7sl5zwd1ld2n4b6bp16c5gk91qsap0spfbb5iwpglq3galv2l";
+ })
];
configureFlags = with stdenv.lib; [ |
|
Fixed in 0c5502e. |
|
Thank you! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation for this change
So, this is far from ideal but it's the only way to fix the build.
Right know gnash is really the only viable solution to play swf files, so I think it's worth keeping it around.
Things done
./result/bin/)nix path-info -Sbefore and after)