diff --git a/ibus-HEAD.patch b/ibus-HEAD.patch index 3b0b706..97124ab 100644 --- a/ibus-HEAD.patch +++ b/ibus-HEAD.patch @@ -2164,3 +2164,53 @@ index 15b2369d..54b7e0d7 100755 -- 2.28.0 +From ab6b9587a497e9662a2936df3dabed4582eeabdb Mon Sep 17 00:00:00 2001 +From: fujiwarat +Date: Tue, 29 Jun 2021 12:40:20 +0900 +Subject: [PATCH] src/tests: Delete G_MESSAGES_DEBUG in desktop-testing for + gsettings + +G_MESSAGES_DEBUG message could be appended to the output of gsettings +command and it's not useful to check the output. +--- + src/tests/ibus-desktop-testing-runner.in | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) + +diff --git a/src/tests/ibus-desktop-testing-runner.in b/src/tests/ibus-desktop-testing-runner.in +index 54b7e0d7..0ef72c03 100755 +--- a/src/tests/ibus-desktop-testing-runner.in ++++ b/src/tests/ibus-desktop-testing-runner.in +@@ -217,6 +217,10 @@ init_gnome() + { + # gsettings set command needs dconf-service with the same $DISPLAY + pkill dconf-service ++ # G_MESSAGES_DEBUG=all or G_MESSAGES_DEBUG=GLib-GIO-DEBUG would append ++ # debug messages to gsettings output and could not get the result correctly. ++ backup_G_MESSAGES_DEBUG="$G_MESSAGES_DEBUG" ++ export -n G_MESSAGES_DEBUG='' + # Disable Tour dialog to get focus + V=`gsettings get org.gnome.shell welcome-dialog-last-shown-version` + if [ x"$V" = x"''" ] ; then +@@ -238,14 +242,17 @@ init_gnome() + echo "$V" | grep "no-overview" > /dev/null + V2=$? + if [ $V2 -ne 0 ] ; then +- V3=`echo "$V" | sed -e 's/\[//' -e 's/\]//'` +- if [ x"$V3" = x"''" ] ; then ++ V3=`echo "$V" | sed -e 's/@as //' -e 's/\[//' -e 's/\]//'` ++ if [ x"$V3" = x"''" ] || [ x"$V3" = x"" ]; then + V4="['no-overview@fthx']" + else + V4="[$V3, 'no-overview@fthx']" + fi + gsettings set org.gnome.shell enabled-extensions "$V4" + fi ++ if [ x"$backup_G_MESSAGES_DEBUG" != x ] ; then ++ export G_MESSAGES_DEBUG="$backup_G_MESSAGES_DEBUG" ++ fi + } + + run_desktop() +-- +2.28.0 + diff --git a/ibus.spec b/ibus.spec index a7e34bd..cc96b39 100644 --- a/ibus.spec +++ b/ibus.spec @@ -38,7 +38,7 @@ Name: ibus Version: 1.5.24 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Intelligent Input Bus for Linux OS License: LGPLv2+ URL: https://github.com/ibus/%name/wiki @@ -510,6 +510,9 @@ dconf update || : %{_datadir}/installed-tests/ibus %changelog +* Tue Jun 29 2021 Takao Fujiwara - 1.5.24-9 +- Delete G_MESSAGES_DEBUG for gsettings output + * Mon Jun 28 2021 Takao Fujiwara - 1.5.24-8 - Depend on gnome-shell-extension-no-overview for CI