[pkgsrc/trunk]: pkgsrc/x11/kguiaddons kguiaddons: Remove hard requirement on ...

[jperkin <jperkin%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/cb3cd52e2ec7
branches:  trunk
changeset: 378912:cb3cd52e2ec7
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Mon May 09 09:24:50 2022 +0000

description:
kguiaddons: Remove hard requirement on wayland.

diffstat:

 x11/kguiaddons/Makefile      |  9 +++++----
 x11/kguiaddons/buildlink3.mk |  9 +++++++--
 2 files changed, 12 insertions(+), 6 deletions(-)

diffs (48 lines):

diff -r 413d6ce34954 -r cb3cd52e2ec7 x11/kguiaddons/Makefile
--- a/x11/kguiaddons/Makefile   Mon May 09 09:08:27 2022 +0000
+++ b/x11/kguiaddons/Makefile   Mon May 09 09:24:50 2022 +0000
@@ -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 @@
 
 .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"
diff -r 413d6ce34954 -r cb3cd52e2ec7 x11/kguiaddons/buildlink3.mk
--- a/x11/kguiaddons/buildlink3.mk      Mon May 09 09:08:27 2022 +0000
+++ b/x11/kguiaddons/buildlink3.mk      Mon May 09 09:24:50 2022 +0000
@@ -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_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