pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

kvirc: Make qtwebengine optional; disable it on NetBSD/i386



Module Name:	pkgsrc-wip
Committed By:	Iris <iris000%duck.com@localhost>
Pushed By:	iris
Date:		Sun Nov 10 04:29:59 2024 +0000
Changeset:	bfc6406d0d6c0023abd1cd1f5e3bb87b1d4c478b

Modified Files:
	kvirc/Makefile
	kvirc/options.mk

Log Message:
kvirc: Make qtwebengine optional; disable it on NetBSD/i386

x11/qt5-qtwebengine-5.15.15 (pkgsrc-2024Q3) currently doesn't
build on NetBSD/i386 and sometimes on Linux.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=bfc6406d0d6c0023abd1cd1f5e3bb87b1d4c478b

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

diffstat:
 kvirc/Makefile   |  2 +-
 kvirc/options.mk | 26 +++++++++++++++++++++-----
 2 files changed, 22 insertions(+), 6 deletions(-)

diffs:
diff --git a/kvirc/Makefile b/kvirc/Makefile
index cf3d8c50e5..23a644b61c 100644
--- a/kvirc/Makefile
+++ b/kvirc/Makefile
@@ -29,7 +29,7 @@ CMAKE_CONFIGURE_ARGS+=	-DMANDIR=man
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../x11/qt5-qtbase/buildlink3.mk"
 .include "../../x11/qt5-qtmultimedia/buildlink3.mk"
-.include "../../x11/qt5-qtwebengine/buildlink3.mk"
+#.include "../../x11/qt5-qtwebengine/buildlink3.mk"
 .include "../../x11/qt5-qtsvg/buildlink3.mk"
 .include "../../x11/qt5-qtx11extras/buildlink3.mk"
 .include "../../x11/libXScrnSaver/buildlink3.mk"
diff --git a/kvirc/options.mk b/kvirc/options.mk
index 128d49e68c..27fd841d85 100644
--- a/kvirc/options.mk
+++ b/kvirc/options.mk
@@ -1,8 +1,16 @@
 # $NetBSD$
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.kvirc
-PKG_SUPPORTED_OPTIONS=	inet6 kde python
-PKG_SUGGESTED_OPTIONS=	inet6 kde
+PKG_SUPPORTED_OPTIONS=	inet6 kde qtwebengine python
+PKG_SUGGESTED_OPTIONS=	inet6 kde qtwebengine
+
+.include "../../mk/bsd.prefs.mk"
+
+# x11/qt5-qtwebengine-5.15 (pkgsrc-2024Q3)
+# does not build on NetBSD/i386 and sometimes on Linux
+.if ${MACHINE_PLATFORM:MNetBSD-*-i386}
+PKG_SUGGESTED_OPTIONS+=	-qtwebengine
+.endif
 
 .include "../../mk/bsd.options.mk"
 
@@ -11,9 +19,6 @@ PKG_SUGGESTED_OPTIONS=	inet6 kde
 CMAKE_CONFIGURE_ARGS+=	-DWANT_IPV6=ON
 .else
 CMAKE_CONFIGURE_ARGS+=	-DWANT_IPV6=OFF
-# Required by x11/qt5-webengine?
-.include "../../x11/qt5-qtwebchannel/buildlink3.mk"
-.include "../../x11/qt5-qtlocation/buildlink3.mk"
 .endif
 
 
@@ -33,6 +38,17 @@ CMAKE_CONFIGURE_ARGS+=	-DWANT_KDE=OFF
 .endif
 
 
+.if !empty(PKG_OPTIONS:Mqtwebengine)
+CMAKE_CONFIGURE_ARGS+=	-DWANT_QTWEBENGINE=ON
+.include "../../x11/qt5-qtwebengine/buildlink3.mk"
+# exposed with -DWANT_IPV6=OFF
+.include "../../x11/qt5-qtwebchannel/buildlink3.mk"
+.include "../../x11/qt5-qtlocation/buildlink3.mk"
+.else
+CMAKE_CONFIGURE_ARGS+=	-DWANT_QTWEBENGINE=OFF
+.endif
+
+
 #
 # [ 88%] Building CXX object src/modules/pythoncore/CMakeFiles/kvipythoncore.dir/libkvipythoncore.cpp.o
 # In file included from /usr/pkgsrc/wip/kvirc/work/KVIrc-5.2.6/src/modules/pythoncore/libkvipythoncore.cpp:38:0:


Home | Main Index | Thread Index | Old Index