maintainer-feedback requested: [Bug 258953] x11-toolkits/qt5-gui turning dbus into an option, proposed diff

[bugzilla-noreply at freebsd.org]

Bugzilla Automation <bugzilla at FreeBSD.org> has asked freebsd-kde (Team)
<kde at FreeBSD.org> for maintainer-feedback:
Bug 258953: x11-toolkits/qt5-gui turning dbus into an option, proposed diff
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=258953



--- Description ---
Here's a proposed diff for x11-toolkits/qt5-gui to turn dbus into a make config
option. It shouldn't affect regular builds. There was interest in turning dbus
into an option for this port. Thank you,


--- Makefile.orig	2021-10-04 20:16:17.706647000 +0000
+++ Makefile	2021-10-04 20:23:18.678333000 +0000
@@ -14,8 +14,7 @@
		${BUILD_DEPENDS_${ARCH}}
 BUILD_DEPENDS_armv6=	as:devel/binutils
 BUILD_DEPENDS_armv7=	as:devel/binutils
-LIB_DEPENDS=	libdbus-1.so:devel/dbus \
-		libevdev.so:devel/libevdev \
+LIB_DEPENDS=	libevdev.so:devel/libevdev \
		libfontconfig.so:x11-fonts/fontconfig \
		libfreetype.so:print/freetype2 \
		libharfbuzz.so:print/harfbuzz \
@@ -36,13 +35,13 @@
			qmake:no_env qt-dist:5,base
 USE_GL=			egl gl
 USE_GNOME=		glib20
-USE_QT=			core dbus network buildtools_build qmake_build
+USE_QT=			core network buildtools_build qmake_build
 QT_BINARIES=		yes
-QT_CONFIG=		accessibility accessibility-atspi-bridge dbus \
+QT_CONFIG=		accessibility accessibility-atspi-bridge \
			fontconfig glib opengl png system-freetype system-jpeg
\
			system-png xcb xcb-glx xcb-render xcb-xlib xinput2 xlib
\
			xrender
-QT_DEFINES=		ACCESSIBILITY DBUS FONTCONFIG FREETYPE GLIB \
+QT_DEFINES=		ACCESSIBILITY FONTCONFIG FREETYPE GLIB \
			IMAGEFORMAT_PNG OPENGL SHAPE XCB XKB XKBCOMMON XRENDER
 USE_XORG=		ice sm xi xrender
 HAS_CONFIGURE= 	yes
@@ -57,13 +56,17 @@
 BUILD_WRKSRC=	${WRKSRC}/src/${PORTNAME}
 INSTALL_WRKSRC=	${BUILD_WRKSRC}

-OPTIONS_DEFINE=		X11
-OPTIONS_DEFAULT=	X11
+OPTIONS_DEFINE=		X11 DBUS
+OPTIONS_DEFAULT=	X11 DBUS
 OPTIONS_SUB=		yes

 X11_USES=	xorg
 X11_USE=	xorg=x11

+DBUS_LIB_DEPENDS=	libdbus-1.so:devel/dbus
+DBUS_USE=		QT=dbus
+DBUS_VARS=		QT_CONFIG+=dbus QT_DEFINES+=DBUS
+
 # Build and install QtPlatformSupport and default QPA plugins (XCB,
 # minimal and offscreen). QtGui won't work without (one of) them, but
 # they depend on QtGui itself, so they can't be added as dependencies.
@@ -113,3 +116,4 @@
 .endfor

 .include <bsd.port.mk>
+.include <bsd.port.options.mk>