GNU bug report logs - #56276
[PATCH 0/2] gnu: Add gdk-pixbuf-xlib.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 56276 in the body.
You can then email your comments to 56276 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Tomasz Jeneralczyk <tj <at> schwi.pl>
To: guix-patches <at> gnu.org
Cc: Tomasz Jeneralczyk <tj <at> schwi.pl>
Subject: [PATCH 0/2] gnu: Add gdk-pixbuf-xlib.
Date: Tue, 28 Jun 2022 13:09:43 +0000

In gdk-pixbuf version 2.42.0 the gdk-pixbuf-xlib was split into
its own separate library:
https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/tags/2.42.0

Although it's described  as deprecated, there's at least one package
that has missing functionality without gdk-pixbuf-xlib but still
builds just fine: xscreensaver.
There might be more packages like this.

I'm not sure if I packaged this library correctly seeing as many other
gtk packages have a lot custom phases and whatnot. But if it is added
as a native-input to xscreensaver it restores its ability to build
the `xscreensaver-demo` binary.


Tomasz Jeneralczyk (2):
  gnu: gdk-pixbuf: Remove unnecessary dependency.
  gnu: Add gdk-pixbuf-xlib.

 gnu/packages/gtk.scm | 30 ++++++++++++++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)


base-commit: 8d810c209f18ffb635a1db2488a939543c6f060f
-- 
2.36.1

Message #8 received at 56276 <at> debbugs.gnu.org (full text, mbox):

From: Tomasz Jeneralczyk <tj <at> schwi.pl>
To: 56276 <at> debbugs.gnu.org
Cc: Tomasz Jeneralczyk <tj <at> schwi.pl>
Subject: [PATCH 1/2] gnu: gdk-pixbuf: Remove unnecessary dependency.
Date: Tue, 28 Jun 2022 13:21:18 +0000

* gnu/packages/gtk.scm (gtk-pixbuf): Remove libx11 from native-inputs

