From 398ecca1398e05058722f8df206b114ec5d99dfcae1e80b93ae5706d09c5e55e Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Sat, 6 Jun 2015 07:51:33 +0000 Subject: [PATCH] Accepting request 310374 from KDE:Qt5 Update to 5.4.2 OBS-URL: https://build.opensuse.org/request/show/310374 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libqt5-qtscript?expand=0&rev=21 --- libqt5-qtscript.changes | 8 ++++++++ libqt5-qtscript.spec | 13 +++++-------- ppc64le-support.patch | 27 --------------------------- qtscript-opensource-src-5.4.1.tar.xz | 3 --- qtscript-opensource-src-5.4.2.tar.xz | 3 +++ 5 files changed, 16 insertions(+), 38 deletions(-) delete mode 100644 ppc64le-support.patch delete mode 100644 qtscript-opensource-src-5.4.1.tar.xz create mode 100644 qtscript-opensource-src-5.4.2.tar.xz diff --git a/libqt5-qtscript.changes b/libqt5-qtscript.changes index 65aadd2..98d3aea 100644 --- a/libqt5-qtscript.changes +++ b/libqt5-qtscript.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Jun 3 22:56:28 UTC 2015 - hrvoje.senjan@gmail.com + +- Update to 5.4.2 + * Bugfix release, for more details please see: + http://blog.qt.io/blog/2015/06/02/qt-5-4-2-released/ +- Drop ppc64le-support.patch, merged upstream + ------------------------------------------------------------------- Tue Feb 24 16:10:25 UTC 2015 - hrvoje.senjan@gmail.com diff --git a/libqt5-qtscript.spec b/libqt5-qtscript.spec index 3c1a378..aef001a 100644 --- a/libqt5-qtscript.spec +++ b/libqt5-qtscript.spec @@ -1,7 +1,7 @@ # # spec file for package libqt5-qtscript # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,22 +21,20 @@ %define libname libQt5Script5 Name: libqt5-qtscript -Version: 5.4.1 +Version: 5.4.2 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.4.1 -%define so_version 5.4.1 +%define real_version 5.4.2 +%define so_version 5.4.2 %define tar_version qtscript-opensource-src-%{real_version} Source: %{tar_version}.tar.xz Source1: baselibs.conf -# PATCH-FIX-UPSTREAM ppc64le-support.diff uweigand@de.ibm.com -- add support for ppc64le -Patch1: ppc64le-support.patch # PATCH-FIX-UPSTREAM libqt5-qtscript-s390-support.patch -- adds s390, taken from webkit upstream -Patch2: libqt5-qtscript-s390-support.patch +Patch1: libqt5-qtscript-s390-support.patch BuildRequires: libQt5Core-private-headers-devel >= %{version} BuildRequires: libQt5Widgets-private-headers-devel >= %{version} BuildRequires: pkgconfig(Qt5DBus) >= %{version} @@ -59,7 +57,6 @@ handling. %prep %setup -q -n qtscript-opensource-src-%{real_version} %patch1 -p1 -%patch2 -p1 %package -n %libname Summary: Qt 5 QtScript Library diff --git a/ppc64le-support.patch b/ppc64le-support.patch deleted file mode 100644 index b244e90..0000000 --- a/ppc64le-support.patch +++ /dev/null @@ -1,27 +0,0 @@ -Index: qtscript-opensource-src-5.2.0-rc1/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h -=================================================================== ---- qtscript-opensource-src-5.2.0-rc1.orig/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h -+++ qtscript-opensource-src-5.2.0-rc1/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h -@@ -156,16 +156,22 @@ - || defined(__POWERPC__) \ - || defined(_M_PPC) \ - || defined(__PPC) -+#if !defined(__ppc64__) && !defined(__PPC64__) - #define WTF_CPU_PPC 1 -+#endif -+#if !defined(__LITTLE_ENDIAN__) - #define WTF_CPU_BIG_ENDIAN 1 - #endif -+#endif - - /* CPU(PPC64) - PowerPC 64-bit */ - #if defined(__ppc64__) \ - || defined(__PPC64__) - #define WTF_CPU_PPC64 1 -+#if !defined(__LITTLE_ENDIAN__) - #define WTF_CPU_BIG_ENDIAN 1 - #endif -+#endif - - /* CPU(SH4) - SuperH SH-4 */ - #if defined(__SH4__) diff --git a/qtscript-opensource-src-5.4.1.tar.xz b/qtscript-opensource-src-5.4.1.tar.xz deleted file mode 100644 index 9c45848..0000000 --- a/qtscript-opensource-src-5.4.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f432acc8376b86279faee273ff4e26226059d0cffbaced35e05a559d2efbcbaf -size 2581684 diff --git a/qtscript-opensource-src-5.4.2.tar.xz b/qtscript-opensource-src-5.4.2.tar.xz new file mode 100644 index 0000000..0d980a6 --- /dev/null +++ b/qtscript-opensource-src-5.4.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e042e444de4c759b562f6e8097a668b84bea5b9ccd8290d18931a2cc80affa47 +size 2591672