Christophe Giboudeaux 2020-02-26 12:43:23 +00:00 committed by Git OBS Bridge
parent f25bd55e18
commit a318ce1cb2
5 changed files with 18 additions and 36 deletions

View File

@ -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;
}
}

View File

@ -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>

View File

@ -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

View File

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

View File

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