From a318ce1cb2dc9d69eed236477f459ae19fb2eed768ac912133568679645ad890 Mon Sep 17 00:00:00 2001
From: Christophe Giboudeaux <christophe@krop.fr>
Date: Wed, 26 Feb 2020 12:43:23 +0000
Subject: [PATCH] Qt 5.15 Alpha

OBS-URL: https://build.opensuse.org/package/show/KDE:Qt:5.15/libqt5-qtwayland?expand=0&rev=2
---
 fix-return-nonvoid-function.patch            | 14 ------------
 libqt5-qtwayland.changes                     | 10 ++++++++
 libqt5-qtwayland.spec                        | 24 ++++----------------
 qtwayland-everywhere-src-5.14.1.tar.xz       |  3 ---
 qtwayland-everywhere-src-5.15.0-alpha.tar.xz |  3 +++
 5 files changed, 18 insertions(+), 36 deletions(-)
 delete mode 100644 fix-return-nonvoid-function.patch
 delete mode 100644 qtwayland-everywhere-src-5.14.1.tar.xz
 create mode 100644 qtwayland-everywhere-src-5.15.0-alpha.tar.xz

diff --git a/fix-return-nonvoid-function.patch b/fix-return-nonvoid-function.patch
deleted file mode 100644
index 8e7dc50..0000000
--- a/fix-return-nonvoid-function.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: qtwayland-everywhere-src-5.14.0-alpha/src/client/qwaylandinputdevice.cpp
-===================================================================
---- qtwayland-everywhere-src-5.14.0-alpha.orig/src/client/qwaylandinputdevice.cpp
-+++ qtwayland-everywhere-src-5.14.0-alpha/src/client/qwaylandinputdevice.cpp
-@@ -968,6 +968,9 @@ bool QWaylandInputDevice::Pointer::Frame
-     case axis_source_finger:
-     case axis_source_continuous:
-         return !delta.isNull();
-+    default:
-+        Q_UNREACHABLE();
-+        return false;
-     }
- }
- 
diff --git a/libqt5-qtwayland.changes b/libqt5-qtwayland.changes
index 26935b9..128cbef 100644
--- a/libqt5-qtwayland.changes
+++ b/libqt5-qtwayland.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Wed Feb 19 10:16:52 UTC 2020 - Fabian Vogt <fabian@ritter-vogt.de>
+
+- Update to 5.15.0-alpha:
+  * New feature release
+  * For more details please see:
+    https://wiki.qt.io/New_Features_in_Qt_5.15
+- Drop patches, now upstream:
+  * fix-return-nonvoid-function.patch
+
 -------------------------------------------------------------------
 Mon Jan 27 13:14:42 UTC 2020 - Fabian Vogt <fabian@ritter-vogt.de>
 
diff --git a/libqt5-qtwayland.spec b/libqt5-qtwayland.spec
index 9525d34..7f88532 100644
--- a/libqt5-qtwayland.spec
+++ b/libqt5-qtwayland.spec
@@ -19,21 +19,19 @@
 %define qt5_snapshot 0
 %define libname libQt5WaylandCompositor5
 %define base_name libqt5
-%define real_version 5.14.1
-%define so_version 5.14.1
-%define tar_version qtwayland-everywhere-src-5.14.1
+%define real_version 5.15.0-alpha
+%define so_version 5.15.0
+%define tar_version qtwayland-everywhere-src-5.15.0-alpha
 Name:           libqt5-qtwayland
-Version:        5.14.1
+Version:        5.15.0~alpha
 Release:        0
 Summary:        Qt 5 Wayland Addon
 # The wayland compositor files are GPL-3.0-or-later
 License:        GPL-3.0-or-later AND (LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-or-later)
 Group:          Development/Libraries/X11
 URL:            https://www.qt.io
-Source:         https://download.qt.io/official_releases/qt/5.14/%{real_version}/submodules/%{tar_version}.tar.xz
+Source:         https://download.qt.io/development_releases/qt/5.15/%{real_version}/submodules/%{tar_version}.tar.xz
 Source1:        baselibs.conf
-# PATCH-FIX-OPENSUSE
-Patch100:       fix-return-nonvoid-function.patch
 BuildRequires:  fdupes
 BuildRequires:  libqt5-qtbase-private-headers-devel >= %{version}
 BuildRequires:  libqt5-qtdeclarative-private-headers-devel >= %{version}
@@ -46,10 +44,6 @@ BuildRequires:  pkgconfig(wayland-server) >= 1.1.0
 BuildRequires:  pkgconfig(xcomposite)
 BuildRequires:  pkgconfig(xkbcommon) >= 0.2.0
 Conflicts:      qtwayland
-%if 0%{?suse_version} < 1330
-# It does not build with the default compiler (GCC 4.8) on Leap 42.x
-BuildRequires:  gcc7-c++
-%endif
 %if %{qt5_snapshot}
 #to create the forwarding headers
 BuildRequires:  perl
@@ -123,16 +117,8 @@ Examples for libqt5-qtwayland module.
 mkdir .git
 %endif
 %{_libqt5_qmake} \
-%if 0%{?suse_version} < 1330
-    QMAKE_CC=gcc-7 QMAKE_CXX=g++-7 CONFIG+=c++14 \
-%endif
 	CONFIG+=wayland-compositor
 
-%if 0%{?suse_version} < 1330
-    export CC=gcc-7
-    export CXX=g++-7
-%endif
-
 %make_jobs
 
 %install
diff --git a/qtwayland-everywhere-src-5.14.1.tar.xz b/qtwayland-everywhere-src-5.14.1.tar.xz
deleted file mode 100644
index edcd652..0000000
--- a/qtwayland-everywhere-src-5.14.1.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2a03b9f554e88c5824ef237c814b3dd45844c022e97be0e091f4a502ca4c9520
-size 544744
diff --git a/qtwayland-everywhere-src-5.15.0-alpha.tar.xz b/qtwayland-everywhere-src-5.15.0-alpha.tar.xz
new file mode 100644
index 0000000..edf4bf2
--- /dev/null
+++ b/qtwayland-everywhere-src-5.15.0-alpha.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4dddd8437d97e44824c098e9a56098a54cd4331d9c6840172a77cc733985834f
+size 561868