Index: head/Mk/bsd.qt.mk =================================================================== --- head/Mk/bsd.qt.mk +++ head/Mk/bsd.qt.mk @@ -175,6 +175,8 @@ . if ${_QT_VERSION:M4*} _EXTRA_PATCHES_QT4= ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-src-corelib-global-qglobal.h \ ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-libtool +# Patch in proper name for armv6 architecture: https://gcc.gnu.org/ml/gcc-patches/2015-06/msg01679.html +_EXTRA_PATCHES_QT4+= ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-armv6 . else _EXTRA_PATCHES_QT5= ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_features_create__cmake.prf \ ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_features_qt__module.prf Index: head/accessibility/qt4-accessible/Makefile =================================================================== --- head/accessibility/qt4-accessible/Makefile +++ head/accessibility/qt4-accessible/Makefile @@ -3,7 +3,7 @@ PORTNAME= accessible DISTVERSION= ${QT4_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= accessibility PKGNAMEPREFIX= qt4- Index: head/chinese/qt4-codecs-cn/Makefile =================================================================== --- head/chinese/qt4-codecs-cn/Makefile +++ head/chinese/qt4-codecs-cn/Makefile @@ -3,7 +3,7 @@ PORTNAME= codecs DISTVERSION= ${QT4_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= chinese PKGNAMEPREFIX= qt4- PKGNAMESUFFIX= -cn Index: head/chinese/qt4-codecs-tw/Makefile =================================================================== --- head/chinese/qt4-codecs-tw/Makefile +++ head/chinese/qt4-codecs-tw/Makefile @@ -3,7 +3,7 @@ PORTNAME= codecs DISTVERSION= ${QT4_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= chinese PKGNAMEPREFIX= qt4- PKGNAMESUFFIX= -tw Index: head/databases/qt4-mysql-plugin/Makefile =================================================================== --- head/databases/qt4-mysql-plugin/Makefile +++ head/databases/qt4-mysql-plugin/Makefile @@ -1,7 +1,7 @@ # Created by: Kay Lehmann # $FreeBSD$ -PORTREVISION= 2 +PORTREVISION= 3 COMMENT= Qt MySQL database plugin DB= mysql Index: head/databases/qt4-odbc-plugin/Makefile =================================================================== --- head/databases/qt4-odbc-plugin/Makefile +++ head/databases/qt4-odbc-plugin/Makefile @@ -1,7 +1,7 @@ # Created by: Michael Nottebrock # $FreeBSD$ -PORTREVISION= 3 +PORTREVISION= 4 DB= odbc COMMENT= Qt Open Database Connectivity plugin Index: head/databases/qt4-pgsql-plugin/Makefile =================================================================== --- head/databases/qt4-pgsql-plugin/Makefile +++ head/databases/qt4-pgsql-plugin/Makefile @@ -1,7 +1,7 @@ # Created by: Lauri Watts # $FreeBSD$ -PORTREVISION= 2 +PORTREVISION= 3 COMMENT= Qt PostgreSQL database plugin DB= psql Index: head/databases/qt4-sql/Makefile =================================================================== --- head/databases/qt4-sql/Makefile +++ head/databases/qt4-sql/Makefile @@ -3,7 +3,7 @@ PORTNAME= sql DISTVERSION= ${QT4_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= databases PKGNAMEPREFIX= qt4- Index: head/databases/qt4-sqlite-plugin/Makefile =================================================================== --- head/databases/qt4-sqlite-plugin/Makefile +++ head/databases/qt4-sqlite-plugin/Makefile @@ -1,7 +1,7 @@ # Created by: Michael Nottebrock # $FreeBSD$ -PORTREVISION= 2 +PORTREVISION= 3 COMMENT= Qt SQLite 2 database plugin DB= sqlite2 Index: head/databases/qt4-sqlite3-plugin/Makefile =================================================================== --- head/databases/qt4-sqlite3-plugin/Makefile +++ head/databases/qt4-sqlite3-plugin/Makefile @@ -1,7 +1,7 @@ # Created by: Michael Nottebrock # $FreeBSD$ -PORTREVISION= 3 +PORTREVISION= 4 COMMENT= Qt SQLite 3 database plugin DB= sqlite Index: head/devel/qt4-assistant-adp/Makefile =================================================================== --- head/devel/qt4-assistant-adp/Makefile +++ head/devel/qt4-assistant-adp/Makefile @@ -3,7 +3,7 @@ PORTNAME= assistant PORTVERSION= 4.6.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= QT PKGNAMEPREFIX= qt4- Index: head/devel/qt4-corelib/Makefile =================================================================== --- head/devel/qt4-corelib/Makefile +++ head/devel/qt4-corelib/Makefile @@ -3,7 +3,7 @@ PORTNAME= corelib DISTVERSION= ${QT4_VERSION} -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= devel PKGNAMEPREFIX= qt4- Index: head/devel/qt4-help-tools/Makefile =================================================================== --- head/devel/qt4-help-tools/Makefile +++ head/devel/qt4-help-tools/Makefile @@ -3,7 +3,7 @@ PORTNAME= help DISTVERSION= ${QT4_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel PKGNAMEPREFIX= qt4- PKGNAMESUFFIX= -tools Index: head/devel/qt4-help/Makefile =================================================================== --- head/devel/qt4-help/Makefile +++ head/devel/qt4-help/Makefile @@ -3,7 +3,7 @@ PORTNAME= help DISTVERSION= ${QT4_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel PKGNAMEPREFIX= qt4- Index: head/devel/qt4-libqtassistantclient/Makefile =================================================================== --- head/devel/qt4-libqtassistantclient/Makefile +++ head/devel/qt4-libqtassistantclient/Makefile @@ -3,7 +3,7 @@ PORTNAME= libQtAssistantClient PORTVERSION= 4.6.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= QT PKGNAMEPREFIX= qt4- Index: head/devel/qt4-linguisttools/Makefile =================================================================== --- head/devel/qt4-linguisttools/Makefile +++ head/devel/qt4-linguisttools/Makefile @@ -2,7 +2,7 @@ PORTNAME= linguisttools DISTVERSION= ${QT4_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel PKGNAMEPREFIX= qt4- Index: head/devel/qt4-makeqpf/Makefile =================================================================== --- head/devel/qt4-makeqpf/Makefile +++ head/devel/qt4-makeqpf/Makefile @@ -3,7 +3,7 @@ PORTNAME= makeqpf DISTVERSION= ${QT4_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel PKGNAMEPREFIX= qt4- Index: head/devel/qt4-porting/Makefile =================================================================== --- head/devel/qt4-porting/Makefile +++ head/devel/qt4-porting/Makefile @@ -3,7 +3,7 @@ PORTNAME= porting DISTVERSION= ${QT4_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel PKGNAMEPREFIX= qt4- Index: head/devel/qt4-qdbusviewer/Makefile =================================================================== --- head/devel/qt4-qdbusviewer/Makefile +++ head/devel/qt4-qdbusviewer/Makefile @@ -3,7 +3,7 @@ PORTNAME= qdbusviewer DISTVERSION= ${QT4_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel PKGNAMEPREFIX= qt4- Index: head/devel/qt4-qdoc3/Makefile =================================================================== --- head/devel/qt4-qdoc3/Makefile +++ head/devel/qt4-qdoc3/Makefile @@ -3,7 +3,7 @@ PORTNAME= qdoc3 DISTVERSION= ${QT4_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel textproc PKGNAMEPREFIX= qt4- Index: head/devel/qt4-qmake/Makefile =================================================================== --- head/devel/qt4-qmake/Makefile +++ head/devel/qt4-qmake/Makefile @@ -3,7 +3,7 @@ PORTNAME= qmake DISTVERSION= ${QT4_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel PKGNAMEPREFIX= qt4- Index: head/devel/qt4-qt3support/Makefile =================================================================== --- head/devel/qt4-qt3support/Makefile +++ head/devel/qt4-qt3support/Makefile @@ -3,7 +3,7 @@ PORTNAME= qt3support DISTVERSION= ${QT4_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel x11-toolkits PKGNAMEPREFIX= qt4- Index: head/devel/qt4-qvfb/Makefile =================================================================== --- head/devel/qt4-qvfb/Makefile +++ head/devel/qt4-qvfb/Makefile @@ -3,7 +3,7 @@ PORTNAME= qvfb DISTVERSION= ${QT4_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel PKGNAMEPREFIX= qt4- Index: head/devel/qt4-script/Makefile =================================================================== --- head/devel/qt4-script/Makefile +++ head/devel/qt4-script/Makefile @@ -3,7 +3,7 @@ PORTNAME= script DISTVERSION= ${QT4_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel PKGNAMEPREFIX= qt4- Index: head/devel/qt4-testlib/Makefile =================================================================== --- head/devel/qt4-testlib/Makefile +++ head/devel/qt4-testlib/Makefile @@ -3,7 +3,7 @@ PORTNAME= testlib DISTVERSION= ${QT4_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel PKGNAMEPREFIX= qt4- Index: head/devel/qt4-uic3/Makefile =================================================================== --- head/devel/qt4-uic3/Makefile +++ head/devel/qt4-uic3/Makefile @@ -3,7 +3,7 @@ PORTNAME= uic3 DISTVERSION= ${QT4_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel PKGNAMEPREFIX= qt4- Index: head/devel/qt4/files/extrapatch-armv6 =================================================================== --- head/devel/qt4/files/extrapatch-armv6 +++ head/devel/qt4/files/extrapatch-armv6 @@ -0,0 +1,28 @@ +Due to a misspelling in GCC [1] (probably) the check for the ARMv6KZ platform +used __ARM_ARCH_6ZK__ instead of __ARM_ARCH_6KZ__. + +Append the correct spellings to the checks for __ARM_ARCH_6ZK__. + + +[1] https://gcc.gnu.org/ml/gcc-patches/2015-06/msg01679.html + +--- src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h.orig 2017-06-02 20:01:34.860331000 +0200 ++++ src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h 2017-06-02 20:02:08.715222000 +0200 +@@ -254,6 +254,7 @@ + #elif defined(__ARM_ARCH_6__) \ + || defined(__ARM_ARCH_6J__) \ + || defined(__ARM_ARCH_6K__) \ ++ || defined(__ARM_ARCH_6KZ__) \ + || defined(__ARM_ARCH_6Z__) \ + || defined(__ARM_ARCH_6ZK__) \ + || defined(__ARM_ARCH_6T2__) \ +--- src/corelib/arch/qatomic_arm.h.orig 2017-06-02 20:02:52.633112000 +0200 ++++ src/corelib/arch/qatomic_arm.h 2017-06-02 20:03:14.263677000 +0200 +@@ -57,6 +57,7 @@ + || defined(__ARM_ARCH_6T2__) \ + || defined(__ARM_ARCH_6Z__) \ + || defined(__ARM_ARCH_6K__) \ ++ || defined(__ARM_ARCH_6KZ__) \ + || defined(__ARM_ARCH_6ZK__) \ + || defined(__ARM_ARCH_6M__) \ + || (defined(__TARGET_ARCH_ARM) && (__TARGET_ARCH_ARM-0 >= 6)) Index: head/graphics/qt4-iconengines/Makefile =================================================================== --- head/graphics/qt4-iconengines/Makefile +++ head/graphics/qt4-iconengines/Makefile @@ -3,7 +3,7 @@ PORTNAME= iconengines DISTVERSION= ${QT4_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics PKGNAMEPREFIX= qt4- Index: head/graphics/qt4-imageformats/Makefile =================================================================== --- head/graphics/qt4-imageformats/Makefile +++ head/graphics/qt4-imageformats/Makefile @@ -3,7 +3,7 @@ PORTNAME= imageformats DISTVERSION= ${QT4_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics PKGNAMEPREFIX= qt4- Index: head/graphics/qt4-opengl/Makefile =================================================================== --- head/graphics/qt4-opengl/Makefile +++ head/graphics/qt4-opengl/Makefile @@ -3,7 +3,7 @@ PORTNAME= opengl DISTVERSION= ${QT4_VERSION} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics PKGNAMEPREFIX= qt4- Index: head/graphics/qt4-pixeltool/Makefile =================================================================== --- head/graphics/qt4-pixeltool/Makefile +++ head/graphics/qt4-pixeltool/Makefile @@ -3,7 +3,7 @@ PORTNAME= pixeltool DISTVERSION= ${QT4_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics PKGNAMEPREFIX= qt4- Index: head/graphics/qt4-svg/Makefile =================================================================== --- head/graphics/qt4-svg/Makefile +++ head/graphics/qt4-svg/Makefile @@ -3,7 +3,7 @@ PORTNAME= svg DISTVERSION= ${QT4_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics PKGNAMEPREFIX= qt4- Index: head/korean/qt4-codecs-kr/Makefile =================================================================== --- head/korean/qt4-codecs-kr/Makefile +++ head/korean/qt4-codecs-kr/Makefile @@ -3,7 +3,7 @@ PORTNAME= codecs DISTVERSION= ${QT4_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= korean PKGNAMEPREFIX= qt4- PKGNAMESUFFIX= -kr Index: head/multimedia/qt4-multimedia/Makefile =================================================================== --- head/multimedia/qt4-multimedia/Makefile +++ head/multimedia/qt4-multimedia/Makefile @@ -2,7 +2,7 @@ PORTNAME= multimedia DISTVERSION= ${QT4_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia PKGNAMEPREFIX= qt4- Index: head/net/qt4-network/Makefile =================================================================== --- head/net/qt4-network/Makefile +++ head/net/qt4-network/Makefile @@ -3,7 +3,7 @@ PORTNAME= network DISTVERSION= ${QT4_VERSION} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net ipv6 PKGNAMEPREFIX= qt4- Index: head/textproc/qt4-xml/Makefile =================================================================== --- head/textproc/qt4-xml/Makefile +++ head/textproc/qt4-xml/Makefile @@ -3,7 +3,7 @@ PORTNAME= xml DISTVERSION= ${QT4_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc PKGNAMEPREFIX= qt4- Index: head/textproc/qt4-xmlpatterns-tool/Makefile =================================================================== --- head/textproc/qt4-xmlpatterns-tool/Makefile +++ head/textproc/qt4-xmlpatterns-tool/Makefile @@ -3,7 +3,7 @@ PORTNAME= xmlpatterns-tool DISTVERSION= ${QT4_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc PKGNAMEPREFIX= qt4- Index: head/textproc/qt4-xmlpatterns/Makefile =================================================================== --- head/textproc/qt4-xmlpatterns/Makefile +++ head/textproc/qt4-xmlpatterns/Makefile @@ -3,7 +3,7 @@ PORTNAME= xmlpatterns DISTVERSION= ${QT4_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc PKGNAMEPREFIX= qt4- Index: head/www/qt4-webkit/Makefile =================================================================== --- head/www/qt4-webkit/Makefile +++ head/www/qt4-webkit/Makefile @@ -3,7 +3,7 @@ PORTNAME= webkit DISTVERSION= ${QT4_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www PKGNAMEPREFIX= qt4- Index: head/x11-themes/qt4-style-Kvantum/Makefile =================================================================== --- head/x11-themes/qt4-style-Kvantum/Makefile +++ head/x11-themes/qt4-style-Kvantum/Makefile @@ -3,6 +3,7 @@ PORTNAME= Kvantum PORTVERSION= 0.10.4 DISTVERSIONPREFIX= V +PORTREVISION= 1 CATEGORIES= x11-themes PKGNAMEPREFIX= qt4-style- Index: head/x11-themes/qt4-style-float/Makefile =================================================================== --- head/x11-themes/qt4-style-float/Makefile +++ head/x11-themes/qt4-style-float/Makefile @@ -3,7 +3,7 @@ PORTNAME= float PORTVERSION= 0.1a2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-themes MASTER_SITES= http://kde-look.org/CONTENT/content-files/ \ http://mirror.amdmi3.ru/distfiles/ Index: head/x11-themes/qt4-style-phase/Makefile =================================================================== --- head/x11-themes/qt4-style-phase/Makefile +++ head/x11-themes/qt4-style-phase/Makefile @@ -3,7 +3,7 @@ PORTNAME= phase PORTVERSION= 0.8 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-themes MASTER_SITES= http://kde-look.org/CONTENT/content-files/ \ http://mirror.amdmi3.ru/distfiles/ Index: head/x11-themes/qt4-style-quantumstyle/Makefile =================================================================== --- head/x11-themes/qt4-style-quantumstyle/Makefile +++ head/x11-themes/qt4-style-quantumstyle/Makefile @@ -3,7 +3,7 @@ PORTNAME= quantumstyle DISTVERSION= rc6 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-themes MASTER_SITES= http://saidlankri.free.fr/ \ http://mirror.amdmi3.ru/distfiles/ Index: head/x11-themes/qtcurve-qt4/Makefile =================================================================== --- head/x11-themes/qtcurve-qt4/Makefile +++ head/x11-themes/qtcurve-qt4/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= qtcurve -PORTREVISION= 0 +PORTREVISION= 1 COMMENT= QtCurve widget style for Qt 4 Index: head/x11-toolkits/qt4-gui/Makefile =================================================================== --- head/x11-toolkits/qt4-gui/Makefile +++ head/x11-toolkits/qt4-gui/Makefile @@ -3,7 +3,7 @@ PORTNAME= gui DISTVERSION= ${QT4_VERSION} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-toolkits PKGNAMEPREFIX= qt4- Index: head/x11/qt4-graphicssystems-opengl/Makefile =================================================================== --- head/x11/qt4-graphicssystems-opengl/Makefile +++ head/x11/qt4-graphicssystems-opengl/Makefile @@ -2,7 +2,7 @@ PORTNAME= graphicssystems DISTVERSION= ${QT4_VERSION} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11 PKGNAMEPREFIX= qt4- PKGNAMESUFFIX= -opengl Index: head/x11/qt4-inputmethods/Makefile =================================================================== --- head/x11/qt4-inputmethods/Makefile +++ head/x11/qt4-inputmethods/Makefile @@ -3,7 +3,7 @@ PORTNAME= inputmethods DISTVERSION= ${QT4_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 PKGNAMEPREFIX= qt4-