Gentoo Archives: gentoo-commits

From: Akinori Hattori <hattya@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-i18n/uim/, app-i18n/uim/files/
Date: Sat, 23 Oct 2021 14:32:11
Message-Id: 1634999509.229ac4caeff2746ed7c89021d037900632e53a36.hattya@gentoo
1 commit: 229ac4caeff2746ed7c89021d037900632e53a36
2 Author: Akinori Hattori <hattya <AT> gentoo <DOT> org>
3 AuthorDate: Sat Oct 23 14:18:41 2021 +0000
4 Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org>
5 CommitDate: Sat Oct 23 14:31:49 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=229ac4ca
7
8 app-i18n/uim: fix desktop file
9
10 Closes: https://bugs.gentoo.org/795867
11 Package-Manager: Portage-3.0.20, Repoman-3.0.3
12 Signed-off-by: Akinori Hattori <hattya <AT> gentoo.org>
13
14 app-i18n/uim/files/uim-1.8.8-desktop.patch | 35 ++++++++++++++++++++++
15 .../{uim-1.8.8-r1.ebuild => uim-1.8.8-r2.ebuild} | 1 +
16 2 files changed, 36 insertions(+)
17
18 diff --git a/app-i18n/uim/files/uim-1.8.8-desktop.patch b/app-i18n/uim/files/uim-1.8.8-desktop.patch
19 new file mode 100644
20 index 00000000000..5e068754791
21 --- /dev/null
22 +++ b/app-i18n/uim/files/uim-1.8.8-desktop.patch
23 @@ -0,0 +1,35 @@
24 +From 63cda66c1665b8ccc9ae11a5a4fb341afb8c5ac0 Mon Sep 17 00:00:00 2001
25 +From: OBATA Akio <obache@××××××××××××××××××××.com>
26 +Date: Mon, 30 Dec 2019 22:26:11 +0900
27 +Subject: [PATCH] Fix to use pref tool with default toolkit (#151)
28 +
29 +---
30 + configure.ac | 1 +
31 + uim.desktop.in.in | 2 +-
32 + 2 files changed, 2 insertions(+), 1 deletion(-)
33 +
34 +diff --git a/configure.ac b/configure.ac
35 +index 472c67f02..d530bc081 100644
36 +--- a/configure.ac
37 ++++ b/configure.ac
38 +@@ -1188,6 +1188,7 @@ AM_CONDITIONAL(DEFAULT_TOOLKIT_GTK3, test "x$default_toolkit" = xgtk3)
39 + AM_CONDITIONAL(DEFAULT_TOOLKIT_QT, test "x$default_toolkit" = xqt)
40 + AM_CONDITIONAL(DEFAULT_TOOLKIT_QT4, test "x$default_toolkit" = xqt4)
41 + AM_CONDITIONAL(DEFAULT_TOOLKIT_QT5, test "x$default_toolkit" = xqt5)
42 ++AC_SUBST(default_toolkit)
43 +
44 + AC_ARG_ENABLE(fep,
45 + AC_HELP_STRING([--disable-fep],
46 +diff --git a/uim.desktop.in.in b/uim.desktop.in.in
47 +index b4a4d4f50..38c5c6d5e 100644
48 +--- a/uim.desktop.in.in
49 ++++ b/uim.desktop.in.in
50 +@@ -3,7 +3,7 @@ Type=Application
51 + _Name=Input Method
52 + _Comment=Customize uim input method environment
53 + _Keywords=input;method;
54 +-Exec=uim-pref-gtk
55 ++Exec=uim-pref-@default_toolkit@
56 + Icon=@uim_pixmapsdir@/uim-icon.png
57 + Terminal=false
58 + Categories=Settings;X-GNOME-PersonalSettings;
59
60 diff --git a/app-i18n/uim/uim-1.8.8-r1.ebuild b/app-i18n/uim/uim-1.8.8-r2.ebuild
61 similarity index 99%
62 rename from app-i18n/uim/uim-1.8.8-r1.ebuild
63 rename to app-i18n/uim/uim-1.8.8-r2.ebuild
64 index 4b72e29cd38..99ed8908464 100644
65 --- a/app-i18n/uim/uim-1.8.8-r1.ebuild
66 +++ b/app-i18n/uim/uim-1.8.8-r2.ebuild
67 @@ -80,6 +80,7 @@ PATCHES=(
68 "${FILESDIR}"/${PN}-tinfo.patch
69 "${FILESDIR}"/${PN}-xkb.patch
70 "${FILESDIR}"/${PN}-zh-TW.patch
71 + "${FILESDIR}"/${P}-desktop.patch
72 "${FILESDIR}"/${P}-fno-common.patch
73 )
74 DOCS=( AUTHORS NEWS README RELNOTE doc )