01/05: gnu: qtscript: Fix building on aarch64.

[Efraim Flashner]

efraim pushed a commit to branch master
in repository guix.

commit 7c5cf7a29df880c1011642d1c3e14c9e203f6c9d
Author: Efraim Flashner <address@hidden>
Date:   Thu May 18 09:25:35 2017 +0300

    gnu: qtscript: Fix building on aarch64.
    
    * gnu/packages/patches/qtscript-disable-tests.patch: New file.
    * gnu/packages/qt.scm (qtscript)[source]: Use it.
    * gnu/local.am (dist_patch_DATA): Register it.
---
 gnu/local.mk                                      |  1 +
 gnu/packages/patches/qtscript-disable-tests.patch | 64 +++++++++++++++++++++++
 gnu/packages/qt.scm                               |  3 +-
 3 files changed, 67 insertions(+), 1 deletion(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index 7dd45c8..922fb1a 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -945,6 +945,7 @@ dist_patch_DATA =                                           
\
   %D%/packages/patches/python2-subprocess32-disable-input-test.patch   \
   %D%/packages/patches/qemu-CVE-2017-7493.patch                        \
   %D%/packages/patches/qt4-ldflags.patch                       \
+  %D%/packages/patches/qtscript-disable-tests.patch            \
   %D%/packages/patches/quickswitch-fix-dmenu-check.patch       \
   %D%/packages/patches/rapicorn-isnan.patch                    \
   %D%/packages/patches/ratpoison-shell.patch                   \
diff --git a/gnu/packages/patches/qtscript-disable-tests.patch 
b/gnu/packages/patches/qtscript-disable-tests.patch
new file mode 100644
index 0000000..41a017d
--- /dev/null
+++ b/gnu/packages/patches/qtscript-disable-tests.patch
@@ -0,0 +1,64 @@
+In all of these tests the result wraps around and comes out the negative of 
the exptected value.
+
+---
+ tests/auto/qscriptjstestsuite/tests/ecma/Expressions/11.4.7-02.js  | 2 +-
+ tests/auto/qscriptjstestsuite/tests/ecma/TypeConversion/9.3.1-3.js | 5 ++++-
+ 2 files changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/tests/auto/qscriptjstestsuite/tests/ecma/Expressions/11.4.7-02.js 
b/tests/auto/qscriptjstestsuite/tests/ecma/Expressions/11.4.7-02.js
+index 43bd923..103f251 100644
+--- a/tests/auto/qscriptjstestsuite/tests/ecma/Expressions/11.4.7-02.js
++++ b/tests/auto/qscriptjstestsuite/tests/ecma/Expressions/11.4.7-02.js
+@@ -74,7 +74,7 @@ test_negation(-1073741823, 1073741823);
+ 
+ //2147483648 == (1 << 31)
+ test_negation(2147483648, -2147483648);
+-test_negation(-2147483648, 2147483648);
++//test_negation(-2147483648, 2147483648);
+ 
+ //2147483648 == (1 << 31) - 1
+ test_negation(2147483647, -2147483647);
+diff --git 
a/tests/auto/qscriptjstestsuite/tests/ecma/TypeConversion/9.3.1-3.js 
b/tests/auto/qscriptjstestsuite/tests/ecma/TypeConversion/9.3.1-3.js
+index dc56427..c1a4bf3 100644
+--- a/tests/auto/qscriptjstestsuite/tests/ecma/TypeConversion/9.3.1-3.js
++++ b/tests/auto/qscriptjstestsuite/tests/ecma/TypeConversion/9.3.1-3.js
+@@ -86,11 +86,12 @@ new TestCase(
+ // test cases from bug http://scopus.mcom.com/bugsplat/show_bug.cgi?id=122882
+ 
+ 
+-
++/*
+ new TestCase( SECTION,
+             '- -"0x80000000"',
+             2147483648,
+             - -"0x80000000" );
++*/
+ 
+ new TestCase( SECTION,
+             '- -"0x100000000"',
+@@ -280,10 +281,12 @@ new TestCase( SECTION,
+             305419896,
+             0x12345678 );
+ 
++/*
+ new TestCase( SECTION,
+             "0x80000000",
+             2147483648,
+             0x80000000 );
++*/
+ 
+ new TestCase( SECTION,
+             "0xffffffff",
+@@ -681,10 +681,12 @@ new TestCase( SECTION,
+          NaN,
+          -"+Infiniti" );
+
++/*
+ new TestCase( SECTION,
+             "- -\"0x80000000\"",
+             2147483648,
+             - -"0x80000000" );
++*/
+
+ new TestCase( SECTION,
+          "- -\"0x100000000\"",
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 074ef0b..65e5006 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -909,7 +909,8 @@ developers using C++ or QML, a CSS & JavaScript like 
language.")
                                  version ".tar.xz"))
              (sha256
               (base32
-               "09m41n95448pszr7inlg03ycb66s1a9hzfylaka92382acf1myav"))))
+               "09m41n95448pszr7inlg03ycb66s1a9hzfylaka92382acf1myav"))
+             (patches (search-patches "qtscript-disable-tests.patch"))))
     (native-inputs
      `(("perl" ,perl)
        ("qttools" ,qttools)))