[Midnightbsd-cvs] mports [23433] trunk/x11-toolkits/qt5-gui: update patchset
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Tue May 8 23:25:38 EDT 2018
Revision: 23433
http://svnweb.midnightbsd.org/mports/?rev=23433
Author: laffer1
Date: 2018-05-08 23:25:37 -0400 (Tue, 08 May 2018)
Log Message:
-----------
update patchset
Modified Paths:
--------------
trunk/x11-toolkits/qt5-gui/Makefile
trunk/x11-toolkits/qt5-gui/pkg-plist
Added Paths:
-----------
trunk/x11-toolkits/qt5-gui/files/
trunk/x11-toolkits/qt5-gui/files/extrapatch-src_gui_painting_qcolor.cpp
trunk/x11-toolkits/qt5-gui/files/patch-mkspecs:features:qt_functions.prf
Modified: trunk/x11-toolkits/qt5-gui/Makefile
===================================================================
--- trunk/x11-toolkits/qt5-gui/Makefile 2018-05-08 13:48:56 UTC (rev 23432)
+++ trunk/x11-toolkits/qt5-gui/Makefile 2018-05-09 03:25:37 UTC (rev 23433)
@@ -10,22 +10,20 @@
MAINTAINER= ports at MidnightBSD.org
COMMENT= Qt graphical user interface module
-LICENSE= gpl3
+LIB_DEPENDS= libdbus-1.so:devel/dbus \
+ libfontconfig.so:x11-fonts/fontconfig \
+ libfreetype.so:print/freetype2 \
+ libharfbuzz.so:print/harfbuzz \
+ libpng.so:graphics/png \
+ libxcb.so:x11/libxcb \
+ libxcb-image.so:x11/xcb-util-image \
+ libxcb-keysyms.so:x11/xcb-util-keysyms \
+ libxcb-render-util.so:x11/xcb-util-renderutil \
+ libxcb-icccm.so:x11/xcb-util-wm \
+ libxkbcommon.so:x11/libxkbcommon
+RUN_DEPENDS= xdg-open:devel/xdg-utils
-LIB_DEPENDS= libdbus-1.so:${PORTSDIR}/devel/dbus \
- libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
- libfreetype.so:${PORTSDIR}/print/freetype2 \
- libharfbuzz.so:${PORTSDIR}/print/harfbuzz \
- libpng.so:${PORTSDIR}/graphics/png \
- libxcb.so:${PORTSDIR}/x11/libxcb \
- libxcb-image.so:${PORTSDIR}/x11/xcb-util-image \
- libxcb-keysyms.so:${PORTSDIR}/x11/xcb-util-keysyms \
- libxcb-render-util.so:${PORTSDIR}/x11/xcb-util-renderutil \
- libxcb-icccm.so:${PORTSDIR}/x11/xcb-util-wm \
- libxkbcommon.so:${PORTSDIR}/x11/libxkbcommon
-RUN_DEPENDS= xdg-open:${PORTSDIR}/devel/xdg-utils
-
-USES= jpeg
+USES= compiler:features jpeg
USE_GL= gl egl
USE_GNOME= glib20
USE_QT5= core dbus network qmake_build buildtools_build
@@ -73,6 +71,23 @@
CFLAGS_powerpc64= -mminimal-toc
+.include <bsd.port.pre.mk>
+
+# Base GCC fails to build qdrawhelper.cpp:
+# painting/qdrawhelper.cpp: In function 'void qConvertARGB64PMToA2RGB30PM_sse2(uint*, const QRgba64*, int)':
+# painting/qdrawhelper.cpp:1276: note: use -flax-vector-conversions to permit conversions between vectors with differing element types or numbers of subparts
+# painting/qdrawhelper.cpp:1276: error: cannot convert 'int __vector__' to 'long long int __vector__' for argument '1' to 'long long int __vector__ __builtin_ia32_psrlqi128(long long int __vector__, int)'
+# painting/qdrawhelper.cpp:1277: error: cannot convert 'int __vector__' to 'long long int __vector__' for argument '1' to 'long long int __vector__ __builtin_ia32_psrlqi128(long long int __vector__, int)'
+# painting/qdrawhelper.cpp:1278: error: cannot convert 'int __vector__' to 'long long int __vector__' for argument '1' to 'long long int __vector__ __builtin_ia32_psrlqi128(long long int __vector__, int)'
+# painting/qdrawhelper.cpp:1282: error: cannot convert 'int __vector__' to 'long long int __vector__' for argument '1' to 'long long int __vector__ __builtin_ia32_psrlqi128(long long int __vector__, int)'
+.if ${COMPILER_TYPE} == gcc && ${COMPILER_VERSION} <= 42
+CXXFLAGS+= -flax-vector-conversions
+.endif
+
+.if ${OSVERSION} < 10000
+EXTRA_PATCHES+= ${FILESDIR}/extrapatch-src_gui_painting_qcolor.cpp
+.endif
+
post-build:
.for d in ${MORE_WRKSRCS}
@cd ${WRKSRC}/${d} && \
@@ -87,4 +102,4 @@
${MAKE_ARGS} ${FAKE_MAKEARGS} ${INSTALL_TARGET}
.endfor
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Added: trunk/x11-toolkits/qt5-gui/files/extrapatch-src_gui_painting_qcolor.cpp
===================================================================
--- trunk/x11-toolkits/qt5-gui/files/extrapatch-src_gui_painting_qcolor.cpp (rev 0)
+++ trunk/x11-toolkits/qt5-gui/files/extrapatch-src_gui_painting_qcolor.cpp 2018-05-09 03:25:37 UTC (rev 23433)
@@ -0,0 +1,20 @@
+On FreeBSD 9.3 with gcc-4.2 we need to mark the constant as an unsigned long long.
+Else the compiler will choke on it being too large:
+
+c++ -c -O2 -pipe [...] itemmodels/qstandarditemmodel.cpp
+painting/qcolor.cpp:527: error: integer constant is too large for 'long' type
+*** [.obj/qcolor.o] Error code 1
+1 error
+
+
+--- src/gui/painting/qcolor.cpp.orig 2016-10-10 16:17:59 UTC
++++ src/gui/painting/qcolor.cpp
+@@ -524,7 +524,7 @@ QString QColor::name(NameFormat format)
+ return QLatin1Char('#') + QString::number(rgba() | 0x1000000, 16).rightRef(6);
+ case HexArgb:
+ // it's called rgba() but it does return AARRGGBB
+- return QLatin1Char('#') + QString::number(rgba() | 0x100000000, 16).rightRef(8);
++ return QLatin1Char('#') + QString::number(rgba() | 0x100000000ULL, 16).rightRef(8);
+ }
+ return QString();
+ }
Property changes on: trunk/x11-toolkits/qt5-gui/files/extrapatch-src_gui_painting_qcolor.cpp
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/x11-toolkits/qt5-gui/files/patch-mkspecs:features:qt_functions.prf
===================================================================
--- trunk/x11-toolkits/qt5-gui/files/patch-mkspecs:features:qt_functions.prf (rev 0)
+++ trunk/x11-toolkits/qt5-gui/files/patch-mkspecs:features:qt_functions.prf 2018-05-09 03:25:37 UTC (rev 23433)
@@ -0,0 +1,11 @@
+--- mkspecs/features/qt_functions.prf.orig 2018-05-06 12:07:22.000000000 -0400
++++ mkspecs/features/qt_functions.prf 2018-05-06 12:07:45.000000000 -0400
+@@ -182,7 +182,7 @@
+ equals(QMAKE_HOST.os, Windows) {
+ deppath.CONFIG = always_prepend
+ deppath.name = PATH
+- } else:contains(QMAKE_HOST.os, Linux|FreeBSD|OpenBSD|NetBSD|DragonFly|SunOS|HP-UX|QNX|GNU) {
++ } else:contains(QMAKE_HOST.os, Linux|FreeBSD|OpenBSD|NetBSD|DragonFly|MidnightBSD|SunOS|HP-UX|QNX|GNU) {
+ deppath.name = LD_LIBRARY_PATH
+ } else:contains(QMAKE_HOST.os, Haiku) {
+ deppath.name = LIBRARY_PATH
Property changes on: trunk/x11-toolkits/qt5-gui/files/patch-mkspecs:features:qt_functions.prf
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/x11-toolkits/qt5-gui/pkg-plist
===================================================================
--- trunk/x11-toolkits/qt5-gui/pkg-plist 2018-05-08 13:48:56 UTC (rev 23432)
+++ trunk/x11-toolkits/qt5-gui/pkg-plist 2018-05-09 03:25:37 UTC (rev 23433)
@@ -35,6 +35,7 @@
%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qguiapplication_p.h
%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qharfbuzzng_p.h
%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qhexstring_p.h
+%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qhighdpiscaling_p.h
%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qicon_p.h
%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qiconloader_p.h
%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qimage_p.h
@@ -96,6 +97,7 @@
%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qrasterizer_p.h
%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qrawfont_p.h
%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qrbtree_p.h
+%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qrgba64_p.h
%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qscreen_p.h
%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qsessionmanager_p.h
%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qshapedpixmapdndwindow_p.h
@@ -267,6 +269,8 @@
%%QT_INCDIR%%/QtGui/QOpenGLContextGroup
%%QT_INCDIR%%/QtGui/QOpenGLDebugLogger
%%QT_INCDIR%%/QtGui/QOpenGLDebugMessage
+%%QT_INCDIR%%/QtGui/QOpenGLExtraFunctions
+%%QT_INCDIR%%/QtGui/QOpenGLExtraFunctionsPrivate
%%QT_INCDIR%%/QtGui/QOpenGLFramebufferObject
%%QT_INCDIR%%/QtGui/QOpenGLFramebufferObjectFormat
%%QT_INCDIR%%/QtGui/QOpenGLFunctions
@@ -341,6 +345,7 @@
%%QT_INCDIR%%/QtGui/QRegularExpressionValidator
%%QT_INCDIR%%/QtGui/QResizeEvent
%%QT_INCDIR%%/QtGui/QRgb
+%%QT_INCDIR%%/QtGui/QRgba64
%%QT_INCDIR%%/QtGui/QScreen
%%QT_INCDIR%%/QtGui/QScreenOrientationChangeEvent
%%QT_INCDIR%%/QtGui/QScrollEvent
@@ -448,6 +453,7 @@
%%QT_INCDIR%%/QtGui/qopengldebug.h
%%QT_INCDIR%%/QtGui/qopengles2ext.h
%%QT_INCDIR%%/QtGui/qopenglext.h
+%%QT_INCDIR%%/QtGui/qopenglextrafunctions.h
%%QT_INCDIR%%/QtGui/qopenglframebufferobject.h
%%QT_INCDIR%%/QtGui/qopenglfunctions.h
%%QT_INCDIR%%/QtGui/qopenglfunctions_1_0.h
@@ -507,6 +513,7 @@
%%QT_INCDIR%%/QtGui/qrawfont.h
%%QT_INCDIR%%/QtGui/qregion.h
%%QT_INCDIR%%/QtGui/qrgb.h
+%%QT_INCDIR%%/QtGui/qrgba64.h
%%QT_INCDIR%%/QtGui/qscreen.h
%%QT_INCDIR%%/QtGui/qsessionmanager.h
%%QT_INCDIR%%/QtGui/qstandarditemmodel.h
@@ -542,22 +549,30 @@
%%QT_INCDIR%%/QtOpenGLExtensions/qopenglextensions.h
%%QT_INCDIR%%/QtOpenGLExtensions/qtopenglextensionsversion.h
%%QT_INCDIR%%/QtPlatformHeaders/QCocoaNativeContext
+%%QT_INCDIR%%/QtPlatformHeaders/QCocoaWindowFunctions
%%QT_INCDIR%%/QtPlatformHeaders/QEGLNativeContext
%%QT_INCDIR%%/QtPlatformHeaders/QEglFSFunctions
%%QT_INCDIR%%/QtPlatformHeaders/QGLXNativeContext
+%%QT_INCDIR%%/QtPlatformHeaders/QPlatformHeaderHelper
%%QT_INCDIR%%/QtPlatformHeaders/QWGLNativeContext
%%QT_INCDIR%%/QtPlatformHeaders/QWindowsWindowFunctions
+%%QT_INCDIR%%/QtPlatformHeaders/QXcbIntegrationFunctions
+%%QT_INCDIR%%/QtPlatformHeaders/QXcbScreenFunctions
%%QT_INCDIR%%/QtPlatformHeaders/QXcbWindowFunctions
%%QT_INCDIR%%/QtPlatformHeaders/QtPlatformHeaders
%%QT_INCDIR%%/QtPlatformHeaders/QtPlatformHeadersDepends
%%QT_INCDIR%%/QtPlatformHeaders/QtPlatformHeadersVersion
%%QT_INCDIR%%/QtPlatformHeaders/qcocoanativecontext.h
+%%QT_INCDIR%%/QtPlatformHeaders/qcocoawindowfunctions.h
%%QT_INCDIR%%/QtPlatformHeaders/qeglfsfunctions.h
%%QT_INCDIR%%/QtPlatformHeaders/qeglnativecontext.h
%%QT_INCDIR%%/QtPlatformHeaders/qglxnativecontext.h
+%%QT_INCDIR%%/QtPlatformHeaders/qplatformheaderhelper.h
%%QT_INCDIR%%/QtPlatformHeaders/qtplatformheadersversion.h
%%QT_INCDIR%%/QtPlatformHeaders/qwglnativecontext.h
%%QT_INCDIR%%/QtPlatformHeaders/qwindowswindowfunctions.h
+%%QT_INCDIR%%/QtPlatformHeaders/qxcbintegrationfunctions.h
+%%QT_INCDIR%%/QtPlatformHeaders/qxcbscreenfunctions.h
%%QT_INCDIR%%/QtPlatformHeaders/qxcbwindowfunctions.h
%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/application_p.h
%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/atspiadaptor_p.h
@@ -568,7 +583,6 @@
%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/dbusconnection_p.h
%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qaccessiblebridgeutils_p.h
%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qbasicfontdatabase_p.h
-%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qcfsocketnotifier_p.h
%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qcoretextfontdatabase_p.h
%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qdbusmenuadaptor_p.h
%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qdbusmenuconnection_p.h
@@ -583,10 +597,7 @@
%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qeglconvenience_p.h
%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qeglpbuffer_p.h
%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qeglplatformcontext_p.h
-%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qeglplatformcursor_p.h
-%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qeglplatformintegration_p.h
-%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qeglplatformscreen_p.h
-%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qeglplatformwindow_p.h
+%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qeglstreamconvenience_p.h
%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qevdevkeyboard_defaultmap_p.h
%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qevdevkeyboardhandler_p.h
%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qevdevkeyboardmanager_p.h
@@ -595,7 +606,6 @@
%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qevdevtablet_p.h
%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qevdevtouchhandler_p.h
%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qevdevtouchmanager_p.h
-%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qeventdispatcher_cf_p.h
%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qeventdispatcher_glib_p.h
%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qfbbackingstore_p.h
%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qfbcursor_p.h
@@ -620,6 +630,7 @@
%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qstatusnotifieritemadaptor_p.h
%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qtslib_p.h
%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qunixeventdispatcher_qpa_p.h
+%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qwindowsguieventdispatcher_p.h
%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qxdgnotificationproxy_p.h
%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qxlibeglintegration_p.h
%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/struct_marshallers_p.h
@@ -689,5 +700,3 @@
%%DEBUG%%%%QT_PLUGINDIR%%/xcbglintegrations/libqxcb-glx-integration.so.debug
libdata/pkgconfig/Qt5Gui.pc
libdata/pkgconfig/Qt5OpenGLExtensions.pc
-libdata/pkgconfig/Qt5PlatformSupport.pc
-libdata/pkgconfig/Qt5XcbQpa.pc
More information about the Midnightbsd-cvs
mailing list