View | Details | Raw Unified | Return to bug 271581 | Differences between
and this patch

Collapse All | Expand All

(-)default/x11-toolkits/qt5-gui/Makefile (-8 / +19 lines)
Lines 14-21 BUILD_DEPENDS= ${LOCALBASE}/include/linu Link Here
14
		${BUILD_DEPENDS_${ARCH}}
14
		${BUILD_DEPENDS_${ARCH}}
15
BUILD_DEPENDS_armv6=	as:devel/binutils
15
BUILD_DEPENDS_armv6=	as:devel/binutils
16
BUILD_DEPENDS_armv7=	as:devel/binutils
16
BUILD_DEPENDS_armv7=	as:devel/binutils
17
LIB_DEPENDS=	libdbus-1.so:devel/dbus \
17
LIB_DEPENDS=	libevdev.so:devel/libevdev \
18
		libevdev.so:devel/libevdev \
19
		libfontconfig.so:x11-fonts/fontconfig \
18
		libfontconfig.so:x11-fonts/fontconfig \
20
		libfreetype.so:print/freetype2 \
19
		libfreetype.so:print/freetype2 \
21
		libharfbuzz.so:print/harfbuzz \
20
		libharfbuzz.so:print/harfbuzz \
Lines 36-48 USES= compiler:c++11-lang gl gnome jpe Link Here
36
USE_GL=			egl gl
35
USE_GL=			egl gl
37
USE_GNOME=		glib20
36
USE_GNOME=		glib20
38
USE_PERL5=		extract
37
USE_PERL5=		extract
39
USE_QT=			core dbus network buildtools:build qmake:build
38
USE_QT=			core network buildtools:build qmake:build
40
QT_BINARIES=		yes
39
QT_BINARIES=		yes
41
QT_CONFIG=		accessibility accessibility-atspi-bridge dbus \
40
QT_CONFIG=		accessibility fontconfig glib opengl png system-freetype system-jpeg \
42
			fontconfig glib opengl png system-freetype system-jpeg \
43
			system-png xcb xcb-glx xcb-render xcb-xlib xinput2 xlib \
41
			system-png xcb xcb-glx xcb-render xcb-xlib xinput2 xlib \
44
			xrender
42
			xrender
45
QT_DEFINES=		ACCESSIBILITY DBUS FONTCONFIG FREETYPE GLIB \
43
QT_DEFINES=		ACCESSIBILITY FONTCONFIG FREETYPE GLIB \
46
			IMAGEFORMAT_PNG OPENGL SHAPE XCB XKB XKBCOMMON XRENDER
44
			IMAGEFORMAT_PNG OPENGL SHAPE XCB XKB XKBCOMMON XRENDER
