lilyp pushed a commit to branch gnome-team
in repository guix.
commit 5040638864113f8bf19978b61c562237f42fb9e8
Author: Liliana Marie Prikler <liliana.prik...@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 a290966bd0..461587ccb9 100644
--- a/gnu/packages/ibus.scm
+++ b/gnu/packages/ibus.scm
@@ -84,8 +84,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/";
@@ -93,7 +92,7 @@
version "/ibus-" version ".tar.gz"))
(sha256
(base32
- "1pwppcy0xpidxa7db9lykjjjj1rcjrqf5l88f77hgxlnvdddmyvf"))))
+ "0vjybn3xq5sz616fdy21f5c4b4ajrj4wmfnbjqz6584xw887yiaa"))))
(build-system glib-or-gtk-build-system)
(outputs '("out" "doc"))
(arguments
@@ -199,6 +198,7 @@
gtk+
iso-codes/pinned
json-glib
+ libdbusmenu
libnotify
libx11
libxkbcommon
@@ -283,23 +283,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")
