uim: rebuild for anthy 0.4

Close: #28410
This commit is contained in:
Đoàn Trần Công Danh 2021-02-02 22:32:37 +07:00
parent 6ed8a3559a
commit 1f18d68404
3 changed files with 62 additions and 4 deletions

View file

@ -0,0 +1,13 @@
Index: configure.ac
===================================================================
--- configure.ac.orig
+++ configure.ac
@@ -124,7 +124,7 @@ AC_ARG_WITH(anthy-utf8,
[with_anthy_utf8=no])
if test "x$with_anthy_utf8" != xno; then
- PKG_CHECK_MODULES(ANTHY_UTF8, anthy >= 8622,
+ PKG_CHECK_MODULES(ANTHY_UTF8, anthy >= 0.4,
[with_anthy_utf8=yes
AC_DEFINE(LIBANTHY_UTF8_CAPABLE, 1,
[libanthy can handle UTF-8])],

View file

@ -0,0 +1,38 @@
From 164e2eb050b5fec25033124834cf49ea1a7d8cbb Mon Sep 17 00:00:00 2001
From: multiSnow <infinity.blick.winkel@gmail.com>
Date: Thu, 7 Feb 2019 01:03:47 +0800
Subject: [PATCH] replace process-kill-without-query with
set-process-query-on-exit-flag
see https://www.gnu.org/software/emacs/news/NEWS.22.1 and https://git.savannah.gnu.org/cgit/emacs.git/commit/?id=f1c48b0ec521744826ed43ae27eed0e152c472bf
---
emacs/uim-helper.el | 2 +-
emacs/uim.el | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git emacs/uim-helper.el emacs/uim-helper.el
index e86e32d06..19ecd4538 100644
--- emacs/uim-helper.el
+++ emacs/uim-helper.el
@@ -106,7 +106,7 @@
(if (not proc)
(error "uim.el: Couldn't invoke uim-el-helper-agent."))
- (process-kill-without-query proc)
+ (set-process-query-on-exit-flag proc nil)
;; wait "OK"
(let ((patience uim-startup-timeout) (ok nil))
diff --git emacs/uim.el emacs/uim.el
index 9110c3cb6..7e1fadbba 100644
--- emacs/uim.el
+++ emacs/uim.el
@@ -488,7 +488,7 @@
(error "uim.el: Couldn't invoke uim-el-agent."))
;; don't ask kill
- (process-kill-without-query proc)
+ (set-process-query-on-exit-flag proc nil)
;; wait "OK"
(let ((patience uim-startup-timeout) (ok nil))

View file

@ -1,13 +1,15 @@
# Template file for 'uim'
pkgname=uim
version=1.8.8
revision=2
revision=3
build_style=gnu-configure
build_helper=qmake
configure_args="--enable-pref --enable-fep --with-gtk2 --with-gtk3
--with-qt5 --with-qt5-immodule --with-x --with-anthy-utf8 --with-skk"
hostmakedepends="pkg-config intltool"
hostmakedepends="pkg-config intltool qt5-host-tools qt5-qmake automake
libtool gettext-devel"
makedepends="gtk+-devel gtk+3-devel qt5-devel ncurses-devel anthy-devel
qt5-x11extras-devel"
libgcroots-devel qt5-x11extras-devel"
short_desc="Multilingual input method library and environment"
maintainer="Kazuho Sakoda <hyonhyoro.kazuho@gmail.com>"
license="BSD-3-Clause"
@ -17,6 +19,10 @@ checksum=34599bbcc4e5ab87832370763e38be5100984a64237555e9234a1ea225a0fadc
CFLAGS="-fcommon"
pre_configure() {
./autogen.sh
}
post_install() {
vlicense COPYING
}
@ -24,10 +30,12 @@ post_install() {
uim-gtk2_package() {
short_desc+=" - GTK2 IM module"
pkg_install() {
vmove usr/bin/uim-input-pad-ja
vmove "usr/bin/uim-*-gtk"
vmove usr/bin/uim-toolbar-gtk-systray
vmove "usr/libexec/uim-*-gtk"
vmove usr/lib/gtk-2.0
vmove usr/share/applications
}
}
@ -74,7 +82,6 @@ uim-devel_package() {
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
vmove "usr/lib/*.a"
vmove "usr/lib/*.so"
}
}