From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C9BE31581C1 for ; Tue, 16 Jul 2024 21:42:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 748332BC030; Tue, 16 Jul 2024 21:42:01 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4EF592BC030 for ; Tue, 16 Jul 2024 21:42:01 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1ED5E33FE7D for ; Tue, 16 Jul 2024 21:42:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 485601E31 for ; Tue, 16 Jul 2024 21:41:58 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1721166022.3ee70e6a8a9a6a34c549ccf045f5f9e57e82529b.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/knewstuff/, kde-frameworks/knewstuff/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: kde-frameworks/knewstuff/files/knewstuff-6.4.0-fix-reference-error.patch kde-frameworks/knewstuff/knewstuff-6.4.0-r1.ebuild X-VCS-Directories: kde-frameworks/knewstuff/files/ kde-frameworks/knewstuff/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 3ee70e6a8a9a6a34c549ccf045f5f9e57e82529b X-VCS-Branch: master Date: Tue, 16 Jul 2024 21:41:58 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 8191cfcd-bf8b-4375-80bc-cde17197932b X-Archives-Hash: 0332190273e2b1197326beb0900acc44 commit: 3ee70e6a8a9a6a34c549ccf045f5f9e57e82529b Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Jul 16 19:32:23 2024 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Jul 16 21:40:22 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ee70e6a kde-frameworks/knewstuff: EntryDetails.qml: Qualify newStuffModel ... use downloadItemId KDE-bug: https://bugs.kde.org/show_bug.cgi?id=483659 Signed-off-by: Andreas Sturmlechner gentoo.org> .../knewstuff-6.4.0-fix-reference-error.patch | 38 ++++++++++++++++++++ kde-frameworks/knewstuff/knewstuff-6.4.0-r1.ebuild | 42 ++++++++++++++++++++++ 2 files changed, 80 insertions(+) diff --git a/kde-frameworks/knewstuff/files/knewstuff-6.4.0-fix-reference-error.patch b/kde-frameworks/knewstuff/files/knewstuff-6.4.0-fix-reference-error.patch new file mode 100644 index 000000000000..536b8d7533ea --- /dev/null +++ b/kde-frameworks/knewstuff/files/knewstuff-6.4.0-fix-reference-error.patch @@ -0,0 +1,38 @@ +From f8fb221d6f355c4f0873592fbf7dce358f4f0b40 Mon Sep 17 00:00:00 2001 +From: Akseli Lahtinen +Date: Fri, 12 Jul 2024 12:58:53 +0000 +Subject: [PATCH] EntryDetails.qml: Qualify newStuffModel, use downloadItemId + +There is no such thing as entryId, change it to downloadItemId +Otherwise the item wont download anything. + +This fixes a bug where in detailed item view, if the list with multiple downloads +appears and user clicks download, nothing would happen and knewstuff would report this +warning in terminal: `qrc:/qt/qml/org/kde/newstuff/EntryDetails.qml:88: ReferenceError: entryId is not defined` + +After this fix it will download items. + +BUG:483659 +--- + src/qtquick/qml/EntryDetails.qml | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/qtquick/qml/EntryDetails.qml b/src/qtquick/qml/EntryDetails.qml +index d21e18fc2..94fc88d76 100644 +--- a/src/qtquick/qml/EntryDetails.qml ++++ b/src/qtquick/qml/EntryDetails.qml +@@ -85,9 +85,9 @@ KCMUtils.SimpleKCM { + parent: component.QQC2.Overlay.overlay + + onItemPicked: (entry, downloadItemId, downloadName) => { +- const entryName = newStuffModel.data(newStuffModel.index(entryId, 0), NewStuff.ItemsModel.NameRole); ++ const entryName = component.newStuffModel.data(component.newStuffModel.index(downloadItemId, 0), NewStuff.ItemsModel.NameRole); + applicationWindow().showPassiveNotification(i18ndc("knewstuff6", "A passive notification shown when installation of an item is initiated", "Installing %1 from %2", downloadName, entryName), 1500); +- newStuffModel.engine.install(component.entry, downloadItemId); ++ component.newStuffModel.engine.install(component.entry, downloadItemId); + } + } + +-- +GitLab + diff --git a/kde-frameworks/knewstuff/knewstuff-6.4.0-r1.ebuild b/kde-frameworks/knewstuff/knewstuff-6.4.0-r1.ebuild new file mode 100644 index 000000000000..266488aa0e98 --- /dev/null +++ b/kde-frameworks/knewstuff/knewstuff-6.4.0-r1.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_DESIGNERPLUGIN="true" +ECM_TEST="false" +PVCUT=$(ver_cut 1-2) +QTMIN=6.6.2 +inherit ecm frameworks.kde.org + +DESCRIPTION="Framework for downloading and sharing additional application data" + +LICENSE="LGPL-2+" +KEYWORDS="~amd64 ~arm64 ~riscv ~x86" +IUSE="opds" + +DEPEND=" + >=dev-qt/qtbase-${QTMIN}:6[gui,network,widgets,xml] + >=dev-qt/qtdeclarative-${QTMIN}:6[widgets] + =kde-frameworks/attica-${PVCUT}*:6 + =kde-frameworks/karchive-${PVCUT}*:6 + =kde-frameworks/kconfig-${PVCUT}*:6 + =kde-frameworks/kcoreaddons-${PVCUT}*:6 + =kde-frameworks/ki18n-${PVCUT}*:6 + =kde-frameworks/kpackage-${PVCUT}*:6 + =kde-frameworks/kwidgetsaddons-${PVCUT}*:6 + opds? ( =kde-frameworks/syndication-${PVCUT}*:6 ) +" +RDEPEND="${DEPEND} + >=kde-frameworks/kirigami-${PVCUT}:6 +" + +PATCHES=( "${FILESDIR}/${P}-fix-reference-error.patch" ) # KDE-bug 483659 + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package opds KF6Syndication) + ) + + ecm_src_configure +}