47
USE_XORG=		ice sm xi xrender
45
USE_XORG=		ice sm xi xrender
48
HAS_CONFIGURE=		yes
46
HAS_CONFIGURE=		yes
Lines 57-69 CONFIGURE_ARGS+= -c++std \ Link Here
57
BUILD_WRKSRC=	${WRKSRC}/src/${PORTNAME}
55
BUILD_WRKSRC=	${WRKSRC}/src/${PORTNAME}
58
INSTALL_WRKSRC=	${BUILD_WRKSRC}
56
INSTALL_WRKSRC=	${BUILD_WRKSRC}
59
57
60
OPTIONS_DEFINE=		X11
58
OPTIONS_DEFINE=		X11 ATK_BRIDGE
61
OPTIONS_DEFAULT=	X11
59
OPTIONS_DEFAULT=	X11 ATK_BRIDGE
62
OPTIONS_SUB=		yes
60
OPTIONS_SUB=		yes
63
61
64
X11_USES=	xorg
62
X11_USES=	xorg
65
X11_USE=	xorg=x11
63
X11_USE=	xorg=x11
66
64
65
ATK_BRIDGE_LIB_DEPENDS= libdbus-1.so:devel/dbus
66
ATK_BRIDGE_USE_QT= dbus
67
68
ATK_BRIDGE_CONFIGURE_OFF= -no-dbus
69
67
# Build and install QtPlatformSupport and default QPA plugins (XCB,
70
# Build and install QtPlatformSupport and default QPA plugins (XCB,
68
# minimal and offscreen). QtGui won't work without (one of) them, but
71
# minimal and offscreen). QtGui won't work without (one of) them, but
69
# they depend on QtGui itself, so they can't be added as dependencies.
72
# they depend on QtGui itself, so they can't be added as dependencies.
Lines 79-84 _MORE_WRKSRCS+= src/plugins/imageformats Link Here
79
# openglextensions is the static library to use for further things like qtcanvas3d
82
# openglextensions is the static library to use for further things like qtcanvas3d
80
_MORE_WRKSRCS+=	src/openglextensions
83
_MORE_WRKSRCS+=	src/openglextensions
81
84
85
.include <bsd.port.options.mk>
86
.if ${PORT_OPTIONS:MATK_BRIDGE}
87
QT_CONFIG+= accessibility-atspi-bridge dbus
88
QT_DEFINES+= DBUS
89
.else
90
QT_DEFINES+= NO_DBUS
91
.endif
92
82
# Inherited from Qt 4.
93
# Inherited from Qt 4.
83
.if defined(PACKAGE_BUILDING)
94
.if defined(PACKAGE_BUILDING)
84
RUN_DEPENDS+=	${LOCALBASE}/share/fonts/encodings/encodings.dir:x11-fonts/encodings \
95
RUN_DEPENDS+=	${LOCALBASE}/share/fonts/encodings/encodings.dir:x11-fonts/encodings \
(-)default/x11-toolkits/qt5-gui/pkg-plist (-18 / +18 lines)
Lines 711-727 Link Here
711
%%X11%%%%QT_INCDIR%%/QtKmsSupport/QtKmsSupportDepends
711
%%X11%%%%QT_INCDIR%%/QtKmsSupport/QtKmsSupportDepends
712
%%X11%%%%QT_INCDIR%%/QtKmsSupport/QtKmsSupportVersion
712
%%X11%%%%QT_INCDIR%%/QtKmsSupport/QtKmsSupportVersion
713
%%X11%%%%QT_INCDIR%%/QtKmsSupport/qtkmssupportversion.h
713
%%X11%%%%QT_INCDIR%%/QtKmsSupport/qtkmssupportversion.h
714
%%X11%%%%QT_INCDIR%%/QtLinuxAccessibilitySupport/%%FULLVER%%/QtLinuxAccessibilitySupport/private/application_p.h
714
%%ATK_BRIDGE%%%%QT_INCDIR%%/QtLinuxAccessibilitySupport/%%FULLVER%%/QtLinuxAccessibilitySupport/private/application_p.h
715
%%X11%%%%QT_INCDIR%%/QtLinuxAccessibilitySupport/%%FULLVER%%/QtLinuxAccessibilitySupport/private/atspiadaptor_p.h
715
%%ATK_BRIDGE%%%%QT_INCDIR%%/QtLinuxAccessibilitySupport/%%FULLVER%%/QtLinuxAccessibilitySupport/private/atspiadaptor_p.h
716
%%X11%%%%QT_INCDIR%%/QtLinuxAccessibilitySupport/%%FULLVER%%/QtLinuxAccessibilitySupport/private/bridge_p.h
716
%%ATK_BRIDGE%%%%QT_INCDIR%%/QtLinuxAccessibilitySupport/%%FULLVER%%/QtLinuxAccessibilitySupport/private/bridge_p.h
717
%%X11%%%%QT_INCDIR%%/QtLinuxAccessibilitySupport/%%FULLVER%%/QtLinuxAccessibilitySupport/private/cache_p.h
717
%%ATK_BRIDGE%%%%QT_INCDIR%%/QtLinuxAccessibilitySupport/%%FULLVER%%/QtLinuxAccessibilitySupport/private/cache_p.h
718
%%X11%%%%QT_INCDIR%%/QtLinuxAccessibilitySupport/%%FULLVER%%/QtLinuxAccessibilitySupport/private/constant_mappings_p.h
718
%%ATK_BRIDGE%%%%QT_INCDIR%%/QtLinuxAccessibilitySupport/%%FULLVER%%/QtLinuxAccessibilitySupport/private/constant_mappings_p.h
719
%%X11%%%%QT_INCDIR%%/QtLinuxAccessibilitySupport/%%FULLVER%%/QtLinuxAccessibilitySupport/private/dbusconnection_p.h
719
%%ATK_BRIDGE%%%%QT_INCDIR%%/QtLinuxAccessibilitySupport/%%FULLVER%%/QtLinuxAccessibilitySupport/private/dbusconnection_p.h
720
%%X11%%%%QT_INCDIR%%/QtLinuxAccessibilitySupport/%%FULLVER%%/QtLinuxAccessibilitySupport/private/struct_marshallers_p.h
720
%%ATK_BRIDGE%%%%QT_INCDIR%%/QtLinuxAccessibilitySupport/%%FULLVER%%/QtLinuxAccessibilitySupport/private/struct_marshallers_p.h
721
%%X11%%%%QT_INCDIR%%/QtLinuxAccessibilitySupport/QtLinuxAccessibilitySupport
721
%%ATK_BRIDGE%%%%QT_INCDIR%%/QtLinuxAccessibilitySupport/QtLinuxAccessibilitySupport
722
%%X11%%%%QT_INCDIR%%/QtLinuxAccessibilitySupport/QtLinuxAccessibilitySupportDepends
722
%%ATK_BRIDGE%%%%QT_INCDIR%%/QtLinuxAccessibilitySupport/QtLinuxAccessibilitySupportDepends
723
%%X11%%%%QT_INCDIR%%/QtLinuxAccessibilitySupport/QtLinuxAccessibilitySupportVersion
723
%%ATK_BRIDGE%%%%QT_INCDIR%%/QtLinuxAccessibilitySupport/QtLinuxAccessibilitySupportVersion
724
%%X11%%%%QT_INCDIR%%/QtLinuxAccessibilitySupport/qtlinuxaccessibilitysupportversion.h
724
%%ATK_BRIDGE%%%%QT_INCDIR%%/QtLinuxAccessibilitySupport/qtlinuxaccessibilitysupportversion.h
725
%%X11%%%%QT_INCDIR%%/QtOpenGLExtensions/QOpenGLExtensions
725
%%X11%%%%QT_INCDIR%%/QtOpenGLExtensions/QOpenGLExtensions
726
%%X11%%%%QT_INCDIR%%/QtOpenGLExtensions/QtOpenGLExtensions
726
%%X11%%%%QT_INCDIR%%/QtOpenGLExtensions/QtOpenGLExtensions
727
%%X11%%%%QT_INCDIR%%/QtOpenGLExtensions/QtOpenGLExtensionsDepends
727
%%X11%%%%QT_INCDIR%%/QtOpenGLExtensions/QtOpenGLExtensionsDepends
Lines 823-829 Link Here
823
%%X11%%%%QT_CMAKEDIR%%/Qt5Gui/Qt5Gui_QEvdevTouchScreenPlugin.cmake
823
%%X11%%%%QT_CMAKEDIR%%/Qt5Gui/Qt5Gui_QEvdevTouchScreenPlugin.cmake
824
%%X11%%%%QT_CMAKEDIR%%/Qt5Gui/Qt5Gui_QGifPlugin.cmake
824
%%X11%%%%QT_CMAKEDIR%%/Qt5Gui/Qt5Gui_QGifPlugin.cmake
825
%%X11%%%%QT_CMAKEDIR%%/Qt5Gui/Qt5Gui_QICOPlugin.cmake
825
%%X11%%%%QT_CMAKEDIR%%/Qt5Gui/Qt5Gui_QICOPlugin.cmake
826
%%X11%%%%QT_CMAKEDIR%%/Qt5Gui/Qt5Gui_QIbusPlatformInputContextPlugin.cmake
826
%%ATK_BRIDGE%%%%QT_CMAKEDIR%%/Qt5Gui/Qt5Gui_QIbusPlatformInputContextPlugin.cmake
827
%%X11%%%%QT_CMAKEDIR%%/Qt5Gui/Qt5Gui_QJpegPlugin.cmake
827
%%X11%%%%QT_CMAKEDIR%%/Qt5Gui/Qt5Gui_QJpegPlugin.cmake
828
%%X11%%%%QT_CMAKEDIR%%/Qt5Gui/Qt5Gui_QMinimalIntegrationPlugin.cmake
828
%%X11%%%%QT_CMAKEDIR%%/Qt5Gui/Qt5Gui_QMinimalIntegrationPlugin.cmake
829
%%X11%%%%QT_CMAKEDIR%%/Qt5Gui/Qt5Gui_QOffscreenIntegrationPlugin.cmake
829
%%X11%%%%QT_CMAKEDIR%%/Qt5Gui/Qt5Gui_QOffscreenIntegrationPlugin.cmake
Lines 836-843 Link Here
836
%%X11%%%%QT_CMAKEDIR%%/Qt5InputSupport/Qt5InputSupportConfigVersion.cmake
836
%%X11%%%%QT_CMAKEDIR%%/Qt5InputSupport/Qt5InputSupportConfigVersion.cmake
837
%%X11%%%%QT_CMAKEDIR%%/Qt5KmsSupport/Qt5KmsSupportConfig.cmake
837
%%X11%%%%QT_CMAKEDIR%%/Qt5KmsSupport/Qt5KmsSupportConfig.cmake
838
%%X11%%%%QT_CMAKEDIR%%/Qt5KmsSupport/Qt5KmsSupportConfigVersion.cmake
838
%%X11%%%%QT_CMAKEDIR%%/Qt5KmsSupport/Qt5KmsSupportConfigVersion.cmake
839
%%X11%%%%QT_CMAKEDIR%%/Qt5LinuxAccessibilitySupport/Qt5LinuxAccessibilitySupportConfig.cmake
839
%%ATK_BRIDGE%%%%QT_CMAKEDIR%%/Qt5LinuxAccessibilitySupport/Qt5LinuxAccessibilitySupportConfig.cmake
840
%%X11%%%%QT_CMAKEDIR%%/Qt5LinuxAccessibilitySupport/Qt5LinuxAccessibilitySupportConfigVersion.cmake
840
%%ATK_BRIDGE%%%%QT_CMAKEDIR%%/Qt5LinuxAccessibilitySupport/Qt5LinuxAccessibilitySupportConfigVersion.cmake
841
%%X11%%%%QT_CMAKEDIR%%/Qt5OpenGLExtensions/Qt5OpenGLExtensionsConfig.cmake
841
%%X11%%%%QT_CMAKEDIR%%/Qt5OpenGLExtensions/Qt5OpenGLExtensionsConfig.cmake
842
%%X11%%%%QT_CMAKEDIR%%/Qt5OpenGLExtensions/Qt5OpenGLExtensionsConfigVersion.cmake
842
%%X11%%%%QT_CMAKEDIR%%/Qt5OpenGLExtensions/Qt5OpenGLExtensionsConfigVersion.cmake
843
%%X11%%%%QT_CMAKEDIR%%/Qt5PlatformCompositorSupport/Qt5PlatformCompositorSupportConfig.cmake
843
%%X11%%%%QT_CMAKEDIR%%/Qt5PlatformCompositorSupport/Qt5PlatformCompositorSupportConfig.cmake
Lines 880-887 Link Here
880
%%X11%%%%QT_LIBDIR%%/libQt5InputSupport.prl
880
%%X11%%%%QT_LIBDIR%%/libQt5InputSupport.prl
881
%%X11%%%%QT_LIBDIR%%/libQt5KmsSupport.a
881
%%X11%%%%QT_LIBDIR%%/libQt5KmsSupport.a
882
%%X11%%%%QT_LIBDIR%%/libQt5KmsSupport.prl
882
%%X11%%%%QT_LIBDIR%%/libQt5KmsSupport.prl
883
%%X11%%%%QT_LIBDIR%%/libQt5LinuxAccessibilitySupport.a
883
%%ATK_BRIDGE%%%%QT_LIBDIR%%/libQt5LinuxAccessibilitySupport.a
884
%%X11%%%%QT_LIBDIR%%/libQt5LinuxAccessibilitySupport.prl
884
%%ATK_BRIDGE%%%%QT_LIBDIR%%/libQt5LinuxAccessibilitySupport.prl
885
%%X11%%%%QT_LIBDIR%%/libQt5OpenGLExtensions.a
885
%%X11%%%%QT_LIBDIR%%/libQt5OpenGLExtensions.a
886
%%X11%%%%QT_LIBDIR%%/libQt5OpenGLExtensions.prl
886
%%X11%%%%QT_LIBDIR%%/libQt5OpenGLExtensions.prl
887
%%X11%%%%QT_LIBDIR%%/libQt5PlatformCompositorSupport.a
887
%%X11%%%%QT_LIBDIR%%/libQt5PlatformCompositorSupport.a
Lines 913-919 Link Here
913
%%QT_MKSPECDIR%%/modules/qt_lib_gui_private.pri
913
%%QT_MKSPECDIR%%/modules/qt_lib_gui_private.pri
914
%%X11%%%%QT_MKSPECDIR%%/modules/qt_lib_input_support_private.pri
914
%%X11%%%%QT_MKSPECDIR%%/modules/qt_lib_input_support_private.pri
915
%%X11%%%%QT_MKSPECDIR%%/modules/qt_lib_kms_support_private.pri
915
%%X11%%%%QT_MKSPECDIR%%/modules/qt_lib_kms_support_private.pri
916
%%X11%%%%QT_MKSPECDIR%%/modules/qt_lib_linuxaccessibility_support_private.pri
916
%%ATK_BRIDGE%%%%QT_MKSPECDIR%%/modules/qt_lib_linuxaccessibility_support_private.pri
917
%%X11%%%%QT_MKSPECDIR%%/modules/qt_lib_openglextensions.pri
917
%%X11%%%%QT_MKSPECDIR%%/modules/qt_lib_openglextensions.pri
918
%%X11%%%%QT_MKSPECDIR%%/modules/qt_lib_openglextensions_private.pri
918
%%X11%%%%QT_MKSPECDIR%%/modules/qt_lib_openglextensions_private.pri
919
%%X11%%%%QT_MKSPECDIR%%/modules/qt_lib_platformcompositor_support_private.pri
919
%%X11%%%%QT_MKSPECDIR%%/modules/qt_lib_platformcompositor_support_private.pri
Lines 944-950 Link Here
944
%%X11%%%%DEBUG%%%%QT_PLUGINDIR%%/imageformats/libqjpeg.so.debug
944
%%X11%%%%DEBUG%%%%QT_PLUGINDIR%%/imageformats/libqjpeg.so.debug
945
%%X11%%%%QT_PLUGINDIR%%/platforminputcontexts/libcomposeplatforminputcontextplugin.so
945
%%X11%%%%QT_PLUGINDIR%%/platforminputcontexts/libcomposeplatforminputcontextplugin.so
946
%%X11%%%%DEBUG%%%%QT_PLUGINDIR%%/platforminputcontexts/libcomposeplatforminputcontextplugin.so.debug
946
%%X11%%%%DEBUG%%%%QT_PLUGINDIR%%/platforminputcontexts/libcomposeplatforminputcontextplugin.so.debug
947
%%X11%%%%QT_PLUGINDIR%%/platforminputcontexts/libibusplatforminputcontextplugin.so
947
%%ATK_BRIDGE%%%%QT_PLUGINDIR%%/platforminputcontexts/libibusplatforminputcontextplugin.so
948
%%X11%%%%DEBUG%%%%QT_PLUGINDIR%%/platforminputcontexts/libibusplatforminputcontextplugin.so.debug
948
%%X11%%%%DEBUG%%%%QT_PLUGINDIR%%/platforminputcontexts/libibusplatforminputcontextplugin.so.debug
949
%%X11%%%%QT_PLUGINDIR%%/platforms/libqbsdfb.so
949
%%X11%%%%QT_PLUGINDIR%%/platforms/libqbsdfb.so
950
%%X11%%%%DEBUG%%%%QT_PLUGINDIR%%/platforms/libqbsdfb.so.debug
950
%%X11%%%%DEBUG%%%%QT_PLUGINDIR%%/platforms/libqbsdfb.so.debug

Return to bug 271581