Index: Mk/bsd.qt.mk =================================================================== --- Mk/bsd.qt.mk +++ Mk/bsd.qt.mk @@ -173,6 +173,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 arm6 architecture: https://gcc.gnu.org/ml/gcc-patches/2015-06/msg01679.html +_EXTRA_PATCHES_QT4+= ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-arm6 . 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: devel/qt4-qmake/Makefile =================================================================== --- devel/qt4-qmake/Makefile +++ devel/qt4-qmake/Makefile @@ -3,7 +3,7 @@ PORTNAME= qmake DISTVERSION= ${QT4_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel PKGNAMEPREFIX= qt4- Index: devel/qt4-script/Makefile =================================================================== --- devel/qt4-script/Makefile +++ devel/qt4-script/Makefile @@ -3,7 +3,7 @@ PORTNAME= script DISTVERSION= ${QT4_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel PKGNAMEPREFIX= qt4- Index: devel/qt4/files/extrapatch-arm6 =================================================================== --- /dev/null +++ devel/qt4/files/extrapatch-arm6 @@ -0,0 +1,38 @@ +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/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h.orig 2017-06-02 20:02:20.027527000 +0200 ++++ src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h 2017-06-02 20:02:44.473068000 +0200 +@@ -279,6 +279,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: www/qt4-webkit/Makefile =================================================================== --- www/qt4-webkit/Makefile +++ www/qt4-webkit/Makefile @@ -3,7 +3,7 @@ PORTNAME= webkit DISTVERSION= ${QT4_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www PKGNAMEPREFIX= qt4-