git: dc84281c1af6 - main - textproc/uim: Update to the snapshot on 2021-01-04.
MANTANI Nobutaka
nobutaka at FreeBSD.org
Sat May 1 14:26:44 UTC 2021
The branch main has been updated by nobutaka:
URL: https://cgit.FreeBSD.org/ports/commit/?id=dc84281c1af6a0616aa1f20a4c5b958ffeaa1ea2
commit dc84281c1af6a0616aa1f20a4c5b958ffeaa1ea2
Author: MANTANI Nobutaka <nobutaka at FreeBSD.org>
AuthorDate: 2021-05-01 14:14:17 +0000
Commit: MANTANI Nobutaka <nobutaka at FreeBSD.org>
CommitDate: 2021-05-01 14:25:40 +0000
textproc/uim: Update to the snapshot on 2021-01-04.
- Use GTK+ 3 as default GUI toolkit.
- textproc/uim-qt5 installs KDE Plasma 5 applet.
- Bump PORTREVISION of ports that depends on textproc/uim
---
japanese/mozc-server/Makefile | 2 +-
japanese/scim-uim/Makefile | 2 +-
japanese/uim-anthy/Makefile | 11 ++--
japanese/uim-anthy/pkg-plist | 2 +-
japanese/uim-mozc/Makefile | 1 +
japanese/uim-tomoe-gtk/Makefile | 2 +-
textproc/uim-el/Makefile | 19 ++++--
textproc/uim-el/distinfo | 6 +-
textproc/uim-el/files/patch-emacs_Makefile.am | 21 ++++++
textproc/uim-el/files/patch-emacs_Makefile.in | 20 ------
textproc/uim-el/files/patch-emacs_uim-helper.el | 11 ----
textproc/uim-el/files/patch-emacs_uim.el | 11 ----
textproc/uim-gtk/Makefile | 18 +----
textproc/uim-gtk/pkg-plist | 3 +
textproc/uim-gtk3/Makefile | 20 +++---
textproc/uim-gtk3/pkg-plist | 3 -
textproc/uim-m17nlib/Makefile | 2 -
textproc/uim-qt5/Makefile | 7 +-
textproc/uim-qt5/pkg-plist | 8 +++
textproc/uim/Makefile | 36 +++++++---
textproc/uim/distinfo | 10 ++-
.../uim/files/extra-patch-gtk2_dict_Makefile.in | 22 -------
.../files/extra-patch-gtk2_immodule_Makefile.in | 23 -------
.../uim/files/extra-patch-gtk2_pad_Makefile.in | 24 -------
.../uim/files/extra-patch-gtk2_pref_Makefile.in | 25 -------
.../files/extra-patch-gtk2_switcher_Makefile.in | 29 ---------
.../uim/files/extra-patch-gtk2_toolbar_Makefile.in | 76 ----------------------
.../uim/files/extra-patch-gtk3_candwin_Makefile.in | 68 -------------------
.../uim/files/extra-patch-gtk3_dict_Makefile.in | 22 -------
.../files/extra-patch-gtk3_immodule_Makefile.in | 24 -------
.../uim/files/extra-patch-gtk3_pad_Makefile.in | 24 -------
.../uim/files/extra-patch-gtk3_pref_Makefile.in | 28 --------
.../files/extra-patch-gtk3_switcher_Makefile.in | 30 ---------
.../uim/files/extra-patch-gtk3_toolbar_Makefile.in | 52 ---------------
.../uim/files/extra-patch-qt3_candwin_Makefile.in | 24 -------
.../uim/files/extra-patch-qt3_immodule_Makefile.in | 22 -------
.../uim/files/extra-patch-qt3_pref_Makefile.in | 27 --------
.../uim/files/extra-patch-qt3_switcher_Makefile.in | 27 --------
.../uim/files/extra-patch-qt3_toolbar_Makefile.in | 65 ------------------
.../files/extra-patch-qt4_toolbar_CMakeLists.txt | 11 ----
.../extra-patch-qt_chardict_po_Makefile.in.in | 20 ------
textproc/uim/files/extra-patch-uim_Makefile.in | 54 ---------------
textproc/uim/files/extra-patch-uim_editline.c | 22 -------
textproc/uim/files/patch-configure | 57 ----------------
textproc/uim/files/patch-configure.ac | 20 ++++++
textproc/uim/files/patch-emacs_Makefile.am | 12 ++++
textproc/uim/files/patch-emacs_Makefile.in | 24 -------
textproc/uim/files/patch-gtk2_candwin_Makefile.am | 30 +++++++++
textproc/uim/files/patch-gtk2_immodule_Makefile.am | 13 ++++
textproc/uim/files/patch-gtk2_pad_Makefile.am | 12 ++++
textproc/uim/files/patch-gtk2_pref_Makefile.am | 13 ++++
textproc/uim/files/patch-gtk2_switcher_Makefile.am | 14 ++++
textproc/uim/files/patch-gtk2_toolbar_Makefile.am | 34 ++++++++++
textproc/uim/files/patch-gtk3_dict_Makefile.am | 12 ++++
textproc/uim/files/patch-gtk3_immodule_Makefile.am | 13 ++++
textproc/uim/files/patch-gtk3_pad_Makefile.am | 12 ++++
textproc/uim/files/patch-gtk3_pref_Makefile.am | 13 ++++
textproc/uim/files/patch-gtk3_switcher_Makefile.am | 14 ++++
textproc/uim/files/patch-gtk3_toolbar_Makefile.am | 35 ++++++++++
textproc/uim/files/patch-qt4_immodule_plugin.cpp | 21 ------
.../patch-qt5_applet_qtquick-plugin_CMakeLists.txt | 13 ++++
...patch-scm_Makefile.in => patch-scm_Makefile.am} | 9 +--
textproc/uim/files/patch-sigscheme_doc_Makefile.am | 8 +++
textproc/uim/files/patch-sigscheme_doc_Makefile.in | 11 ----
...-sigscheme_libgcroots_include_private_gc_priv.h | 11 ----
textproc/uim/files/patch-uim_Makefile.am | 29 +++++++++
textproc/uim/files/patch-xim_main.cpp | 15 -----
textproc/uim/pkg-plist | 6 +-
68 files changed, 409 insertions(+), 976 deletions(-)
diff --git a/japanese/mozc-server/Makefile b/japanese/mozc-server/Makefile
index 1f575a8fcc9e..027ba40e2df8 100644
--- a/japanese/mozc-server/Makefile
+++ b/japanese/mozc-server/Makefile
@@ -3,7 +3,7 @@
PORTNAME= mozc
PORTVERSION= 2.23.2815.102.01
DISTVERSIONPREFIX= v
-PORTREVISION= 3
+PORTREVISION?= 3
CATEGORIES= japanese
MAINTAINER= hrs at FreeBSD.org
diff --git a/japanese/scim-uim/Makefile b/japanese/scim-uim/Makefile
index 006e9b934bbd..81f07bc585d6 100644
--- a/japanese/scim-uim/Makefile
+++ b/japanese/scim-uim/Makefile
@@ -2,7 +2,7 @@
PORTNAME= scim-uim
PORTVERSION= 0.2.0
-PORTREVISION= 12
+PORTREVISION= 13
CATEGORIES= japanese
MASTER_SITES= SF/scim/${PORTNAME}/${PORTVERSION} \
http://freedesktop.org/~suzhe/sources/
diff --git a/japanese/uim-anthy/Makefile b/japanese/uim-anthy/Makefile
index 62576cc491f9..46aceff818d4 100644
--- a/japanese/uim-anthy/Makefile
+++ b/japanese/uim-anthy/Makefile
@@ -10,7 +10,7 @@ PKGNAMESUFFIX= -anthy
COMMENT= Uim plugin using Anthy input method
.if !defined(WITHOUT_X11)
-USE_GNOME= cairo gdkpixbuf2 gtk20
+USE_GNOME= cairo gdkpixbuf2 gtk30
.endif
LIB_DEPENDS= libanthy.so:japanese/anthy \
@@ -23,19 +23,16 @@ PKGDIR= ${.CURDIR}
CONFIGURE_ARGS= --with-anthy --with-anthy-utf8
.if !defined(WITHOUT_X11)
-CONFIGURE_ARGS+= --with-gtk2 --enable-dict
+CONFIGURE_ARGS+= --with-gtk3 --enable-dict
.endif
UIM_SLAVE= yes
-EXTRA_PATCHES= ${PATCHDIR}/extra-patch-uim_Makefile.in \
- ${PATCHDIR}/extra-patch-gtk2_dict_Makefile.in
-
do-build:
(cd ${WRKSRC}/uim && ${MAKE_CMD} libuim-anthy.la)
(cd ${WRKSRC}/uim && ${MAKE_CMD} libuim-anthy-utf8.la)
.if !defined(WITHOUT_X11)
- (cd ${WRKSRC}/gtk2/dict && ${MAKE_CMD} uim-dict-gtk)
+ (cd ${WRKSRC}/gtk3/dict && ${MAKE_CMD} uim-dict-gtk3)
.endif
do-install:
@@ -43,7 +40,7 @@ do-install:
${MAKE_CMD} DESTDIR=${STAGEDIR} uim_plugin_LTLIBRARIES=libuim-anthy.la install-uim_pluginLTLIBRARIES && \
${MAKE_CMD} DESTDIR=${STAGEDIR} uim_plugin_LTLIBRARIES=libuim-anthy-utf8.la install-uim_pluginLTLIBRARIES)
.if !defined(WITHOUT_X11)
- (cd ${WRKSRC}/gtk2/dict && ${MAKE_CMD} DESTDIR=${STAGEDIR} bin_PROGRAMS=uim-dict-gtk install-binPROGRAMS install-uim_dict_uiDATA)
+ (cd ${WRKSRC}/gtk3/dict && ${MAKE_CMD} DESTDIR=${STAGEDIR} bin_PROGRAMS=uim-dict-gtk3 install-binPROGRAMS install-uim_dict_uiDATA)
.endif
.include "${MASTERDIR}/Makefile"
diff --git a/japanese/uim-anthy/pkg-plist b/japanese/uim-anthy/pkg-plist
index 054958c35ec7..83c1562f00a6 100644
--- a/japanese/uim-anthy/pkg-plist
+++ b/japanese/uim-anthy/pkg-plist
@@ -1,4 +1,4 @@
-%%X11%%bin/uim-dict-gtk
+%%X11%%bin/uim-dict-gtk3
lib/uim/plugin/libuim-anthy.so
lib/uim/plugin/libuim-anthy-utf8.so
%%X11%%%%DATADIR%%/helperdata/uim-dict-ui.xml
diff --git a/japanese/uim-mozc/Makefile b/japanese/uim-mozc/Makefile
index 0f71293def29..b22d0302ecea 100644
--- a/japanese/uim-mozc/Makefile
+++ b/japanese/uim-mozc/Makefile
@@ -1,5 +1,6 @@
# Created by: Koichiro IWAO <meta+ports at vmeta.jp>
+PORTREVISION= 4
PKGNAMEPREFIX= ja-uim-
COMMENT= Mozc engine for uim
diff --git a/japanese/uim-tomoe-gtk/Makefile b/japanese/uim-tomoe-gtk/Makefile
index d3e33f1bf72e..75f279f3bb47 100644
--- a/japanese/uim-tomoe-gtk/Makefile
+++ b/japanese/uim-tomoe-gtk/Makefile
@@ -2,7 +2,7 @@
PORTNAME= uim-tomoe-gtk
PORTVERSION= 0.6.0
-PORTREVISION= 15
+PORTREVISION= 16
CATEGORIES= japanese
MASTER_SITES= SF/tomoe/${PORTNAME}/${PORTNAME}-${PORTVERSION}
diff --git a/textproc/uim-el/Makefile b/textproc/uim-el/Makefile
index 4ad739078e0c..7c70ab0909fe 100644
--- a/textproc/uim-el/Makefile
+++ b/textproc/uim-el/Makefile
@@ -1,12 +1,10 @@
# Created by: MANTANI Nobutaka <nobutaka at FreeBSD.org>
PORTNAME= uim-el
-PORTVERSION= 1.8.8
-PORTREVISION= 6
+PORTVERSION= 1.8.9.b.20210104
CATEGORIES= textproc
-MASTER_SITES= https://github.com/uim/uim/releases/download/${PORTVERSION}/
PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
-DISTNAME= uim-${PORTVERSION}
+#DISTNAME= uim-${PORTVERSION}
MAINTAINER= nobutaka at FreeBSD.org
COMMENT?= Emacs lisp for uim input method library
@@ -17,16 +15,22 @@ LICENSE_FILE= ${WRKSRC}/COPYING
RUN_DEPENDS= uim-el-agent:textproc/uim
-USES= emacs gettext-tools gmake gnome iconv perl5 tar:bzip2
+USES= autoreconf:build emacs gettext gmake gnome iconv libtool pathfix perl5 pkgconfig
USE_GNOME= intltool
USE_PERL5= build
+USE_GITHUB= yes
+GH_ACCOUNT= uim
+GH_PROJECT= uim
+GH_TAGNAME= d1ac9d9
+
GNU_CONFIGURE= yes
BUILD_WRKSRC= ${WRKSRC}/emacs
INSTALL_WRKSRC= ${WRKSRC}/emacs
-CONFIGURE_ARGS?=--enable-emacs --with-lispdir=${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}
+CONFIGURE_ARGS?=--enable-maintainer-mode --enable-emacs \
+ --with-lispdir=${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}
CONFIGURE_ENV= EMACS="${EMACS_CMD}"
CPPFLAGS+= -I${LOCALBASE}/include
LIBS+= -L${LOCALBASE}/lib
@@ -36,6 +40,9 @@ PLIST_SUB+= DOCSDIR_JA="${DOCSDIR_JA:S,^${PREFIX}/,,}"
OPTIONS_DEFINE= DOCS
+pre-configure:
+ cd ${WRKSRC} && ./autogen.sh
+
post-install:
${MKDIR} ${STAGEDIR}${DOCSDIR}
${MKDIR} ${STAGEDIR}${DOCSDIR_JA}
diff --git a/textproc/uim-el/distinfo b/textproc/uim-el/distinfo
index c2fd4a7cefdb..51504dd1929c 100644
--- a/textproc/uim-el/distinfo
+++ b/textproc/uim-el/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1530281548
-SHA256 (uim-1.8.8.tar.bz2) = 34599bbcc4e5ab87832370763e38be5100984a64237555e9234a1ea225a0fadc
-SIZE (uim-1.8.8.tar.bz2) = 6228743
+TIMESTAMP = 1619703401
+SHA256 (uim-uim-1.8.9.b.20210104-d1ac9d9_GH0.tar.gz) = e187667560eb920201c93a6af104868c7c86b0d61364f6f7a20b33416c15a935
+SIZE (uim-uim-1.8.9.b.20210104-d1ac9d9_GH0.tar.gz) = 4052581
diff --git a/textproc/uim-el/files/patch-emacs_Makefile.am b/textproc/uim-el/files/patch-emacs_Makefile.am
new file mode 100644
index 000000000000..9edaeaaa6f40
--- /dev/null
+++ b/textproc/uim-el/files/patch-emacs_Makefile.am
@@ -0,0 +1,21 @@
+--- emacs/Makefile.am.orig 2021-04-29 12:52:58 UTC
++++ emacs/Makefile.am
+@@ -1,13 +1,11 @@
+ EXTRA_DIST = README.ja uim-version.el.in
+
+-if UIM_EL
+
+ uimel_lispdir = $(UIMEL_LISP_DIR)
+ dist_uimel_lisp_DATA = uim.el uim-var.el uim-version.el uim-keymap.el \
+ uim-key.el uim-util.el \
+ uim-candidate.el uim-preedit.el uim-debug.el uim-leim.el uim-helper.el
+
+-bin_PROGRAMS = uim-el-agent uim-el-helper-agent
+
+ uim_el_agent_SOURCES = uim-el-agent.c debug.c output.c context.c preedit.c \
+ key.c candidate.c encoding.c im.c callback.c commit.c \
+@@ -27,4 +25,3 @@ uim_el_helper_agent_CPPFLAGS = -I$(top_srcdir)
+ uim_el_helper_agent_LDADD = $(top_builddir)/uim/libuim-scm.la \
+ $(top_builddir)/uim/libuim.la
+
+-endif
diff --git a/textproc/uim-el/files/patch-emacs_Makefile.in b/textproc/uim-el/files/patch-emacs_Makefile.in
deleted file mode 100644
index d26865a485b9..000000000000
--- a/textproc/uim-el/files/patch-emacs_Makefile.in
+++ /dev/null
@@ -1,20 +0,0 @@
---- emacs/Makefile.in.orig 2018-05-11 21:27:46 UTC
-+++ emacs/Makefile.in
-@@ -89,8 +89,6 @@ PRE_UNINSTALL = :
- POST_UNINSTALL = :
- build_triplet = @build@
- host_triplet = @host@
-- at UIM_EL_TRUE@bin_PROGRAMS = uim-el-agent$(EXEEXT) \
-- at UIM_EL_TRUE@ uim-el-helper-agent$(EXEEXT)
- subdir = emacs
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/ac_cxx_have_stl.m4 \
-@@ -1087,7 +1085,7 @@ distdir: $(DISTFILES)
- done
- check-am: all-am
- check: check-am
--all-am: Makefile $(PROGRAMS) $(DATA)
-+all-am: Makefile $(DATA)
- installdirs:
- for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(uimel_lispdir)"; do \
- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
diff --git a/textproc/uim-el/files/patch-emacs_uim-helper.el b/textproc/uim-el/files/patch-emacs_uim-helper.el
deleted file mode 100644
index 0bb4dc000d24..000000000000
--- a/textproc/uim-el/files/patch-emacs_uim-helper.el
+++ /dev/null
@@ -1,11 +0,0 @@
---- emacs/uim-helper.el.orig 2017-08-14 00:07:26 UTC
-+++ 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 a/textproc/uim-el/files/patch-emacs_uim.el b/textproc/uim-el/files/patch-emacs_uim.el
deleted file mode 100644
index 5992936bb854..000000000000
--- a/textproc/uim-el/files/patch-emacs_uim.el
+++ /dev/null
@@ -1,11 +0,0 @@
---- emacs/uim.el.orig 2018-05-08 04:53:27 UTC
-+++ 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))
diff --git a/textproc/uim-gtk/Makefile b/textproc/uim-gtk/Makefile
index f1db6ba907b5..1e4b8c10dc1a 100644
--- a/textproc/uim-gtk/Makefile
+++ b/textproc/uim-gtk/Makefile
@@ -15,29 +15,15 @@ CONFIGURE_ARGS= --with-gtk2 --enable-pref
UIM_SLAVE= yes
-EXTRA_PATCHES= ${PATCHDIR}/extra-patch-gtk2_immodule_Makefile.in \
- ${PATCHDIR}/extra-patch-gtk2_pad_Makefile.in \
- ${PATCHDIR}/extra-patch-gtk2_pref_Makefile.in \
- ${PATCHDIR}/extra-patch-gtk2_switcher_Makefile.in \
- ${PATCHDIR}/extra-patch-gtk2_toolbar_Makefile.in
-
.if defined(WITHOUT_X11)
IGNORE= requires X11
.endif
do-build:
(cd ${WRKSRC}/uim && ${MAKE_CMD} libuim-x-util.la libuim-counted-init.la)
- (cd ${WRKSRC}/gtk2/immodule && ${MAKE_CMD})
- (cd ${WRKSRC}/gtk2/pad && ${MAKE_CMD})
- (cd ${WRKSRC}/gtk2/pref && ${MAKE_CMD})
- (cd ${WRKSRC}/gtk2/switcher && ${MAKE_CMD})
- (cd ${WRKSRC}/gtk2/toolbar && ${MAKE_CMD})
+ (cd ${WRKSRC}/gtk2 && ${MAKE_CMD})
do-install:
- (cd ${WRKSRC}/gtk2/immodule && ${MAKE_CMD} DESTDIR=${STAGEDIR} install)
- (cd ${WRKSRC}/gtk2/pad && ${MAKE_CMD} DESTDIR=${STAGEDIR} install)
- (cd ${WRKSRC}/gtk2/pref && ${MAKE_CMD} DESTDIR=${STAGEDIR} install)
- (cd ${WRKSRC}/gtk2/switcher && ${MAKE_CMD} DESTDIR=${STAGEDIR} install)
- (cd ${WRKSRC}/gtk2/toolbar && ${MAKE_CMD} DESTDIR=${STAGEDIR} install)
+ (cd ${WRKSRC}/gtk2 && ${MAKE_CMD} DESTDIR=${STAGEDIR} install)
.include "${MASTERDIR}/Makefile"
diff --git a/textproc/uim-gtk/pkg-plist b/textproc/uim-gtk/pkg-plist
index 8336f64cefac..1a2e1d2daee2 100644
--- a/textproc/uim-gtk/pkg-plist
+++ b/textproc/uim-gtk/pkg-plist
@@ -4,5 +4,8 @@ bin/uim-pref-gtk
bin/uim-toolbar-gtk
bin/uim-toolbar-gtk-systray
lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-uim.so
+libexec/uim-candwin-gtk
+libexec/uim-candwin-horizontal-gtk
+libexec/uim-candwin-tbl-gtk
@postexec %%LOCALBASE%%/bin/gtk-query-immodules-2.0 --update-cache
@postunexec %%LOCALBASE%%/bin/gtk-query-immodules-2.0 --update-cache
diff --git a/textproc/uim-gtk3/Makefile b/textproc/uim-gtk3/Makefile
index 2322c6d5cb2f..80bbb0cab30f 100644
--- a/textproc/uim-gtk3/Makefile
+++ b/textproc/uim-gtk3/Makefile
@@ -13,23 +13,23 @@ CONFIGURE_ARGS= --with-gtk3 --enable-pref --enable-default-toolkit=gtk3
UIM_SLAVE= yes
-EXTRA_PATCHES= ${PATCHDIR}/extra-patch-gtk3_candwin_Makefile.in \
- ${PATCHDIR}/extra-patch-gtk3_dict_Makefile.in \
- ${PATCHDIR}/extra-patch-gtk3_immodule_Makefile.in \
- ${PATCHDIR}/extra-patch-gtk3_pad_Makefile.in \
- ${PATCHDIR}/extra-patch-gtk3_pref_Makefile.in \
- ${PATCHDIR}/extra-patch-gtk3_switcher_Makefile.in \
- ${PATCHDIR}/extra-patch-gtk3_toolbar_Makefile.in
-
.if defined(WITHOUT_X11)
IGNORE= requires X11
.endif
do-build:
(cd ${WRKSRC}/uim && ${MAKE_CMD} libuim-x-util.la libuim-counted-init.la)
- (cd ${WRKSRC}/gtk3 && ${MAKE_CMD})
+ (cd ${WRKSRC}/gtk3/immodule && ${MAKE_CMD})
+ (cd ${WRKSRC}/gtk3/pad && ${MAKE_CMD})
+ (cd ${WRKSRC}/gtk3/pref && ${MAKE_CMD})
+ (cd ${WRKSRC}/gtk3/switcher && ${MAKE_CMD})
+ (cd ${WRKSRC}/gtk3/toolbar && ${MAKE_CMD})
do-install:
- (cd ${WRKSRC}/gtk3 && ${MAKE_CMD} DESTDIR=${STAGEDIR} install)
+ (cd ${WRKSRC}/gtk3/immodule && ${MAKE_CMD} DESTDIR=${STAGEDIR} install)
+ (cd ${WRKSRC}/gtk3/pad && ${MAKE_CMD} DESTDIR=${STAGEDIR} install)
+ (cd ${WRKSRC}/gtk3/pref && ${MAKE_CMD} DESTDIR=${STAGEDIR} install)
+ (cd ${WRKSRC}/gtk3/switcher && ${MAKE_CMD} DESTDIR=${STAGEDIR} install)
+ (cd ${WRKSRC}/gtk3/toolbar && ${MAKE_CMD} DESTDIR=${STAGEDIR} install)
.include "${MASTERDIR}/Makefile"
diff --git a/textproc/uim-gtk3/pkg-plist b/textproc/uim-gtk3/pkg-plist
index 0805c90bb413..8643ff2531f1 100644
--- a/textproc/uim-gtk3/pkg-plist
+++ b/textproc/uim-gtk3/pkg-plist
@@ -4,8 +4,5 @@ bin/uim-pref-gtk3
bin/uim-toolbar-gtk3
bin/uim-toolbar-gtk3-systray
lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-uim.so
-libexec/uim-candwin-gtk3
-libexec/uim-candwin-horizontal-gtk3
-libexec/uim-candwin-tbl-gtk3
@postexec %%LOCALBASE%%/bin/gtk-query-immodules-3.0 --update-cache > /dev/null 2>&1 || /usr/bin/true
@postunexec %%LOCALBASE%%/bin/gtk-query-immodules-3.0 --update-cache > /dev/null 2>&1 || /usr/bin/true
diff --git a/textproc/uim-m17nlib/Makefile b/textproc/uim-m17nlib/Makefile
index 2a4778c90b17..6be918defd9f 100644
--- a/textproc/uim-m17nlib/Makefile
+++ b/textproc/uim-m17nlib/Makefile
@@ -23,8 +23,6 @@ CONFIGURE_ARGS= --with-m17nlib
UIM_SLAVE= yes
-EXTRA_PATCHES= ${PATCHDIR}/extra-patch-uim_Makefile.in
-
do-build:
(cd ${WRKSRC}/uim && ${MAKE_CMD} libuim-m17nlib.la)
diff --git a/textproc/uim-qt5/Makefile b/textproc/uim-qt5/Makefile
index 9b4426c1d2e9..76d4dad0df2f 100644
--- a/textproc/uim-qt5/Makefile
+++ b/textproc/uim-qt5/Makefile
@@ -1,4 +1,3 @@
-PORTREVISION= 2
PKGNAMESUFFIX= -qt5
COMMENT= Qt5 modules of uim input method
@@ -7,11 +6,13 @@ LICENSE= BSD3CLAUSE GPLv2+ GPLv3+ LGPL21+ PD
LICENSE_COMB= multi
LICENSE_FILE= ${WRKSRC}/COPYING
+BUILD_DEPENDS= cmake:devel/cmake
LIB_DEPENDS= libuim.so:textproc/uim
-USES= compiler:c++11-lang gl iconv libtool qt:5
+USES= compiler:c++11-lang gl iconv kde:5 libtool qt:5
USE_GL= gl
-USE_QT= buildtools_build core gui qmake_build widgets x11extras
+USE_KDE= plasma-framework
+USE_QT= buildtools_build core declarative gui network qmake_build widgets x11extras
MASTERDIR= ${.CURDIR}/../../textproc/uim
PKGDIR= ${.CURDIR}
diff --git a/textproc/uim-qt5/pkg-plist b/textproc/uim-qt5/pkg-plist
index fbf8ad2d02c5..a3630246057c 100644
--- a/textproc/uim-qt5/pkg-plist
+++ b/textproc/uim-qt5/pkg-plist
@@ -2,5 +2,13 @@ bin/uim-chardict-qt5
bin/uim-im-switcher-qt5
bin/uim-pref-qt5
bin/uim-toolbar-qt5
+%%QT_QMLDIR%%/com/github/uim/libuim-qtquick-plugin.so
+%%QT_QMLDIR%%/com/github/uim/qmldir
%%QT_PLUGINDIR%%/platforminputcontexts/libuimplatforminputcontextplugin.so
libexec/uim-candwin-qt5
+share/kservices5/plasma-applet-com.github.uim.status.desktop
+share/metainfo/com.github.uim.status.appdata.xml
+share/plasma/plasmoids/com.github.uim.status/contents/ui/main.qml
+share/plasma/plasmoids/com.github.uim.status/contents/ui/messageProcessor.js
+share/plasma/plasmoids/com.github.uim.status/metadata.desktop
+share/plasma/plasmoids/com.github.uim.status/metadata.json
diff --git a/textproc/uim/Makefile b/textproc/uim/Makefile
index 4025f8d86b68..1a9d054f1c80 100644
--- a/textproc/uim/Makefile
+++ b/textproc/uim/Makefile
@@ -1,10 +1,8 @@
# Created by: MANTANI Nobutaka <nobutaka at FreeBSD.org>
PORTNAME= uim
-PORTVERSION= 1.8.8
-PORTREVISION?= 2
+PORTVERSION= 1.8.9.b.20210104
CATEGORIES?= textproc
-MASTER_SITES= https://github.com/uim/uim/releases/download/${PORTVERSION}/
.if !defined(UIM_SLAVE) && defined(WITHOUT_X11)
PKGNAMESUFFIX= -nox11
.endif
@@ -18,11 +16,17 @@ LICENSE_FILE= ${WRKSRC}/COPYING
BROKEN_riscv64= fails to configure: ./include/private/gcconfig.h:492:5: The collector has not been ported to this machine/OS combination
-USES+= gettext gmake gnome iconv libedit libtool pathfix pkgconfig perl5 sqlite tar:bzip2
+USES+= autoreconf:build gettext gmake gnome iconv libedit libtool pathfix pkgconfig sqlite
USE_LDCONFIG= yes
USE_GNOME+= glib20 intltool
-USE_PERL5= build
+
+USE_GITHUB= yes
+GH_TAGNAME= d1ac9d9
+GH_TUPLE= uim:sigscheme:beb8fbd:sigscheme \
+ uim:libgcroots:d362356:libgcroots
+
GNU_CONFIGURE= yes
+CONFIGURE_ARGS+= --enable-maintainer-mode
OPTIONS_DEFINE= DOCS X11
OPTIONS_DEFAULT= X11
@@ -37,11 +41,15 @@ CONFIGURE_ARGS+= --with-x --with-xft
.endif
.if !defined(UIM_SLAVE)
+USES+= perl5
+USE_GNOME+= librsvg2:build
+USE_PERL5= build
+USE_RUBY= build
.if ${PORT_OPTIONS:MX11}
-USE_GNOME+= cairo gdkpixbuf2 gtk20
+USE_GNOME+= cairo gdkpixbuf2 gtk30
LIB_DEPENDS+= libfreetype.so:print/freetype2 \
libfontconfig.so:x11-fonts/fontconfig
-CONFIGURE_ARGS+= --with-gtk2
+CONFIGURE_ARGS+= --with-gtk3
.endif
CONFIGURE_ARGS+= --enable-emacs --with-sj3 --with-canna --with-prime
.endif
@@ -69,7 +77,7 @@ PLIST_SUB+= X11=""
CONFIGURE_ARGS+= --enable-storage=fatty
.endif
-.for _x in x xft gtk2 qt anthy canna m17nlib prime scim dict
+.for _x in x xft gtk2 gtk3 qt5 anthy canna m17nlib prime scim dict
.if ${CONFIGURE_ARGS:M--with-${_x}} == ""
CONFIGURE_ARGS+=--without-${_x}
.endif
@@ -80,16 +88,24 @@ CONFIGURE_ARGS+=--disable-${_x}
.endif
.endfor
+post-extract:
+ ${CP} -R ${WRKSRC_sigscheme}/* ${WRKSRC}/sigscheme
+ ${MKDIR} ${WRKSRC}/sigscheme/libgcroots
+ ${CP} -R ${WRKSRC_libgcroots}/* ${WRKSRC}/sigscheme/libgcroots
+
post-patch:
${REINPLACE_CMD} -e 's,%%LOCALBASE%%,${LOCALBASE},' ${WRKSRC}/scm/skk-custom.scm
+pre-configure:
+ cd ${WRKSRC} && ./autogen.sh
+
do-build:
.if !defined(UIM_SLAVE)
.for d in replace sigscheme uim scm xim po fep emacs pixmaps tables
cd ${WRKSRC}/${d} && ${MAKE_CMD}
.endfor
.if ${PORT_OPTIONS:MX11}
- cd ${WRKSRC}/gtk2/candwin && ${MAKE_CMD}
+ cd ${WRKSRC}/gtk3/candwin && ${MAKE_CMD}
.endif
.endif
@@ -100,7 +116,7 @@ do-install:
cd ${WRKSRC}/${d} && ${MAKE_CMD} DESTDIR=${STAGEDIR} install
.endfor
.if ${PORT_OPTIONS:MX11}
- cd ${WRKSRC}/gtk2/candwin && ${MAKE_CMD} DESTDIR=${STAGEDIR} install
+ cd ${WRKSRC}/gtk3/candwin && ${MAKE_CMD} DESTDIR=${STAGEDIR} install
.endif
.endif
diff --git a/textproc/uim/distinfo b/textproc/uim/distinfo
index 581f6727f397..eb5a5de6cce3 100644
--- a/textproc/uim/distinfo
+++ b/textproc/uim/distinfo
@@ -1,3 +1,7 @@
-TIMESTAMP = 1530280332
-SHA256 (uim-1.8.8.tar.bz2) = 34599bbcc4e5ab87832370763e38be5100984a64237555e9234a1ea225a0fadc
-SIZE (uim-1.8.8.tar.bz2) = 6228743
+TIMESTAMP = 1619679684
+SHA256 (uim-uim-1.8.9.b.20210104-d1ac9d9_GH0.tar.gz) = e187667560eb920201c93a6af104868c7c86b0d61364f6f7a20b33416c15a935
+SIZE (uim-uim-1.8.9.b.20210104-d1ac9d9_GH0.tar.gz) = 4052581
+SHA256 (uim-sigscheme-beb8fbd_GH0.tar.gz) = c3ad5cbec2ff32bb97aed4273e7a61ee74b2a0da301490349798e475c894a25c
+SIZE (uim-sigscheme-beb8fbd_GH0.tar.gz) = 570745
+SHA256 (uim-libgcroots-d362356_GH0.tar.gz) = ae01589f5a7b49cf78418aca8679a7cd46a177a37d7776a4353b517d88cef451
+SIZE (uim-libgcroots-d362356_GH0.tar.gz) = 88740
diff --git a/textproc/uim/files/extra-patch-gtk2_dict_Makefile.in b/textproc/uim/files/extra-patch-gtk2_dict_Makefile.in
deleted file mode 100644
index a2a7d0e97fce..000000000000
--- a/textproc/uim/files/extra-patch-gtk2_dict_Makefile.in
+++ /dev/null
@@ -1,22 +0,0 @@
---- gtk2/dict/Makefile.in.orig 2012-04-01 03:16:41.000000000 +0900
-+++ gtk2/dict/Makefile.in 2012-04-01 03:18:52.000000000 +0900
-@@ -94,8 +94,6 @@
- uim_dict_gtk_OBJECTS = $(am_uim_dict_gtk_OBJECTS)
- am__DEPENDENCIES_1 =
- @DICT_TRUE@@GTK2_TRUE at uim_dict_gtk_DEPENDENCIES = \
-- at DICT_TRUE@@GTK2_TRUE@ $(top_builddir)/uim/libuim-scm.la \
-- at DICT_TRUE@@GTK2_TRUE@ $(top_builddir)/uim/libuim.la \
- @DICT_TRUE@@GTK2_TRUE@ $(am__DEPENDENCIES_1) \
- @DICT_TRUE@@GTK2_TRUE@ $(am__DEPENDENCIES_1) \
- @DICT_TRUE@@GTK2_TRUE@ $(am__DEPENDENCIES_1)
-@@ -419,8 +417,8 @@
- @DICT_TRUE@@GTK2_TRUE@ cclass-dialog.h $(am__append_1) \
- @DICT_TRUE@@GTK2_TRUE@ $(am__append_4) $(am__append_7)
- @DICT_TRUE@@GTK2_TRUE at uim_dict_gtk_LDADD = @GTK2_LIBS@ \
-- at DICT_TRUE@@GTK2_TRUE@ $(top_builddir)/uim/libuim-scm.la \
-- at DICT_TRUE@@GTK2_TRUE@ $(top_builddir)/uim/libuim.la \
-+ at DICT_TRUE@@GTK2_TRUE@ -luim-scm \
-+ at DICT_TRUE@@GTK2_TRUE@ -luim \
- @DICT_TRUE@@GTK2_TRUE@ $(am__append_2) $(am__append_5) \
- @DICT_TRUE@@GTK2_TRUE@ $(am__append_8)
- @DICT_TRUE@@GTK2_TRUE at uim_dict_gtk_CPPFLAGS = $(helper_defs) \
diff --git a/textproc/uim/files/extra-patch-gtk2_immodule_Makefile.in b/textproc/uim/files/extra-patch-gtk2_immodule_Makefile.in
deleted file mode 100644
index 26ed309a17b3..000000000000
--- a/textproc/uim/files/extra-patch-gtk2_immodule_Makefile.in
+++ /dev/null
@@ -1,23 +0,0 @@
---- gtk2/immodule/Makefile.in.orig 2018-06-30 00:34:14.035453000 +0900
-+++ gtk2/immodule/Makefile.in 2018-06-30 00:35:43.223656000 +0900
-@@ -156,8 +156,7 @@
- }
- am__installdirs = "$(DESTDIR)$(moduledir)"
- LTLIBRARIES = $(module_LTLIBRARIES)
-- at GTK2_TRUE@im_uim_la_DEPENDENCIES = $(top_builddir)/uim/libuim-scm.la \
-- at GTK2_TRUE@ $(top_builddir)/uim/libuim.la \
-+ at GTK2_TRUE@im_uim_la_DEPENDENCIES = \
- @GTK2_TRUE@ $(top_builddir)/uim/libuim-counted-init.la \
- @GTK2_TRUE@ $(am__append_1)
- am__im_uim_la_SOURCES_DIST = gtk-im-uim.c gtk-im-uim.h key-util-gtk.c \
-@@ -547,8 +546,8 @@
- @GTK2_TRUE at module_LTLIBRARIES = $(im_uim_la)
- @GTK2_TRUE at im_uim_la_SOURCES = $(IM_UIM_SOURCES)
- @GTK2_TRUE at im_uim_la_LDFLAGS = -module -avoid-version
-- at GTK2_TRUE@im_uim_la_LIBADD = $(top_builddir)/uim/libuim-scm.la \
-- at GTK2_TRUE@ $(top_builddir)/uim/libuim.la \
-+ at GTK2_TRUE@im_uim_la_LIBADD = -luim-scm \
-+ at GTK2_TRUE@ -luim \
- @GTK2_TRUE@ $(top_builddir)/uim/libuim-counted-init.la \
- @GTK2_TRUE@ $(am__append_1) -lm @GTK2_LIBS@
- @GTK2_TRUE at IM_UIM_SOURCES = \
diff --git a/textproc/uim/files/extra-patch-gtk2_pad_Makefile.in b/textproc/uim/files/extra-patch-gtk2_pad_Makefile.in
deleted file mode 100644
index 2610f6d0d479..000000000000
--- a/textproc/uim/files/extra-patch-gtk2_pad_Makefile.in
+++ /dev/null
@@ -1,24 +0,0 @@
---- gtk2/pad/Makefile.in.orig 2018-06-29 23:22:27.240949000 +0900
-+++ gtk2/pad/Makefile.in 2018-06-29 23:26:29.433490000 +0900
-@@ -131,9 +131,7 @@
- @GTK2_TRUE at am_uim_input_pad_ja_OBJECTS = \
- @GTK2_TRUE@ uim_input_pad_ja-ja.$(OBJEXT)
- uim_input_pad_ja_OBJECTS = $(am_uim_input_pad_ja_OBJECTS)
-- at GTK2_TRUE@uim_input_pad_ja_DEPENDENCIES = \
-- at GTK2_TRUE@ $(top_builddir)/uim/libuim-scm.la \
-- at GTK2_TRUE@ $(top_builddir)/uim/libuim.la
-+ at GTK2_TRUE@uim_input_pad_ja_DEPENDENCIES =
- AM_V_lt = $(am__v_lt_ at AM_V@)
- am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
- am__v_lt_0 = --silent
-@@ -484,8 +482,8 @@
- top_srcdir = @top_srcdir@
- uim_pixmapsdir = @uim_pixmapsdir@
- @GTK2_TRUE at uim_input_pad_ja_SOURCES = ja.c
-- at GTK2_TRUE@uim_input_pad_ja_LDADD = @GTK2_LIBS@ $(top_builddir)/uim/libuim-scm.la \
-- at GTK2_TRUE@ $(top_builddir)/uim/libuim.la
-+ at GTK2_TRUE@uim_input_pad_ja_LDADD = @GTK2_LIBS@ -luim-scm \
-+ at GTK2_TRUE@ -luim
-
- @GTK2_TRUE at uim_input_pad_ja_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)
- @GTK2_TRUE at uim_input_pad_ja_CFLAGS = @GTK2_CFLAGS@
diff --git a/textproc/uim/files/extra-patch-gtk2_pref_Makefile.in b/textproc/uim/files/extra-patch-gtk2_pref_Makefile.in
deleted file mode 100644
index b73282d6a8cb..000000000000
--- a/textproc/uim/files/extra-patch-gtk2_pref_Makefile.in
+++ /dev/null
@@ -1,25 +0,0 @@
---- gtk2/pref/Makefile.in.orig 2016-10-14 09:57:35 UTC
-+++ gtk2/pref/Makefile.in
-@@ -86,9 +86,6 @@ am__uim_pref_gtk_SOURCES_DIST = gtk.c gt
- @GTK2_4_TRUE@@PREF_TRUE@ uim_pref_gtk-key-util-gtk.$(OBJEXT)
- uim_pref_gtk_OBJECTS = $(am_uim_pref_gtk_OBJECTS)
- @GTK2_4_TRUE@@PREF_TRUE at uim_pref_gtk_DEPENDENCIES = \
-- at GTK2_4_TRUE@@PREF_TRUE@ $(top_builddir)/uim/libuim-custom.la \
-- at GTK2_4_TRUE@@PREF_TRUE@ $(top_builddir)/uim/libuim-scm.la \
-- at GTK2_4_TRUE@@PREF_TRUE@ $(top_builddir)/uim/libuim.la \
- @GTK2_4_TRUE@@PREF_TRUE@ $(am__append_1)
- uim_pref_gtk_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(uim_pref_gtk_CFLAGS) \
-@@ -392,9 +389,9 @@ helper_defs = -DUIM_DATADIR=\""$(datadir
- @GTK2_4_TRUE@@PREF_TRUE@ ../immodule/key-util-gtk.h
-
- @GTK2_4_TRUE@@PREF_TRUE at uim_pref_gtk_LDADD = @GTK2_LIBS@ \
-- at GTK2_4_TRUE@@PREF_TRUE@ $(top_builddir)/uim/libuim-custom.la \
-- at GTK2_4_TRUE@@PREF_TRUE@ $(top_builddir)/uim/libuim-scm.la \
-- at GTK2_4_TRUE@@PREF_TRUE@ $(top_builddir)/uim/libuim.la \
-+ at GTK2_4_TRUE@@PREF_TRUE@ -luim-custom \
-+ at GTK2_4_TRUE@@PREF_TRUE@ -luim-scm \
-+ at GTK2_4_TRUE@@PREF_TRUE@ -luim \
- @GTK2_4_TRUE@@PREF_TRUE@ $(am__append_1)
- @GTK2_4_TRUE@@PREF_TRUE at uim_pref_gtk_CPPFLAGS = $(helper_defs) -I$(top_srcdir) -I$(top_builddir)
- @GTK2_4_TRUE@@PREF_TRUE at uim_pref_gtk_CFLAGS = @GTK2_CFLAGS@
diff --git a/textproc/uim/files/extra-patch-gtk2_switcher_Makefile.in b/textproc/uim/files/extra-patch-gtk2_switcher_Makefile.in
deleted file mode 100644
index 875fabd7d20a..000000000000
--- a/textproc/uim/files/extra-patch-gtk2_switcher_Makefile.in
+++ /dev/null
@@ -1,29 +0,0 @@
---- gtk2/switcher/Makefile.in.orig 2018-06-29 23:31:04.197505000 +0900
-+++ gtk2/switcher/Makefile.in 2018-06-30 00:27:43.554671000 +0900
-@@ -131,11 +131,7 @@
- @GTK2_TRUE at am_uim_im_switcher_gtk_OBJECTS = \
- @GTK2_TRUE@ uim_im_switcher_gtk-gtk.$(OBJEXT)
- uim_im_switcher_gtk_OBJECTS = $(am_uim_im_switcher_gtk_OBJECTS)
-- at GTK2_TRUE@uim_im_switcher_gtk_DEPENDENCIES = \
-- at GTK2_TRUE@ $(top_builddir)/uim/libuim-scm.la \
-- at GTK2_TRUE@ $(top_builddir)/uim/libuim-custom.la \
-- at GTK2_TRUE@ $(top_builddir)/uim/libuim-scm.la \
-- at GTK2_TRUE@ $(top_builddir)/uim/libuim.la
-+ at GTK2_TRUE@uim_im_switcher_gtk_DEPENDENCIES =
- AM_V_lt = $(am__v_lt_ at AM_V@)
- am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
- am__v_lt_0 = --silent
-@@ -486,10 +482,9 @@
- top_srcdir = @top_srcdir@
- uim_pixmapsdir = @uim_pixmapsdir@
- @GTK2_TRUE at uim_im_switcher_gtk_SOURCES = gtk.c
-- at GTK2_TRUE@uim_im_switcher_gtk_LDADD = @GTK2_LIBS@ $(top_builddir)/uim/libuim-scm.la \
-- at GTK2_TRUE@ $(top_builddir)/uim/libuim-custom.la \
-- at GTK2_TRUE@ $(top_builddir)/uim/libuim-scm.la \
-- at GTK2_TRUE@ $(top_builddir)/uim/libuim.la
-+ at GTK2_TRUE@uim_im_switcher_gtk_LDADD = @GTK2_LIBS@ -luim-scm \
-+ at GTK2_TRUE@ -luim-custom \
-+ at GTK2_TRUE@ -luim
-
- @GTK2_TRUE at uim_im_switcher_gtk_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)
- @GTK2_TRUE at uim_im_switcher_gtk_CFLAGS = @GTK2_CFLAGS@
diff --git a/textproc/uim/files/extra-patch-gtk2_toolbar_Makefile.in b/textproc/uim/files/extra-patch-gtk2_toolbar_Makefile.in
deleted file mode 100644
index e5b2413b11e7..000000000000
--- a/textproc/uim/files/extra-patch-gtk2_toolbar_Makefile.in
+++ /dev/null
@@ -1,76 +0,0 @@
---- gtk2/toolbar/Makefile.in.orig 2018-06-30 00:28:37.045910000 +0900
-+++ gtk2/toolbar/Makefile.in 2018-06-30 00:33:13.062351000 +0900
-@@ -139,10 +139,7 @@
- @GNOME_APPLET_TRUE@ uim_toolbar_applet-applet-gnome.$(OBJEXT) \
- @GNOME_APPLET_TRUE@ uim_toolbar_applet-common-gtk.$(OBJEXT)
- uim_toolbar_applet_OBJECTS = $(am_uim_toolbar_applet_OBJECTS)
-- at GNOME_APPLET_TRUE@uim_toolbar_applet_DEPENDENCIES = \
-- at GNOME_APPLET_TRUE@ $(top_builddir)/uim/libuim-scm.la \
-- at GNOME_APPLET_TRUE@ $(top_builddir)/uim/libuim.la \
-- at GNOME_APPLET_TRUE@ $(top_builddir)/uim/libuim-custom.la
-+ at GNOME_APPLET_TRUE@uim_toolbar_applet_DEPENDENCIES =
- AM_V_lt = $(am__v_lt_ at AM_V@)
- am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
- am__v_lt_0 = --silent
-@@ -154,9 +151,7 @@
- am_uim_toolbar_gtk_OBJECTS = uim_toolbar_gtk-standalone-gtk.$(OBJEXT) \
- uim_toolbar_gtk-common-gtk.$(OBJEXT)
- uim_toolbar_gtk_OBJECTS = $(am_uim_toolbar_gtk_OBJECTS)
--uim_toolbar_gtk_DEPENDENCIES = $(top_builddir)/uim/libuim-scm.la \
-- $(top_builddir)/uim/libuim.la \
-- $(top_builddir)/uim/libuim-custom.la
-+uim_toolbar_gtk_DEPENDENCIES =
- uim_toolbar_gtk_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
- $(uim_toolbar_gtk_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
-@@ -167,10 +162,7 @@
- uim_toolbar_gtk_systray-eggtrayicon.$(OBJEXT)
- uim_toolbar_gtk_systray_OBJECTS = \
- $(am_uim_toolbar_gtk_systray_OBJECTS)
--uim_toolbar_gtk_systray_DEPENDENCIES = \
-- $(top_builddir)/uim/libuim-scm.la \
-- $(top_builddir)/uim/libuim.la \
-- $(top_builddir)/uim/libuim-custom.la
-+uim_toolbar_gtk_systray_DEPENDENCIES =
- uim_toolbar_gtk_systray_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
- $(uim_toolbar_gtk_systray_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-@@ -549,9 +541,9 @@
- EXTRA_DIST = GNOME_UimApplet.server.in.in
- helper_defs = -DUIM_DATADIR=\""$(datadir)/@PACKAGE@"\"
- @GNOME_APPLET_TRUE at uim_toolbar_applet_LDADD = @GTK2_LIBS@ @GNOME_APPLET_LIBS@ \
-- at GNOME_APPLET_TRUE@ $(top_builddir)/uim/libuim-scm.la \
-- at GNOME_APPLET_TRUE@ $(top_builddir)/uim/libuim.la \
-- at GNOME_APPLET_TRUE@ $(top_builddir)/uim/libuim-custom.la
-+ at GNOME_APPLET_TRUE@ -luim-scm \
-+ at GNOME_APPLET_TRUE@ -luim \
-+ at GNOME_APPLET_TRUE@ -luim-custom
-
- @GNOME_APPLET_TRUE at uim_toolbar_applet_CPPFLAGS = $(helper_defs) -I$(top_srcdir) -I$(top_builddir)
- @GNOME_APPLET_TRUE at uim_toolbar_applet_CFLAGS = @GTK2_CFLAGS@ @GNOME_APPLET_CFLAGS@
-@@ -566,9 +558,9 @@
- @GNOME_APPLET_TRUE@ GNOME_UimApplet.server.in.tmp
-
- uim_toolbar_gtk_SOURCES = standalone-gtk.c common-gtk.c
--uim_toolbar_gtk_LDADD = @GTK2_LIBS@ $(top_builddir)/uim/libuim-scm.la \
-- $(top_builddir)/uim/libuim.la \
-- $(top_builddir)/uim/libuim-custom.la
-+uim_toolbar_gtk_LDADD = @GTK2_LIBS@ -luim-scm \
-+ -luim \
-+ -luim-custom
-
- uim_toolbar_gtk_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)
- uim_toolbar_gtk_CFLAGS = @GTK2_CFLAGS@
-@@ -577,9 +569,9 @@
-
- uim_toolbar_gtk_systray_LDADD = @GTK2_LIBS@ \
- @X11_LIBS@ \
-- $(top_builddir)/uim/libuim-scm.la \
-- $(top_builddir)/uim/libuim.la \
-- $(top_builddir)/uim/libuim-custom.la
-+ -luim-scm \
-+ -luim \
-+ -luim-custom
-
- uim_toolbar_gtk_systray_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)
- uim_toolbar_gtk_systray_CFLAGS = @GTK2_CFLAGS@
diff --git a/textproc/uim/files/extra-patch-gtk3_candwin_Makefile.in b/textproc/uim/files/extra-patch-gtk3_candwin_Makefile.in
deleted file mode 100644
index e594e98df1d0..000000000000
--- a/textproc/uim/files/extra-patch-gtk3_candwin_Makefile.in
+++ /dev/null
@@ -1,68 +0,0 @@
---- gtk3/candwin/Makefile.in.orig 2018-06-30 03:38:40.172272000 +0900
-+++ gtk3/candwin/Makefile.in 2018-06-30 03:41:06.825966000 +0900
-@@ -136,9 +136,7 @@
- @GTK3_TRUE@ uim_candwin_gtk3-gtk.$(OBJEXT) \
- @GTK3_TRUE@ uim_candwin_gtk3-caret-state-indicator.$(OBJEXT)
- uim_candwin_gtk3_OBJECTS = $(am_uim_candwin_gtk3_OBJECTS)
-- at GTK3_TRUE@uim_candwin_gtk3_DEPENDENCIES = \
-- at GTK3_TRUE@ $(top_builddir)/uim/libuim-scm.la \
-- at GTK3_TRUE@ $(top_builddir)/uim/libuim.la
-+ at GTK3_TRUE@uim_candwin_gtk3_DEPENDENCIES =
- AM_V_lt = $(am__v_lt_ at AM_V@)
- am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
- am__v_lt_0 = --silent
-@@ -155,9 +153,7 @@
- @GTK3_TRUE@ uim_candwin_horizontal_gtk3-caret-state-indicator.$(OBJEXT)
- uim_candwin_horizontal_gtk3_OBJECTS = \
- $(am_uim_candwin_horizontal_gtk3_OBJECTS)
-- at GTK3_TRUE@uim_candwin_horizontal_gtk3_DEPENDENCIES = \
-- at GTK3_TRUE@ $(top_builddir)/uim/libuim-scm.la \
-- at GTK3_TRUE@ $(top_builddir)/uim/libuim.la
-+ at GTK3_TRUE@uim_candwin_horizontal_gtk3_DEPENDENCIES =
- uim_candwin_horizontal_gtk3_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
- $(uim_candwin_horizontal_gtk3_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-@@ -169,9 +165,7 @@
- @GTK3_TRUE@ uim_candwin_tbl_gtk3-tbl-gtk.$(OBJEXT) \
- @GTK3_TRUE@ uim_candwin_tbl_gtk3-caret-state-indicator.$(OBJEXT)
- uim_candwin_tbl_gtk3_OBJECTS = $(am_uim_candwin_tbl_gtk3_OBJECTS)
-- at GTK3_TRUE@uim_candwin_tbl_gtk3_DEPENDENCIES = \
-- at GTK3_TRUE@ $(top_builddir)/uim/libuim-scm.la \
-- at GTK3_TRUE@ $(top_builddir)/uim/libuim.la
-+ at GTK3_TRUE@uim_candwin_tbl_gtk3_DEPENDENCIES =
- uim_candwin_tbl_gtk3_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
- $(uim_candwin_tbl_gtk3_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-@@ -525,8 +519,8 @@
- @GTK3_TRUE@ ../../gtk2/immodule/caret-state-indicator.c \
- @GTK3_TRUE@ ../../gtk2/immodule/caret-state-indicator.h
-
-- at GTK3_TRUE@uim_candwin_gtk3_LDADD = @GTK3_LIBS@ $(top_builddir)/uim/libuim-scm.la \
-- at GTK3_TRUE@ $(top_builddir)/uim/libuim.la
-+ at GTK3_TRUE@uim_candwin_gtk3_LDADD = @GTK3_LIBS@ -luim-scm \
-+ at GTK3_TRUE@ -luim
-
- @GTK3_TRUE at uim_candwin_gtk3_CPPFLAGS = -I$(top_srcdir)
- @GTK3_TRUE at uim_candwin_gtk3_CFLAGS = @GTK3_CFLAGS@
-@@ -534,8 +528,8 @@
- @GTK3_TRUE@ ../../gtk2/immodule/caret-state-indicator.c \
- @GTK3_TRUE@ ../../gtk2/immodule/caret-state-indicator.h
-
-- at GTK3_TRUE@uim_candwin_tbl_gtk3_LDADD = @GTK3_LIBS@ $(top_builddir)/uim/libuim-scm.la \
-- at GTK3_TRUE@ $(top_builddir)/uim/libuim.la
-+ at GTK3_TRUE@uim_candwin_tbl_gtk3_LDADD = @GTK3_LIBS@ -luim-scm \
-+ at GTK3_TRUE@ -luim
-
- @GTK3_TRUE at uim_candwin_tbl_gtk3_CPPFLAGS = -I$(top_srcdir)
- @GTK3_TRUE at uim_candwin_tbl_gtk3_CFLAGS = @GTK3_CFLAGS@
-@@ -543,8 +537,8 @@
- @GTK3_TRUE@ ../../gtk2/immodule/caret-state-indicator.c \
- @GTK3_TRUE@ ../../gtk2/immodule/caret-state-indicator.h
-
-- at GTK3_TRUE@uim_candwin_horizontal_gtk3_LDADD = @GTK3_LIBS@ $(top_builddir)/uim/libuim-scm.la \
-- at GTK3_TRUE@ $(top_builddir)/uim/libuim.la
-+ at GTK3_TRUE@uim_candwin_horizontal_gtk3_LDADD = @GTK3_LIBS@ -luim-scm \
-+ at GTK3_TRUE@ -luim
-
- @GTK3_TRUE at uim_candwin_horizontal_gtk3_CPPFLAGS = -I$(top_srcdir)
- @GTK3_TRUE at uim_candwin_horizontal_gtk3_CFLAGS = @GTK3_CFLAGS@
diff --git a/textproc/uim/files/extra-patch-gtk3_dict_Makefile.in b/textproc/uim/files/extra-patch-gtk3_dict_Makefile.in
deleted file mode 100644
index f3d8a7375c31..000000000000
--- a/textproc/uim/files/extra-patch-gtk3_dict_Makefile.in
+++ /dev/null
@@ -1,22 +0,0 @@
---- gtk3/dict/Makefile.in.orig 2011-08-06 17:59:45.000000000 +0900
-+++ gtk3/dict/Makefile.in 2011-08-06 18:03:03.000000000 +0900
-@@ -103,8 +103,6 @@
- uim_dict_gtk3_OBJECTS = $(am_uim_dict_gtk3_OBJECTS)
- am__DEPENDENCIES_1 =
- @DICT_TRUE@@GTK3_TRUE at uim_dict_gtk3_DEPENDENCIES = \
-- at DICT_TRUE@@GTK3_TRUE@ $(top_builddir)/uim/libuim-scm.la \
-- at DICT_TRUE@@GTK3_TRUE@ $(top_builddir)/uim/libuim.la \
- @DICT_TRUE@@GTK3_TRUE@ $(am__DEPENDENCIES_1) \
- @DICT_TRUE@@GTK3_TRUE@ $(am__DEPENDENCIES_1) \
- @DICT_TRUE@@GTK3_TRUE@ $(am__DEPENDENCIES_1)
-@@ -435,8 +433,8 @@
- @DICT_TRUE@@GTK3_TRUE@ $(am__append_1) $(am__append_4) \
- @DICT_TRUE@@GTK3_TRUE@ $(am__append_7)
- @DICT_TRUE@@GTK3_TRUE at uim_dict_gtk3_LDADD = @GTK3_LIBS@ \
-- at DICT_TRUE@@GTK3_TRUE@ $(top_builddir)/uim/libuim-scm.la \
-- at DICT_TRUE@@GTK3_TRUE@ $(top_builddir)/uim/libuim.la \
-+ at DICT_TRUE@@GTK3_TRUE@ -luim-scm \
-+ at DICT_TRUE@@GTK3_TRUE@ -luim \
- @DICT_TRUE@@GTK3_TRUE@ $(am__append_2) $(am__append_5) \
- @DICT_TRUE@@GTK3_TRUE@ $(am__append_8)
- @DICT_TRUE@@GTK3_TRUE at uim_dict_gtk3_CPPFLAGS = $(helper_defs) \
diff --git a/textproc/uim/files/extra-patch-gtk3_immodule_Makefile.in b/textproc/uim/files/extra-patch-gtk3_immodule_Makefile.in
deleted file mode 100644
index b4038716130a..000000000000
--- a/textproc/uim/files/extra-patch-gtk3_immodule_Makefile.in
+++ /dev/null
@@ -1,24 +0,0 @@
---- gtk3/immodule/Makefile.in.orig 2018-06-30 03:42:36.499824000 +0900
-+++ gtk3/immodule/Makefile.in 2018-06-30 03:44:30.252814000 +0900
-@@ -154,9 +154,7 @@
- }
- am__installdirs = "$(DESTDIR)$(moduledir)"
- LTLIBRARIES = $(module_LTLIBRARIES)
-- at GTK3_TRUE@im_uim_la_DEPENDENCIES = $(top_builddir)/uim/libuim-scm.la \
-- at GTK3_TRUE@ $(top_builddir)/uim/libuim.la \
-- at GTK3_TRUE@ $(top_builddir)/uim/libuim-counted-init.la \
-+ at GTK3_TRUE@im_uim_la_DEPENDENCIES = \
- @GTK3_TRUE@ $(am__append_1)
- am__im_uim_la_SOURCES_DIST = ../../gtk2/immodule/gtk-im-uim.c \
- ../../gtk2/immodule/gtk-im-uim.h \
-@@ -542,8 +540,8 @@
- @GTK3_TRUE at module_LTLIBRARIES = $(im_uim_la)
- @GTK3_TRUE at im_uim_la_SOURCES = $(IM_UIM_SOURCES)
- @GTK3_TRUE at im_uim_la_LDFLAGS = -module -avoid-version
-- at GTK3_TRUE@im_uim_la_LIBADD = $(top_builddir)/uim/libuim-scm.la \
-- at GTK3_TRUE@ $(top_builddir)/uim/libuim.la \
-+ at GTK3_TRUE@im_uim_la_LIBADD = -luim-scm \
-+ at GTK3_TRUE@ -luim \
- @GTK3_TRUE@ $(top_builddir)/uim/libuim-counted-init.la \
- @GTK3_TRUE@ $(am__append_1) @GTK3_LIBS@ -lm
- @GTK3_TRUE at IM_UIM_SOURCES = \
diff --git a/textproc/uim/files/extra-patch-gtk3_pad_Makefile.in b/textproc/uim/files/extra-patch-gtk3_pad_Makefile.in
deleted file mode 100644
index 8da43727fc57..000000000000
--- a/textproc/uim/files/extra-patch-gtk3_pad_Makefile.in
+++ /dev/null
@@ -1,24 +0,0 @@
---- gtk3/pad/Makefile.in.orig 2018-06-30 03:46:16.677802000 +0900
-+++ gtk3/pad/Makefile.in 2018-06-30 03:49:07.172912000 +0900
-@@ -131,9 +131,7 @@
*** 1089 LINES SKIPPED ***
More information about the dev-commits-ports-all
mailing list