Subject: bug#71565: closed (Re: [bug#71565] [PATCH] gnu: ibus-minimal: Graft to 1.5.29.)

From: [email-masked] (GNU bug Tracking System)
Date: Mon, 24 Jun 2024 04:52:02 +0000

Your bug report

#71565: [PATCH] gnu: ibus-minimal: Graft to 1.5.29.

which was filed against the guix-patches package, has been closed.

The explanation is attached below, along with your original report.
If you require more details, please reply to [email-masked].

-- 
71565: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=71565
GNU Bug Tracking System
Contact [email-masked] with problems

Subject: Re: [bug#71565] [PATCH] gnu: ibus-minimal: Graft to 1.5.29.
From: Maxim Cournoyer <[email-masked]>
To: Liliana Marie Prikler <[email-masked]>
Cc: [email-masked], [email-masked]
Date: Mon, 24 Jun 2024 00:50:35 -0400
List-Id: <debbugs-submit.debbugs.gnu.org>

Hi Liliana,

Liliana Marie Prikler <[email-masked]> writes:

> Hi Maxim,
>
> Am Sonntag, dem 23.06.2024 um 22:13 -0400 schrieb Maxim Cournoyer:
>> > […] I might have been cargo-culting the -public part from other
>> > definitions.  Are grafts typically not exported?
>> 
>> Not thinking about CI shenanigans, I think it's more logical that
>> they be private, since we want the users to use the grafted package,
>> not the graft itself (although in the end the result should be the
>> same).
>
> You mean that users end up accidentally discovering and using the wrong
> ibus through CLI?  I don't think that's an issue for ibus-minimal,
> though, since it's hidden anyway, and I do trust users who write the
> files to be sensible here.
>
> On that note, I think I remember a graft which had to be public to also
> fix issues in certain dependent packages.  (I might have committed that
> one myself and IIRC, it was meson).  Feel free to drop the -public part
> from the ibus graft though; I had pushed it without resolving this
> conversation.

No big deal, but a reminder that we should add some proper grafting
guidelines to our doc.

-- 
Thanks,
Maxim

Subject: [PATCH] gnu: ibus-minimal: Graft to 1.5.29.
From: Liliana Marie Prikler <[email-masked]>
To: [email-masked]
Date: Sat, 15 Jun 2024 09:18:20 +0200
List-Id: <debbugs-submit.debbugs.gnu.org>

This fixes an issue, where IBus was not able to query emoji lists.
See also <https://github.com/ibus/ibus/issues/2476>.

* gnu/packages/ibus.scm (ibus-minimal/fixed): New variable.
(ibus-minimal): Add ibus-minimal/fixed as replacement.
---
 gnu/packages/ibus.scm | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm
index c821279bd3..a2775b2f84 100644
--- a/gnu/packages/ibus.scm
+++ b/gnu/packages/ibus.scm
@@ -81,6 +81,7 @@ (define-module (gnu packages ibus)
 (define-public ibus-minimal
   (package
     (name "ibus")
+    (replacement ibus-minimal/fixed)
     (version "1.5.27")
     (source (origin
               (method url-fetch)
@@ -279,6 +280,23 @@ (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")

base-commit: 7770e4140cddd5dc9c9879cb2bfcbd6cd4de59a0
-- 
2.45.1