Wed Dec 20 15:07:29 2023 UTC (158d)
fcitx5-gtk: Fix linking with libxkbcommon on non-wayland platforms
fcitx5-gtk:s configure step claims that libxkbcommon is optional
but it always links to XKBCommon::XKBCommon. libxbcommon is pulled
in via buildlink3.mk from gtk3 on wayland platforms. On non-wayland
platforms it is not pulled in causing build breakage. Include
libxkbcommons buildlink3.mk in the Makefile to make sure it is
available unconditionally.
No revbump is done in this commit since it is a build fix, all
built packages are already linked to libxkbcommon.


(nros)
diff -r1.15 -r1.16 pkgsrc/inputmethod/fcitx5-gtk/Makefile
cvs diff -r1.15 -r1.16 pkgsrc/inputmethod/fcitx5-gtk/Makefile (expand / switch to unified diff)

--- pkgsrc/inputmethod/fcitx5-gtk/Makefile 2023/11/14 14:02:17 1.15
+++ pkgsrc/inputmethod/fcitx5-gtk/Makefile 2023/12/20 15:07:28 1.16
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.15 2023/11/14 14:02:17 wiz Exp $ 1# $NetBSD: Makefile,v 1.16 2023/12/20 15:07:28 nros Exp $
2 2
3DISTNAME= fcitx5-gtk-5.0.4 3DISTNAME= fcitx5-gtk-5.0.4
4PKGREVISION= 8 4PKGREVISION= 8
5CATEGORIES= inputmethod 5CATEGORIES= inputmethod
6MASTER_SITES= https://download.fcitx-im.org/fcitx5/fcitx5-gtk/ 6MASTER_SITES= https://download.fcitx-im.org/fcitx5/fcitx5-gtk/
7EXTRACT_SUFX= .tar.xz 7EXTRACT_SUFX= .tar.xz
8 8
9MAINTAINER= ryoon@NetBSD.org 9MAINTAINER= ryoon@NetBSD.org
10HOMEPAGE= https://github.com/fcitx/fcitx5-gtk 10HOMEPAGE= https://github.com/fcitx/fcitx5-gtk
11COMMENT= GTK input method module for fcitx5 11COMMENT= GTK input method module for fcitx5
12LICENSE= gnu-lgpl-v2.1 12LICENSE= gnu-lgpl-v2.1
13 13
14TOOL_DEPENDS+= extra-cmake-modules-[0-9]*:../../devel/extra-cmake-modules 14TOOL_DEPENDS+= extra-cmake-modules-[0-9]*:../../devel/extra-cmake-modules
@@ -17,14 +17,15 @@ USE_CMAKE= yes @@ -17,14 +17,15 @@ USE_CMAKE= yes
17USE_TOOLS+= pkg-config 17USE_TOOLS+= pkg-config
18USE_LANGUAGES= c c++ 18USE_LANGUAGES= c c++
19 19
20USE_CXX_FEATURES+= c++17 20USE_CXX_FEATURES+= c++17
21 21
22PKGCONFIG_OVERRIDE+= fcitx-gclient/Fcitx5GClient.pc.in 22PKGCONFIG_OVERRIDE+= fcitx-gclient/Fcitx5GClient.pc.in
23 23
24.include "../../devel/glib2/buildlink3.mk" 24.include "../../devel/glib2/buildlink3.mk"
25.include "../../devel/gobject-introspection/buildlink3.mk" 25.include "../../devel/gobject-introspection/buildlink3.mk"
26.include "../../textproc/fmtlib/buildlink3.mk" 26.include "../../textproc/fmtlib/buildlink3.mk"
27.include "../../x11/gtk2/buildlink3.mk" 27.include "../../x11/gtk2/buildlink3.mk"
28.include "../../x11/gtk3/buildlink3.mk" 28.include "../../x11/gtk3/buildlink3.mk"
29.include "../../x11/gtk4/buildlink3.mk" 29.include "../../x11/gtk4/buildlink3.mk"
 30.include "../../x11/libxkbcommon/buildlink3.mk"
30.include "../../mk/bsd.pkg.mk" 31.include "../../mk/bsd.pkg.mk"