all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Liliana Marie Prikler <liliana.prikler@gmail.com>
To: 72702@debbugs.gnu.org
Cc: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com,
	vivien@planete-kraus.eu
Subject: [bug#72702] [PATCH gnome-team 12/20] gnu: Ungraft ibus-minimal.
Date: Sat, 17 Aug 2024 14:52:46 +0200	[thread overview]
Message-ID: <3954942a724303b06a9e16f9825cfffcf25f7030.1724000901.git.liliana.prikler@gmail.com> (raw)
In-Reply-To: <cover.1724000901.git.liliana.prikler@gmail.com>

* 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





  parent reply	other threads:[~2024-08-18 17:24 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-08-18 17:08 [bug#72702] [PATCH gnome-team 00/20] Update core-ish packages Liliana Marie Prikler
2024-08-16 18:40 ` [bug#72702] [PATCH gnome-team 01/20] gnu: gsettings-desktop-schemas: Update to 46.0 Liliana Marie Prikler
2024-08-16 18:58 ` [bug#72702] [PATCH gnome-team 02/20] gnu: pango: Update to 1.54.0 Liliana Marie Prikler
2024-08-17  8:36 ` [bug#72702] [PATCH gnome-team 03/20] gnu: librsvg: Disable rtl_tspan_svg test Liliana Marie Prikler
2024-08-17  8:38 ` [bug#72702] [PATCH gnome-team 04/20] gnu: vala: Update to 0.56.17 Liliana Marie Prikler
2024-08-17  8:47 ` [bug#72702] [PATCH gnome-team 05/20] gnu: at-spi2-core: Update to 2.52.0 Liliana Marie Prikler
2024-08-17  8:47 ` [bug#72702] [PATCH gnome-team 06/20] gnu: atkmm: Update to 2.36.3 Liliana Marie Prikler
2024-08-17  8:53 ` [bug#72702] [PATCH gnome-team 07/20] gnu: gtkmm: Update to 4.14.0 Liliana Marie Prikler
2024-08-17  9:00 ` [bug#72702] [PATCH gnome-team 08/20] gnu: pangomm: Update to 2.54.0 Liliana Marie Prikler
2024-08-17  9:03 ` [bug#72702] [PATCH gnome-team 09/20] gnu: gtk+: Update to 3.24.41 Liliana Marie Prikler
2024-08-17  9:03 ` [bug#72702] [PATCH gnome-team 10/20] gnu: gtk: Update to 4.14.5 Liliana Marie Prikler
2024-08-17 11:26 ` [bug#72702] [PATCH gnome-team 11/20] gnu: gtk-doc: Update to 1.34.0 Liliana Marie Prikler
2024-08-17 12:52 ` Liliana Marie Prikler [this message]
2024-08-17 21:26 ` [bug#72702] [PATCH gnome-team 13/20] gnu: gstreamer: Update to 1.24.6 Liliana Marie Prikler
2024-08-17 21:27 ` [bug#72702] [PATCH gnome-team 14/20] gnu: gst-plugins-base: " Liliana Marie Prikler
2024-08-17 21:27 ` [bug#72702] [PATCH gnome-team 15/20] gnu: gst-plugins-good: " Liliana Marie Prikler
2024-08-17 21:27 ` [bug#72702] [PATCH gnome-team 16/20] gnu: gst-plugins-bad: " Liliana Marie Prikler
2024-08-17 21:27 ` [bug#72702] [PATCH gnome-team 17/20] gnu: gst-plugins-ugly: " Liliana Marie Prikler
2024-08-17 21:27 ` [bug#72702] [PATCH gnome-team 19/20] gnu: gst-editing-services: " Liliana Marie Prikler
2024-08-17 21:27 ` [bug#72702] [PATCH gnome-team 20/20] gnu: python-gst: " Liliana Marie Prikler
2024-08-19 16:48 ` [bug#72702] [PATCH gnome-team 00/20] Update core-ish packages Andrew Tropin via Guix-patches via

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=3954942a724303b06a9e16f9825cfffcf25f7030.1724000901.git.liliana.prikler@gmail.com \
    --to=liliana.prikler@gmail.com \
    --cc=72702@debbugs.gnu.org \
    --cc=maxim.cournoyer@gmail.com \
    --cc=vivien@planete-kraus.eu \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.