Hello community, here is the log from the commit of package kmousetool for openSUSE:Factory checked in at 2019-11-15 22:37:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kmousetool (Old) and /work/SRC/openSUSE:Factory/.kmousetool.new.26869 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kmousetool" Fri Nov 15 22:37:30 2019 rev:103 rq:748600 version:19.08.3 Changes: -------- --- /work/SRC/openSUSE:Factory/kmousetool/kmousetool.changes 2019-11-12 11:38:01.410259037 +0100 +++ /work/SRC/openSUSE:Factory/.kmousetool.new.26869/kmousetool.changes 2019-11-15 22:37:31.563984244 +0100 @@ -1,0 +2,6 @@ +Thu Nov 14 10:18:31 UTC 2019 - Christophe Giboudeaux <christo...@krop.fr> + +- Add Fix-build-with-Qt-5_14.diff to fix build with Qt 5.14. +- Use cmake() style BuildRequires when possible. + +------------------------------------------------------------------- New: ---- Fix-build-with-Qt-5_14.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kmousetool.spec ++++++ --- /var/tmp/diff_new_pack.Ci8ztj/_old 2019-11-15 22:37:32.123986060 +0100 +++ /var/tmp/diff_new_pack.Ci8ztj/_new 2019-11-15 22:37:32.135986099 +0100 @@ -1,7 +1,7 @@ # # spec file for package kmousetool # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -32,19 +32,22 @@ Source1: https://download.kde.org/stable/applications/%{version}/src/%{name}-%{version}.tar.xz.sig Source2: applications.keyring %endif +# PATCH-FIX-UPSTREAM +Patch0: Fix-build-with-Qt-5_14.diff BuildRequires: alsa-devel BuildRequires: extra-cmake-modules -BuildRequires: kdelibs4support-devel -BuildRequires: knotifications-devel BuildRequires: oxygen-icon-theme-large -BuildRequires: phonon4qt5-devel BuildRequires: pkgconfig BuildRequires: sbl BuildRequires: update-desktop-files BuildRequires: xz -BuildRequires: pkgconfig(Qt5Core) >= 5.3.0 -BuildRequires: pkgconfig(Qt5Gui) >= 5.3.0 -BuildRequires: pkgconfig(Qt5Widgets) >= 5.3.0 +BuildRequires: cmake(KF5KDELibs4Support) +BuildRequires: cmake(KF5Notifications) +BuildRequires: cmake(KF5WindowSystem) +BuildRequires: cmake(Phonon4Qt5) +BuildRequires: cmake(Qt5Core) >= 5.3.0 +BuildRequires: cmake(Qt5Gui) >= 5.3.0 +BuildRequires: cmake(Qt5Widgets) >= 5.3.0 BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xext) BuildRequires: pkgconfig(xt) @@ -63,7 +66,7 @@ %endif %prep -%setup -q +%autosetup -p1 %build %cmake_kf5 -d build ++++++ Fix-build-with-Qt-5_14.diff ++++++ diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -23,6 +23,7 @@ I18n IconThemes Notifications + WindowSystem # fixx11.h XmlGui ) diff --git a/kmousetool/CMakeLists.txt b/kmousetool/CMakeLists.txt --- a/kmousetool/CMakeLists.txt +++ b/kmousetool/CMakeLists.txt @@ -23,7 +23,8 @@ KF5::I18n KF5::IconThemes KF5::Notifications - KF5::XmlGui + KF5::WindowSystem + KF5::XmlGui ${X11_XTest_LIB} ${X11_Xext_LIB} ${X11_LIBRARIES}) diff --git a/kmousetool/kmousetool.cpp b/kmousetool/kmousetool.cpp --- a/kmousetool/kmousetool.cpp +++ b/kmousetool/kmousetool.cpp @@ -21,15 +21,13 @@ #include "kmousetool.h" -// Needs to be be before X11/Intrinsic.h because of qtextstream.h -#include <phonon/MediaObject> - #include <X11/Xmd.h> #include "mtstroke.h" #include <X11/Intrinsic.h> /* Intrinsics Definitions*/ #include <X11/StringDefs.h> /* Standard Name-String definitions*/ #include <X11/extensions/xtestext1.h> /* Standard Name-String definitions*/ #include <X11/extensions/XTest.h> /* Standard Name-String definitions*/ +#include <fixx11h.h> #include <QAbstractEventDispatcher> #include <QApplication> @@ -50,6 +48,8 @@ #include <KSharedConfig> #include <KStandardGuiItem> +#include <phonon/MediaObject> + int currentXPosition; int currentYPosition;
