From: Jean-Pierre De Jesus DIAZ via Guix-patches via <guix-patches@gnu.org>
To: 67623@debbugs.gnu.org
Cc: Jean-Pierre De Jesus DIAZ <jean@foundationdevices.com>,
Liliana Marie Prikler <liliana.prikler@gmail.com>,
Maxim Cournoyer <maxim.cournoyer@gmail.com>,
Raghav Gururajan <rg@raghavgururajan.name>
Subject: [bug#67623] [PATCH 1/3] gnu: gtk+: Require zlib in gdk-3.0.pc.
Date: Mon, 4 Dec 2023 14:39:31 +0100 [thread overview]
Message-ID: <20231204133934.3890-1-jean@foundationdevices.com> (raw)
In-Reply-To: <20231204133657.3448-1-jean@foundationdevices.com>
* gnu/packages/gtk.scm (gtk+) <inputs>: Add zlib.
* gnu/packages/gtk.scm (gtk+) <arguments>: Add 'add-zlib-to-gdk-3.0.pc
phase.
Change-Id: I5efadebded159e0bd495ec07020b431413bd6e10
---
gnu/packages/gtk.scm | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 47d4c1808f..752c9f456d 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -1032,7 +1032,9 @@ (define-public gtk+
mesa
pango
wayland
- wayland-protocols))
+ wayland-protocols
+ ;; When broadway backend is enabled gdk-3.0 requires zlib.
+ zlib))
(inputs
(list colord-minimal ;to prevent a cycle with inkscape
cups
@@ -1087,6 +1089,15 @@ (define-public gtk+
(add-after 'unpack 'generate-gdk-pixbuf-loaders-cache-file
(assoc-ref glib-or-gtk:%standard-phases
'generate-gdk-pixbuf-loaders-cache-file))
+ (add-after 'unpack 'add-zlib-to-gdk-3.0.pc
+ (lambda _
+ ;; When -Dbroadway_backend=true zlib is added as a dependency to
+ ;; gdk-3.0 but isn't done correctly and can cause pkg-config to
+ ;; not add the correct -L...-zlib/lib flag.
+ (substitute* "meson.build"
+ (("pc_gdk_extra_libs += \\['-lz'\\]") "")
+ (("^gdk_packages \\+= cairo_packages" all)
+ (string-append all "\ngdk_packages += ' zlib'\n")))))
(add-before 'check 'pre-check
(lambda _
;; Tests require a running X server.
--
2.41.0
next prev parent reply other threads:[~2023-12-04 13:40 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-04 13:36 [bug#67623] [PATCH 0/3 gnome-team]: Require zlib in gdk-3.0.pc Jean-Pierre De Jesus DIAZ via Guix-patches via
2023-12-04 13:39 ` Jean-Pierre De Jesus DIAZ via Guix-patches via [this message]
2023-12-04 19:32 ` [bug#67623] [PATCH 1/3] gnu: gtk+: " Liliana Marie Prikler
2024-01-03 19:50 ` [bug#67623] [PATCH 0/3 gnome-team]: " Maxim Cournoyer
2024-01-03 22:34 ` Jean-Pierre De Jesus Diaz via Guix-patches via
2024-01-04 20:12 ` Liliana Marie Prikler
2024-01-05 16:43 ` Jean-Pierre De Jesus Diaz via Guix-patches via
2023-12-04 13:39 ` [bug#67623] [PATCH 2/3] gnu: ocaml-lablgtk3-sourceview3: Fix inputs Jean-Pierre De Jesus DIAZ via Guix-patches via
2023-12-04 13:39 ` [bug#67623] [PATCH 3/3] gnu: frama-c: Remove zlib from inputs Jean-Pierre De Jesus DIAZ via Guix-patches via
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
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231204133934.3890-1-jean@foundationdevices.com \
--to=guix-patches@gnu.org \
--cc=67623@debbugs.gnu.org \
--cc=jean@foundationdevices.com \
--cc=liliana.prikler@gmail.com \
--cc=maxim.cournoyer@gmail.com \
--cc=rg@raghavgururajan.name \
/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.
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).