[PATCH] gnu: Remove gobject-introspection-next.

  • Done
  • quality assurance status badge
Details
3 participants
  • Greg Hogan
  • Liliana Marie Prikler
  • Maxim Cournoyer
Owner
unassigned
Submitted by
Liliana Marie Prikler
Severity
normal

Debbugs page

Liliana Marie Prikler wrote 1 years ago
(address . guix-patches@gnu.org)
52ae70f96290a83efc7ba0580565e6eca352a9cc.1704646458.git.liliana.prikler@gmail.com
Our gobject-introspection is already newer.

* gnu/packages/glib.scm (gobject-introspection-next): Delete variable.
* gnu/packages/gtk.scm (gtksourceview)[native-inputs]: Use
gobject-introspection instead.
---
gnu/packages/glib.scm | 17 -----------------
gnu/packages/gtk.scm | 2 +-
2 files changed, 1 insertion(+), 18 deletions(-)

Toggle diff (46 lines)
diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index 7b8cc3286d..d5d0b77352 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -672,23 +672,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 8b4fe7d681..f88ab930d5 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -626,7 +626,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.

base-commit: 1cd97066c2dc84c6e538cfa63820e18f6c12a414
prerequisite-patch-id: e8b6782eaa5783cfc6ed74633ca8bfca5fd22715
--
2.41.0
Maxim Cournoyer wrote 1 years ago
(name . Liliana Marie Prikler)(address . liliana.prikler@gmail.com)(address . rg@raghavgururajan.name)(address . 68307@debbugs.gnu.org)
87zfxeuvt9.fsf@gmail.com
Liliana Marie Prikler <liliana.prikler@gmail.com> writes:

Toggle quote (6 lines)
> Our gobject-introspection is already newer.
>
> * gnu/packages/glib.scm (gobject-introspection-next): Delete variable.
> * gnu/packages/gtk.scm (gtksourceview)[native-inputs]: Use
> gobject-introspection instead.

Reviewed-by: Maxim Cournoyer <maxim.cournoyer@gmail>

--
Thanks,
Maxim
Greg Hogan wrote 5 days ago
(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)(address . rg@raghavgururajan.name)(name . Liliana Marie Prikler)(address . liliana.prikler@gmail.com)(address . 68307-done@debbugs.gnu.org)
CA+3U0Zn8hQYiy+18COnUSfjykcHdAnVODL202xuWvZPi1O55Hg@mail.gmail.com
On Tue, Jan 9, 2024 at 2:55 PM Maxim Cournoyer
<maxim.cournoyer@gmail.com> wrote:
Toggle quote (15 lines)
>
> Liliana Marie Prikler <liliana.prikler@gmail.com> writes:
>
> > Our gobject-introspection is already newer.
> >
> > * gnu/packages/glib.scm (gobject-introspection-next): Delete variable.
> > * gnu/packages/gtk.scm (gtksourceview)[native-inputs]: Use
> > gobject-introspection instead.
>
> Reviewed-by: Maxim Cournoyer <maxim.cournoyer@gmail>
>
> --
> Thanks,
> Maxim

Closing as this has been applied:

commit 4299b4cc881deaadf908937cda1e9cbc48a40a38
Author: Liliana Marie Prikler <liliana.prikler@gmail.com>
Date: Fri Aug 16 09:54:02 2024 +0200

gnu: Drop gobject-introspection 1.73.1.

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.
Closed
?
Your comment

Commenting via the web interface is currently disabled.

To comment on this conversation send an email to 68307@debbugs.gnu.org

To respond to this issue using the mumi CLI, first switch to it
mumi current 68307
Then, you may apply the latest patchset in this issue (with sign off)
mumi am -- -s
Or, compose a reply to this issue
mumi compose
Or, send patches to this issue
mumi send-email *.patch
You may also tag this issue. See list of standard tags. For example, to set the confirmed and easy tags
mumi command -t +confirmed -t +easy
Or, remove the moreinfo tag and set the help tag
mumi command -t -moreinfo -t +help