Accepting request 227528 from KDE:Qt5

Update to 5.3.0 beta

OBS-URL: https://build.opensuse.org/request/show/227528
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libqt5-qtscript?expand=0&rev=11

aarch64-support.patch

@@ -1,49 +0,0 @@
-From: Riku Voipio <riku.voipio@iki.fi>
-Date: Tue, 07 Jan 2014 15:15:56 +0000
-Subject: Detect AArch64 architecture
-X-Git-Url: http://quickgit.kde.org/?p=qt%2Fqtscript.git&a=commitdiff&h=2e049836ee16f4aedbe7ccc3335fc57852725716
----
-Detect AArch64 architecture
-
-Adds WTF platform support for the AArch64 architecture.
-
-Patch is based on WebKit-gtk patch done by Riku Voipio, and was
-cherry-picked and tested by Marcin Juszkiewicz.
-
-Task-number: QTBUG-35442
-
-Change-Id: Ie6194f3c430cb6513367a3cdf221a41d60a1ed14
-Signed-off-by: Riku Voipio <riku.voipio@iki.fi>
-Signed-off-by: Marcin Juszkiewicz <marcin@juszkiewicz.com.pl>
-Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
----
-
-
---- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
-+++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
-@@ -209,6 +209,14 @@
- #define WTF_CPU_AIX64 1
- #endif
-
-+/* CPU(AARCH64) - AArch64 */
-+#if defined(__aarch64__)
-+#define WTF_CPU_AARCH64 1
-+#if defined(__AARCH64EB__)
-+#define WTF_CPU_BIG_ENDIAN 1
-+#endif
-+#endif
-+
- /* CPU(ARM) - ARM, any version*/
- #if   defined(arm) \
-     || defined(__arm__) \
-@@ -896,7 +904,7 @@
- #endif
-
- #if !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32) && !defined(WTF_USE_JSVALUE32_64)
--#if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64) || CPU(MIPS64)
-+#if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64) || CPU(MIPS64) || CPU(AARCH64)
- #define WTF_USE_JSVALUE64 1
- #elif CPU(ARM) || CPU(PPC64)
- #define WTF_USE_JSVALUE32 1
-
-

libqt5-qtscript-s390-support.patch

@@ -1,5 +1,5 @@
---- qtscript-opensource-src-5.2.1.orig/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
+--- qtscript-opensource-src-5.3.0-beta.orig/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h	2014-03-25 19:58:23.107458803 +0100
-+++ qtscript-opensource-src-5.2.1/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
++++ qtscript-opensource-src-5.3.0-beta/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h	2014-03-25 19:59:36.641818784 +0100
 @@ -195,6 +195,18 @@
  #define WTF_CPU_SPARC 1
  #endif
@@ -19,9 +19,9 @@
  /* CPU(X86) - i386 / x86 32-bit */
  #if   defined(__i386__) \
      || defined(i386)     \
-@@ -912,7 +924,7 @@
+@@ -919,7 +931,7 @@
  #if !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32) && !defined(WTF_USE_JSVALUE32_64)
- #if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64) || CPU(MIPS64) || CPU(AARCH64)
+ #if (CPU(X86_64) && !CPU(X32) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64) || CPU(MIPS64) || CPU(AARCH64)
  #define WTF_USE_JSVALUE64 1
 -#elif CPU(ARM) || CPU(PPC64)
 +#elif CPU(ARM) || CPU(PPC64) || CPU(S390X)

libqt5-qtscript.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Tue Mar 25 11:44:16 UTC 2014 - hrvoje.senjan@gmail.com
+
+- Update to 5.3.0 beta
+  * New feature release, please see
+  http://blog.qt.digia.com/blog/2014/03/25/qt-5-3-beta-released/
+  and http://qt-project.org/wiki/New-Features-in-Qt-5.3
+- Drop aarch64-support.patch, merged upstream
+- Rebase libqt5-qtscript-s390-support.patch for this release
+
 -------------------------------------------------------------------
 Fri Mar 21 02:31:22 UTC 2014 - hrvoje.senjan@gmail.com
 

libqt5-qtscript.spec

@@ -21,15 +21,15 @@
 %define libname libQt5Script5
 
 Name:           libqt5-qtscript
-Version:        5.2.1
+Version:        5.3.0~beta
 Release:        0
 Summary:        Qt 5 QtScript Library
 License:        SUSE-LGPL-2.1-with-digia-exception-1.1 or GPL-3.0
 Group:          Development/Libraries/X11
 Url:            http://qt.digia.com
 %define base_name libqt5
-%define real_version 5.2.1
+%define real_version 5.3.0-beta
-%define so_version 5.2.1
+%define so_version 5.3.0
 %if %qt5_snapshot
 %define tar_version qtscript-%{real_version}
 %else
@@ -38,10 +38,8 @@ Url:            http://qt.digia.com
 Source:         %{tar_version}.tar.xz
 # PATCH-FIX-UPSTREAM ppc64le-support.diff uweigand@de.ibm.com -- add support for ppc64le
 Patch1:         ppc64le-support.patch
-# PATCH-FIX-UPSTREAM aarch64-support.patch  -- add support for aarch64
-Patch2:         aarch64-support.patch
 # PATCH-FIX-UPSTREAM libqt5-qtscript-s390-support.patch -- adds s390, taken from webkit upstream
-Patch3:         libqt5-qtscript-s390-support.patch
+Patch2:         libqt5-qtscript-s390-support.patch
 BuildRequires:  libQt5Core-private-headers-devel >= %{version}
 BuildRequires:  libQt5Widgets-private-headers-devel >= %{version}
 BuildRequires:  pkgconfig(Qt5DBus) >= %{version}
@@ -69,7 +67,6 @@ handling.
 %endif
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 
 %package -n %libname
 Summary:        Qt 5 QtScript Library

qtscript-opensource-src-5.2.1.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6621350d5eff65cb6f9853247246f30a2d4cdb465c14923ff7ccbd8c3a9cdefa
-size 2585204

qtscript-opensource-src-5.3.0-beta.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bbc76f45e425f9ef3cdaa7e7a8aeaeca8eb79ab611248507f2f0529e95d227cc
+size 2589996