public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Takao Fujiwara <tfujiwar@redhat.com>
To: git-commits@fedoraproject.org
Subject: [rpms/ibus] rawhide: Delete upstreamed patches
Date: Fri, 19 Jun 2026 12:15:14 GMT	[thread overview]
Message-ID: <178187131439.1.8177193430496407294.rpms-ibus-52d8fba4fea5@fedoraproject.org> (raw)

A new commit has been pushed.

Repo   : rpms/ibus
Branch : rawhide
Commit : 52d8fba4fea55cfe10acdcc82109b03eeea1263c
Author : Takao Fujiwara <tfujiwar@redhat.com>
Date   : 2026-06-19T20:47:05+09:00
Stats  : +0/-93 in 1 file(s)
URL    : https://src.fedoraproject.org/rpms/ibus/c/52d8fba4fea55cfe10acdcc82109b03eeea1263c?branch=rawhide

Log:
Delete upstreamed patches

---
diff --git a/ibus-HEAD.patch b/ibus-HEAD.patch
deleted file mode 100644
index 4c445c9..0000000
--- a/ibus-HEAD.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-From 25f693aef6587496e4e4cd1491c485eb945a66f0 Mon Sep 17 00:00:00 2001
-From: fujiwarat <takao.fujiwara1@gmail.com>
-Date: Thu, 4 Jun 2026 11:13:52 +0900
-Subject: [PATCH] meson: Fix meson -Dgtk2=disabled
-
-tools/meson.build file requires `gtk2_im_module_dir`.
-
-Closes: #2915
----
- bindings/vala/meson.build | 2 +-
- meson.build               | 8 +++++++-
- 2 files changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/bindings/vala/meson.build b/bindings/vala/meson.build
-index ae27dc6e..053233f6 100644
---- a/bindings/vala/meson.build
-+++ b/bindings/vala/meson.build
-@@ -39,7 +39,7 @@ xi_vapi = declare_dependency(
-   ],
- )
- 
--if get_option('emoji-dict')
-+if get_option('emoji-dict') and enable_gtk3
-   # Lordy lordy
-   libibus_emoji_dialog_sources = files(
-     meson.current_source_dir() / '../../ui/gtk3/candidatearea.vala',
-diff --git a/meson.build b/meson.build
-index 5da449b7..843791ef 100644
---- a/meson.build
-+++ b/meson.build
-@@ -121,6 +121,8 @@ if enable_gtk2
-     gtk2_im_module_dir = get_option('prefix') / get_option('libdir') / \
-         'gtk-2.0' / gtk2_binary_version / 'immodules'
-   endif
-+else
-+  gtk2_im_module_dir = ''
- endif
- 
- enable_gtk3 = get_option('gtk3')
-@@ -141,6 +143,7 @@ else
-   if get_option('ui')
-     error('UI option requires GTK3')
-   endif
-+  gtk3_im_module_dir = ''
- endif
- 
- enable_gtk4 = get_option('gtk4')
-@@ -154,6 +157,8 @@ if enable_gtk4
-     gtk4_im_module_dir = get_option('prefix') / get_option('libdir') / \
-         'gtk-4.0' / gtk4_binary_version / 'immodules'
-   endif
-+else
-+  gtk4_im_module_dir = ''
- endif
- 
- # X11 / XIM
-@@ -398,7 +403,8 @@ summary({
-   'Build gtk4 immodule':           enable_gtk4,
-   'Build XIM agent server':        enable_xim,
-   'Build wayland support':         enable_wayland,
--  'Build gdk3 wayland support':    gdk3_wayland_dep.found(),
-+  'Build gdk3 wayland support':    enable_gtk3 ?
-+                                     gdk3_wayland_dep.found() : false,
-   'Build appindicator support':    get_option('appindicator'),
-   'Build memconf modules':         enable_memconf,
-   'Build dconf modules':           enable_dconf,
--- 
-2.54.0
-
-From 7d43b31b66c5c35b744824ef53c8ab5f362d5c16 Mon Sep 17 00:00:00 2001
-From: fujiwarat <takao.fujiwara1@gmail.com>
-Date: Thu, 4 Jun 2026 22:04:50 +0900
-Subject: [PATCH] src/meson: Install ibus-visibility.h
-
----
- src/meson.build | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/meson.build b/src/meson.build
-index e05f7b37..1fb0786b 100644
---- a/src/meson.build
-+++ b/src/meson.build
-@@ -37,6 +37,7 @@ ibus_sources = files(
- )
- 
- ibus_headers = files(
-+  'ibus-visibility.h',
-   'ibus.h',
-   'ibusaccelgroup.h',
-   'ibusattribute.h',
--- 
-2.53.0
-

                 reply	other threads:[~2026-06-19 12:15 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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=178187131439.1.8177193430496407294.rpms-ibus-52d8fba4fea5@fedoraproject.org \
    --to=tfujiwar@redhat.com \
    --cc=git-commits@fedoraproject.org \
    /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.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox