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

Collapse All | Expand All

(-)Mk/bsd.qt.mk (-1 / +3 lines)
Lines 171-177 Link Here
171 
. if ${QT_DIST} == "base" || ${_QT_VERSION:M4*}
 171 
. if ${QT_DIST} == "base" || ${_QT_VERSION:M4*}
172 
.  if ${_QT_VERSION:M4*}
 172 
.  if ${_QT_VERSION:M4*}
173 
_EXTRA_PATCHES_QT4=	${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-src-corelib-global-qglobal.h \
 173 
_EXTRA_PATCHES_QT4=	${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-src-corelib-global-qglobal.h \
174 
					${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-libtool
 174 
					${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-libtool \
175 
					${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_Platform.h \
176 
					${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-src_corelib_arch_qatomic_arm.h
175 
.  else
 177 
.  else
176 
_EXTRA_PATCHES_QT5=	${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-src_corelib_global_qcompilerdetection.h \
 178 
_EXTRA_PATCHES_QT5=	${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-src_corelib_global_qcompilerdetection.h \
177 
					${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_features_qt__module.prf
 179 
					${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_features_qt__module.prf
(-)devel/qt4/files/extrapatch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_Platform.h (+10 lines)
Line 0 Link Here
1 
--- src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h.orig	2014-04-10 22:37:12.000000000 +0400
2 
+++ src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h	2014-12-20 07:17:24.000000000 +0300
3 
@@ -254,6 +254,7 @@
4 
 #elif defined(__ARM_ARCH_6__) \
5 
     || defined(__ARM_ARCH_6J__) \
6 
     || defined(__ARM_ARCH_6K__) \
7 
+    || defined(__ARM_ARCH_6KZ__) \
8 
     || defined(__ARM_ARCH_6Z__) \
9 
     || defined(__ARM_ARCH_6ZK__) \
10 
     || defined(__ARM_ARCH_6T2__) \
(-)devel/qt4/files/extrapatch-src_corelib_arch_qatomic_arm.h (+10 lines)
Line 0 Link Here
1 
--- src/corelib/arch/qatomic_arm.h.orig	2016-04-20 19:50:29 UTC
2 
+++ src/corelib/arch/qatomic_arm.h
3 
@@ -57,6 +57,7 @@ QT_END_INCLUDE_HEADER
4 
     || defined(__ARM_ARCH_6T2__) \
5 
     || defined(__ARM_ARCH_6Z__) \
6 
     || defined(__ARM_ARCH_6K__) \
7 
+    || defined(__ARM_ARCH_6KZ__) \
8 
     || defined(__ARM_ARCH_6ZK__) \
9 
     || defined(__ARM_ARCH_6M__) \
10 
     || (defined(__TARGET_ARCH_ARM) && (__TARGET_ARCH_ARM-0 >= 6))

Return to bug 210027