--- Begin Message ---
Subject: |
[PATCH] gnu: Drop gobject-introspection 1.73.1. |
Date: |
Fri, 16 Aug 2024 09:54:02 +0200 |
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
--- End Message ---
--- Begin Message ---
Subject: |
Re: [bug#72654] [PATCH] gnu: Drop gobject-introspection 1.73.1. |
Date: |
Mon, 02 Sep 2024 17:24:48 +0200 |
User-agent: |
Gnus/5.13 (Gnus v5.13) |
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
--- End Message ---