Accepting request 1150875 from KDE:Applications
KDE release gear 24.02.0 OBS-URL: https://build.opensuse.org/request/show/1150875 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kalk?expand=0&rev=11
This commit is contained in:
commit
cf172427ec
@ -1,55 +0,0 @@
|
||||
From 790b0156ab42a5f08f803be71656395740c0bd7c Mon Sep 17 00:00:00 2001
|
||||
From: Fabian Vogt <fabian@ritter-vogt.de>
|
||||
Date: Tue, 12 Dec 2023 08:30:24 +0100
|
||||
Subject: [PATCH] Drop use of QtFeedback
|
||||
|
||||
---
|
||||
src/qml/NumberButton.qml | 18 ------------------
|
||||
1 file changed, 18 deletions(-)
|
||||
|
||||
diff --git a/src/qml/NumberButton.qml b/src/qml/NumberButton.qml
|
||||
index b321f9f..8f15bf6 100644
|
||||
--- a/src/qml/NumberButton.qml
|
||||
+++ b/src/qml/NumberButton.qml
|
||||
@@ -11,7 +11,6 @@ import QtQuick 2.15
|
||||
import QtQuick.Layouts 1.1
|
||||
import QtGraphicalEffects 1.12
|
||||
import QtQuick.Controls 2.2 as Controls
|
||||
-import QtFeedback 5.0
|
||||
|
||||
import org.kde.kirigami 2.15 as Kirigami
|
||||
|
||||
@@ -39,17 +38,6 @@ Item {
|
||||
property color buttonBorderPressedColor: Qt.rgba(baseColor.r, baseColor.g, baseColor.b, 0.7)
|
||||
property color buttonTextColor: Kirigami.Theme.textColor
|
||||
|
||||
- // vibration
|
||||
- HapticsEffect {
|
||||
- id: vibrate
|
||||
- attackIntensity: 0.0
|
||||
- attackTime: 0
|
||||
- fadeTime: 0
|
||||
- fadeIntensity: 0.0
|
||||
- intensity: 0.5
|
||||
- duration: 10
|
||||
- }
|
||||
-
|
||||
Controls.AbstractButton {
|
||||
id: button
|
||||
anchors.fill: parent
|
||||
@@ -110,12 +98,6 @@ Item {
|
||||
}
|
||||
}
|
||||
|
||||
- onPressedChanged: {
|
||||
- if (pressed) {
|
||||
- vibrate.start();
|
||||
- }
|
||||
- }
|
||||
-
|
||||
onClicked: root.clicked(root.text)
|
||||
onPressAndHold: root.longClicked()
|
||||
|
||||
--
|
||||
2.43.0
|
||||
|
Binary file not shown.
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:2cd6eee395ce7ff70d274ca55c99e2ad61ee8162ce34712d33eb696a6e9eecd9
|
||||
size 85652
|
@ -1,16 +0,0 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmVu8ZcACgkQu0YzUNbv
|
||||
Me9l5w/+NGAYP0FL/vBMD9FfG3Hy+b//rNXOZCwXtaYo70Rv9UWoTOe3KUxROTnf
|
||||
WtOrmooeyuxzoSsOlJaxZfvEoew5AOA/rPTctu6FTWk2YhjsPHEh3ztGI9D6QXIy
|
||||
DFh3+415yfAZo4kCEQqvqR46sjUYbR6JRWeN3p1I6KfLpVjPIo4897uRTXSsXy4U
|
||||
X9Ref5aQNTVvQbdJL59MxFRX3ptRHZhU64TZHBTuJxN0KOo6PuSN0eQ1Kk84px9z
|
||||
ObxSc58wynMk7rpbZ9GEt+FeIMmo27Os35fg2p6XQen8FZ3cdxHNKWN62wo4wdp/
|
||||
f0wW0weQM7tpLOEiLgDmhZJiBP24/AXm88e+Fu4rXNpyv2POW2do3uoG439wct3G
|
||||
/0yb+fzdshrXN8X2sViRf2ChvaJ+8CyIDI7Vj+6AE5egYj5d/sEnz7WmhoYvK3Ps
|
||||
Uz6QicMHRfl6CwmNdEC3eZwDlBHhrwIBsKYibbiHgr3kweJ5Z6eGyetAbc5amIao
|
||||
NtxdqAmT+KbIKcE+6bsI8aom9lXvXW9rbNNExLoQKrzmy/4+9XQdz01kQoPPm9l+
|
||||
33NGfpDqNC5ZVqGSiom1Cn+Ctq9tO6wu0DQ26zx+PcXSYjSlAzJt3tRYI+51hKY6
|
||||
jQpq+TZHgKjv5g5fWevYcVv+wGRK+lqQ1m6Jik9tttBxBPC6N/A=
|
||||
=RsH6
|
||||
-----END PGP SIGNATURE-----
|
3
kalk-24.02.0.tar.xz
Normal file
3
kalk-24.02.0.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:9dcae334181bb5f50c0e649257d33dc604939f27431b796f1a5c76f9e795dba9
|
||||
size 72736
|
16
kalk-24.02.0.tar.xz.sig
Normal file
16
kalk-24.02.0.tar.xz.sig
Normal file
@ -0,0 +1,16 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmXVrxIACgkQu0YzUNbv
|
||||
Me+tow//Yrb4JbV/C11U7IFPCyxGgDcaGxjXbWOrqBRrn/2qzigs1m61zyWGSCI0
|
||||
/lH/0sRrGL1e8xB0v/f7KquCI0eSuN2+hTD+Zh1PqjAxh6yjsq8gOd0HjUFe0uYV
|
||||
SX1Jg9+Xh/6rhfZHUNq94w7KUWMeDRqIIKqv5ahYVL4xPyqozelh6prFkmuasprS
|
||||
pIprnGLlNmMvQhH/+jaxpSadJA1XdeYm6/VP/mMzSCbJkgsjlF+4QE7/uZDe8mcx
|
||||
8zpxBCKYThqWmTy1krI1K3ZBl83KqJm1l3ga77nacuouqESD5qCdipIw4x2i1L0M
|
||||
4oJeJlSbq5wEdWgnwdkn+7fP/uvirc2ZVWCxltuEdfFEli+lTu6BVI4tKvGWh+Ij
|
||||
le+eQicnBcm+mIIpeulAPTa1Z97OgqnOAg3KiTIBUGIKHRjfFVhvgwEyASVNOI1D
|
||||
B13vb7kEdqPbpHM4N37sMT9SqMHQ4uqCbYHwZndk6W7uWlnRNzCQVwyz8J0s+Vn8
|
||||
wdAAyZ+cSYP8JOpn/3DtuQFcRlEIeFZBauRb+L1viK6mCPE1R8ZcuFjOZPwj5gs3
|
||||
QsufCfQAwpmQ5QWXQdgSOnRrekHCphePmfzdU+upAyPmhwe44PlUfVoHtipnAnys
|
||||
NxjBw3jp+uhjyf6AkSdsf/HUegIjzxniYtd7cxsZsud6JH9P3e8=
|
||||
=Qkui
|
||||
-----END PGP SIGNATURE-----
|
15
kalk.changes
15
kalk.changes
@ -1,3 +1,18 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Feb 23 13:58:36 UTC 2024 - Christophe Marin <christophe@krop.fr>
|
||||
|
||||
- Update to 24.02.0
|
||||
* New feature release
|
||||
- No code change since 24.01.95
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Feb 9 16:07:42 UTC 2024 - Christophe Marin <christophe@krop.fr>
|
||||
|
||||
- Update to 24.01.95
|
||||
* https://kde.org/announcements/megarelease/6/rc2/
|
||||
- Drop patch, merged upstream:
|
||||
* 0001-Drop-use-of-QtFeedback.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Dec 12 07:37:47 UTC 2023 - Fabian Vogt <fabian@ritter-vogt.de>
|
||||
|
||||
|
62
kalk.spec
62
kalk.spec
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package kalk
|
||||
#
|
||||
# Copyright (c) 2023 SUSE LLC
|
||||
# Copyright (c) 2024 SUSE LLC
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -16,41 +16,37 @@
|
||||
#
|
||||
|
||||
|
||||
%define kf6_version 5.246.0
|
||||
%define qt6_version 6.6.0
|
||||
|
||||
%bcond_without released
|
||||
Name: kalk
|
||||
Version: 23.08.4
|
||||
Version: 24.02.0
|
||||
Release: 0
|
||||
Summary: Convergent calculator
|
||||
License: GPL-3.0-or-later
|
||||
URL: https://apps.kde.org/kalk
|
||||
Source0: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz
|
||||
Source0: %{name}-%{version}.tar.xz
|
||||
%if %{with released}
|
||||
Source1: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig
|
||||
Source1: %{name}-%{version}.tar.xz.sig
|
||||
Source2: applications.keyring
|
||||
%endif
|
||||
# PATCH-FIX(?)-DOWNSTREAM
|
||||
Patch1: 0001-Drop-use-of-QtFeedback.patch
|
||||
BuildRequires: bison
|
||||
BuildRequires: extra-cmake-modules
|
||||
BuildRequires: flex
|
||||
BuildRequires: gmp-devel
|
||||
BuildRequires: hicolor-icon-theme
|
||||
BuildRequires: mpfr-devel
|
||||
BuildRequires: kf6-extra-cmake-modules >= %{kf6_version}
|
||||
BuildRequires: pkgconfig
|
||||
BuildRequires: update-desktop-files
|
||||
BuildRequires: cmake(KF5Config)
|
||||
BuildRequires: cmake(KF5CoreAddons)
|
||||
BuildRequires: cmake(KF5I18n)
|
||||
BuildRequires: cmake(KF5Kirigami2)
|
||||
BuildRequires: cmake(KF5UnitConversion)
|
||||
BuildRequires: cmake(Qt5Core) >= 5.15.2
|
||||
BuildRequires: cmake(Qt5Gui)
|
||||
BuildRequires: cmake(Qt5Quick)
|
||||
BuildRequires: cmake(Qt5QuickCompiler)
|
||||
BuildRequires: cmake(Qt5QuickControls2)
|
||||
BuildRequires: cmake(Qt5Test)
|
||||
BuildRequires: cmake(Qt5Widgets)
|
||||
Requires: kirigami2
|
||||
BuildRequires: cmake(KF6Config) >= %{kf6_version}
|
||||
BuildRequires: cmake(KF6CoreAddons) >= %{kf6_version}
|
||||
BuildRequires: cmake(KF6I18n) >= %{kf6_version}
|
||||
BuildRequires: cmake(KF6Kirigami) >= %{kf6_version}
|
||||
BuildRequires: cmake(KF6UnitConversion) >= %{kf6_version}
|
||||
BuildRequires: cmake(Qt6Core) >= %{qt6_version}
|
||||
BuildRequires: cmake(Qt6Gui) >= %{qt6_version}
|
||||
BuildRequires: cmake(Qt6Quick) >= %{qt6_version}
|
||||
BuildRequires: cmake(Qt6QuickControls2) >= %{qt6_version}
|
||||
BuildRequires: cmake(Qt6Test) >= %{qt6_version}
|
||||
BuildRequires: cmake(Qt6Widgets) >= %{qt6_version}
|
||||
BuildRequires: pkgconfig(libqalculate) >= 4.7.0
|
||||
Requires: kf6-kirigami-imports >= %{kf6_version}
|
||||
Requires: qt6-declarative-imports >= %{qt6_version}
|
||||
|
||||
%description
|
||||
Kalk is a convergent calculator application built with the Kirigami framework.
|
||||
@ -63,22 +59,22 @@ desktop.
|
||||
%autosetup -p1
|
||||
|
||||
%build
|
||||
%cmake_kf5 -d build
|
||||
%cmake_kf6
|
||||
|
||||
%cmake_build
|
||||
%kf6_build
|
||||
|
||||
%install
|
||||
%kf5_makeinstall -C build
|
||||
%kf6_install
|
||||
|
||||
%find_lang %{name} --all-name
|
||||
|
||||
%files
|
||||
%license LICENSES/*
|
||||
%doc README.md
|
||||
%{_kf5_applicationsdir}/org.kde.kalk.desktop
|
||||
%{_kf5_appstreamdir}/org.kde.kalk.appdata.xml
|
||||
%{_kf5_bindir}/kalk
|
||||
%{_kf5_iconsdir}/hicolor/scalable/apps/org.kde.kalk.svg
|
||||
%{_kf6_applicationsdir}/org.kde.kalk.desktop
|
||||
%{_kf6_appstreamdir}/org.kde.kalk.appdata.xml
|
||||
%{_kf6_bindir}/kalk
|
||||
%{_kf6_iconsdir}/hicolor/scalable/apps/org.kde.kalk.svg
|
||||
|
||||
%files lang -f %{name}.lang
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user