CVS commit: pkgsrc/x11/qt4-libs

["Richard PALO" <richard%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   richard
Date:           Tue Aug 30 07:58:27 UTC 2016

Modified Files:
        pkgsrc/x11/qt4-libs: distinfo options.mk
Added Files:
        pkgsrc/x11/qt4-libs/patches:
            patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_Platform.h

Log Message:
deal with aarch64 in webkit wtf for qt4-libs


To generate a diff of this commit:
cvs rdiff -u -r1.109 -r1.110 pkgsrc/x11/qt4-libs/distinfo
cvs rdiff -u -r1.6 -r1.7 pkgsrc/x11/qt4-libs/options.mk
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/x11/qt4-libs/patches/patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_Platform.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/qt4-libs/distinfo
diff -u pkgsrc/x11/qt4-libs/distinfo:1.109 pkgsrc/x11/qt4-libs/distinfo:1.110
--- pkgsrc/x11/qt4-libs/distinfo:1.109  Tue May 31 21:35:11 2016
+++ pkgsrc/x11/qt4-libs/distinfo        Tue Aug 30 07:58:27 2016
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.109 2016/05/31 21:35:11 joerg Exp $
+$NetBSD: distinfo,v 1.110 2016/08/30 07:58:27 richard Exp $
 
 SHA1 (qt-everywhere-opensource-src-4.8.7.tar.gz) = 76aef40335c0701e5be7bb3a9101df5d22fe3666
 RMD160 (qt-everywhere-opensource-src-4.8.7.tar.gz) = afb5e5a99388e6429faca59cb5000054feffd166
@@ -57,6 +57,7 @@ SHA1 (patch-src_3rdparty_webkit_Source_J
 SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_HashSet.h) = 25654a9f2cedb17b5f536b324e47d56eb4010029
 SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_MathExtras.h) = 68152f0077ec5bcce1b3774aaac64af5fd9e491e
 SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_NullPtr.h) = 3c1dbd49e236669fe9849918e571eed58980421b
+SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_Platform.h) = 8f398aebc6d1b380c271489248efd92a35c7e23d
 SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_RefCountedLeakCounter.h) = fc4686c018471fcae375d9382737e0844a0f45a8
 SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_StringImpl.h) = d5460bede6b3662df4d9dbec5826db98c6ef4f61
 SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_ThreadSafeRefCounted.h) = 2d3176beb56697d033387ab10729cfb6681d01c7

Index: pkgsrc/x11/qt4-libs/options.mk
diff -u pkgsrc/x11/qt4-libs/options.mk:1.6 pkgsrc/x11/qt4-libs/options.mk:1.7
--- pkgsrc/x11/qt4-libs/options.mk:1.6  Wed Jun 18 09:26:12 2014
+++ pkgsrc/x11/qt4-libs/options.mk      Tue Aug 30 07:58:27 2016
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.6 2014/06/18 09:26:12 wiz Exp $
+# $NetBSD: options.mk,v 1.7 2016/08/30 07:58:27 richard Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.qt4
 PKG_SUPPORTED_OPTIONS= cups debug gtk2
@@ -6,7 +6,7 @@ PKG_SUPPORTED_OPTIONS=  cups debug gtk2
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mcups)
-.  include "../../print/cups15/buildlink3.mk"
+.  include "../../print/cups/buildlink3.mk"
 CONFIGURE_ARGS+=       -cups
 .else
 CONFIGURE_ARGS+=       -no-cups

Added files:

Index: pkgsrc/x11/qt4-libs/patches/patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_Platform.h
diff -u /dev/null pkgsrc/x11/qt4-libs/patches/patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_Platform.h:1.1
--- /dev/null   Tue Aug 30 07:58:27 2016
+++ pkgsrc/x11/qt4-libs/patches/patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_Platform.h  Tue Aug 30 07:58:27 2016
@@ -0,0 +1,25 @@
+$NetBSD: patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_Platform.h,v 1.1 2016/08/30 07:58:27 richard Exp $
+deal with aarch64
+--- src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h.orig      2015-05-07 14:14:45.000000000 +0000
++++ src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h
+@@ -373,6 +373,10 @@
+ #define WTF_CPU_NEEDS_ALIGNED_ACCESS 1
+ #endif
+ 
++/* CPU(AARCH64) */
++#if defined(__aarch64__)
++#define WTF_CPU_AARCH64 1
++#endif
+ /* ==== OS() - underlying operating system; only to be used for mandated low-level services like 
+    virtual memory, not to choose a GUI toolkit ==== */
+ 
+@@ -1003,7 +1007,8 @@
+     || CPU(SPARC64) \
+     || CPU(S390X) \
+     || CPU(PPC64) \
+-    || CPU(MIPS64)
++    || CPU(MIPS64) \
++    || CPU(AARCH64)
+ #define WTF_USE_JSVALUE64 1
+ #else
+ #define WTF_USE_JSVALUE32_64 1