diff --git a/0001-Make-it-compiles-without-deprecated-method.patch b/0001-Make-it-compiles-without-deprecated-method.patch new file mode 100644 index 0000000..6ca0f6b --- /dev/null +++ b/0001-Make-it-compiles-without-deprecated-method.patch @@ -0,0 +1,46 @@ +From 90ebe8e37b8699ef26c10fb2928cf673cad04a06 Mon Sep 17 00:00:00 2001 +From: Laurent Montel +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 + diff --git a/kruler.changes b/kruler.changes index 3fb8b06..9c14d35 100644 --- a/kruler.changes +++ b/kruler.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Nov 14 10:08:31 UTC 2019 - Christophe Giboudeaux + +- Add 0001-Make-it-compiles-without-deprecated-method.patch to fix build with Qt 5.14. + ------------------------------------------------------------------- Thu Nov 7 23:13:18 UTC 2019 - Luca Beltrame diff --git a/kruler.spec b/kruler.spec index f3623de..1c7bb7f 100644 --- a/kruler.spec +++ b/kruler.spec @@ -32,6 +32,8 @@ Source: https://download.kde.org/stable/applications/%{version}/src/%{na 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 @@ -57,7 +59,7 @@ A screen ruler for the K Desktop Environment %endif %prep -%setup -q +%autosetup -p1 %build %cmake_kf5 -d build