I would like remove KDE3, Qt3 and Qt4 support in uim. I do not use it,
nor do I know what to do with it. We are on the way to end the support
for qt3 and qt4.
Cause I'm here, fixed missing ${COMPILER_LIBCXX}
OK?
Rafael Sadowski
Index: Makefile
===================================================================
RCS file: /cvs/ports/inputmethods/uim/Makefile,v
retrieving revision 1.67
diff -u -p -u -p -r1.67 Makefile
--- Makefile 12 Jul 2019 20:47:14 -0000 1.67
+++ Makefile 20 Aug 2020 04:07:12 -0000
@@ -1,13 +1,8 @@
# $OpenBSD: Makefile,v 1.67 2019/07/12 20:47:14 sthen Exp $
-DPB_PROPERTIES= tag:kde3
-
COMMENT-main= multilingual input method library
COMMENT-gtk= uim for GTK+2
COMMENT-gtk3= uim for GTK+3
-COMMENT-kde= uim for KDE3
-COMMENT-qt= uim for QT3
-COMMENT-qt4= uim for QT4
CATEGORIES= inputmethods japanese chinese
@@ -16,13 +11,10 @@ DISTNAME= uim-$V
PKGNAME-main= uim-$V
PKGNAME-gtk= uim-gtk-$V
PKGNAME-gtk3= uim-gtk3-$V
-PKGNAME-kde= uim-kde-$V
-PKGNAME-qt= uim-qt-$V
-PKGNAME-qt4= uim-qt4-$V
-
-REVISION-main= 0
-REVISION-gtk3= 0
-REVISION-qt4= 0
+
+REVISION-main= 1
+REVISION-gtk= 0
+REVISION-gtk3= 1
MASTER_SITES= https://github.com/uim/uim/releases/download/$V/
HOMEPAGE= https://github.com/uim/uim
@@ -38,11 +30,9 @@ cWANTLIB += X11 Xext Xrender fontconfig
COMPILER = base-clang ports-gcc base-gcc
-MULTI_PACKAGES= -main -gtk -gtk3 -kde -qt -qt4
+MULTI_PACKAGES= -main -gtk -gtk3
-MODULES= textproc/intltool \
- x11/qt4 \
- x11/kde # last on purpose
+MODULES= textproc/intltool
USE_GMAKE= Yes
@@ -56,22 +46,22 @@ LIB_DEPENDS-main= inputmethods/anthy \
devel/libgcroots \
misc/m17n/lib
-WANTLIB-gtk += ${cWANTLIB}
+WANTLIB-gtk += ${cWANTLIB} ${COMPILER_LIBCXX}
WANTLIB-gtk += Xcomposite Xcursor Xdamage Xfixes Xi Xinerama Xrandr
WANTLIB-gtk += atk-1.0 c cairo expat ffi gcroots gdk-x11-2.0 gdk_pixbuf-2.0
WANTLIB-gtk += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 graphite2
-WANTLIB-gtk += gthread-2.0 gtk-x11-2.0 harfbuzz pango-1.0 pangocairo-1.0
+WANTLIB-gtk += gtk-x11-2.0 harfbuzz pango-1.0 pangocairo-1.0
WANTLIB-gtk += pangoft2-1.0 pcre pixman-1 png pthread fribidi
WANTLIB-gtk += uim uim-custom uim-scm xcb xcb-render xcb-shm z
LIB_DEPENDS-gtk= inputmethods/uim \
x11/gtk+2
-WANTLIB-gtk3 += ${cWANTLIB}
+WANTLIB-gtk3 += ${cWANTLIB} ${COMPILER_LIBCXX}
WANTLIB-gtk3 += Xcomposite Xcursor Xdamage Xfixes Xi Xinerama
WANTLIB-gtk3 += Xrandr atk-1.0 atk-bridge-2.0 c cairo cairo-gobject
WANTLIB-gtk3 += expat ffi gcroots gdk-3 gdk_pixbuf-2.0 gio-2.0
-WANTLIB-gtk3 += glib-2.0 gmodule-2.0 gobject-2.0 graphite2 gthread-2.0
+WANTLIB-gtk3 += glib-2.0 gmodule-2.0 gobject-2.0 graphite2
WANTLIB-gtk3 += gtk-3 harfbuzz pango-1.0 pangocairo-1.0 pangoft2-1.0
WANTLIB-gtk3 += pcre pixman-1 png pthread uim uim-custom fribidi
WANTLIB-gtk3 += uim-scm xcb xcb-render xcb-shm z epoxy
@@ -79,54 +69,18 @@ WANTLIB-gtk3 += uim-scm xcb xcb-render x
LIB_DEPENDS-gtk3= inputmethods/uim \
x11/gtk+3
-WANTLIB-kde += ${cWANTLIB} ${KDE}/kdecore ${KDE}/kdeui
-WANTLIB-kde += DCOP GL ICE SM X11-xcb Xcursor Xdamage Xfixes
-WANTLIB-kde += Xft Xi Xinerama Xmu Xrandr Xt Xxf86vm art_lgpl_2 drm
-WANTLIB-kde += expat gcroots glapi idn jpeg kdefx lcms mng png pthread
-WANTLIB-kde += qt-mt ${COMPILER_LIBCXX} uim uim-scm util xcb xcb-dri2
-WANTLIB-kde += xcb-dri3 xcb-present xcb-sync xcb-xfixes xshmfence
-WANTLIB-kde += xcb-glx z
-
-LIB_DEPENDS-kde= inputmethods/uim \
- x11/kde/libs3
-
-WANTLIB-qt += ${cWANTLIB} ${MODQT3_WANTLIB}
-WANTLIB-qt += GL ICE SM X11-xcb Xcursor Xdamage Xfixes
-WANTLIB-qt += Xft Xi Xinerama Xmu Xrandr Xt Xxf86vm c drm expat gcroots
-WANTLIB-qt += glapi jpeg lcms mng png pthread ${COMPILER_LIBCXX}
-WANTLIB-qt += uim uim-custom uim-scm xcb xcb-dri2 xcb-glx z
-WANTLIB-qt += xcb-dri3 xcb-present xcb-sync xcb-xfixes xshmfence
-
-LIB_DEPENDS-qt= ${MODQT3_LIB_DEPENDS} \
- inputmethods/uim
-
-WANTLIB-qt4 += ${cWANTLIB} ${MODQT4_WANTLIB}
-WANTLIB-qt4 += ICE QtGui SM Xi Xinerama c pthread ${COMPILER_LIBCXX} uim
-WANTLIB-qt4 += uim-custom uim-scm replace
-
-LIB_DEPENDS-qt4= ${MODQT4_LIB_DEPENDS} \
- net/samba,-util \
- inputmethods/uim
-
AUTOCONF_VERSION= 2.69
CONFIGURE_STYLE= autoconf
-CONFIGURE_ENV= CPPFLAGS='-I${MODQT3_INCDIR} -I${LOCALBASE}/include
-I${X11BASE}/include' \
- LDFLAGS='-L${MODQT3_LIBDIR} -L${LOCALBASE}/lib
-L${X11BASE}/lib' \
- ac_cv_prog_HOST_MOC=${MODQT3_MOC} \
- ac_cv_prog_HOST_UIC=${MODQT3_MOC}
-
-CONFIGURE_ARGS= --with-qt \
- --with-qt-immodule \
- --with-qt4 \
- --with-qt4-immodule \
- --with-anthy-utf8 \
+CONFIGURE_ENV= CPPFLAGS='-I${LOCALBASE}/include -I${X11BASE}/include' \
+ LDFLAGS='-L${LOCALBASE}/lib -L${X11BASE}/lib'
+
+CONFIGURE_ARGS= --with-anthy-utf8 \
--with-libgcroots
post-install:
rm ${PREFIX}/lib/uim/plugin/*.{a,la}
rm ${PREFIX}/lib/gtk-2.0/2.10.0/immodules/*.{a,la}
rm ${PREFIX}/lib/gtk-3.0/3.0.0/immodules/*.{a,la}
- rm ${PREFIX}/lib/kde3/*.{a,la}
.include <bsd.port.mk>
Index: patches/patch-qt4_immodule_plugin_cpp
===================================================================
RCS file: patches/patch-qt4_immodule_plugin_cpp
diff -N patches/patch-qt4_immodule_plugin_cpp
--- patches/patch-qt4_immodule_plugin_cpp 11 Mar 2019 11:16:05 -0000
1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-qt4_immodule_plugin_cpp,v 1.2 2019/03/11 11:16:05 bentley Exp $
-
-Index: qt4/immodule/plugin.cpp
---- qt4/immodule/plugin.cpp.orig
-+++ qt4/immodule/plugin.cpp
-@@ -68,6 +68,7 @@
- # undef None
- #endif
- #include "quiminputcontext_with_slave.h"
-+#include <locale.h>
-
- #define UIM_QT_LIST_SUBIM_AS_QTIM 0
-
Index: pkg/DESCR-kde
===================================================================
RCS file: pkg/DESCR-kde
diff -N pkg/DESCR-kde
--- pkg/DESCR-kde 8 Apr 2007 14:58:04 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,10 +0,0 @@
-kde input module for uim, the universal input method.
-In order to use it, you have to put something like
-
-export XMODIFIERS=@im=uim
-export QT_IM_MODULE=uim
-
-in your .xinitrc.
-
-start uim-toolbar-qt, then you can select any input method
-from your application.
Index: pkg/DESCR-qt
===================================================================
RCS file: pkg/DESCR-qt
diff -N pkg/DESCR-qt
--- pkg/DESCR-qt 9 Jan 2015 16:45:37 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,4 +0,0 @@
-QT3 input module for uim.
-
-Usage requires setting the following in the environment:
-export QT_IM_MODULE=uim
Index: pkg/DESCR-qt4
===================================================================
RCS file: pkg/DESCR-qt4
diff -N pkg/DESCR-qt4
--- pkg/DESCR-qt4 9 Jan 2015 16:45:37 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,4 +0,0 @@
-QT4 input module for uim.
-
-Usage requires setting the following in the environment:
-export QT_IM_MODULE=uim
Index: pkg/PLIST-gtk
===================================================================
RCS file: /cvs/ports/inputmethods/uim/pkg/PLIST-gtk,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 PLIST-gtk
--- pkg/PLIST-gtk 7 Jul 2018 22:39:42 -0000 1.10
+++ pkg/PLIST-gtk 20 Aug 2020 04:07:12 -0000
@@ -4,7 +4,7 @@
@bin bin/uim-pref-gtk
@bin bin/uim-toolbar-gtk
@bin bin/uim-toolbar-gtk-systray
-lib/gtk-2.0/2.10.0/immodules/im-uim.so
+@so lib/gtk-2.0/2.10.0/immodules/im-uim.so
@bin libexec/uim-candwin-gtk
@bin libexec/uim-candwin-horizontal-gtk
@bin libexec/uim-candwin-tbl-gtk
Index: pkg/PLIST-gtk3
===================================================================
RCS file: /cvs/ports/inputmethods/uim/pkg/PLIST-gtk3,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 PLIST-gtk3
--- pkg/PLIST-gtk3 7 Jul 2018 22:39:42 -0000 1.2
+++ pkg/PLIST-gtk3 20 Aug 2020 04:07:12 -0000
@@ -4,7 +4,7 @@
@bin bin/uim-pref-gtk3
@bin bin/uim-toolbar-gtk3
@bin bin/uim-toolbar-gtk3-systray
-lib/gtk-3.0/3.0.0/immodules/im-uim.so
+@so lib/gtk-3.0/3.0.0/immodules/im-uim.so
@bin libexec/uim-candwin-gtk3
@bin libexec/uim-candwin-horizontal-gtk3
@bin libexec/uim-candwin-tbl-gtk3
Index: pkg/PLIST-kde
===================================================================
RCS file: pkg/PLIST-kde
diff -N pkg/PLIST-kde
--- pkg/PLIST-kde 9 Jan 2015 16:45:37 -0000 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,5 +0,0 @@
-@comment $OpenBSD: PLIST-kde,v 1.4 2015/01/09 16:45:37 ajacoutot Exp $
-${KDE}/uim_panelapplet.so
-share/apps.kde3/kicker/
-share/apps.kde3/kicker/applets/
-share/apps.kde3/kicker/applets/uimapplet.desktop
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/inputmethods/uim/pkg/PLIST-main,v
retrieving revision 1.11
diff -u -p -u -p -r1.11 PLIST-main
--- pkg/PLIST-main 19 May 2019 14:02:46 -0000 1.11
+++ pkg/PLIST-main 20 Aug 2020 04:07:12 -0000
@@ -22,31 +22,33 @@ include/uim/uim-scm.h
include/uim/uim-util.h
include/uim/uim.h
include/uim/version.h
-lib/libuim-custom.a
+lib/gtk-2.0/
+lib/gtk-3.0/
+@static-lib lib/libuim-custom.a
lib/libuim-custom.la
@lib lib/libuim-custom.so.${LIBuim-custom_VERSION}
-lib/libuim-scm.a
+@static-lib lib/libuim-scm.a
lib/libuim-scm.la
@lib lib/libuim-scm.so.${LIBuim-scm_VERSION}
-lib/libuim.a
+@static-lib lib/libuim.a
lib/libuim.la
@lib lib/libuim.so.${LIBuim_VERSION}
lib/pkgconfig/uim.pc
lib/uim/
lib/uim/plugin/
-lib/uim/plugin/libuim-anthy-utf8.so
-lib/uim/plugin/libuim-anthy.so
-lib/uim/plugin/libuim-custom-enabler.so
-lib/uim/plugin/libuim-editline.so
-lib/uim/plugin/libuim-fileio.so
-lib/uim/plugin/libuim-lolevel.so
-lib/uim/plugin/libuim-look.so
-lib/uim/plugin/libuim-m17nlib.so
-lib/uim/plugin/libuim-process.so
-lib/uim/plugin/libuim-skk.so
-lib/uim/plugin/libuim-socket.so
-lib/uim/plugin/libuim-sqlite3.so
-lib/uim/plugin/libuim-xkb.so
+@so lib/uim/plugin/libuim-anthy-utf8.so
+@so lib/uim/plugin/libuim-anthy.so
+@so lib/uim/plugin/libuim-custom-enabler.so
+@so lib/uim/plugin/libuim-editline.so
+@so lib/uim/plugin/libuim-fileio.so
+@so lib/uim/plugin/libuim-lolevel.so
+@so lib/uim/plugin/libuim-look.so
+@so lib/uim/plugin/libuim-m17nlib.so
+@so lib/uim/plugin/libuim-process.so
+@so lib/uim/plugin/libuim-skk.so
+@so lib/uim/plugin/libuim-socket.so
+@so lib/uim/plugin/libuim-sqlite3.so
+@so lib/uim/plugin/libuim-xkb.so
@bin libexec/uim-helper-server
@man man/man1/uim-xim.1
share/applications/uim.desktop
@@ -119,8 +121,6 @@ share/uim/google-cgiapi-jp.scm
share/uim/hangul.scm
share/uim/hangul2.scm
share/uim/hangul3.scm
-share/uim/helperdata/
-share/uim/helperdata/bushu.t
share/uim/http-client.scm
share/uim/http-server.scm
share/uim/i18n.scm
Index: pkg/PLIST-qt
===================================================================
RCS file: pkg/PLIST-qt
diff -N pkg/PLIST-qt
--- pkg/PLIST-qt 9 Jan 2015 16:45:37 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,6 +0,0 @@
-@comment $OpenBSD: PLIST-qt,v 1.3 2015/01/09 16:45:37 ajacoutot Exp $
-@bin bin/uim-chardict-qt
-@bin bin/uim-im-switcher-qt
-@bin bin/uim-pref-qt
-@bin bin/uim-toolbar-qt
-@bin libexec/uim-candwin-qt
Index: pkg/PLIST-qt4
===================================================================
RCS file: pkg/PLIST-qt4
diff -N pkg/PLIST-qt4
--- pkg/PLIST-qt4 9 Jan 2015 16:45:37 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,7 +0,0 @@
-@comment $OpenBSD: PLIST-qt4,v 1.1 2015/01/09 16:45:37 ajacoutot Exp $
-@bin bin/uim-chardict-qt4
-@bin bin/uim-im-switcher-qt4
-@bin bin/uim-pref-qt4
-@bin bin/uim-toolbar-qt4
-lib/qt4/plugins/inputmethods/libuiminputcontextplugin.so
-@bin libexec/uim-candwin-qt4