Hi ports@, Hi Kevin,
I think we can say goodbye to the qt4 support in fcitx. For Qt5 there is
a fcitx-qt5 port. We only have a handful of Qt4 ports left and I'd like
it to be less.
OK for the diff below with a line in devel/quirks?
Index: Makefile
===================================================================
RCS file: /cvs/ports/inputmethods/fcitx/Makefile,v
retrieving revision 1.11
diff -u -p -u -p -r1.11 Makefile
--- Makefile 12 Jul 2019 20:47:12 -0000 1.11
+++ Makefile 25 Feb 2020 06:07:04 -0000
@@ -2,16 +2,13 @@
COMMENT-main = flexible input method framework
COMMENT-gtk3 = fcitx for GTK+3
-COMMENT-qt4 = fcitx for QT4
V = 4.2.9.6
DISTNAME = fcitx-$V
PKGNAME-main = fcitx-$V
PKGNAME-gtk3 = fcitx-gtk3-$V
-PKGNAME-qt4 = fcitx-qt4-$V
REVISION-main = 1
REVISION-gtk3 = 0
-REVISION-qt4 = 0
SHARED_LIBS += fcitx-config 0.0 # 4.1
SHARED_LIBS += fcitx-core 0.0 # 0.3
@@ -28,7 +25,7 @@ MAINTAINER = Kevin Lo <ke...@openbsd.or
# GPLv2+ with plugin exception
PERMIT_PACKAGE= Yes
-MULTI_PACKAGES = -main -gtk3 -qt4
+MULTI_PACKAGES = -main -gtk3
COMPILER = base-clang ports-gcc base-gcc
@@ -69,15 +66,6 @@ LIB_DEPENDS-gtk3 = devel/libexecinfo \
x11/gtk+3 \
x11/xkbcommon
-WANTLIB-qt4 += ${WANTLIB-common}
-WANTLIB-qt4 += ${COMPILER_LIBCXX} c ICE QtCore QtDBus QtGui SM X11 \
- Xext m
-
-RUN_DEPENDS-qt4 = inputmethods/fcitx,-main
-LIB_DEPENDS-qt4 = ${MODQT4_LIB_DEPENDS} \
- devel/libexecinfo \
- x11/xkbcommon
-
MASTER_SITES = https://download.fcitx-im.org/fcitx/
DISTFILES = ${DISTNAME}${EXTRACT_SUFX}
@@ -90,8 +78,7 @@ EXTRACT_SUFX = .tar.xz
DIST_SUBDIR = fcitx
-MODULES = devel/cmake \
- x11/qt4
+MODULES = devel/cmake
CONFIGURE_ARGS =-DENABLE_GTK3_IM_MODULE=ON \
-DENABLE_ENCHANT=OFF \
Index: pkg/DESCR-qt4
===================================================================
RCS file: pkg/DESCR-qt4
diff -N pkg/DESCR-qt4
--- pkg/DESCR-qt4 28 Nov 2017 02:56:56 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,4 +0,0 @@
-QT4 input module for fcitx.
-
-Usage requires setting the following in the environment:
-export QT_IM_MODULE=fcitx
Index: pkg/PLIST-qt4
===================================================================
RCS file: pkg/PLIST-qt4
diff -N pkg/PLIST-qt4
--- pkg/PLIST-qt4 28 Nov 2017 02:56:56 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,18 +0,0 @@
-@comment $OpenBSD: PLIST-qt4,v 1.1.1.1 2017/11/28 02:56:56 kevlo Exp $
-include/fcitx-qt/
-include/fcitx-qt/fcitxqt_export.h
-include/fcitx-qt/fcitxqtconfiguifactory.h
-include/fcitx-qt/fcitxqtconfiguiplugin.h
-include/fcitx-qt/fcitxqtconfiguiwidget.h
-include/fcitx-qt/fcitxqtconnection.h
-include/fcitx-qt/fcitxqtformattedpreedit.h
-include/fcitx-qt/fcitxqtinputcontextproxy.h
-include/fcitx-qt/fcitxqtinputmethoditem.h
-include/fcitx-qt/fcitxqtinputmethodproxy.h
-include/fcitx-qt/fcitxqtkeyboardlayout.h
-include/fcitx-qt/fcitxqtkeyboardproxy.h
-include/fcitx-qt/fcitxqtkeysequencewidget.h
-@bin lib/fcitx/libexec/fcitx-qt-gui-wrapper
-@lib lib/libfcitx-qt.so.${LIBfcitx-qt_VERSION}
-lib/pkgconfig/fcitx-qt.pc
-lib/qt4/plugins/inputmethods/qtim-fcitx.so
