CVS commit: pkgsrc/x11/kguiaddons

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Mon May  9 09:24:50 UTC 2022

Modified Files:
        pkgsrc/x11/kguiaddons: Makefile buildlink3.mk

Log Message:
kguiaddons: Remove hard requirement on wayland.


To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 pkgsrc/x11/kguiaddons/Makefile
cvs rdiff -u -r1.23 -r1.24 pkgsrc/x11/kguiaddons/buildlink3.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/kguiaddons/Makefile
diff -u pkgsrc/x11/kguiaddons/Makefile:1.33 pkgsrc/x11/kguiaddons/Makefile:1.34
--- pkgsrc/x11/kguiaddons/Makefile:1.33 Mon Apr 25 08:41:36 2022
+++ pkgsrc/x11/kguiaddons/Makefile      Mon May  9 09:24:50 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2022/04/25 08:41:36 markd Exp $
+# $NetBSD: Makefile,v 1.34 2022/05/09 09:24:50 jperkin Exp $
 
 DISTNAME=      kguiaddons-${KF5VER}
 CATEGORIES=    x11
@@ -13,11 +13,12 @@ USE_TOOLS+= pkg-config
 
 .include "../../devel/wayland/platform.mk"
 
-.if empty(PLATFORM_SUPPORTS_WAYLAND:M[Yy][Ee][Ss])
-PKG_SKIP_REASON+=      "Platform does not support Wayland"
+.if ${PLATFORM_SUPPORTS_WAYLAND} == "yes"
+.  include "../../x11/qt5-qtwayland/buildlink3.mk"
+.else
+CMAKE_ARGS+=   -DWITH_WAYLAND=OFF
 .endif
 
 .include "../../x11/qt5-qtbase/buildlink3.mk"
-.include "../../x11/qt5-qtwayland/buildlink3.mk"
 .include "../../x11/qt5-qtx11extras/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/x11/kguiaddons/buildlink3.mk
diff -u pkgsrc/x11/kguiaddons/buildlink3.mk:1.23 pkgsrc/x11/kguiaddons/buildlink3.mk:1.24
--- pkgsrc/x11/kguiaddons/buildlink3.mk:1.23    Mon Apr 18 19:10:14 2022
+++ pkgsrc/x11/kguiaddons/buildlink3.mk Mon May  9 09:24:50 2022
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.23 2022/04/18 19:10:14 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.24 2022/05/09 09:24:50 jperkin Exp $
 
 BUILDLINK_TREE+=       kguiaddons
 
@@ -9,7 +9,12 @@ BUILDLINK_API_DEPENDS.kguiaddons+=     kguia
 BUILDLINK_ABI_DEPENDS.kguiaddons?=     kguiaddons>=5.80.0nb3
 BUILDLINK_PKGSRCDIR.kguiaddons?=       ../../x11/kguiaddons
 
-.include "../../x11/qt5-qtwayland/buildlink3.mk"
+.include "../../devel/wayland/platform.mk"
+
+.if ${PLATFORM_SUPPORTS_WAYLAND} == "yes"
+.  include "../../x11/qt5-qtwayland/buildlink3.mk"
+.endif
+
 .include "../../x11/qt5-qtx11extras/buildlink3.mk"
 .endif # KGUIADDONS_BUILDLINK3_MK