Update to 1.4.2-7

This commit is contained in:
Daiki Ueno 2013-10-28 17:35:22 +09:00
parent 242f95c684
commit a63a730da1
2 changed files with 47 additions and 1 deletions

View File

@ -0,0 +1,39 @@
From e9bf85e48e204392ba26fcb5767a02ac31486583 Mon Sep 17 00:00:00 2001
From: Daiki Ueno <ueno@unixuser.org>
Date: Mon, 28 Oct 2013 17:28:26 +0900
Subject: [PATCH] Invoke ibus-setup-hangul with the absolute path
Partially 8d3735e4, which installs ibus-setup-hangul under bindir.
---
src/engine.c | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/src/engine.c b/src/engine.c
index 602f073..e918a15 100644
--- a/src/engine.c
+++ b/src/engine.c
@@ -1201,10 +1201,19 @@ ibus_hangul_engine_property_activate (IBusEngine *engine,
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, "hanja_mode") == 0) {
IBusHangulEngine *hangul = (IBusHangulEngine *) engine;
--
1.8.3.1

View File

@ -3,7 +3,7 @@
Name: ibus-hangul
Version: 1.4.2
Release: 6%{?dist}
Release: 7%{?dist}
Summary: The Hangul engine for IBus input platform
License: GPLv2+
Group: System Environment/Libraries
@ -13,6 +13,7 @@ Source0: http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz
#Patch0: ibus-hangul-HEAD.patch
# not upstreamed patches
Patch1: ibus-hangul-dconf-prefix.patch
Patch2: ibus-hangul-setup-abspath.patch
BuildRequires: gettext-devel, automake, libtool
BuildRequires: intltool
@ -34,6 +35,7 @@ libhangul.
%prep
%setup -q
%patch1 -p1 -b .dconf-prefix
%patch2 -p1 -b .setup-abspath
autopoint -f
AUTOPOINT='intltoolize --automake --copy' autoreconf -fi
@ -76,6 +78,11 @@ fi
%{_datadir}/icons/hicolor/*/apps/*
%changelog
* Mon Oct 28 2013 Daiki Ueno <dueno@redhat.com> - 1.4.2-7
- Invoke ibus-setup-hangul with the absolute path.
- Fix bug 1012732 - Click ibus hangul setup on gnome-shell top bar's
ibus -> No Response
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.4.2-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild