commit a7ba48d949c7b478eb6ef9ffd92ab46a8957c497
Author: Jakub Bogusz <[email protected]>
Date: Fri Apr 24 16:59:04 2020 +0200
- updated to 1.8.2
- enhanced no-bash patch to revert using bash for already unbashed scripts
imsettings-no-bash.patch | 25 +++++++++++++++++++++++++
imsettings.spec | 6 +++---
2 files changed, 28 insertions(+), 3 deletions(-)
---
diff --git a/imsettings.spec b/imsettings.spec
index ef731a7..038af0a 100644
--- a/imsettings.spec
+++ b/imsettings.spec
@@ -8,12 +8,12 @@
Summary: Delivery framework for general Input Method configuration
Summary(pl.UTF-8): Szkielet do ogólnej konfiguracji method wprowadzania
znaków
Name: imsettings
-Version: 1.8.1
-Release: 3
+Version: 1.8.2
+Release: 1
License: LGPL v2+
Group: Applications/System
Source0:
https://bitbucket.org/tagoh/imsettings/downloads/%{name}-%{version}.tar.bz2
-# Source0-md5: c04341a008d8c60e1532f033f4020f44
+# Source0-md5: 43be3604274543f9646fb163d63b0bee
Patch0: %{name}-constraint-of-language.patch
Patch1: %{name}-no-bash.patch
URL: https://tagoh.bitbucket.org/imsettings/
diff --git a/imsettings-no-bash.patch b/imsettings-no-bash.patch
index 5b0c53d..605eb24 100644
--- a/imsettings-no-bash.patch
+++ b/imsettings-no-bash.patch
@@ -272,3 +272,28 @@
# imsettings-target-checker.sh
# Copyright (C) 2013 Akira TAGOH
#
+--- imsettings-1.8.2/imsettings-daemon/imsettings-server.c.orig
2019-11-14 06:08:03.000000000 +0100
++++ imsettings-1.8.2/imsettings-daemon/imsettings-server.c 2020-04-24
16:54:57.049247210 +0200
+@@ -722,9 +722,9 @@
+ helper_path = g_strdup(IMSETTINGS_HELPER_PATH);
+ script = g_build_filename(helper_path, "imsettings-target-checker.sh",
NULL);
+ if (desktop)
+- cmd = g_strdup_printf("bash -c 'export XDG_CURRENT_DESKTOP=%s;
bash %s'", quoted_desktop ? quoted_desktop : "", script);
++ cmd = g_strdup_printf("sh -c 'export XDG_CURRENT_DESKTOP=%s; sh
%s'", quoted_desktop ? quoted_desktop : "", script);
+ else
+- cmd = g_strdup_printf("bash -c %s", script);
++ cmd = g_strdup_printf("sh -c %s", script);
+ g_free(script);
+ g_free(helper_path);
+
+--- imsettings-1.8.2/utils/imsettings-switch.c.orig 2019-11-14
06:10:12.000000000 +0100
++++ imsettings-1.8.2/utils/imsettings-switch.c 2020-04-24 16:55:51.335619782
+0200
+@@ -105,7 +105,7 @@
+ else
+ helper_path = g_strdup(IMSETTINGS_HELPER_PATH);
+ script = g_build_filename(helper_path, "imsettings-functions",
NULL);
+- cmd = g_strdup_printf("bash -c '. %s && echo -n
$(get_desktop)'", script);
++ cmd = g_strdup_printf("sh -c '. %s && echo -n $(get_desktop)'",
script);
+ g_free(script);
+ g_free(helper_path);
+ g_spawn_command_line_sync(cmd, &out, NULL, &ret, &error);
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/imsettings.git/commitdiff/a7ba48d949c7b478eb6ef9ffd92ab46a8957c497
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
