Index: default/x11-toolkits/qt5-gui/Makefile =================================================================== --- default.orig/x11-toolkits/qt5-gui/Makefile +++ default/x11-toolkits/qt5-gui/Makefile @@ -14,8 +14,7 @@ BUILD_DEPENDS= ${LOCALBASE}/include/linu ${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,12 @@ USES= compiler:c++11-lang gl gnome jpe USE_GL= egl gl USE_GNOME= glib20 USE_PERL5= extract -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 \ - fontconfig glib opengl png system-freetype system-jpeg \ +QT_CONFIG= accessibility 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 +55,24 @@ CONFIGURE_ARGS+= -c++std \ BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME} INSTALL_WRKSRC= ${BUILD_WRKSRC} -OPTIONS_DEFINE= X11 -OPTIONS_DEFAULT= X11 +OPTIONS_DEFINE= X11 ATK_BRIDGE +OPTIONS_DEFAULT= X11 ATK_BRIDGE OPTIONS_SUB= yes X11_USES= xorg X11_USE= xorg=x11 +ATK_BRIDGE_DESC=AT-SPI ATK bridge support +ATK_BRIDGE_LIB_DEPENDS= libdbus-1.so:devel/dbus +ATK_BRIDGE_USE= qt=dbus +ATK_BRIDGE_CONFIGURE_OFF= -no-dbus +ATK_BRIDGE_VARS= qt_config_opt+=accessibility-atspi-bridge qt_config_opt+=dbus \ + qt_defines_opt+=DBUS +ATK_BRIDGE_VARS_OFF= qt_defines_opt+=NO_DBUS +ATK_BRIDGE_CXXFLAGS_OFF=-DQT_NO_DBUS + +MAKE_ARGS=QT_CONFIG="${QT_CONFIG} ${QT_CONFIG_OPT}" QT_DEFINES="${QT_DEFINES} ${QT_DEFINES_OPT}" + # 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. Index: default/x11-toolkits/qt5-gui/pkg-plist =================================================================== --- default.orig/x11-toolkits/qt5-gui/pkg-plist +++ default/x11-toolkits/qt5-gui/pkg-plist @@ -711,17 +711,17 @@ %%X11%%%%QT_INCDIR%%/QtKmsSupport/QtKmsSupportDepends %%X11%%%%QT_INCDIR%%/QtKmsSupport/QtKmsSupportVersion %%X11%%%%QT_INCDIR%%/QtKmsSupport/qtkmssupportversion.h -%%X11%%%%QT_INCDIR%%/QtLinuxAccessibilitySupport/%%FULLVER%%/QtLinuxAccessibilitySupport/private/application_p.h -%%X11%%%%QT_INCDIR%%/QtLinuxAccessibilitySupport/%%FULLVER%%/QtLinuxAccessibilitySupport/private/atspiadaptor_p.h -%%X11%%%%QT_INCDIR%%/QtLinuxAccessibilitySupport/%%FULLVER%%/QtLinuxAccessibilitySupport/private/bridge_p.h -%%X11%%%%QT_INCDIR%%/QtLinuxAccessibilitySupport/%%FULLVER%%/QtLinuxAccessibilitySupport/private/cache_p.h -%%X11%%%%QT_INCDIR%%/QtLinuxAccessibilitySupport/%%FULLVER%%/QtLinuxAccessibilitySupport/private/constant_mappings_p.h -%%X11%%%%QT_INCDIR%%/QtLinuxAccessibilitySupport/%%FULLVER%%/QtLinuxAccessibilitySupport/private/dbusconnection_p.h -%%X11%%%%QT_INCDIR%%/QtLinuxAccessibilitySupport/%%FULLVER%%/QtLinuxAccessibilitySupport/private/struct_marshallers_p.h -%%X11%%%%QT_INCDIR%%/QtLinuxAccessibilitySupport/QtLinuxAccessibilitySupport -%%X11%%%%QT_INCDIR%%/QtLinuxAccessibilitySupport/QtLinuxAccessibilitySupportDepends -%%X11%%%%QT_INCDIR%%/QtLinuxAccessibilitySupport/QtLinuxAccessibilitySupportVersion -%%X11%%%%QT_INCDIR%%/QtLinuxAccessibilitySupport/qtlinuxaccessibilitysupportversion.h +%%ATK_BRIDGE%%%%QT_INCDIR%%/QtLinuxAccessibilitySupport/%%FULLVER%%/QtLinuxAccessibilitySupport/private/application_p.h +%%ATK_BRIDGE%%%%QT_INCDIR%%/QtLinuxAccessibilitySupport/%%FULLVER%%/QtLinuxAccessibilitySupport/private/atspiadaptor_p.h +%%ATK_BRIDGE%%%%QT_INCDIR%%/QtLinuxAccessibilitySupport/%%FULLVER%%/QtLinuxAccessibilitySupport/private/bridge_p.h +%%ATK_BRIDGE%%%%QT_INCDIR%%/QtLinuxAccessibilitySupport/%%FULLVER%%/QtLinuxAccessibilitySupport/private/cache_p.h +%%ATK_BRIDGE%%%%QT_INCDIR%%/QtLinuxAccessibilitySupport/%%FULLVER%%/QtLinuxAccessibilitySupport/private/constant_mappings_p.h +%%ATK_BRIDGE%%%%QT_INCDIR%%/QtLinuxAccessibilitySupport/%%FULLVER%%/QtLinuxAccessibilitySupport/private/dbusconnection_p.h +%%ATK_BRIDGE%%%%QT_INCDIR%%/QtLinuxAccessibilitySupport/%%FULLVER%%/QtLinuxAccessibilitySupport/private/struct_marshallers_p.h +%%ATK_BRIDGE%%%%QT_INCDIR%%/QtLinuxAccessibilitySupport/QtLinuxAccessibilitySupport +%%ATK_BRIDGE%%%%QT_INCDIR%%/QtLinuxAccessibilitySupport/QtLinuxAccessibilitySupportDepends +%%ATK_BRIDGE%%%%QT_INCDIR%%/QtLinuxAccessibilitySupport/QtLinuxAccessibilitySupportVersion +%%ATK_BRIDGE%%%%QT_INCDIR%%/QtLinuxAccessibilitySupport/qtlinuxaccessibilitysupportversion.h %%X11%%%%QT_INCDIR%%/QtOpenGLExtensions/QOpenGLExtensions %%X11%%%%QT_INCDIR%%/QtOpenGLExtensions/QtOpenGLExtensions %%X11%%%%QT_INCDIR%%/QtOpenGLExtensions/QtOpenGLExtensionsDepends @@ -823,7 +823,7 @@ %%X11%%%%QT_CMAKEDIR%%/Qt5Gui/Qt5Gui_QEvdevTouchScreenPlugin.cmake %%X11%%%%QT_CMAKEDIR%%/Qt5Gui/Qt5Gui_QGifPlugin.cmake %%X11%%%%QT_CMAKEDIR%%/Qt5Gui/Qt5Gui_QICOPlugin.cmake -%%X11%%%%QT_CMAKEDIR%%/Qt5Gui/Qt5Gui_QIbusPlatformInputContextPlugin.cmake +%%ATK_BRIDGE%%%%QT_CMAKEDIR%%/Qt5Gui/Qt5Gui_QIbusPlatformInputContextPlugin.cmake %%X11%%%%QT_CMAKEDIR%%/Qt5Gui/Qt5Gui_QJpegPlugin.cmake %%X11%%%%QT_CMAKEDIR%%/Qt5Gui/Qt5Gui_QMinimalIntegrationPlugin.cmake %%X11%%%%QT_CMAKEDIR%%/Qt5Gui/Qt5Gui_QOffscreenIntegrationPlugin.cmake @@ -836,8 +836,8 @@ %%X11%%%%QT_CMAKEDIR%%/Qt5InputSupport/Qt5InputSupportConfigVersion.cmake %%X11%%%%QT_CMAKEDIR%%/Qt5KmsSupport/Qt5KmsSupportConfig.cmake %%X11%%%%QT_CMAKEDIR%%/Qt5KmsSupport/Qt5KmsSupportConfigVersion.cmake -%%X11%%%%QT_CMAKEDIR%%/Qt5LinuxAccessibilitySupport/Qt5LinuxAccessibilitySupportConfig.cmake -%%X11%%%%QT_CMAKEDIR%%/Qt5LinuxAccessibilitySupport/Qt5LinuxAccessibilitySupportConfigVersion.cmake +%%ATK_BRIDGE%%%%QT_CMAKEDIR%%/Qt5LinuxAccessibilitySupport/Qt5LinuxAccessibilitySupportConfig.cmake +%%ATK_BRIDGE%%%%QT_CMAKEDIR%%/Qt5LinuxAccessibilitySupport/Qt5LinuxAccessibilitySupportConfigVersion.cmake %%X11%%%%QT_CMAKEDIR%%/Qt5OpenGLExtensions/Qt5OpenGLExtensionsConfig.cmake %%X11%%%%QT_CMAKEDIR%%/Qt5OpenGLExtensions/Qt5OpenGLExtensionsConfigVersion.cmake %%X11%%%%QT_CMAKEDIR%%/Qt5PlatformCompositorSupport/Qt5PlatformCompositorSupportConfig.cmake @@ -880,8 +880,8 @@ %%X11%%%%QT_LIBDIR%%/libQt5InputSupport.prl %%X11%%%%QT_LIBDIR%%/libQt5KmsSupport.a %%X11%%%%QT_LIBDIR%%/libQt5KmsSupport.prl -%%X11%%%%QT_LIBDIR%%/libQt5LinuxAccessibilitySupport.a -%%X11%%%%QT_LIBDIR%%/libQt5LinuxAccessibilitySupport.prl +%%ATK_BRIDGE%%%%QT_LIBDIR%%/libQt5LinuxAccessibilitySupport.a +%%ATK_BRIDGE%%%%QT_LIBDIR%%/libQt5LinuxAccessibilitySupport.prl %%X11%%%%QT_LIBDIR%%/libQt5OpenGLExtensions.a %%X11%%%%QT_LIBDIR%%/libQt5OpenGLExtensions.prl %%X11%%%%QT_LIBDIR%%/libQt5PlatformCompositorSupport.a @@ -913,7 +913,7 @@ %%QT_MKSPECDIR%%/modules/qt_lib_gui_private.pri %%X11%%%%QT_MKSPECDIR%%/modules/qt_lib_input_support_private.pri %%X11%%%%QT_MKSPECDIR%%/modules/qt_lib_kms_support_private.pri -%%X11%%%%QT_MKSPECDIR%%/modules/qt_lib_linuxaccessibility_support_private.pri +%%ATK_BRIDGE%%%%QT_MKSPECDIR%%/modules/qt_lib_linuxaccessibility_support_private.pri %%X11%%%%QT_MKSPECDIR%%/modules/qt_lib_openglextensions.pri %%X11%%%%QT_MKSPECDIR%%/modules/qt_lib_openglextensions_private.pri %%X11%%%%QT_MKSPECDIR%%/modules/qt_lib_platformcompositor_support_private.pri @@ -944,7 +944,7 @@ %%X11%%%%DEBUG%%%%QT_PLUGINDIR%%/imageformats/libqjpeg.so.debug %%X11%%%%QT_PLUGINDIR%%/platforminputcontexts/libcomposeplatforminputcontextplugin.so %%X11%%%%DEBUG%%%%QT_PLUGINDIR%%/platforminputcontexts/libcomposeplatforminputcontextplugin.so.debug -%%X11%%%%QT_PLUGINDIR%%/platforminputcontexts/libibusplatforminputcontextplugin.so +%%ATK_BRIDGE%%%%QT_PLUGINDIR%%/platforminputcontexts/libibusplatforminputcontextplugin.so %%X11%%%%DEBUG%%%%QT_PLUGINDIR%%/platforminputcontexts/libibusplatforminputcontextplugin.so.debug %%X11%%%%QT_PLUGINDIR%%/platforms/libqbsdfb.so %%X11%%%%DEBUG%%%%QT_PLUGINDIR%%/platforms/libqbsdfb.so.debug