Hi ports,
The following updates fcitx to 4.2.9.8 and fcitx-qt5 to 1.2.5.
There are no symbol changes, so no lib bumps.
Tested on amd64.
Ok?
diff f774fbfd3e6b7af035101ca0b84a2d18e48fa5d8 /usr/ports
blob - 0c9bef028b69746ae5ff97994a9cb5874eaa46ed
file + inputmethods/fcitx/Makefile
--- inputmethods/fcitx/Makefile
+++ inputmethods/fcitx/Makefile
@@ -1,19 +1,16 @@
# $OpenBSD: Makefile,v 1.14 2020/02/29 15:20:56 naddy Exp $
COMMENT-main = flexible input method framework
-COMMENT-gtk3 = fcitx for GTK+3
+COMMENT-gtk3 = fcitx for GTK+3
-V = 4.2.9.6
-DISTNAME = fcitx-$V
-PKGNAME-main = fcitx-$V
+V = 4.2.9.8
+DISTNAME = fcitx-$V
+PKGNAME-main = ${PKGNAME}
PKGNAME-gtk3 = fcitx-gtk3-$V
-REVISION-main = 2
-REVISION-gtk3 = 1
SHARED_LIBS += fcitx-config 0.0 # 4.1
SHARED_LIBS += fcitx-core 0.0 # 0.3
SHARED_LIBS += fcitx-gclient 0.0 # 0.2
-SHARED_LIBS += fcitx-qt 0.0 # 0.1
SHARED_LIBS += fcitx-utils 0.0 # 0.1
CATEGORIES = inputmethods chinese japanese
@@ -29,26 +26,23 @@ MULTI_PACKAGES = -main -gtk3
COMPILER = base-clang ports-gcc base-gcc
-WANTLIB-common = execinfo iconv intl kvm xkbcommon
+WANTLIB-main += X11 Xext Xfixes Xinerama Xrender c cairo dbus-1
\
+ execinfo gdk-x11-2.0 gettextpo gio-2.0 glib-2.0 \
+ gobject-2.0 gtk-x11-2.0 iconv intl json-c kvm \
+ pango-1.0 pangocairo-1.0 pthread uuid xkbcommon \
+ xkbfile xml2
-WANTLIB-main += ${WANTLIB-common}
-WANTLIB-main += ICE X11 Xcomposite Xcursor Xdamage Xext Xfixes \
- Xi Xinerama Xrandr Xrender atk-1.0 c cairo dbus-1 \
- execinfo fontconfig freetype gdk_pixbuf-2.0 \
- gdk-x11-2.0 gettextpo gio-2.0 glib-2.0 \
- gobject-2.0 gtk-x11-2.0 pango-1.0 pangocairo-1.0 \
- pangoft2-1.0 pthread uuid xkbcommon xkbfile xml2 z
-
BUILD_DEPENDS = devel/gettext,-tools \
devel/gobject-introspection \
devel/iso-codes \
devel/kf5/extra-cmake-modules \
shells/bash
-RUN_DEPENDS-main = devel/desktop-file-utils \
+RUN_DEPENDS = devel/desktop-file-utils \
misc/shared-mime-info \
shells/bash \
x11/gtk+3,-guic
-LIB_DEPENDS-main = devel/gettext,-tools \
+LIB_DEPENDS = devel/gettext,-tools \
+ devel/json-c \
devel/libexecinfo \
sysutils/e2fsprogs \
textproc/libxml \
@@ -56,15 +50,11 @@ LIB_DEPENDS-main = devel/gettext,-tools \
x11/gtk+2 \
x11/xkbcommon
-WANTLIB-gtk3 += ${WANTLIB-common}
-WANTLIB-gtk3 += atk-1.0 cairo cairo-gobject dbus-1
gdk_pixbuf-2.0 \
- gdk-3 gio-2.0 glib-2.0 gobject-2.0 gtk-3 pango-1.0 \
- pangocairo-1.0
+WANTLIB-gtk3 += fcitx-gclient fcitx-utils glib-2.0 gobject-2.0
gdk-3
+WANTLIB-gtk3 += gtk-3 pango-1.0 xkbcommon
-RUN_DEPENDS-gtk3 = inputmethods/fcitx,-main
-LIB_DEPENDS-gtk3 = devel/libexecinfo \
- x11/gtk+3 \
- x11/xkbcommon
+LIB_DEPENDS-gtk3 = ${BUILD_PKGPATH},-main \
+ x11/gtk+3
MASTER_SITES = https://download.fcitx-im.org/fcitx/
DISTFILES = ${DISTNAME}${EXTRACT_SUFX}
@@ -80,7 +70,8 @@ DIST_SUBDIR = fcitx
MODULES = devel/cmake
-CONFIGURE_ARGS =-DENABLE_GTK3_IM_MODULE=ON \
+CONFIGURE_ARGS =-Wno-dev \
+ -DENABLE_GTK3_IM_MODULE=ON \
-DENABLE_ENCHANT=OFF \
-DENABLE_OPENCC=OFF \
-DENABLE_PRESAGE=OFF \
@@ -89,8 +80,12 @@ CONFIGURE_ARGS =-DENABLE_GTK3_IM_MODULE=ON \
-DENABLE_QT_GUI=OFF \
-DSYSCONFDIR=${PREFIX}/share/examples/fcitx \
-DMAN_INSTALL_DIR=${PREFIX}/man/ \
- -DCMAKE_C_FLAGS="${CFLAGS} -I${LOCALBASE}/include
-I${X11BASE}/include" \
- -DCMAKE_CXX_FLAGS="${CXXFLAGS} -I${LOCALBASE}/include
-I${X11BASE}/include"
+ -DCMAKE_C_FLAGS="${CFLAGS} \
+ -I${LOCALBASE}/include \
+ -I${X11BASE}/include" \
+ -DCMAKE_CXX_FLAGS="${CXXFLAGS} \
+ -I${LOCALBASE}/include \
+ -I${X11BASE}/include"
NO_TEST = Yes
@@ -102,6 +97,6 @@ post-patch:
@cp ${FULLDISTDIR}/py_stroke-20121124.tar.gz \
${WRKSRC}/src/module/pinyin-enhance/data
@cp ${FULLDISTDIR}/py_table-20121124.tar.gz \
- ${WRKSRC}/src/module/pinyin-enhance/data/
+ ${WRKSRC}/src/module/pinyin-enhance/data/
.include <bsd.port.mk>
blob - 668e99ddd70c9bc3db26c62a6078f63bb08a06e8
file + inputmethods/fcitx/distinfo
--- inputmethods/fcitx/distinfo
+++ inputmethods/fcitx/distinfo
@@ -1,11 +1,11 @@
SHA256 (fcitx/en_dict-20121020.tar.gz) =
xEpdeEeSXuqeTS0EdI1ELNKN2SmaC1cu99kerE9abOs=
-SHA256 (fcitx/fcitx-4.2.9.6.tar.xz) =
1V7uPwlAN7XDLwxTl9WF/fkyy8fSCR7W94/Xqa5RLEc=
+SHA256 (fcitx/fcitx-4.2.9.8.tar.xz) =
vbaofQdQa5A1WOmySnsVSGNGlak9UEXFStUgxhafHio=
SHA256 (fcitx/pinyin.tar.gz) = WDgpskp1jAh8CN5KaUgNC/WUY1T+d9s2DW1/Rnwr2OE=
SHA256 (fcitx/py_stroke-20121124.tar.gz) =
jrEoqb+kOVLmfPL87h/RNMb0z9MXvC9sOKYV9etk4kg=
SHA256 (fcitx/py_table-20121124.tar.gz) =
QhRqyX3mwT1V+eme2HORX0xmc56cEVMqNFVrrfl5LAQ=
SHA256 (fcitx/table.tar.gz) = YZYFPHJBJeOuPYvWsvkXLQyDtlsNQQ083mO3qNarh7c=
SIZE (fcitx/en_dict-20121020.tar.gz) = 630491
-SIZE (fcitx/fcitx-4.2.9.6.tar.xz) = 1706336
+SIZE (fcitx/fcitx-4.2.9.8.tar.xz) = 1703948
SIZE (fcitx/pinyin.tar.gz) = 1608886
SIZE (fcitx/py_stroke-20121124.tar.gz) = 445601
SIZE (fcitx/py_table-20121124.tar.gz) = 186822
blob - 7e7fb460f2bd6edf5e52abc081a427bcfe120b4a
file + inputmethods/fcitx-qt5/Makefile
--- inputmethods/fcitx-qt5/Makefile
+++ inputmethods/fcitx-qt5/Makefile
@@ -7,8 +7,7 @@ SHARED_LIBS += FcitxQt5WidgetsAddons 0.0 # 1.0
GH_ACCOUNT = fcitx
GH_PROJECT = fcitx-qt5
-GH_TAGNAME = 1.2.3
-REVISION = 0
+GH_TAGNAME = 1.2.5
CATEGORIES = inputmethods
blob - 8beb6b4f87d9742023a4e8732d091f824c9043b8
file + inputmethods/fcitx-qt5/distinfo
--- inputmethods/fcitx-qt5/distinfo
+++ inputmethods/fcitx-qt5/distinfo
@@ -1,2 +1,2 @@
-SHA256 (fcitx-qt5-1.2.3.tar.gz) = bhozXrf1+6+MqbwwM++++DlPhgzB05UZ39rnc9K1kVY=
-SIZE (fcitx-qt5-1.2.3.tar.gz) = 208589
+SHA256 (fcitx-qt5-1.2.5.tar.gz) = tFGD2aUaZdrK7TNyZYehYE0Jx3rf/qnwJzUIXpM1BT0=
+SIZE (fcitx-qt5-1.2.5.tar.gz) = 140256
blob - 1c04bcc75a9b564b74591621cd7ac97039d0c52e
file + inputmethods/fcitx-qt5/pkg/PLIST
--- inputmethods/fcitx-qt5/pkg/PLIST
+++ inputmethods/fcitx-qt5/pkg/PLIST
@@ -29,10 +29,10 @@ lib/cmake/FcitxQt5WidgetsAddons/FcitxQt5WidgetsAddonsT
lib/cmake/FcitxQt5WidgetsAddons/FcitxQt5WidgetsAddonsTargets.cmake
@bin lib/fcitx/libexec/fcitx-qt5-gui-wrapper
lib/fcitx/qt/
-lib/fcitx/qt/libfcitx-quickphrase-editor5.so
+@so lib/fcitx/qt/libfcitx-quickphrase-editor5.so
@lib lib/libFcitxQt5DBusAddons.so.${LIBFcitxQt5DBusAddons_VERSION}
@lib lib/libFcitxQt5WidgetsAddons.so.${LIBFcitxQt5WidgetsAddons_VERSION}
-lib/qt5/plugins/platforminputcontexts/libfcitxplatforminputcontextplugin.so
+@so lib/qt5/plugins/platforminputcontexts/libfcitxplatforminputcontextplugin.so
share/locale/ca/LC_MESSAGES/fcitx-qt5.mo
share/locale/da/LC_MESSAGES/fcitx-qt5.mo
share/locale/de/LC_MESSAGES/fcitx-qt5.mo
