rpms/ibus
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Disable ibus-panel rich condition in RHEL

Browse Source 
- Delete ibus-xx-desktop-testing-mutter.patch
This commit is contained in:
Takao Fujiwara 2024-07-29 23:24:45 +09:00
parent 6ee90f2800
commit 86f9167f27
2 changed files with 5 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
ibus-xx-desktop-testing-mutter.patch
View File

@ -1,37 +0,0 @@
From d63da885f8f4e3764b8b572347b70a0cefadc335 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 11 Feb 2022 11:43:57 +0900
Subject: [PATCH] src/tests: Change window manager to mutter for RHEL
---
src/tests/ibus-desktop-testing-runner.in | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/tests/ibus-desktop-testing-runner.in b/src/tests/ibus-desktop-testing-runner.in
index 54b7e0d7..211e0da5 100755
--- a/src/tests/ibus-desktop-testing-runner.in
+++ b/src/tests/ibus-desktop-testing-runner.in
@@ -45,7 +45,7 @@ TEST_LOG_STDOUT=0
SCREEN_LOG=""
HAVE_GRAPHICS=1
VERBOSE=0
-DESKTOP_COMMAND="dbus-launch --exit-with-session gnome-session"
+DESKTOP_COMMAND="dbus-launch --exit-with-session mutter"
PID_XORG=0
PID_GNOME_SESSION=0
TESTING_RUNNER="default"
@@ -81,9 +81,9 @@ usage()
"-s, --srcdir=SOURCEDIR Set the SOURCEDIR\n" \
"-c, --no-graphics Use Xvfb instead of Xorg\n" \
"-V, --verbose Verbose log for ibus-daemon\n" \
-"-d, --desktop=DESKTOP Run DESTKTOP. The default is gnome-session.\n" \
+"-d, --desktop=DESKTOP Run DESTKTOP. The default is mutter.\n" \
" Suffix '-with-dbus' can run DESKTOP with dbus session." \
-" E.g. --desktop=mutter-with-dbus" \
+" E.g. --desktop=gnome-session-with-dbus" \
"-t, --tests=\"TESTS...\" Run TESTS programs which is separated by space\n" \
"-r, --runner=RUNNER Run TESTS programs with a test RUNNER.\n" \
" RUNNDER = gnome or default.\n" \
--
2.28.0

10
ibus.spec
View File

@ -62,7 +62,7 @@
Name: ibus
Version: 1.5.31~beta1
# https://github.com/fedora-infra/rpmautospec/issues/101
Release: 10%{?dist}
Release: 11%{?dist}
Summary: Intelligent Input Bus for Linux OS
License: LGPL-2.1-or-later
URL: https://github.com/ibus/%name/wiki
@ -74,10 +74,6 @@ Source3: %{name}.conf.5
Patch0: %{name}-HEAD.patch
# Under testing #1349148 #1385349 #1350291 #1406699 #1432252 #1601577
Patch1: %{name}-1385349-segv-bus-proxy.patch
%if 0%{?rhel} > 8
# Use mutter window manager in RHEL CI
Patch100: %{name}-xx-desktop-testing-mutter.patch
%endif
# autoreconf requires autopoint but not po.m4
BuildRequires: gettext-devel
@ -620,6 +616,10 @@ dconf update || :
%{_datadir}/installed-tests/ibus
%changelog
* Mon Jul 29 2024 Takao Fujiwara <tfujiwar@redhat.com> - 1.5.31~beta1-11
- Disable ibus-panel rich condition in RHEL
- Delete ibus-xx-desktop-testing-mutter.patch
* Sat Jul 27 2024 Takao Fujiwara <tfujiwar@redhat.com> - 1.5.31~beta1-10
- Replace GNOME Xorg with GNOME Wayland in CI
- Replace STI with TMT in CI