Hello community, here is the log from the commit of package kruler for openSUSE:Factory checked in at 2019-11-15 22:37:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kruler (Old) and /work/SRC/openSUSE:Factory/.kruler.new.26869 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kruler" Fri Nov 15 22:37:25 2019 rev:109 rq:748599 version:19.08.3 Changes: -------- --- /work/SRC/openSUSE:Factory/kruler/kruler.changes 2019-11-12 11:38:52.594312921 +0100 +++ /work/SRC/openSUSE:Factory/.kruler.new.26869/kruler.changes 2019-11-15 22:37:27.871972277 +0100 @@ -1,0 +2,5 @@ +Thu Nov 14 10:08:31 UTC 2019 - Christophe Giboudeaux <christo...@krop.fr> + +- Add 0001-Make-it-compiles-without-deprecated-method.patch to fix build with Qt 5.14. + +------------------------------------------------------------------- New: ---- 0001-Make-it-compiles-without-deprecated-method.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kruler.spec ++++++ --- /var/tmp/diff_new_pack.2nCI6A/_old 2019-11-15 22:37:28.403974002 +0100 +++ /var/tmp/diff_new_pack.2nCI6A/_new 2019-11-15 22:37:28.407974014 +0100 @@ -32,6 +32,8 @@ Source1: https://download.kde.org/stable/applications/%{version}/src/%{name}-%{version}.tar.xz.sig Source2: applications.keyring %endif +# PATCH-FIX-UPSTREAM +Patch0: 0001-Make-it-compiles-without-deprecated-method.patch BuildRequires: extra-cmake-modules BuildRequires: kdoctools-devel BuildRequires: ki18n-devel @@ -50,14 +52,14 @@ %endif %description -A screen ruler for the K Desktop Environment +A screen ruler for the Plasma desktop environnement. %if %{with lang} %lang_package %endif %prep -%setup -q +%autosetup -p1 %build %cmake_kf5 -d build ++++++ 0001-Make-it-compiles-without-deprecated-method.patch ++++++ >From 90ebe8e37b8699ef26c10fb2928cf673cad04a06 Mon Sep 17 00:00:00 2001 From: Laurent Montel <mon...@kde.org> Date: Wed, 18 Sep 2019 06:41:34 +0200 Subject: [PATCH] Make it compiles without deprecated method --- klineal.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/klineal.cpp b/klineal.cpp index 8b5d3c3..0f9bc48 100644 --- a/klineal.cpp +++ b/klineal.cpp @@ -705,7 +705,7 @@ void KLineal::mouseReleaseEvent( QMouseEvent *inEvent ) void KLineal::wheelEvent( QWheelEvent *e ) { - int numDegrees = e->delta() / 8; + int numDegrees = e->angleDelta().y() / 8; int numSteps = numDegrees / 15; // changing offset @@ -756,8 +756,7 @@ void KLineal::drawScale( QPainter &painter ) } if ( digit % 100 == 0 && digit != 0 ) { - QString units; - units.sprintf( "%d", digit ); + QString units = QStringLiteral("%1").arg(digit); drawScaleText( painter, x, units ); } @@ -771,9 +770,8 @@ void KLineal::drawScale( QPainter &painter ) int x = (int)( i * step ); if ( i % 10 == 0 && i != 0 && i != 100 ) { - QString units; int value = mLeftToRight ? i : ( 100 - i ); - units.sprintf( "%d%%", value ); + const QString units = QString::asprintf( "%d%%", value ); drawScaleText( painter, x, units ); len = MEDIUM2_TICK_SIZE; } else { -- 2.24.0
