[rpms/ibus] autotool: Revert GDM relative patch

[Takao Fujiwara <tfujiwar@redhat.com>]

A new commit has been pushed.

Repo   : rpms/ibus
Branch : autotool
Commit : 2fd52dbb59914c92fe57f5434914c1b587077462
Author : Takao Fujiwara <tfujiwar@redhat.com>
Date   : 2025-10-07T14:52:58+09:00
Stats  : +127/-1 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/ibus/c/2fd52dbb59914c92fe57f5434914c1b587077462?branch=autotool

Log:
Revert GDM relative patch

---
diff --git a/ibus-HEAD.patch b/ibus-HEAD.patch
index e69de29..2715ed0 100644
--- a/ibus-HEAD.patch
+++ b/ibus-HEAD.patch
@@ -0,0 +1,122 @@
+From ea70b2dff6bbcedc8c339f4f016cf6862e20d1e7 Mon Sep 17 00:00:00 2001
+From: fujiwarat <takao.fujiwara1@gmail.com>
+Date: Tue, 7 Oct 2025 14:24:54 +0900
+Subject: [PATCH] Revert "bus: Update gdm bits based on new gdm changes"
+
+Unfortunately this patch(4a45bf1) enables ibus-daemon in gdm by default
+and I'm reverting it for ibus 1.5.33.
+The GDM default has been disable IBus.
+
+Fixes: https://github.com/ibus/ibus/commit/4a45bf1
+BUG=https://github.com/ibus/ibus/pull/2804
+---
+ bus/main.c                                    | 33 +------------------
+ ....freedesktop.IBus.session.GNOME.service.in |  3 ++
+ configure.ac                                  |  2 +-
+ 3 files changed, 5 insertions(+), 33 deletions(-)
+
+diff --git a/bus/main.c b/bus/main.c
+index e0db15b3..63ec5536 100644
+--- a/bus/main.c
++++ b/bus/main.c
+@@ -39,7 +39,6 @@
+ 
+ #ifdef G_OS_UNIX
+ #include <glib-unix.h>
+-#include <grp.h>
+ #endif
+ 
+ #include "global.h"
+@@ -57,12 +56,10 @@ static gchar *config = "default";
+ static gchar *desktop = "gnome";
+ 
+ static gchar *panel_extension_disable_users[] = {
++    "gdm",
+     "gnome-initial-setup",
+     "liveuser"
+ };
+-static gchar *panel_extension_disable_groups[] = {
+-    "gdm",
+-};
+ 
+ static void
+ show_version_and_quit (void)
+@@ -187,11 +184,6 @@ main (gint argc, gchar **argv)
+ {
+     int i;
+     const gchar *username = ibus_get_user_name ();
+-    const gchar *groupname = NULL;
+-#ifdef HAVE_GETGRGID_R
+-    char buffer[4096];
+-    struct group gbuf;
+-#endif
+ 
+     setlocale (LC_ALL, "");
+ 
+@@ -224,23 +216,6 @@ main (gint argc, gchar **argv)
+         }
+     }
+ 
+-    /* get group name */
+-    {
+-        struct group *grp = NULL;
+-#ifdef HAVE_GETGRGID_R
+-        /* MT-Safe locale */
+-        getgrgid_r (getgid (), &gbuf, buffer, sizeof(buffer), &grp);
+-#else
+-        /* MT-Unsafe race:grgid locale */
+-        grp = getgrgid (getgid ());
+-#endif
+-
+-        if (grp && grp->gr_name && grp->gr_name[0])
+-            groupname = grp->gr_name;
+-        else
+-            g_warning ("Couldn't get group name");
+-    }
+-
+     /* daemonize process */
+     if (daemonize) {
+         if (daemon (1, 0) != 0) {
+@@ -284,12 +259,6 @@ main (gint argc, gchar **argv)
+             break;
+         }
+     }
+-    for (i = 0; i < G_N_ELEMENTS(panel_extension_disable_groups); i++) {
+-        if (g_strcmp0 (groupname, panel_extension_disable_groups[i]) == 0) {
+-            emoji_extension = "disable";
+-            break;
+-        }
+-    }
+     if (!single) {
+         /* execute config component */
+         if (g_strcmp0 (config, "default") == 0) {
+diff --git a/bus/services/org.freedesktop.IBus.session.GNOME.service.in b/bus/services/org.freedesktop.IBus.session.GNOME.service.in
+index f0debb37..858cf10d 100644
+--- a/bus/services/org.freedesktop.IBus.session.GNOME.service.in
++++ b/bus/services/org.freedesktop.IBus.session.GNOME.service.in
+@@ -12,6 +12,9 @@ Before=gnome-session.target
+ After=gnome-session-initialized.target
+ PartOf=gnome-session-initialized.target
+ 
++# Never run in GDM
++Conflicts=gnome-session@gnome-login.target
++
+ [Service]
+ Type=dbus
+ # Only pull --xim in X11 session, it is done via Xwayland-session.d on Wayland
+diff --git a/configure.ac b/configure.ac
+index ad4f1929..b353a654 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -178,7 +178,7 @@ AC_MSG_RESULT([$enable_product_build])
+ AC_CHECK_HEADERS([sys/prctl.h])
+ 
+ # Check functions.
+-AC_CHECK_FUNCS(daemon getgrgid_r)
++AC_CHECK_FUNCS(daemon)
+ 
+ # Check dlclose() in libc.so.
+ AC_CHECK_LIB(c, dlclose, LIBDL="", [AC_CHECK_LIB(dl, dlclose, LIBDL="-ldl")])
+-- 
+2.51.0
+

diff --git a/ibus.spec b/ibus.spec
index 5ca92ad..a522ac3 100644
--- a/ibus.spec
+++ b/ibus.spec
@@ -63,7 +63,7 @@
 Name:           ibus
 Version:        1.5.33~rc2
 # https://github.com/fedora-infra/rpmautospec/issues/101
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Intelligent Input Bus for Linux OS
 License:        LGPL-2.1-or-later
 URL:            https://github.com/ibus/%name/wiki
@@ -72,6 +72,7 @@ Source1:        https://github.com/ibus/%name/releases/download/%{source_version
 Source2:        %{name}-xinput
 Source3:        %{name}.conf.5
 # Patch0:         %%{name}-HEAD.patch
+Patch0:         %{name}-HEAD.patch
 # Under testing #1349148 #1385349 #1350291 #1406699 #1432252 #1601577
 Patch1:         %{name}-1385349-segv-bus-proxy.patch
 
@@ -638,6 +639,9 @@ dconf update || :
 %{_datadir}/installed-tests/ibus
 
 %changelog
+* Mon Oct 06 2025 Takao Fujiwara <tfujiwar@redhat.com> - 1.5.33~rc2-3
+- Revert GDM relative patch
+
 * Mon Oct 06 2025 Takao Fujiwara <tfujiwar@redhat.com> - 1.5.33~rc2-2
 - Rebuild for cldr-emoji-annotation-48~beta1-1.fc43 and
   gnome-shell-extension-no-overview-49-1.fc43