[bug#72654] [PATCH] gnu: Drop gobject-introspection 1.73.1.

[bug#72654] [PATCH] gnu: Drop gobject-introspection 1.73.1.

[Liliana Marie Prikler]

The actual gobject-introspection has been newer than its "next" variant for
some while.

* gnu/packages/glib.scm (gobject-introspection-next): Remove variable.
* gnu/packages/gtk.scm (gtksourceview)[native-inputs]: Replace
gobject-introspection-next with gobject-introspection.
* gnu/packages/guile-xyz.scm (guile-g-golf)[native-inputs]: Likewise.
---
 gnu/packages/glib.scm      | 17 -----------------
 gnu/packages/gtk.scm       |  2 +-
 gnu/packages/guile-xyz.scm |  2 +-
 3 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index b11046f05d..f490005b2d 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -688,23 +688,6 @@ (define gobject-introspection
       ;; For tools.
       license:gpl2+))))
 
-(define-public gobject-introspection-next
-  (package
-    (inherit gobject-introspection)
-    (name "gobject-introspection")
-    (version "1.73.1")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "mirror://gnome/sources/"
-                                  "gobject-introspection/" (version-major+minor version)
-                                  "/gobject-introspection-" version ".tar.xz"))
-              (sha256
-               (base32 "1gkbx32as3v2286w7k3j24fwhkxj6brr49881m2zavxamfwxdm34"))
-              (patches (search-patches
-                        "gobject-introspection-cc-1.72.patch"
-                        "gobject-introspection-girepository.patch"
-                        "gobject-introspection-absolute-shlib-path-1.72.patch"))))))
-
 (define intltool
   (package
     (name "intltool")
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 04183fa806..01cb5cf4fc 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -652,7 +652,7 @@ (define-public gtksourceview
      (list `(,glib "bin")               ; for glib-genmarshal, etc.
            gettext-minimal
            gi-docgen
-           gobject-introspection-next
+           gobject-introspection
            pkg-config
            vala
            ;; For testing.
diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index 0759c399c3..86f0982ca8 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -2538,7 +2538,7 @@ (define-public guile-g-golf
            clutter
            xorg-server-for-tests))
     (propagated-inputs
-     (list gobject-introspection-next))
+     (list gobject-introspection))
     (home-page "https://www.gnu.org/software/g-golf/")
     (synopsis "Guile bindings for GObject Introspection")
     (description

base-commit: 888fdfd1b1c4e4b3913b7b229f1ebc9f4596be20
-- 
2.45.2

[bug#72654] [PATCH] gnu: Drop gobject-introspection 1.73.1.

[pelzflorian (Florian Pelz)]

Liliana Marie Prikler <liliana.prikler@gmail.com> writes:
> * gnu/packages/guile-xyz.scm (guile-g-golf)[native-inputs]: Likewise.

Yes, please. :)  That guile-g-golf is partially broken (*) is *not* a
regression and it’s still good to have your updated introspection tools.
gedit and gnome-builder work fine.

That’s on x86_64.  I cannot test ARM anymore and never had graphics on
riscv.

Regards,
Florian

(*) Running
$(guix build --source guile-g-golf)/examples/gtk-4/hello-world.scm
fails [1] when not using --no-grafts because gtk simultaneously uses
two gdk-pixbuf store items with different outputs, but this is not
permitted.
$(guix build --source guile-g-golf)/examples/gtk-4/drawing-widget.scm
fails because
instead of the vfunc, on Guix it runs random bogus code [2] on Guix and
crashes, but again, this is no regression.


[1] https://lists.gnu.org/archive/html/guile-user/2024-04/msg00069.html
[2] https://lists.gnu.org/archive/html/guile-user/2024-05/msg00013.html

[bug#72654] [PATCH] gnu: Drop gobject-introspection 1.73.1.

[pelzflorian (Florian Pelz)]

"pelzflorian (Florian Pelz)" <pelzflorian@pelzflorian.de> writes:
> $(guix build --source guile-g-golf)/examples/gtk-4/drawing-widget.scm
> fails

This was with a guile-g-golf at --with-commit=guile-g-golf=v0.8.0-rc.5
g-golf at guix master does not have drawing-widget.scm or vfunc support.
But the rest holds.

[bug#72654] [PATCH] gnu: Drop gobject-introspection 1.73.1.

[Liliana Marie Prikler]

Am Freitag, dem 16.08.2024 um 20:01 +0200 schrieb pelzflorian (Florian
Pelz):
> Yes, please. :)  That guile-g-golf is partially broken (*) is *not* a
> regression and it’s still good to have your updated introspection
> tools.
Thanks for the heads-up.

> (*) Running
> $(guix build --source guile-g-golf)/examples/gtk-4/hello-world.scm
> fails [1] when not using --no-grafts because gtk simultaneously uses
> two gdk-pixbuf store items with different outputs, but this is not
> permitted. 
> $(guix build --source guile-g-golf)/examples/gtk-4/drawing-widget.scm
> fails because instead of the vfunc, on Guix it runs random bogus code
> [2] on Guix and crashes, but again, this is no regression.
> 
> [1]
> https://lists.gnu.org/archive/html/guile-user/2024-04/msg00069.html
> [2]
> https://lists.gnu.org/archive/html/guile-user/2024-05/msg00013.html
Is there a report on this?  Maybe someone who works with g-golf ought
to look at it – despite being a member of gnome-team, I'm not
particularly knowledgable here.

Cheers

[bug#72654] [PATCH] gnu: Drop gobject-introspection 1.73.1.

[pelzflorian (Florian Pelz)]

Liliana Marie Prikler <liliana.prikler@gmail.com> writes:
>> [1]
>> https://lists.gnu.org/archive/html/guile-user/2024-04/msg00069.html
>> [2]
>> https://lists.gnu.org/archive/html/guile-user/2024-05/msg00013.html
> Is there a report on this?  Maybe someone who works with g-golf ought
> to look at it – despite being a member of gnome-team, I'm not
> particularly knowledgable here.
>
> Cheers

The grafts bug in my assumption is Guix bug
<https://issues.guix.gnu.org/48907> as I wrote at the guile-user mail
[1].  There, Maxim thinks <https://issues.guix.gnu.org/64836> has the
same cause.

The vfunc issue is not in the g-golf version from Guix master yet, which
has no support for vfuncs.

In discussion with g-golf author David Pirotte, I failed to find the
cause so far and have not investigated further recently, except that
David’s other recent g-golf closure marshal fixes in new g-golf releases
do not fix this Guix-specific vfunc issue.

Regards,
Florian

bug#72654: [PATCH] gnu: Drop gobject-introspection 1.73.1.

[pelzflorian (Florian Pelz)]

Thank you for pushing.  Closing.

On guile-user, Matija Osid progressively debugs the remaining g-golf
issues for Nix.  In particular, using

((package-input-rewriting
  `((,libffi . ,libffi-sans-static-trampolines)))
 guile-3.0)

makes every g-golf demo work.

Regards,
Florian