From b438f3b63f330dbfe746025c4315e5c65c6ac7dc4b30463b3ac35234a64f9aa3 Mon Sep 17 00:00:00 2001 From: Michael Vetter Date: Mon, 27 Jan 2020 09:44:35 +0000 Subject: [PATCH] - bsc#1161365: Fix build with Qt 5.14 OBS-URL: https://build.opensuse.org/package/show/X11:LXQt/liblxqt?expand=0&rev=17 --- liblxqt-0.14.1-fix-qt-5.14.patch | 11 +++++++++++ liblxqt.changes | 5 +++++ liblxqt.spec | 6 ++++-- 3 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 liblxqt-0.14.1-fix-qt-5.14.patch diff --git a/liblxqt-0.14.1-fix-qt-5.14.patch b/liblxqt-0.14.1-fix-qt-5.14.patch new file mode 100644 index 0000000..1612ea0 --- /dev/null +++ b/liblxqt-0.14.1-fix-qt-5.14.patch @@ -0,0 +1,11 @@ +diff -urEbw liblxqt-0.14.1/lxqtpowermanager.cpp liblxqt-0.14.1.new/lxqtpowermanager.cpp +--- liblxqt-0.14.1/lxqtpowermanager.cpp 2019-02-24 01:13:58.000000000 +0100 ++++ liblxqt-0.14.1.new/lxqtpowermanager.cpp 2020-01-27 10:41:19.505077141 +0100 +@@ -32,6 +32,7 @@ + #include + #include + #include ++#include + #include "lxqttranslator.h" + #include "lxqtglobals.h" + #include "lxqtsettings.h" diff --git a/liblxqt.changes b/liblxqt.changes index 7f56305..88ec2fd 100644 --- a/liblxqt.changes +++ b/liblxqt.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jan 27 09:43:57 UTC 2020 - Michael Vetter + +- bsc#1161365: Fix build with Qt 5.14 + ------------------------------------------------------------------- Mon Feb 25 10:06:01 UTC 2019 - mvetter@suse.com diff --git a/liblxqt.spec b/liblxqt.spec index 1c7df30..cdf2edd 100644 --- a/liblxqt.spec +++ b/liblxqt.spec @@ -1,7 +1,7 @@ # # spec file for package liblxqt # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -26,6 +26,7 @@ Url: http://www.lxqt.org Source: https://github.com/lxqt/%{name}/releases/download/%{version}/%{name}-%{version}.tar.xz Source1: https://github.com/lxqt/%{name}/releases/download/%{version}/%{name}-%{version}.tar.xz.asc Source2: %{name}.keyring +Patch0: liblxqt-0.14.1-fix-qt-5.14.patch BuildRequires: cmake >= 3.1.0 BuildRequires: fdupes BuildRequires: gcc-c++ @@ -76,6 +77,7 @@ applications that want to make use of liblxqt. %prep %setup -q -n liblxqt-%{version} +%patch0 -p1 %build %cmake -DPULL_TRANSLATIONS=No