From 80447205747b3025586a1b4a40197fbd927b28ea Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Oct 30 2018 05:00:27 +0000 Subject: import imsettings-1.6.3-10.el7 --- diff --git a/SOURCES/imsettings-fix-assertion-in-gio.patch b/SOURCES/imsettings-fix-assertion-in-gio.patch new file mode 100644 index 0000000..8ca192e --- /dev/null +++ b/SOURCES/imsettings-fix-assertion-in-gio.patch @@ -0,0 +1,29 @@ +From 8a31bcd1b07f6d541e108623dffc67579798b105 Mon Sep 17 00:00:00 2001 +From: Akira TAGOH +Date: Thu, 15 Jan 2015 16:42:41 +0900 +Subject: [PATCH 21/52] Fix an assertion in GIO + +--- + imsettings-daemon/imsettings-server.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/imsettings-daemon/imsettings-server.c b/imsettings-daemon/imsettings-server.c +index 25f45a6..300bbe0 100644 +--- a/imsettings-daemon/imsettings-server.c ++++ b/imsettings-daemon/imsettings-server.c +@@ -1039,9 +1039,11 @@ imsettings_server_bus_method_call(GDBusConnection *connection, + d(g_print("%s: sender[%s] path[%s] iface[%s] method[%s]\n", __PRETTY_FUNCTION__, sender, object_path, interface_name, method_name)); + + if (g_strcmp0(method_name, "StopService") == 0) { ++ value = g_variant_new_boolean(TRUE); + g_dbus_method_invocation_return_value(invocation, +- g_variant_new_boolean(TRUE)); ++ g_variant_new_tuple(&value, 1)); + g_signal_emit(server, signals[SIG_DISCONNECTED], 0, NULL); ++ value = NULL; + } else if (g_strcmp0(method_name, "GetVersion") == 0) { + value = g_variant_new_uint32(IMSETTINGS_SETTINGS_API_VERSION); + } else if (g_strcmp0(method_name, "GetInfoVariants") == 0) { +-- +2.17.1 + diff --git a/SOURCES/imsettings-fix-unbound-variable.patch b/SOURCES/imsettings-fix-unbound-variable.patch new file mode 100644 index 0000000..0639257 --- /dev/null +++ b/SOURCES/imsettings-fix-unbound-variable.patch @@ -0,0 +1,39 @@ +From e8dab09d0f47c6030878c89e6db7168af9f7e009 Mon Sep 17 00:00:00 2001 +From: Akira TAGOH +Date: Wed, 10 Jan 2018 21:29:26 +0900 +Subject: [PATCH 52/52] Fix unbound variable issue + +--- + data/xinput.sh.in.in | 2 +- + data/xinputinfo.sh.in | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/data/xinput.sh.in.in b/data/xinput.sh.in.in +index e8e99ee..f56e57a 100755 +--- a/data/xinput.sh.in.in ++++ b/data/xinput.sh.in.in +@@ -38,7 +38,7 @@ tmplang=${LC_CTYPE:-${LANG:-"en_US.UTF-8"}} + # unset env vars to be safe + unset AUXILIARY_PROGRAM AUXILIARY_ARGS GTK_IM_MODULE ICON IMSETTINGS_IGNORE_ME LONG_DESC NOT_RUN PREFERENCE_PROGRAM PREFERENCE_ARGS QT_IM_MODULE SHORT_DESC XIM XIM_PROGRAM XIM_ARGS XMODIFIERS + +-[ -z "$IMSETTINGS_DISABLE_USER_XINPUTRC" ] && IMSETTINGS_DISABLE_USER_XINPUTRC=no ++[ -z "${IMSETTINGS_DISABLE_USER_XINPUTRC-}" ] && IMSETTINGS_DISABLE_USER_XINPUTRC=no + + # migrate old configuration file + [ ! -d $CONFIGDIR ] && mkdir -p $CONFIGDIR || : +diff --git a/data/xinputinfo.sh.in b/data/xinputinfo.sh.in +index 9802392..2ce5b20 100755 +--- a/data/xinputinfo.sh.in ++++ b/data/xinputinfo.sh.in +@@ -56,7 +56,7 @@ if [ $# -gt 0 ]; then + source $1 + IMSETTINGS_FILENAME=$1 + else +- [ -z "$IMSETTINGS_DISABLE_USER_XINPUTRC" ] && IMSETTINGS_DISABLE_USER_XINPUTRC=no ++ [ -z "${IMSETTINGS_DISABLE_USER_XINPUTRC-}" ] && IMSETTINGS_DISABLE_USER_XINPUTRC=no + + if [ -r "$USER_XINPUTRC" -a "x$IMSETTINGS_DISABLE_USER_XINPUTRC" = "xno" ]; then + source "$USER_XINPUTRC" +-- +2.17.1 + diff --git a/SOURCES/imsettings-rebase-gnome.patch b/SOURCES/imsettings-rebase-gnome.patch new file mode 100644 index 0000000..5dc6244 --- /dev/null +++ b/SOURCES/imsettings-rebase-gnome.patch @@ -0,0 +1,35 @@ +From af1791e51e3285dfa33c7d53a66254477dfc2355 Mon Sep 17 00:00:00 2001 +From: Akira TAGOH +Date: Thu, 7 Dec 2017 20:36:58 +0900 +Subject: [PATCH 50/52] Fix to detect the latest GNOME + +--- + data/imsettings-target-checker.sh.in | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/data/imsettings-target-checker.sh.in b/data/imsettings-target-checker.sh.in +index 07a207d..9f734f6 100755 +--- a/data/imsettings-target-checker.sh.in ++++ b/data/imsettings-target-checker.sh.in +@@ -68,7 +68,7 @@ gsettings_get_bool() { + echo $exe get $schema $key + fi + ret=`$exe get $schema $key` +- if [ $ret == "true" ]; then ++ if [ x$ret == "xtrue" ]; then + return 0 + else + return 1 +@@ -82,6 +82,9 @@ case $(get_desktop|tr '[A-Z]' '[a-z]') in + if gsettings_get_bool org.gnome.settings-daemon.plugins.keyboard active; then + log "org.gnome.settings-daemon.plugins.keyboard.active is true. imsettings is going to be disabled." + exit 0 ++ elif [ -f /etc/xdg/autostart/org.gnome.SettingsDaemon.Keyboard.desktop ]; then ++ log "org.gnome.SettingsDaemon.Keyboard.desktop exists. imsettings is going to be disabled." ++ exit 0 + else + exit 1 + fi +-- +2.17.1 + diff --git a/SPECS/imsettings.spec b/SPECS/imsettings.spec index 33b95b4..0c4ace7 100644 --- a/SPECS/imsettings.spec +++ b/SPECS/imsettings.spec @@ -1,6 +1,6 @@ Name: imsettings Version: 1.6.3 -Release: 9%{?dist} +Release: 10%{?dist} License: LGPLv2+ URL: https://tagoh.bitbucket.org/%{name}/ BuildRequires: desktop-file-utils @@ -22,6 +22,9 @@ Patch2: %{name}-xinput-xcompose.patch Patch3: %{name}-fix-memleak-and-crash.patch Patch4: %{name}-1.6.3-translations-update.patch Patch5: %{name}-imsettings-reload-locale.patch +Patch6: %{name}-fix-assertion-in-gio.patch +Patch7: %{name}-rebase-gnome.patch +Patch8: %{name}-fix-unbound-variable.patch Summary: Delivery framework for general Input Method configuration Group: Applications/System @@ -179,6 +182,9 @@ This package contains a module to get this working on MATE. %patch3 -p1 -b .3-memleak-crash %patch4 -p2 -b .4-trans %patch5 -p1 -b .5-reload +%patch6 -p1 -b .6-gio +%patch7 -p1 -b .7-rebase-gnome +%patch8 -p1 -b .8-unbound-variable %build %configure \ @@ -292,6 +298,10 @@ fi %changelog +* Thu Jun 21 2018 Akira TAGOH - 1.6.3-10 +- Fix a regression imsettings can't detect GNOME running caused by GNOME rebase. (#1533772) +- Fix unbound variable issue (#1533050) + * Fri Jan 24 2014 Daniel Mach - 1.6.3-9 - Mass rebuild 2014-01-24