gdk-pixbuf-xlib was split into its own library in gdk-pixbuf version 2.42.0:
https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/tags/2.42.0
---
 gnu/packages/gtk.scm | 2 --
 1 file changed, 2 deletions(-)

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 4d6a690fbb..835c0be3a2 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -682,8 +682,6 @@ (define-public gdk-pixbuf
     (propagated-inputs
      (list ;; Required by gdk-pixbuf-2.0.pc
            glib
-           ;; Required by gdk-pixbuf-xlib-2.0.pc
-           libx11
            ;; Used for testing and required at runtime.
            shared-mime-info))
     (inputs
-- 
2.36.1

Message #11 received at 56276 <at> debbugs.gnu.org (full text, mbox):

From: Tomasz Jeneralczyk <tj <at> schwi.pl>
To: 56276 <at> debbugs.gnu.org
Cc: Tomasz Jeneralczyk <tj <at> schwi.pl>
Subject: [PATCH 2/2] gnu: Add gdk-pixbuf-xlib.
Date: Tue, 28 Jun 2022 13:21:19 +0000

* gnu/packages/gtk.scm (gtk-pixbuf-xlib): Add variable.

This was part of gtk-pixbuf before but was split into its own library
in version 2.42.0: https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/tags/2.42.0
---
 gnu/packages/gtk.scm | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 835c0be3a2..31e100e91d 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -715,6 +715,34 @@ (define-public gdk-pixbuf
     (home-page "https://wiki.gnome.org/Projects/GdkPixbuf")
     (license license:lgpl2.1+)))
 
+(define-public gdk-pixbuf-xlib
+  (package
+    (name "gdk-pixbuf-xlib")
+    (version "2.40.2")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url
+                     "https://gitlab.gnome.org/Archive/gdk-pixbuf-xlib.git")
+                    (commit version)))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "1vwnvqxap3r9zw932jwasazy9sxw49j78x2g650xkn70iili90bg"))))
+    (build-system meson-build-system)
+    (arguments
+     '(#:configure-flags '("-Dgtk_doc=true")))
+    (native-inputs (list pkg-config gtk-doc/stable))
+    (inputs (list gdk-pixbuf libx11))
+    (synopsis "Deprecated Xlib integration for GdkPixbuf")
+    (description
+     "GdkPixbuf-Xlib contains the deprecated API for integrating GdkPixbuf with
+Xlib data types.  This library was originally shipped by gdk-pixbuf, and has
+since been moved out of the original repository.  No newly written code should
+ever use this library.")
+    (home-page "https://gitlab.gnome.org/Archive/gdk-pixbuf-xlib")
+    (license license:lgpl2.1+)))
+
 ;;; A minimal variant used to prevent a cycle with Inkscape.
 (define-public at-spi2-core-minimal
   (hidden-package
-- 
2.36.1

Message #14 received at 56276 <at> debbugs.gnu.org (full text, mbox):

From: Liliana Marie Prikler <liliana.prikler <at> ist.tugraz.at>
To: Tomasz Jeneralczyk <tj <at> schwi.pl>, 56276 <at> debbugs.gnu.org
Subject: Re: [PATCH 1/2] gnu: gdk-pixbuf: Remove unnecessary dependency.
Date: Tue, 28 Jun 2022 14:38:05 +0200

Am Dienstag, dem 28.06.2022 um 13:21 +0000 schrieb Tomasz Jeneralczyk:
> * gnu/packages/gtk.scm (gtk-pixbuf): Remove libx11 from native-inputs
> 
> gdk-pixbuf-xlib was split into its own library in gdk-pixbuf version
> 2.42.0:
> https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/tags/2.42.0
Details go before, not after the ChangeLog.
> ---
>  gnu/packages/gtk.scm | 2 --
>  1 file changed, 2 deletions(-)
> 
> diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
> index 4d6a690fbb..835c0be3a2 100644
> --- a/gnu/packages/gtk.scm
> +++ b/gnu/packages/gtk.scm
> @@ -682,8 +682,6 @@ (define-public gdk-pixbuf
>      (propagated-inputs
>       (list ;; Required by gdk-pixbuf-2.0.pc
>             glib
> -           ;; Required by gdk-pixbuf-xlib-2.0.pc
> -           libx11
>             ;; Used for testing and required at runtime.
>             shared-mime-info))
>      (inputs
This patch should go to core-updates, while 2/2 can go to master.

Message #17 received at 56276 <at> debbugs.gnu.org (full text, mbox):

From: Tomasz Jeneralczyk <tj <at> schwi.pl>
To: Liliana Marie Prikler <liliana.prikler <at> ist.tugraz.at>
Cc: 56276 <at> debbugs.gnu.org
Subject: Re: [PATCH 1/2] gnu: gdk-pixbuf: Remove unnecessary dependency.
Date: Tue, 28 Jun 2022 13:45:46 +0000

On 2022-06-28 12:38, Liliana Marie Prikler wrote:
> This patch should go to core-updates, while 2/2 can go to master.

Should I send the patched here as [PATCH v2 1/2 core-updates] and [PATCH 
v2 2/2], or split it into two new patches?
Sorry, it's just not clear to me.

I also noticed I gave the 1/2 an incorrect changelog - it should be 
`propagated-inputs` instead of `native-inputs`. I'll fix that too.

Message #20 received at 56276 <at> debbugs.gnu.org (full text, mbox):

From: Liliana Marie Prikler <liliana.prikler <at> ist.tugraz.at>
To: Tomasz Jeneralczyk <tj <at> schwi.pl>
Cc: 56276 <at> debbugs.gnu.org
Subject: Re: [PATCH 1/2] gnu: gdk-pixbuf: Remove unnecessary dependency.
Date: Tue, 28 Jun 2022 15:49:25 +0200

Am Dienstag, dem 28.06.2022 um 13:45 +0000 schrieb Tomasz Jeneralczyk:
> On 2022-06-28 12:38, Liliana Marie Prikler wrote:
> > This patch should go to core-updates, while 2/2 can go to master.
> 
> Should I send the patched here as [PATCH v2 1/2 core-updates] and
> [PATCH v2 2/2], or split it into two new patches?
> Sorry, it's just not clear to me.
The way you propose is *probably* fine.  It's rather rare that patches
"need" to be split in this manner.  FWIW I'd propose swapping the
patches around, so that [1/2] can go to master and [2/2] to core-
updates.

> I also noticed I gave the 1/2 an incorrect changelog - it should be 
> `propagated-inputs` instead of `native-inputs`. I'll fix that too.
Please do.

Cheers

Message #23 received at 56276 <at> debbugs.gnu.org (full text, mbox):

From: Tomasz Jeneralczyk <tj <at> schwi.pl>
To: 56276 <at> debbugs.gnu.org
Cc: Tomasz Jeneralczyk <tj <at> schwi.pl>
Subject: [PATCH v2 1/2] gnu: Add gdk-pixbuf-xlib.
Date: Tue, 28 Jun 2022 16:15:47 +0000

This was part of gtk-pixbuf before but was split into its own library
in version 2.42.0: https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/tags/2.42.0

* gnu/packages/gtk.scm (gtk-pixbuf-xlib): Add variable.
---
 gnu/packages/gtk.scm | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 4d6a690fbb..358eb365ef 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -717,6 +717,34 @@ (define-public gdk-pixbuf
     (home-page "https://wiki.gnome.org/Projects/GdkPixbuf")
     (license license:lgpl2.1+)))
 
+(define-public gdk-pixbuf-xlib
+  (package
+    (name "gdk-pixbuf-xlib")
+    (version "2.40.2")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url
+                     "https://gitlab.gnome.org/Archive/gdk-pixbuf-xlib.git")
+                    (commit version)))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "1vwnvqxap3r9zw932jwasazy9sxw49j78x2g650xkn70iili90bg"))))
+    (build-system meson-build-system)
+    (arguments
+     '(#:configure-flags '("-Dgtk_doc=true")))
+    (native-inputs (list pkg-config gtk-doc/stable))
+    (inputs (list gdk-pixbuf libx11))
+    (synopsis "Deprecated Xlib integration for GdkPixbuf")
+    (description
+     "GdkPixbuf-Xlib contains the deprecated API for integrating GdkPixbuf with
+Xlib data types.  This library was originally shipped by gdk-pixbuf, and has
+since been moved out of the original repository.  No newly written code should
+ever use this library.")
+    (home-page "https://gitlab.gnome.org/Archive/gdk-pixbuf-xlib")
+    (license license:lgpl2.1+)))
+
 ;;; A minimal variant used to prevent a cycle with Inkscape.
 (define-public at-spi2-core-minimal
   (hidden-package

base-commit: 8d810c209f18ffb635a1db2488a939543c6f060f
-- 
2.36.1

Message #26 received at 56276 <at> debbugs.gnu.org (full text, mbox):

From: Tomasz Jeneralczyk <tj <at> schwi.pl>
To: 56276 <at> debbugs.gnu.org
Cc: Tomasz Jeneralczyk <tj <at> schwi.pl>
Subject: [PATCH core-updates v2 2/2] gnu: gdk-pixbuf: Remove unnecessary
 dependency.
Date: Tue, 28 Jun 2022 16:15:48 +0000

gdk-pixbuf-xlib was split into its own library in gdk-pixbuf version 2.42.0:
https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/tags/2.42.0

* gnu/packages/gtk.scm (gtk-pixbuf): Remove libx11 from propagated-inputs
---
 gnu/packages/gtk.scm | 2 --
 1 file changed, 2 deletions(-)

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 358eb365ef..31e100e91d 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -682,8 +682,6 @@ (define-public gdk-pixbuf
     (propagated-inputs
      (list ;; Required by gdk-pixbuf-2.0.pc
            glib
-           ;; Required by gdk-pixbuf-xlib-2.0.pc
-           libx11
            ;; Used for testing and required at runtime.
            shared-mime-info))
     (inputs
-- 
2.36.1

Message #31 received at 56276-done <at> debbugs.gnu.org (full text, mbox):

From: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
To: Tomasz Jeneralczyk <tj <at> schwi.pl>, 56276-done <at> debbugs.gnu.org
Subject: Re: [PATCH v2 1/2] gnu: Add gdk-pixbuf-xlib.
Date: Sat, 02 Jul 2022 13:54:12 +0200

Am Dienstag, dem 28.06.2022 um 16:15 +0000 schrieb Tomasz Jeneralczyk:
> This was part of gtk-pixbuf before but was split into its own library
> in version 2.42.0:
> https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/tags/2.42.0
> 
> * gnu/packages/gtk.scm (gtk-pixbuf-xlib): Add variable.
Pushed with a slight rewording, though I missed the typo in gtk-pixbuf-
xlib.  Also added a follow-up commit to hint core-updates folk that the
libx11 input ought to be removed from gdk-pixbuf.

I'll thus mark this as “done”, even if a task remains :)

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.