Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 05 Oct 2021 19:26:43 +0000
From:      bugzilla-noreply@freebsd.org
To:        ports-bugs@FreeBSD.org
Subject:   [Bug 258953] x11-toolkits/qt5-gui turning dbus into an option, proposed diff
Message-ID:  <bug-258953-7788@https.bugs.freebsd.org/bugzilla/>

next in thread | raw e-mail | index | archive | help
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D258953

            Bug ID: 258953
           Summary: x11-toolkits/qt5-gui turning dbus into an option,
                    proposed diff
           Product: Ports & Packages
           Version: Latest
          Hardware: Any
                OS: Any
            Status: New
          Severity: Affects Only Me
          Priority: ---
         Component: Individual Port(s)
          Assignee: kde@FreeBSD.org
          Reporter: sid@bsdmail.com
             Flags: maintainer-feedback?(kde@FreeBSD.org)
          Assignee: kde@FreeBSD.org

Here's a proposed diff for x11-toolkits/qt5-gui to turn dbus into a make co=
nfig
option. It shouldn't affect regular builds. There was interest in turning d=
bus
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=3D   as:devel/binutils
 BUILD_DEPENDS_armv7=3D   as:devel/binutils
-LIB_DEPENDS=3D   libdbus-1.so:devel/dbus \
-               libevdev.so:devel/libevdev \
+LIB_DEPENDS=3D   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=3D                        egl gl
 USE_GNOME=3D             glib20
-USE_QT=3D                        core dbus network buildtools_build qmake_=
build
+USE_QT=3D                        core network buildtools_build qmake_build
 QT_BINARIES=3D           yes
-QT_CONFIG=3D             accessibility accessibility-atspi-bridge dbus \
+QT_CONFIG=3D             accessibility accessibility-atspi-bridge \
                        fontconfig glib opengl png system-freetype system-j=
peg
\
                        system-png xcb xcb-glx xcb-render xcb-xlib xinput2 =
xlib
\
                        xrender
-QT_DEFINES=3D            ACCESSIBILITY DBUS FONTCONFIG FREETYPE GLIB \
+QT_DEFINES=3D            ACCESSIBILITY FONTCONFIG FREETYPE GLIB \
                        IMAGEFORMAT_PNG OPENGL SHAPE XCB XKB XKBCOMMON XREN=
DER
 USE_XORG=3D              ice sm xi xrender
 HAS_CONFIGURE=3D         yes
@@ -57,13 +56,17 @@
 BUILD_WRKSRC=3D  ${WRKSRC}/src/${PORTNAME}
 INSTALL_WRKSRC=3D        ${BUILD_WRKSRC}

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

 X11_USES=3D      xorg
 X11_USE=3D       xorg=3Dx11

+DBUS_LIB_DEPENDS=3D      libdbus-1.so:devel/dbus
+DBUS_USE=3D              QT=3Ddbus
+DBUS_VARS=3D             QT_CONFIG+=3Ddbus QT_DEFINES+=3DDBUS
+
 # 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>

--=20
You are receiving this mail because:
You are the assignee for the bug.=



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?bug-258953-7788>