From e70b30d5728015d5489544a13f2151ec2411b35c Mon Sep 17 00:00:00 2001 From: Jonathan Riddell Date: Thu, 6 Feb 2020 12:52:26 +0000 Subject: [PATCH 1/2] Update version number for 5.18.0 GIT_SILENT --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 774dc6bc03..f9f1219e60 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.1 FATAL_ERROR) project(KWIN) -set(PROJECT_VERSION "5.17.90") +set(PROJECT_VERSION "5.18.0") set(PROJECT_VERSION_MAJOR 5) set(QT_MIN_VERSION "5.12.0") From 6d8f3732c1fbd6d19af4159eed92e475aabd650f Mon Sep 17 00:00:00 2001 From: Heiko Becker Date: Wed, 29 Jan 2020 22:20:55 +0100 Subject: [PATCH 2/2] Require kdecoration >= 5.18.0 Summary: To successfully build kwin needs 13e6459a3baeebe6a7b594efd995b88f6dd7524e in kdecoration. Otherwise it fails with: "previewclient.h:93:11: error: 'QSize KDecoration2::Preview::PreviewClient::size() const' marked 'override', but does not override QSize size() const override;" So this is not a new requirement but just an update to the build system to reflect the actual requirements. Test Plan: Builds fine with the newly required version Reviewers: #kwin Subscribers: kwin Tags: #kwin Differential Revision: https://phabricator.kde.org/D27242 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f9f1219e60..1120e13fd7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -118,7 +118,7 @@ set_package_properties(KF5Kirigami2 PROPERTIES TYPE RUNTIME ) -find_package(KDecoration2 5.13.0 CONFIG REQUIRED) +find_package(KDecoration2 5.18.0 CONFIG REQUIRED) find_package(KScreenLocker CONFIG REQUIRED) set_package_properties(KScreenLocker PROPERTIES