Subject: [PATCH gnome-team 12/20] gnu: Ungraft ibus-minimal.

From: Liliana Marie Prikler <[email-masked]>
Date: Sat, 17 Aug 2024 14:52:46 +0200

* 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 a2775b2f84..8cac1ab602 100644
--- a/gnu/packages/ibus.scm
+++ b/gnu/packages/ibus.scm
@@ -81,8 +81,7 @@ (define-module (gnu packages ibus)
 (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/"
@@ -90,7 +89,7 @@ (define-public ibus-minimal
                                   version "/ibus-" version ".tar.gz"))
               (sha256
                (base32
-                "1pwppcy0xpidxa7db9lykjjjj1rcjrqf5l88f77hgxlnvdddmyvf"))))
+                "0vjybn3xq5sz616fdy21f5c4b4ajrj4wmfnbjqz6584xw887yiaa"))))
     (build-system glib-or-gtk-build-system)
     (outputs '("out" "doc"))
     (arguments
@@ -196,6 +195,7 @@ (define-public ibus-minimal
            gtk+
            iso-codes
            json-glib
+           libdbusmenu
            libnotify
            libx11
            libxkbcommon
@@ -280,23 +280,6 @@ (define-public ibus
            (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")
-- 
2.45.2