forked from pool/kruler
KDE Applications 19.12 beta
OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kruler?expand=0&rev=103
This commit is contained in:
committed by
Git OBS Bridge
parent
c8fd1ea54f
commit
d91d7f3ee4
@@ -1,46 +0,0 @@
|
|||||||
From 90ebe8e37b8699ef26c10fb2928cf673cad04a06 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Laurent Montel <montel@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
|
|
||||||
|
|
Binary file not shown.
@@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:1825ec4b7f6a0ffc00f1ed09d2879a8d9925da49e62bad0a7484d4e90903df79
|
|
||||||
size 249500
|
|
@@ -1,11 +0,0 @@
|
|||||||
-----BEGIN PGP SIGNATURE-----
|
|
||||||
|
|
||||||
iQEzBAABCgAdFiEE8jJ15L8Qr8HfaRSm29LOiT4tHIcFAl3A/O4ACgkQ29LOiT4t
|
|
||||||
HId56Af/UGc2qypmeJDo0XALEk4WmSeo3/tu9RAZcQSGCgP1FQJbyMJtd8rbomw2
|
|
||||||
57LKGodP9T1A6WbZQhT30p4Jb8jKp8LRvCRJyA8Be1xMNZDx5oz7+ZTGT4fXG/2o
|
|
||||||
XcGlVFaPh71YZLmV52U3rrTgXRyjwlovNDHU0UypVPc7qzw/ML6NHfYwnfn3/XNc
|
|
||||||
l8wGBEZfO8HWkOF/oRbZdXb6ExwLE/ZhxXt4bwBVvXZtngRqessRm+6TUdmWE06J
|
|
||||||
LQWxGCkhmK9gMuFqUP8rdC6GJ83KXNY6W/zu/f4paZLZMiVmfUotGOk/Wq38fT86
|
|
||||||
hoxkHsksGLcfQ0kWlAHKWLBN8jjkVQ==
|
|
||||||
=HCY3
|
|
||||||
-----END PGP SIGNATURE-----
|
|
3
kruler-19.11.80.tar.xz
Normal file
3
kruler-19.11.80.tar.xz
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:b872a6f4d9bd439e9efab87ffb656c92649bb81af840be741384ce199afc2d56
|
||||||
|
size 251000
|
16
kruler-19.11.80.tar.xz.sig
Normal file
16
kruler-19.11.80.tar.xz.sig
Normal file
@@ -0,0 +1,16 @@
|
|||||||
|
-----BEGIN PGP SIGNATURE-----
|
||||||
|
|
||||||
|
iQIzBAABCgAdFiEEyiYsbIPeTS+yijMqOmpNuDnqptcFAl3ObxcACgkQOmpNuDnq
|
||||||
|
ptfmWQ//VrNQvpCKqC6N1Vphy+OIrPdJ17scqPqcC3+xzUGMThVpxNwxBqnr1Ay7
|
||||||
|
Z1DPCWbBU1MjDFPfzIAZZtoRSXwquHsqzBeDB6py9Kx//iPu+sm9FbXNKjnePHQt
|
||||||
|
7bQHLPmfGYhXy2zVDLql2Gv3oE6fXE3n64k3oDItAd16NZPv8WCTB7+ycpfyGpcE
|
||||||
|
ca7v7j+u64kSsSLXWIcZ1iin30Lg9PI2XuHLDeOvKNhhs31DJTvbfWXSRt5qy003
|
||||||
|
EpoX6ScEmRgQeDlDBQAhV4n537D6ucjF1hcGZh3gIswt/CMDihpCAL3+unxxNrrL
|
||||||
|
b6erz0eQQAmp5uMdSqJg2nAp69bqRF3Re2ihRqTSd+umHBoCa/5/3b/tBd1rbtI4
|
||||||
|
2vSB1h5yRsPP5ZC327PyGuXsAshNxhiijBZz2KnEeYN675LB4XL1IMDsl9uWaMBw
|
||||||
|
HVbdwiCFC5oC1DZyYg84wq4GxTpIVrOT1hnx/2bWqxA5bk6xWPv5V/hHdXvE/LbB
|
||||||
|
c9oVyoDaa+0PkzJzjW71XL0K00WcbrNVVSxfpULv1HoUqHBaWlkjJtMkTI4CjR3W
|
||||||
|
n4snZB90AmJyTRVUxMCVwTiRIAEpttAsz6xoF9pvMVwN0M3AeVRUeWn2zquCGIih
|
||||||
|
YZyTfT8yDLZShvzkLyIZwNfqGr2K2K1BD7NO0SaMye+v0X7k9kU=
|
||||||
|
=0Yjl
|
||||||
|
-----END PGP SIGNATURE-----
|
@@ -1,3 +1,20 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Sun Nov 24 13:29:46 UTC 2019 - Luca Beltrame <lbeltrame@kde.org>
|
||||||
|
|
||||||
|
- Update to 19.11.80
|
||||||
|
* New feature release
|
||||||
|
* For more details please see:
|
||||||
|
* https://www.kde.org/announcements/announce-applications-19.12-beta.php
|
||||||
|
- Changes since 19.08.2:
|
||||||
|
* Make it compile without kf5 deprecated method
|
||||||
|
* Fix minor issue found by EBN
|
||||||
|
* Make it compiles without deprecated method
|
||||||
|
* It's time to increase qt version
|
||||||
|
* It compiles fine without foreach
|
||||||
|
* Remove unused includesRemove unused includesRemove unused includes
|
||||||
|
- Dropped patches, now upstream:
|
||||||
|
* 0001-Make-it-compiles-without-deprecated-method.patch
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Thu Nov 14 10:08:31 UTC 2019 - Christophe Giboudeaux <christophe@krop.fr>
|
Thu Nov 14 10:08:31 UTC 2019 - Christophe Giboudeaux <christophe@krop.fr>
|
||||||
|
|
||||||
|
31
kruler.spec
31
kruler.spec
@@ -16,35 +16,32 @@
|
|||||||
#
|
#
|
||||||
|
|
||||||
|
|
||||||
%define kf5_version 5.26.0
|
%define kf5_version 5.60.0
|
||||||
# Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA)
|
# Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA)
|
||||||
%{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')}
|
%{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')}
|
||||||
%bcond_without lang
|
%bcond_without lang
|
||||||
Name: kruler
|
Name: kruler
|
||||||
Version: 19.08.3
|
Version: 19.11.80
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: Screen Ruler
|
Summary: Screen Ruler
|
||||||
License: GPL-2.0-or-later
|
License: GPL-2.0-or-later
|
||||||
Group: Productivity/Graphics/Other
|
Group: Productivity/Graphics/Other
|
||||||
URL: https://www.kde.org
|
URL: https://www.kde.org
|
||||||
Source: https://download.kde.org/stable/applications/%{version}/src/%{name}-%{version}.tar.xz
|
Source: https://download.kde.org/unstable/applications/%{version}/src/%{name}-%{version}.tar.xz
|
||||||
%if %{with lang}
|
%if %{with lang}
|
||||||
Source1: https://download.kde.org/stable/applications/%{version}/src/%{name}-%{version}.tar.xz.sig
|
Source1: https://download.kde.org/unstable/applications/%{version}/src/%{name}-%{version}.tar.xz.sig
|
||||||
Source2: applications.keyring
|
Source2: applications.keyring
|
||||||
%endif
|
%endif
|
||||||
# PATCH-FIX-UPSTREAM
|
|
||||||
Patch0: 0001-Make-it-compiles-without-deprecated-method.patch
|
|
||||||
BuildRequires: extra-cmake-modules
|
BuildRequires: extra-cmake-modules
|
||||||
BuildRequires: kdoctools-devel
|
BuildRequires: cmake(KF5DocTools)
|
||||||
BuildRequires: ki18n-devel
|
BuildRequires: cmake(KF5I18n)
|
||||||
BuildRequires: knotifications-devel
|
BuildRequires: cmake(KF5Notifications)
|
||||||
BuildRequires: kwindowsystem-devel
|
BuildRequires: cmake(KF5WindowSystem)
|
||||||
BuildRequires: kxmlgui-devel
|
BuildRequires: cmake(KF5XmlGui)
|
||||||
BuildRequires: pkgconfig
|
|
||||||
BuildRequires: update-desktop-files
|
BuildRequires: update-desktop-files
|
||||||
BuildRequires: pkgconfig(Qt5Core)
|
BuildRequires: cmake(Qt5Core)
|
||||||
BuildRequires: pkgconfig(Qt5Widgets)
|
BuildRequires: cmake(Qt5Widgets)
|
||||||
BuildRequires: pkgconfig(Qt5X11Extras)
|
BuildRequires: cmake(Qt5X11Extras)
|
||||||
Obsoletes: %{name}5 < %{version}
|
Obsoletes: %{name}5 < %{version}
|
||||||
Provides: %{name}5 = %{version}
|
Provides: %{name}5 = %{version}
|
||||||
%if %{with lang}
|
%if %{with lang}
|
||||||
@@ -52,14 +49,14 @@ Recommends: %{name}-lang
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%description
|
%description
|
||||||
A screen ruler for the Plasma desktop environnement.
|
A screen ruler for the Plasma desktop environment
|
||||||
|
|
||||||
%if %{with lang}
|
%if %{with lang}
|
||||||
%lang_package
|
%lang_package
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%autosetup -p1
|
%setup -q
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%cmake_kf5 -d build
|
%cmake_kf5 -d build
|
||||||
|
Reference in New Issue
Block a user