Hello community, here is the log from the commit of package kcm_tablet for openSUSE:Factory checked in at 2020-06-04 17:57:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kcm_tablet (Old) and /work/SRC/openSUSE:Factory/.kcm_tablet.new.3606 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kcm_tablet" Thu Jun 4 17:57:01 2020 rev:9 rq:811503 version:3.2.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kcm_tablet/kcm_tablet.changes 2019-07-29 17:31:14.746182831 +0200 +++ /work/SRC/openSUSE:Factory/.kcm_tablet.new.3606/kcm_tablet.changes 2020-06-04 17:57:04.461121599 +0200 @@ -1,0 +2,7 @@ +Thu Jun 4 14:01:16 UTC 2020 - Christophe Giboudeaux <[email protected]> + +- Add patch to fix build with Qt 5.15: + * 0001-Fix-build-with-Qt-5.15.patch +- Spec cleanup + +------------------------------------------------------------------- New: ---- 0001-Fix-build-with-Qt-5.15.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kcm_tablet.spec ++++++ --- /var/tmp/diff_new_pack.iUJv9w/_old 2020-06-04 17:57:05.121123666 +0200 +++ /var/tmp/diff_new_pack.iUJv9w/_new 2020-06-04 17:57:05.125123678 +0200 @@ -1,7 +1,7 @@ # # spec file for package kcm_tablet # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # Copyright (c) 2010 Raymond Wooninck <[email protected]> # # All modifications and additions to the file contributed by third parties @@ -24,8 +24,10 @@ Summary: KDE Config Module for Wacom Tablets License: GPL-2.0-or-later Group: System/GUI/KDE -Url: https://cgit.kde.org/wacomtablet.git/ +URL: https://cgit.kde.org/wacomtablet.git/ Source: https://download.kde.org/stable/%{rname}/%{version}/%{rname}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM +Patch0: 0001-Fix-build-with-Qt-5.15.patch BuildRequires: extra-cmake-modules BuildRequires: pkgconfig BuildRequires: update-desktop-files @@ -54,7 +56,7 @@ Requires: xf86-input-wacom >= 0.20 Recommends: %{name}-lang = %{version} Recommends: xrandr >= 1.2 -Supplements: packageand(plasma5-workspace:xf86-input-wacom) +Supplements: (plasma5-workspace and xf86-input-wacom) %description This module implements a GUI for the Wacom Linux Drivers and extends it @@ -67,41 +69,20 @@ %lang_package %prep -%setup -n %{rname}-%{version} +%autosetup -p1 -n %{rname}-%{version} %build %cmake_kf5 -d build - %make_jobs + %cmake_build %install %kf5_makeinstall -C build %find_lang %{rname} %{name}.lang %find_lang plasma_applet_org.kde.plasma.%{rname} %{name}.lang - %if 0%{?suse_version} > 1320 || 0%{?sle_version} >= 120300 %{kf5_find_htmldocs} - %else - # %%kf5_find_htmldocs is only defined since Leap 42.3 - CURDIR=`pwd` - pushd %{buildroot}%{_kf5_htmldir} - for i in *; do - if ! [ -d "%{_datadir}/locale/${i}" ]; then - echo "Removing unsupported translation %{_kf5_htmldir}/${i}" - rm -rf "$i" - elif [ "$i" != "en" ]; then - echo "%doc %lang($i) %{_kf5_htmldir}/${i}" >> $CURDIR/%{name}.lang - fi - done - popd - %endif %suse_update_desktop_file kde_wacom_tabletfinder Qt KDE Utility System Configuration -%post -%desktop_database_post - -%postun -%desktop_database_postun - %files lang -f %{name}.lang %files ++++++ 0001-Fix-build-with-Qt-5.15.patch ++++++ >From 4f73ff02b3efd5e8728b18fcf1067eca166704ee Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux <[email protected]> Date: Thu, 4 Jun 2020 16:00:38 +0200 Subject: [PATCH] Fix build with Qt 5.15 --- src/kcmodule/pressurecurvewidget.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/kcmodule/pressurecurvewidget.cpp b/src/kcmodule/pressurecurvewidget.cpp index 0c943b3..f047a6c 100644 --- a/src/kcmodule/pressurecurvewidget.cpp +++ b/src/kcmodule/pressurecurvewidget.cpp @@ -22,6 +22,7 @@ //Qt includes #include <QDebug> #include <QPainter> +#include <QPainterPath> #include <QMouseEvent> #include <QResizeEvent> #include <QTabletEvent> -- 2.26.2
