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..72b8017 100644 --- a/libqt5-qtwayland.changes +++ b/libqt5-qtwayland.changes @@ -1,3 +1,61 @@ +------------------------------------------------------------------- +Tue May 26 11:25:20 UTC 2020 - Callum Farmer + +- Update to version 5.15.0: + * No changelog available + +------------------------------------------------------------------- +Wed May 20 16:56:26 UTC 2020 - Callum Farmer + +- Update to version 5.15.0-rc2: + * No changelog available + +------------------------------------------------------------------- +Wed May 6 11:38:28 UTC 2020 - Fabian Vogt + +- Update to 5.15.0-rc: + * New bugfix release + * For the changes between 5.14.2 and 5.15.0 please see: + http://code.qt.io/cgit/qt/qtwayland.git/plain/dist/changes-5.15.0/?h=5.15.0 + +------------------------------------------------------------------- +Fri Apr 24 07:11:37 UTC 2020 - Fabian Vogt + +- Update to 5.15.0-beta4: + * New bugfix release + * No changelog available + +------------------------------------------------------------------- +Tue Apr 14 06:47:54 UTC 2020 - Fabian Vogt + +- Update to 5.15.0-beta3: + * New bugfix release + * No changelog available + +------------------------------------------------------------------- +Tue Mar 24 12:14:02 UTC 2020 - Fabian Vogt + +- Update to 5.15.0-beta2: + * New bugfix release + * No changelog available + +------------------------------------------------------------------- +Fri Feb 28 09:59:18 UTC 2020 - Fabian Vogt + +- Update to 5.15.0-beta1: + * New bugfix release + * No changelog available + +------------------------------------------------------------------- +Wed Feb 19 10:16:52 UTC 2020 - Fabian Vogt + +- 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 diff --git a/libqt5-qtwayland.spec b/libqt5-qtwayland.spec index 9525d34..11472e7 100644 --- a/libqt5-qtwayland.spec +++ b/libqt5-qtwayland.spec @@ -1,7 +1,7 @@ # # spec file for package libqt5-qtwayland # -# Copyright (c) 2019 SUSE LLC +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -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 +%define so_version 5.15.0 +%define tar_version qtwayland-everywhere-src-5.15.0 Name: libqt5-qtwayland -Version: 5.14.1 +Version: 5.15.0 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/official_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.tar.xz b/qtwayland-everywhere-src-5.15.0.tar.xz new file mode 100644 index 0000000..12c558a --- /dev/null +++ b/qtwayland-everywhere-src-5.15.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:084133e10bfbd32a28125639660c59975f23457bba6a79b30a25802cec76a9fb +size 562408