diff --git a/0001-Fix-link-list-dialog-for-installation-button.patch b/0001-Fix-link-list-dialog-for-installation-button.patch deleted file mode 100644 index af12db0..0000000 --- a/0001-Fix-link-list-dialog-for-installation-button.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 49f2037ac22fcb430fadd5d7b29bd8af234573a4 Mon Sep 17 00:00:00 2001 -From: Akseli Lahtinen -Date: Thu, 7 Mar 2024 16:01:44 +0000 -Subject: [PATCH] Fix link list dialog for installation button - -In gridview, installation buttons showed "Install..." for every item, -even if the item had only single download link. This fixes it -by showing correct button. - -The problem was using `entry` directly instead of `model`. - -BUG: 482349 -FIXED-IN: 6.1 ---- - .../qml/private/entrygriddelegates/TileDelegate.qml | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/qtquick/qml/private/entrygriddelegates/TileDelegate.qml b/src/qtquick/qml/private/entrygriddelegates/TileDelegate.qml -index 2fdee68b..36224abe 100644 ---- a/src/qtquick/qml/private/entrygriddelegates/TileDelegate.qml -+++ b/src/qtquick/qml/private/entrygriddelegates/TileDelegate.qml -@@ -40,13 +40,13 @@ Private.GridTileDelegate { - visible: enabled - }, - Kirigami.Action { -- text: entry.downloadLinks.length === 1 ? i18ndc("knewstuff6", "Request installation of this item, available when there is exactly one downloadable item", "Install") : i18ndc("knewstuff6", "Show installation options, where there is more than one downloadable item", "Install…"); -+ text: model.downloadLinks.length === 1 ? i18ndc("knewstuff6", "Request installation of this item, available when there is exactly one downloadable item", "Install") : i18ndc("knewstuff6", "Show installation options, where there is more than one downloadable item", "Install…"); - icon.name: "install" - onTriggered: { -- if (entry.downloadLinks.length === 1) { -- newStuffEngine.install(entry.entry, NewStuff.ItemsModel.FirstLinkId); -+ if (model.downloadLinks.length === 1) { -+ newStuffEngine.install(entry, NewStuff.ItemsModel.FirstLinkId); - } else { -- downloadItemsSheet.downloadLinks = entry.downloadLinks; -+ downloadItemsSheet.downloadLinks = model.downloadLinks; - downloadItemsSheet.entry = entry; - downloadItemsSheet.open(); - } --- -2.44.0 - diff --git a/kf6-knewstuff.changes b/kf6-knewstuff.changes index 8a55cd6..b2e5970 100644 --- a/kf6-knewstuff.changes +++ b/kf6-knewstuff.changes @@ -1,3 +1,26 @@ +------------------------------------------------------------------- +Fri Apr 5 12:52:48 UTC 2024 - Christophe Marin + +- Update to 6.1.0 + * New feature release +- Changes since 6.0.0: + * update version for new release + * Add extra ksnrc key to indicate the safety of installation + * Use Continue/Cancel style of question for overwrite dialog + * Change default sorting of entries to "Most Downloads" + * resultsstream: Delay the entry loading into the event look (kde#473472) + * resultsstream: handle query results assertively + * resultsstream: Allow for the members to be constant + * Unify default sizes (kde#482604) + * Fix the "working..." overlay for item installation (kde#483108) + * Remove the last uses of Qt5Compat.GraphicalEffects + * Refresh visible entry on uninstall (kde#476152) + * [qtquick/action] Add API to set transient parent for dialog (kde#479816) + * Fix link list dialog for installation button (kde#482349) + * Set questionAsker implicit sizes, set maxWidth to dialog width (kde#480338) +- Drop patch, merged upstream: + * 0001-Fix-link-list-dialog-for-installation-button.patch + ------------------------------------------------------------------- Wed Mar 13 08:33:07 UTC 2024 - Christophe Marin diff --git a/kf6-knewstuff.spec b/kf6-knewstuff.spec index 67059a8..6638442 100644 --- a/kf6-knewstuff.spec +++ b/kf6-knewstuff.spec @@ -1,7 +1,7 @@ # # spec file for package kf6-knewstuff # -# 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 @@ -19,13 +19,13 @@ %define qt6_version 6.6.0 %define rname knewstuff -# Full KF6 version (e.g. 6.0.0) +# Full KF6 version (e.g. 6.1.0) %{!?_kf6_version: %global _kf6_version %{version}} # Last major and minor KF6 version (e.g. 6.0) %{!?_kf6_bugfix_version: %define _kf6_bugfix_version %(echo %{_kf6_version} | awk -F. '{print $1"."$2}')} %bcond_without released Name: kf6-knewstuff -Version: 6.0.0 +Version: 6.1.0 Release: 0 Summary: Framework for downloading and sharing additional application data License: LGPL-2.1-or-later @@ -35,8 +35,6 @@ Source: %{rname}-%{version}.tar.xz Source1: %{rname}-%{version}.tar.xz.sig Source2: frameworks.keyring %endif -# PATCH-FIX-UPSTREAM -Patch0: 0001-Fix-link-list-dialog-for-installation-button.patch BuildRequires: doxygen BuildRequires: fdupes BuildRequires: kf6-extra-cmake-modules >= %{_kf6_bugfix_version} diff --git a/knewstuff-6.0.0.tar.xz b/knewstuff-6.0.0.tar.xz deleted file mode 100644 index bc5b821..0000000 --- a/knewstuff-6.0.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0299dba980590bd7c74870a74c6bb6ca732af478ab2c9ba414943f62ea0be0fa -size 3099232 diff --git a/knewstuff-6.0.0.tar.xz.sig b/knewstuff-6.0.0.tar.xz.sig deleted file mode 100644 index a9c2214..0000000 --- a/knewstuff-6.0.0.tar.xz.sig +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEE4KPrIC+OV1KOE+cv11dEg7tXsY0FAmXdGHIACgkQ11dEg7tX -sY0D5Q//ff4NvIrtlmWg118nmeOKYBQyD7ykyQOpELf2cXVLjDbNzwbwhIPd4Kmk -O+4t5G5XyqSJ7vFCVO4FadA2QE9wBMhxgkwoCocplTnwYtMA7yjDO1DAXB2x8j1E -x4hjVX+2R5qK1zigkvhAbdkUDIodKgW6EwjQJD9jefHFUX/ud1YrvpNu+TMBs5dC -oGaPZDCtkMZQ82U1OpVzrJvPT9rjc6PiMl+1mh7bAYjVih12kZ3+8IooJ/oxyLDK -RM7DPcFfHPDqo1QPUT9Qm9nyo5/aVQu4V3RxPJfHXUdOYmrizv91loU09Si9YJMc -BGj5zboB+RoGDtegzZ2wvRBll8W3BXRpb8GeR5POEuBQP0bX5SioZUQQRv4vT2bs -kkWt+8vosdkPAnD+0YyQkSyzdERxfNVPK6LlVvW1ITlH0eCSfVAYUiCjmKq06FAh -LvGwul4sle7BUXf+LndSKTJ8z4ut1PUUAncHjjKCLupVwH2PB0qr/QWR/plnFpwE -wyf/yOpXGZXYCu9qh46iREGxEb7LviQh9p2D7fnQXSA3LnK7NaYu/B2MOBB+NwV3 -vxgjKArbMfeHRWQpccA8TmpEkgDqVwtuKQxeNUOQTE5+qn7KZNP5BV+7TYi03BH1 -C7BVc3pixjezOxOgCZtBr59icxO7jO7CHyLjTQO037GwnalCtSU= -=UF0G ------END PGP SIGNATURE----- diff --git a/knewstuff-6.1.0.tar.xz b/knewstuff-6.1.0.tar.xz new file mode 100644 index 0000000..391cd7c --- /dev/null +++ b/knewstuff-6.1.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1c6a076410538084021cff1eeb02be2f34280284717a34290d42b11dfe3b3d3f +size 3102052 diff --git a/knewstuff-6.1.0.tar.xz.sig b/knewstuff-6.1.0.tar.xz.sig new file mode 100644 index 0000000..8032137 --- /dev/null +++ b/knewstuff-6.1.0.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEE4KPrIC+OV1KOE+cv11dEg7tXsY0FAmYP2SYACgkQ11dEg7tX +sY0yDg/9GvJBvBlFvNy4Kdc+15eruCJxOoJ5a8w4f8seyXMkYULvh54H7q5Phls3 +nI+j51iUvi3IMOZKMJtSm25ZLHCNBtVB0dgZmJV2rfw1gMHVjNoDBCLRTONSz345 +O5cDOPMKfyCntNXG6ePOjs419OPw1vDm+z4xb7V5tut+Khq2o+v34q34IpFx8F0N +YVzbCGoWAmdv287Krw2vS9UF1lbm9GqlKLLZ0DSYqh8xO1Mnf07lTiKoJAUsRy3E +Nc+OiwJNxNLTNPqYjp817DT3uPrAl/kVP6LLTjiMkNF96zXCoXCoDKSw3L+gBg7K +O8l2DQeGrmFijtVw8gHu79SLssmDH550IAIigMkSzuJ3k22KN1vF56ku2epvfaIQ +4A39lExL8EqDOaNWcl+qxzpXsuCqBDT/vrWhrIjjQXP3ZS1lJTZeFc/GQKHVLm2k +22HS/ZlYWAsQ9VQjDU2DDNzjpkyceOQpVVGjUuXN3mGGVS8bBfBCe/AvkhBAgSFl +pnyFHYSx9HzAq4UdCNBXX23csmwHlmfzhJdeuCU3agL/qGns1PhtLjN86iDlbFOM +FTwCv9/ejR+h6CpzzG6HmVkKZJ14WGnLZFGyQVtUKg+dD23rw4GzKpuqVB7/Oyns +EuIP86vocbRwf9PFLiuTIJwQCciC8pOu1au8oNJCnMXvEEo6eXo= +=jRCQ +-----END PGP SIGNATURE-----