unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
blob 489baa089c77794bca3b5df2c8871a67318e2629 1096 bytes (raw)
name: gnu/packages/patches/gnash-do-not-depend-on-pangox.patch 	 # note: path name is non-authoritative(*)

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
 
From c63b5843ca1bb56bb825ba0521c3df81861f88c4 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 6 Feb 2020 23:59:49 +0100
Subject: [PATCH] Do not depend on pangox

pangox has been removed from Pango years ago breaking the build
on modern distros.

Gnash does not actually use pango directly at all. It looks like
it was added for static linking against GTK when not using pkg-config
but it was not updated or limited to non-pkg-config GTK builds
(pkg-config would provide the necessary transitive dependencies automatically).

The proper solution would be removing all the pango checks and relying
on pkg-config but as a quick hack this should suffice.
---
 macros/pango.m4 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
-- 
2.25.0


debug log:

solving 489baa089c ...
found 489baa089c in https://yhetil.org/guix-patches/20201120200551.19145-1-monego@posteo.net/

applying [1/1] https://yhetil.org/guix-patches/20201120200551.19145-1-monego@posteo.net/
diff --git a/gnu/packages/patches/gnash-do-not-depend-on-pangox.patch b/gnu/packages/patches/gnash-do-not-depend-on-pangox.patch
new file mode 100644
index 0000000000..489baa089c

1:37: trailing whitespace.
 
1:39: trailing whitespace.
-- 
Checking patch gnu/packages/patches/gnash-do-not-depend-on-pangox.patch...
1:41: new blank line at EOF.
+
Applied patch gnu/packages/patches/gnash-do-not-depend-on-pangox.patch cleanly.
warning: 3 lines add whitespace errors.

index at:
100644 489baa089c77794bca3b5df2c8871a67318e2629	gnu/packages/patches/gnash-do-not-depend-on-pangox.patch

(*) Git path names are given by the tree(s) the blob belongs to.
    Blobs themselves have no identifier aside from the hash of its contents.^

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

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 read-only IMAP folder(s) and NNTP newsgroup(s).