Attachment 183121 Details for Bug 210027 – patch

[patch] patch

qt4.diff (text/plain), 3.21 KB, created by Mikael Urankar on 2017-06-01 09:45:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mikael Urankar

Created: 2017-06-01 09:45:14 UTC

Size: 3.21 KB

patch

obsolete

>Index: Mk/bsd.qt.mk
>===================================================================
>--- Mk/bsd.qt.mk	(revision 430609)
>+++ Mk/bsd.qt.mk	(working copy)
>@@ -171,7 +171,9 @@
> . if ${QT_DIST} == "base" || ${_QT_VERSION:M4*}
> .  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
>+					${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-libtool \
>+					${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_Platform.h \
>+					${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-src_corelib_arch_qatomic_arm.h
> .  else
> _EXTRA_PATCHES_QT5=	${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-src_corelib_global_qcompilerdetection.h \
> 					${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_features_qt__module.prf
>Index: devel/qt4/files/extrapatch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_Platform.h
>===================================================================
>--- devel/qt4/files/extrapatch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_Platform.h	(nonexistent)
>+++ devel/qt4/files/extrapatch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_Platform.h	(working copy)
>@@ -0,0 +1,10 @@
>+--- src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h.orig	2014-04-10 22:37:12.000000000 +0400
>++++ src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h	2014-12-20 07:17:24.000000000 +0300
>+@@ -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__) \
>
>Property changes on: devel/qt4/files/extrapatch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_Platform.h
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>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
>Index: devel/qt4/files/extrapatch-src_corelib_arch_qatomic_arm.h
>===================================================================
>--- devel/qt4/files/extrapatch-src_corelib_arch_qatomic_arm.h	(nonexistent)
>+++ devel/qt4/files/extrapatch-src_corelib_arch_qatomic_arm.h	(working copy)
>@@ -0,0 +1,10 @@
>+--- src/corelib/arch/qatomic_arm.h.orig	2016-04-20 19:50:29 UTC
>++++ src/corelib/arch/qatomic_arm.h
>+@@ -57,6 +57,7 @@ QT_END_INCLUDE_HEADER
>+     || 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))
>
>Property changes on: devel/qt4/files/extrapatch-src_corelib_arch_qatomic_arm.h
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>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

Actions: View | Diff

Attachments on bug 210027: 171015 | 171650 | 171651 | 178963 | 183121