Re: UPDATE: inputmethods/fcitx 4.2.9.6 => 4.2.9.8 and inputmethods/fcitx-qt5 1.2.3 => 1.2.5

2020-08-20 Thread Kevin Lo 
On Fri, Aug 14, 2020 at 03:39:04PM +0800, Kevin Lo wrote:
> 
> 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?

ping

> 
> 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-config0.0 # 4.1
>  SHARED_LIBS +=   fcitx-core  0.0 # 0.3
>  SHARED_LIBS +=   fcitx-gclient   0.0 # 0.2
> -SHARED_LIBS +=   fcitx-qt0.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

UPDATE: inputmethods/fcitx 4.2.9.6 => 4.2.9.8 and inputmethods/fcitx-qt5 1.2.3 => 1.2.5

2020-08-14 Thread Kevin Lo 
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-config0.0 # 4.1
 SHARED_LIBS += fcitx-core  0.0 # 0.3
 SHARED_LIBS += fcitx-gclient   0.0 # 0.2
-SHARED_LIBS += fcitx-qt0.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/
+