uim: update to 1.8.9.
This commit is contained in:
hazen2215
classabbyamp
parent
3aede34728
commit
ed77afa4a2
|
|
@ -1,38 +0,0 @@
|
|||
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
|
||||
--- a/emacs/uim-helper.el
|
||||
+++ b/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
|
||||
--- a/emacs/uim.el
|
||||
+++ b/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))
|
||||
|
|
@ -0,0 +1,80 @@
|
|||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -1449,6 +1449,28 @@
|
||||
|
||||
AM_CONDITIONAL(KDE4_APPLET, test "x$enable_kde4_applet" = xyes)
|
||||
|
||||
+dnl ****************************
|
||||
+dnl *** test for KDE5 applet ***
|
||||
+dnl ****************************
|
||||
+AC_ARG_ENABLE(kde5-applet,
|
||||
+ AC_HELP_STRING([--disable-kde5-applet],
|
||||
+ [do not build uim KDE Plasma 5 widget]),
|
||||
+ [],
|
||||
+ [enable_kde5_applet=yes])
|
||||
+
|
||||
+if test "x$enable_kde5_applet" != xno; then
|
||||
+ if test "x$with_qt5" != xyes; then
|
||||
+ enable_kde5_applet=no
|
||||
+ fi
|
||||
+fi
|
||||
+
|
||||
+if test "x$enable_kde5_applet" = xyes && test "x$CMAKE" = xno; then
|
||||
+ AC_MSG_WARN([no CMake found])
|
||||
+ enable_kde5_applet=no
|
||||
+fi
|
||||
+
|
||||
+AM_CONDITIONAL(KDE5_APPLET, test "x$enable_kde5_applet" = xyes)
|
||||
+
|
||||
AC_ARG_ENABLE(pref,
|
||||
AC_HELP_STRING([--disable-pref],
|
||||
[do not build graphical utility to edit user settings]),
|
||||
@@ -1883,7 +1905,6 @@
|
||||
cmake_option="-DCMAKE_BUILD_TYPE=${cmake_build_type}"
|
||||
cmake_option="${cmake_option} -DCMAKE_INSTALL_PREFIX=${prefix}"
|
||||
cmake_option="${cmake_option} -DCMAKE_SKIP_RPATH=true"
|
||||
- cmake_option="${cmake_option} -DKDE4_USE_ALWAYS_FULL_RPATH=false"
|
||||
fi
|
||||
|
||||
if test "x$with_qt4" = xyes; then
|
||||
@@ -1948,12 +1969,15 @@
|
||||
qt5_immodule_option="DEFINES+=QT5_IMMODULE"
|
||||
fi
|
||||
set -e
|
||||
- # FIXME: move CMAKE_CXX_FLAGS into cmake_option
|
||||
- ${CMAKE} \
|
||||
- -B ${ac_abs_top_builddir}/qt5/applet.cmake \
|
||||
- -S ${ac_abs_top_srcdir}/qt5/applet \
|
||||
- -DCMAKE_CXX_FLAGS="${CXXFLAGS} ${X_CFLAGS}" \
|
||||
- ${cmake_option}
|
||||
+ # Generate a Makefile for KDE5 applet by cmake
|
||||
+ if test "x$enable_kde5_applet" = xyes; then
|
||||
+ # FIXME: move CMAKE_CXX_FLAGS into cmake_option
|
||||
+ ${CMAKE} \
|
||||
+ -B ${ac_abs_top_builddir}/qt5/applet.cmake \
|
||||
+ -S ${ac_abs_top_srcdir}/qt5/applet \
|
||||
+ -DCMAKE_CXX_FLAGS="${CXXFLAGS} ${X_CFLAGS}" \
|
||||
+ ${cmake_option}
|
||||
+ fi
|
||||
${QMAKE5} -o ${ac_abs_top_builddir}/qt5/candwin/Makefile.qmake \
|
||||
${ac_abs_top_builddir}/qt5/candwin/uim-candwin-qt5.pro
|
||||
${QMAKE5} -o ${ac_abs_top_builddir}/qt5/chardict/Makefile.qmake \
|
||||
@@ -2007,6 +2031,7 @@
|
||||
Qt5 immodule : ${with_qt5_immodule}
|
||||
KDE3 Applet : ${enable_kde_applet}
|
||||
KDE4 Applet : ${enable_kde4_applet}
|
||||
+ KDE5 Applet : ${enable_kde5_applet}
|
||||
FEP : ${enable_fep}
|
||||
Emacs : ${enable_emacs}
|
||||
XIM : ${use_xim}
|
||||
--- a/qt5/applet/Makefile.am
|
||||
+++ b/qt5/applet/Makefile.am
|
||||
@@ -6,6 +6,8 @@
|
||||
plasmoid
|
||||
|
||||
if QT5
|
||||
+if KDE5_APPLET
|
||||
all clean install uninstall:
|
||||
$(MAKE) $(AM_MAKEFLAGS) -C ../applet.cmake $@
|
||||
endif
|
||||
+endif
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
# Template file for 'uim'
|
||||
pkgname=uim
|
||||
version=1.8.8
|
||||
revision=5
|
||||
version=1.8.9
|
||||
revision=1
|
||||
build_style=gnu-configure
|
||||
build_helper=qmake
|
||||
configure_args="--enable-pref --enable-fep --with-gtk2 --with-gtk3
|
||||
|
|
@ -16,7 +16,7 @@ maintainer="Kazuho Sakoda <hyonhyoro.kazuho@gmail.com>"
|
|||
license="BSD-3-Clause"
|
||||
homepage="https://github.com/uim/uim/wiki"
|
||||
distfiles="https://github.com/uim/uim/releases/download/${version}/uim-${version}.tar.bz2"
|
||||
checksum=34599bbcc4e5ab87832370763e38be5100984a64237555e9234a1ea225a0fadc
|
||||
checksum=dbbd983768bf748449551644f330dbebe859bfeb6f024fea6697ac75131c7aa4
|
||||
|
||||
CFLAGS="-fcommon"
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue