!3 Upgrade to version 1.5.5
From: @chen-jan Reviewed-by: @lyn1001 Signed-off-by: @lyn1001
This commit is contained in:
commit
41ba617c6b
Binary file not shown.
BIN
ibus-hangul-1.5.5.tar.xz
Normal file
BIN
ibus-hangul-1.5.5.tar.xz
Normal file
Binary file not shown.
36
ibus-hangul-setup-abspath.patch
Normal file
36
ibus-hangul-setup-abspath.patch
Normal file
@ -0,0 +1,36 @@
|
|||||||
|
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;
|
||||||
|
|
||||||
@ -1,13 +1,16 @@
|
|||||||
Name: ibus-hangul
|
Name: ibus-hangul
|
||||||
Summary: a Korean input method engine for IBus
|
Summary: a Korean input method engine for IBus
|
||||||
Version: 1.5.1
|
Version: 1.5.5
|
||||||
Release: 4
|
Release: 1
|
||||||
License: GPLv2+
|
License: GPLv2+
|
||||||
URL: https://github.com/libhangul/%{name}
|
URL: https://github.com/libhangul/%{name}
|
||||||
Source0: https://github.com/libhangul/%{name}/releases/download/%{version}/%{name}-%{version}.tar.gz
|
Source0: https://github.com/libhangul/%{name}/releases/download/%{version}/%{name}-%{version}.tar.xz
|
||||||
|
|
||||||
|
Patch001: ibus-hangul-setup-abspath.patch
|
||||||
|
|
||||||
BuildRequires: gettext-devel automake intltool libtool gnome-common python3 pkgconfig
|
BuildRequires: gettext-devel automake intltool libtool gnome-common python3 pkgconfig
|
||||||
BuildRequires: libhangul-devel >= 0.1.0 ibus-devel >= 1.3.99 desktop-file-utils
|
BuildRequires: libhangul-devel >= 0.1.0 ibus-devel >= 1.3.99 desktop-file-utils
|
||||||
|
BuildRequires: gtk3-devel
|
||||||
|
|
||||||
Requires: ibus >= 1.3.99 libhangul >= 0.1.0 python3-gobject python3
|
Requires: ibus >= 1.3.99 libhangul >= 0.1.0 python3-gobject python3
|
||||||
|
|
||||||
@ -29,21 +32,29 @@ libhangul.
|
|||||||
|
|
||||||
%install
|
%install
|
||||||
make DESTDIR=%{buildroot} install INSTALL="install -p"
|
make DESTDIR=%{buildroot} install INSTALL="install -p"
|
||||||
install -d %{buildroot}%{_datadir}/appdata
|
|
||||||
|
%py_byte_compile %{__python3} $RPM_BUILD_ROOT%{_datadir}/ibus-hangul/setup
|
||||||
|
|
||||||
|
rm -f ${RPM_BUILD_ROOT}%{_bindir}/ibus-setup-hangul
|
||||||
sed -i 's!^Exec=ibus-setup-hangul!Exec=%{_libexecdir}/ibus-setup-hangul!' %{buildroot}%{_datadir}/applications/ibus-setup-hangul.desktop
|
sed -i 's!^Exec=ibus-setup-hangul!Exec=%{_libexecdir}/ibus-setup-hangul!' %{buildroot}%{_datadir}/applications/ibus-setup-hangul.desktop
|
||||||
desktop-file-validate %{buildroot}%{_datadir}/applications/ibus-setup-hangul.desktop
|
desktop-file-validate %{buildroot}%{_datadir}/applications/ibus-setup-hangul.desktop
|
||||||
|
|
||||||
%find_lang %{name}
|
%find_lang %{name}
|
||||||
|
|
||||||
|
%check
|
||||||
|
make check \
|
||||||
|
DISABLE_GUI_TESTS="ibus-hangul" \
|
||||||
|
VERBOSE=1
|
||||||
|
|
||||||
%files -f %{name}.lang
|
%files -f %{name}.lang
|
||||||
%{_libexecdir}/ibus-setup-hangul
|
%{_libexecdir}/ibus-setup-hangul
|
||||||
%{_libexecdir}/ibus-engine-hangul
|
%{_libexecdir}/ibus-engine-hangul
|
||||||
%{_datadir}/icons/hicolor/*/apps/*
|
%{_datadir}/icons/hicolor/*/apps/*
|
||||||
|
%{_datadir}/metainfo/*.metainfo.xml
|
||||||
%{_datadir}/glib-2.0/schemas/*.gschema.xml
|
%{_datadir}/glib-2.0/schemas/*.gschema.xml
|
||||||
%{_datadir}/applications/ibus-setup-hangul.desktop
|
%{_datadir}/applications/ibus-setup-hangul.desktop
|
||||||
%{_datadir}/ibus/component/*
|
%{_datadir}/ibus/component/*
|
||||||
%{_datadir}/%{name}
|
%{_datadir}/%{name}
|
||||||
%exclude %{_bindir}/ibus-setup-hangul
|
|
||||||
|
|
||||||
%files help
|
%files help
|
||||||
%doc README COPYING AUTHORS
|
%doc README COPYING AUTHORS
|
||||||
@ -59,6 +70,9 @@ if [ -x %{_bindir}/ibus ];then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Sep 01 2023 chenchen <chen_aka_jan@163.com> - 1.5.5-1
|
||||||
|
- Upgrade to version 1.5.5
|
||||||
|
|
||||||
* Fri Jan 17 2020 wangzhishun1<wangzhishun1@huawei.com> - 1.5.1-4
|
* Fri Jan 17 2020 wangzhishun1<wangzhishun1@huawei.com> - 1.5.1-4
|
||||||
- Type:bugfix
|
- Type:bugfix
|
||||||
- ID:NA
|
- ID:NA
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user