!1 add bugfix

From: @xiangshuaizhx 
Reviewed-by: @small_leek 
Signed-off-by: @small_leek
This commit is contained in:
openeuler-ci-bot 2023-05-24 10:49:16 +00:00 committed by Gitee
commit 6650c61fc5
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 7 additions and 39 deletions

View File

@ -1,36 +0,0 @@
From e9bf85e48e204392ba26fcb5767a02ac31486583 Mon Sep 17 00:00:00 2001
From: Daiki Ueno <dueno@redhat.com>
Date: Mon, 28 Oct 2013 17:28:26 +0900
Subject: [PATCH] Invoke ibus-setup-hangul with the absolute path
Partially revert 8d3735e4, which installs ibus-setup-hangul under
bindir.
---
src/engine.c | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
Index: ibus-hangul-1.5.0/src/engine.c
===================================================================
--- ibus-hangul-1.5.0.orig/src/engine.c
+++ ibus-hangul-1.5.0/src/engine.c
@@ -1337,10 +1337,18 @@ ibus_hangul_engine_property_activate (IB
if (strcmp(prop_name, "setup") == 0) {
GError *error = NULL;
gchar *argv[2] = { NULL, };
+ gchar *path;
+ const char* libexecdir;
- argv[0] = "ibus-setup-hangul";
+ libexecdir = g_getenv("LIBEXECDIR");
+ if (libexecdir == NULL)
+ libexecdir = LIBEXECDIR;
+
+ path = g_build_filename(libexecdir, "ibus-setup-hangul", NULL);
+ argv[0] = path;
argv[1] = NULL;
- g_spawn_async (NULL, argv, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, NULL, &error);
+ g_spawn_async (NULL, argv, NULL, 0, NULL, NULL, NULL, &error);
+ g_free(path);
} else if (strcmp(prop_name, "InputMode") == 0) {
IBusHangulEngine *hangul = (IBusHangulEngine *) engine;

View File

@ -1,13 +1,11 @@
Name: ibus-hangul
Summary: a Korean input method engine for IBus
Version: 1.5.1
Release: 3
Release: 4
License: GPLv2+
URL: https://github.com/libhangul/%{name}
Source0: https://github.com/libhangul/%{name}/releases/download/%{version}/%{name}-%{version}.tar.gz
Patch1: ibus-hangul-setup-abspath.patch
BuildRequires: gettext-devel automake intltool libtool gnome-common python3 pkgconfig
BuildRequires: libhangul-devel >= 0.1.0 ibus-devel >= 1.3.99 desktop-file-utils
@ -61,5 +59,11 @@ if [ -x %{_bindir}/ibus ];then
fi
%changelog
* Fri Jan 17 2020 wangzhishun1<wangzhishun1@huawei.com> - 1.5.1-4
- Type:bugfix
- ID:NA
- SUG:NA
- DESC: add build requires
* Tue Nov 19 2019 caomeng<caomeng5@huawei.com> - 1.5.1-3
- Package init