50/73: gnu: Ungraft ibus-minimal.

[guix-commits]

lilyp pushed a commit to branch gnome-team
in repository guix.

commit 415f7b6cfb0718c9a72f255ce3267c9a3170cae4
Author: Liliana Marie Prikler <liliana.prikler@gmail.com>
AuthorDate: Sat Aug 17 14:52:46 2024 +0200

    gnu: Ungraft ibus-minimal.
    
    * gnu/packages/ibus.scm (ibus-minimal/fixed): Delete variable, inlining
    changes into…
    (ibus-minimal): … this.
---
 gnu/packages/ibus.scm | 23 +++--------------------
 1 file changed, 3 insertions(+), 20 deletions(-)

diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm
index 07f5b90f67..77981ac81e 100644
--- a/gnu/packages/ibus.scm
+++ b/gnu/packages/ibus.scm
@@ -82,8 +82,7 @@
 (define-public ibus-minimal
   (package
     (name "ibus")
-    (replacement ibus-minimal/fixed)
-    (version "1.5.27")
+    (version "1.5.29")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://github.com/ibus/ibus/";
@@ -91,7 +90,7 @@
                                   version "/ibus-" version ".tar.gz"))
               (sha256
                (base32
-                "1pwppcy0xpidxa7db9lykjjjj1rcjrqf5l88f77hgxlnvdddmyvf"))))
+                "0vjybn3xq5sz616fdy21f5c4b4ajrj4wmfnbjqz6584xw887yiaa"))))
     (build-system glib-or-gtk-build-system)
     (outputs '("out" "doc"))
     (arguments
@@ -197,6 +196,7 @@
            gtk+
            iso-codes
            json-glib
+           libdbusmenu
            libnotify
            libx11
            libxkbcommon
@@ -281,23 +281,6 @@ may also simplify input method development.")
            (package-native-search-paths ibus-minimal)))
     (properties (alist-delete 'hidden? (package-properties ibus-minimal)))))
 
-(define-public ibus-minimal/fixed
-  ;; Fixes <https://github.com/ibus/ibus/issues/2476>.
-  ;; Ungraft on gnome-team, core-updates or a dedicated ungrafing branch.
-  (package
-    (inherit ibus-minimal)
-    (version "1.5.29")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://github.com/ibus/ibus/";
-                                  "releases/download/"
-                                  version "/ibus-" version ".tar.gz"))
-              (sha256
-               (base32
-                "0vjybn3xq5sz616fdy21f5c4b4ajrj4wmfnbjqz6584xw887yiaa"))))
-    (inputs (modify-inputs (package-inputs ibus-minimal)
-              (prepend libdbusmenu)))))
-
 (define-public ibus-libpinyin
   (package
     (name "ibus-libpinyin")