diff options
author | ryoon <ryoon@pkgsrc.org> | 2019-04-27 03:20:32 +0000 |
---|---|---|
committer | ryoon <ryoon@pkgsrc.org> | 2019-04-27 03:20:32 +0000 |
commit | fcc78907824a222e2662fb9d713362feb5e70c34 (patch) | |
tree | 901a4c6c92ba6fa6008c4fa29f0eec54a8a0a5e8 /inputmethod/fcitx | |
parent | 0514f961fa1201c5939a7cc828f33063631448b0 (diff) | |
download | pkgsrc-fcc78907824a222e2662fb9d713362feb5e70c34.tar.gz |
Make Qt4 optional and disable by default
Bump PKGREVISION
Diffstat (limited to 'inputmethod/fcitx')
-rw-r--r-- | inputmethod/fcitx/Makefile | 12 | ||||
-rw-r--r-- | inputmethod/fcitx/PLIST | 38 | ||||
-rw-r--r-- | inputmethod/fcitx/options.mk | 22 |
3 files changed, 45 insertions, 27 deletions
diff --git a/inputmethod/fcitx/Makefile b/inputmethod/fcitx/Makefile index f47c4bc9d6f..71365e9902d 100644 --- a/inputmethod/fcitx/Makefile +++ b/inputmethod/fcitx/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.18 2018/11/27 13:07:25 bsiegert Exp $ +# $NetBSD: Makefile,v 1.19 2019/04/27 03:20:32 ryoon Exp $ # DISTNAME= fcitx-4.2.9.6 -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= inputmethod MASTER_SITES= https://download.fcitx-im.org/fcitx/ EXTRACT_SUFX= .tar.xz @@ -17,6 +17,8 @@ DATAFILES+= table.tar.gz EXTRACT_ONLY= ${DEFAULT_DISTFILES} +.include "options.mk" + .for f in ${DATAFILES} SITES.${f}= https://download.fcitx-im.org/data/ DISTFILES+= ${f} @@ -27,7 +29,6 @@ HOMEPAGE= https://www.fcitx-im.org/ COMMENT= Free Chinese Input Toy of X BUILD_DEPENDS+= extra-cmake-modules-[0-9]*:../../devel/extra-cmake-modules -BUILD_DEPENDS+= automoc4-[0-9]*:../../devel/automoc4 USE_LANGUAGES+= c c++ @@ -41,8 +42,6 @@ CMAKE_ARGS+= -DENABLE_PRESAGE=OFF CMAKE_ARGS+= -DENABLE_GIR=OFF CMAKE_ARGS+= -DENABLE_GTK2_IM_MODULE=ON CMAKE_ARGS+= -DENABLE_GTK3_IM_MODULE=ON -CMAKE_ARGS+= -DENABLE_QT_IM_MODULE=ON -CMAKE_ARGS+= -DENABLE_QT_GUI=ON BUILDLINK_DEPMETHOD.libXt?= build @@ -78,9 +77,6 @@ post-extract: .include "../../x11/libXt/buildlink3.mk" .include "../../x11/libxkbcommon/buildlink3.mk" .include "../../x11/libxkbfile/buildlink3.mk" -.include "../../x11/qt4-libs/buildlink3.mk" -.include "../../x11/qt4-qdbus/buildlink3.mk" -.include "../../x11/qt4-tools/buildlink3.mk" .include "../../x11/xkeyboard-config/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/inputmethod/fcitx/PLIST b/inputmethod/fcitx/PLIST index 9254abba7e6..fca85bcd649 100644 --- a/inputmethod/fcitx/PLIST +++ b/inputmethod/fcitx/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2018/08/18 01:11:16 ryoon Exp $ +@comment $NetBSD: PLIST,v 1.4 2019/04/27 03:20:32 ryoon Exp $ bin/createPYMB bin/fcitx bin/fcitx-autostart @@ -22,18 +22,18 @@ include/fcitx-gclient/fcitxclient.h include/fcitx-gclient/fcitxconnection.h include/fcitx-gclient/fcitxinputmethod.h include/fcitx-gclient/fcitxkbd.h -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 +${PLIST.qt4}include/fcitx-qt/fcitxqt_export.h +${PLIST.qt4}include/fcitx-qt/fcitxqtconfiguifactory.h +${PLIST.qt4}include/fcitx-qt/fcitxqtconfiguiplugin.h +${PLIST.qt4}include/fcitx-qt/fcitxqtconfiguiwidget.h +${PLIST.qt4}include/fcitx-qt/fcitxqtconnection.h +${PLIST.qt4}include/fcitx-qt/fcitxqtformattedpreedit.h +${PLIST.qt4}include/fcitx-qt/fcitxqtinputcontextproxy.h +${PLIST.qt4}include/fcitx-qt/fcitxqtinputmethoditem.h +${PLIST.qt4}include/fcitx-qt/fcitxqtinputmethodproxy.h +${PLIST.qt4}include/fcitx-qt/fcitxqtkeyboardlayout.h +${PLIST.qt4}include/fcitx-qt/fcitxqtkeyboardproxy.h +${PLIST.qt4}include/fcitx-qt/fcitxqtkeysequencewidget.h include/fcitx-utils/bitset.h include/fcitx-utils/desktop-parse.h include/fcitx-utils/handler-table.h @@ -117,7 +117,7 @@ lib/fcitx/fcitx-xkb.so lib/fcitx/fcitx-xkbdbus.so lib/fcitx/libexec/comp-spell-dict lib/fcitx/libexec/fcitx-po-parser -lib/fcitx/libexec/fcitx-qt-gui-wrapper +${PLIST.qt4}lib/fcitx/libexec/fcitx-qt-gui-wrapper lib/fcitx/libexec/fcitx-scanner lib/gtk-2.0/2.10.0/immodules/im-fcitx.so lib/gtk-3.0/3.0.0/immodules/im-fcitx.so @@ -130,18 +130,18 @@ lib/libfcitx-core.so.0.3 lib/libfcitx-gclient.so lib/libfcitx-gclient.so.0.2 lib/libfcitx-gclient.so.1 -lib/libfcitx-qt.so -lib/libfcitx-qt.so.0 -lib/libfcitx-qt.so.0.1 +${PLIST.qt4}lib/libfcitx-qt.so +${PLIST.qt4}lib/libfcitx-qt.so.0 +${PLIST.qt4}lib/libfcitx-qt.so.0.1 lib/libfcitx-utils.so lib/libfcitx-utils.so.0 lib/libfcitx-utils.so.0.1 lib/pkgconfig/fcitx-config.pc lib/pkgconfig/fcitx-gclient.pc -lib/pkgconfig/fcitx-qt.pc +${PLIST.qt4}lib/pkgconfig/fcitx-qt.pc lib/pkgconfig/fcitx-utils.pc lib/pkgconfig/fcitx.pc -qt4/plugins/inputmethods/qtim-fcitx.so +${PLIST.qt4}qt4/plugins/inputmethods/qtim-fcitx.so share/applications/fcitx-configtool.desktop share/applications/fcitx-skin-installer.desktop share/applications/fcitx.desktop diff --git a/inputmethod/fcitx/options.mk b/inputmethod/fcitx/options.mk new file mode 100644 index 00000000000..34c6326921f --- /dev/null +++ b/inputmethod/fcitx/options.mk @@ -0,0 +1,22 @@ +# $NetBSD: options.mk,v 1.1 2019/04/27 03:20:32 ryoon Exp $ + +PKG_OPTIONS_VAR= PKG_OPTIONS.fcitx + +PKG_SUPPORTED_OPTIONS+= qt4 +PLIST_VARS+= qt4 + +.include "../../mk/bsd.options.mk" + +.if !empty(PKG_OPTIONS:Mqt4) +BUILD_DEPENDS+= automoc4-[0-9]*:../../devel/automoc4 +CMAKE_ARGS+= -DENABLE_QT_IM_MODULE=ON +CMAKE_ARGS+= -DENABLE_QT_GUI=ON +.include "../../x11/qt4-libs/buildlink3.mk" +.include "../../x11/qt4-qdbus/buildlink3.mk" +.include "../../x11/qt4-tools/buildlink3.mk" +PLIST.qt4= yes +.else +CMAKE_ARGS+= -DENABLE_QT=OFF +CMAKE_ARGS+= -DENABLE_QT_IM_MODULE=OFF +CMAKE_ARGS+= -DENABLE_QT_GUI=OFF +.endif |