all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
* [bug#67623] [PATCH 0/3 gnome-team]: Require zlib in gdk-3.0.pc.
@ 2023-12-04 13:36 Jean-Pierre De Jesus DIAZ via Guix-patches via
  2023-12-04 13:39 ` [bug#67623] [PATCH 1/3] gnu: gtk+: " Jean-Pierre De Jesus DIAZ via Guix-patches via
                   ` (2 more replies)
  0 siblings, 3 replies; 9+ messages in thread
From: Jean-Pierre De Jesus DIAZ via Guix-patches via @ 2023-12-04 13:36 UTC (permalink / raw)
  To: 67623; +Cc: Jean-Pierre De Jesus DIAZ, Andreas Enge, Efraim Flashner,
	Eric Bavier

This fixes the gtk+ package to correctly depend on zlib on the
pkg-config file as right now it specifies it as -lz but pkg-config is
not able to find the library directory of zlib because it is not listed.

This changes it so that zlib appears in the requires field.

This in turns fixes the coq-ide package build which wasn't able to find
zlib for that reason, and also simplifies the frama-c package which
worked around this by just adding zlib as an input.

I think it's best to use pkg-config way of doing things which simplifies
packages IMO instead of adding zlib to packages that require gtk+ and
don't have zlib listed in inputs.

Additionally moves gtksourceview-3 from native inputs to inputs as it is
a runtime dependency.

Jean-Pierre De Jesus DIAZ (3):
  gnu: gtk+: Require zlib in gdk-3.0.pc.
  gnu: ocaml-lablgtk3-sourceview3: Fix inputs.
  gnu: frama-c: Remove zlib from inputs.

 gnu/packages/gtk.scm   | 13 ++++++++++++-
 gnu/packages/maths.scm |  3 +--
 gnu/packages/ocaml.scm |  2 +-
 3 files changed, 14 insertions(+), 4 deletions(-)

-- 
2.41.0





^ permalink raw reply	[flat|nested] 9+ messages in thread

* [bug#67623] [PATCH 1/3] gnu: gtk+: Require zlib in gdk-3.0.pc.
  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
  2023-12-04 19:32   ` Liliana Marie Prikler
  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
  2 siblings, 1 reply; 9+ messages in thread
From: Jean-Pierre De Jesus DIAZ via Guix-patches via @ 2023-12-04 13:39 UTC (permalink / raw)
  To: 67623
  Cc: Jean-Pierre De Jesus DIAZ, Liliana Marie Prikler, Maxim Cournoyer,
	Raghav Gururajan

* 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





^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [bug#67623] [PATCH 2/3] gnu: ocaml-lablgtk3-sourceview3: Fix inputs.
  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 ` [bug#67623] [PATCH 1/3] gnu: gtk+: " Jean-Pierre De Jesus DIAZ via Guix-patches via
@ 2023-12-04 13:39 ` 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
  2 siblings, 0 replies; 9+ messages in thread
From: Jean-Pierre De Jesus DIAZ via Guix-patches via @ 2023-12-04 13:39 UTC (permalink / raw)
  To: 67623; +Cc: Jean-Pierre De Jesus DIAZ, Julien Lepiller, pukkamustard

* gnu/packages/ocaml.scm (ocaml-lablgtk3-sourceview3): Move
  gtksourceview-3 from native-inputs to inputs.

Change-Id: I9ea843ddf4cbb38cd69a93e3c125149417d8fa3d
---
 gnu/packages/ocaml.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 7993dbaa73..47ea323b7d 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -9467,7 +9467,7 @@ (define-public ocaml-lablgtk3-sourceview3
     (inherit lablgtk3)
     (name "ocaml-lablgtk3-sourceview3")
     (propagated-inputs (list lablgtk3))
-    (native-inputs (list gtksourceview-3 pkg-config))
+    (inputs (list gtksourceview-3))
     (arguments
      `(#:package "lablgtk3-sourceview3"))
     (synopsis "OCaml interface to GTK+ gtksourceview library")
-- 
2.41.0





^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [bug#67623] [PATCH 3/3] gnu: frama-c: Remove zlib from inputs.
  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 ` [bug#67623] [PATCH 1/3] gnu: gtk+: " 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 ` Jean-Pierre De Jesus DIAZ via Guix-patches via
  2 siblings, 0 replies; 9+ messages in thread
From: Jean-Pierre De Jesus DIAZ via Guix-patches via @ 2023-12-04 13:39 UTC (permalink / raw)
  To: 67623; +Cc: Jean-Pierre De Jesus DIAZ, Andreas Enge, Efraim Flashner,
	Eric Bavier

* gnu/packages/maths.scm (frama-c) <inputs>: Remove zlib.

Change-Id: I338ba303ee59468ef7538cc2b87bc90fd597d6fb
---
 gnu/packages/maths.scm | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 246f189115..39f620c8af 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -9284,8 +9284,7 @@ (define-public frama-c
            (lambda* (#:key inputs #:allow-other-keys)
              (setenv "CONFIG_SHELL"
                      (search-input-file inputs "/bin/sh")))))))
-    (inputs
-     (list gmp zlib))
+    (inputs (list gmp))
     (propagated-inputs
      (list ocaml-biniou
            ocaml-easy-format
-- 
2.41.0





^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [bug#67623] [PATCH 1/3] gnu: gtk+: Require zlib in gdk-3.0.pc.
  2023-12-04 13:39 ` [bug#67623] [PATCH 1/3] gnu: gtk+: " Jean-Pierre De Jesus DIAZ via Guix-patches via
@ 2023-12-04 19:32   ` Liliana Marie Prikler
  2024-01-03 19:50     ` [bug#67623] [PATCH 0/3 gnome-team]: " Maxim Cournoyer
  0 siblings, 1 reply; 9+ messages in thread
From: Liliana Marie Prikler @ 2023-12-04 19:32 UTC (permalink / raw)
  To: Jean-Pierre De Jesus DIAZ, 67623; +Cc: Raghav Gururajan, Maxim Cournoyer

Am Montag, dem 04.12.2023 um 14:39 +0100 schrieb Jean-Pierre De Jesus
DIAZ:
> * 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")))))
Is there a good reason to do it this way?  I would hope that
downstreams are already aware of this pkg-config variable.

Cheers

^ permalink raw reply	[flat|nested] 9+ messages in thread

* [bug#67623] [PATCH 0/3 gnome-team]: Require zlib in gdk-3.0.pc.
  2023-12-04 19:32   ` Liliana Marie Prikler
@ 2024-01-03 19:50     ` Maxim Cournoyer
  2024-01-03 22:34       ` Jean-Pierre De Jesus Diaz via Guix-patches via
  0 siblings, 1 reply; 9+ messages in thread
From: Maxim Cournoyer @ 2024-01-03 19:50 UTC (permalink / raw)
  To: Liliana Marie Prikler; +Cc: Raghav Gururajan, Jean-Pierre De Jesus DIAZ, 67623

Hello,

Liliana Marie Prikler <liliana.prikler@gmail.com> writes:

> Am Montag, dem 04.12.2023 um 14:39 +0100 schrieb Jean-Pierre De Jesus
> DIAZ:
>> * 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")))))
> Is there a good reason to do it this way?  I would hope that
> downstreams are already aware of this pkg-config variable.

It seems a problem that should be taken to upstream.  Then while
waiting, we could carry that patch, with a reference to the upstream
issue.

Jean-Pierre, could you please check if this issue is known with the GTK
project, else file it on there tracker and reference it as a comment
with your patch?

-- 
Thanks,
Maxim

^ permalink raw reply	[flat|nested] 9+ messages in thread

* [bug#67623] [PATCH 0/3 gnome-team]: Require zlib in gdk-3.0.pc.
  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
  0 siblings, 1 reply; 9+ messages in thread
From: Jean-Pierre De Jesus Diaz via Guix-patches via @ 2024-01-03 22:34 UTC (permalink / raw)
  To: Maxim Cournoyer; +Cc: Raghav Gururajan, Liliana Marie Prikler, 67623

Hello

On Wed, Jan 3, 2024 at 7:50 PM Maxim Cournoyer
<maxim.cournoyer@gmail.com> wrote:
>
> Hello,
>
> Liliana Marie Prikler <liliana.prikler@gmail.com> writes:
>
> > Am Montag, dem 04.12.2023 um 14:39 +0100 schrieb Jean-Pierre De Jesus
> > DIAZ:
> >> * 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")))))
> > Is there a good reason to do it this way?  I would hope that
> > downstreams are already aware of this pkg-config variable.
>
> It seems a problem that should be taken to upstream.  Then while
> waiting, we could carry that patch, with a reference to the upstream
> issue.
>
> Jean-Pierre, could you please check if this issue is known with the GTK
> project, else file it on there tracker and reference it as a comment
> with your patch?
>
> --
> Thanks,
> Maxim

I've searched on the GNOME's GitLab instance for related issues but
found none so
instead filed this one:

https://gitlab.gnome.org/GNOME/gtk/-/issues/6306

Thanks,

-- 
Jean-Pierre De Jesus DIAZ
Foundation Devices, Inc.




^ permalink raw reply	[flat|nested] 9+ messages in thread

* [bug#67623] [PATCH 0/3 gnome-team]: Require zlib in gdk-3.0.pc.
  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
  0 siblings, 1 reply; 9+ messages in thread
From: Liliana Marie Prikler @ 2024-01-04 20:12 UTC (permalink / raw)
  To: Jean-Pierre De Jesus Diaz, Maxim Cournoyer; +Cc: Raghav Gururajan, 67623

Am Mittwoch, dem 03.01.2024 um 22:34 +0000 schrieb Jean-Pierre De Jesus
Diaz:
> I've searched on the GNOME's GitLab instance for related issues but
> found none so instead filed this one:
> 
> https://gitlab.gnome.org/GNOME/gtk/-/issues/6306
> 
> Thanks,
As reported upstream, this doesn't look like an abuse of the pkg-config
though, more like only zlib missing as propagated input.  Do you have
an instance where the pkg-config variable is not resolved correctly?

Cheers





^ permalink raw reply	[flat|nested] 9+ messages in thread

* [bug#67623] [PATCH 0/3 gnome-team]: Require zlib in gdk-3.0.pc.
  2024-01-04 20:12         ` Liliana Marie Prikler
@ 2024-01-05 16:43           ` Jean-Pierre De Jesus Diaz via Guix-patches via
  0 siblings, 0 replies; 9+ messages in thread
From: Jean-Pierre De Jesus Diaz via Guix-patches via @ 2024-01-05 16:43 UTC (permalink / raw)
  To: Liliana Marie Prikler; +Cc: Raghav Gururajan, Maxim Cournoyer, 67623

Hello,

On Thu, Jan 4, 2024 at 8:12 PM Liliana Marie Prikler
<liliana.prikler@gmail.com> wrote:
>
> Am Mittwoch, dem 03.01.2024 um 22:34 +0000 schrieb Jean-Pierre De Jesus
> Diaz:
> > I've searched on the GNOME's GitLab instance for related issues but
> > found none so instead filed this one:
> >
> > https://gitlab.gnome.org/GNOME/gtk/-/issues/6306
> >
> > Thanks,
> As reported upstream, this doesn't look like an abuse of the pkg-config
> though, more like only zlib missing as propagated input.  Do you have
> an instance where the pkg-config variable is not resolved correctly?
>
> Cheers
>

The coq-ide package fails to build because ocaml-lablgtk3-sourceview3 isn't
able to find zlib correctly, I guess adding it to propagated-inputs would also
solve the problems though as libz.so should then be in the search paths.

-- 
Jean-Pierre De Jesus DIAZ
Foundation Devices, Inc.




^ permalink raw reply	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2024-01-05 16:45 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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 ` [bug#67623] [PATCH 1/3] gnu: gtk+: " Jean-Pierre De Jesus DIAZ via Guix-patches via
2023-12-04 19:32   ` 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

Code repositories for project(s) associated with this external index

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

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.