From 240b57012ace855bbfd9934b07642416ceeeb5b8 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 25 Jul 2023 22:29:02 +0100 Subject: gentoo auto-resync : 25:07:2023 - 22:29:01 --- kde-apps/baloo-widgets/Manifest | 3 +- .../baloo-widgets/baloo-widgets-23.04.3-r1.ebuild | 33 ++++++++++++++++++++++ .../baloo-widgets/baloo-widgets-23.04.3.ebuild | 31 -------------------- .../files/baloo-widgets-23.04.3-exiv2-0.28.patch | 29 +++++++++++++++++++ 4 files changed, 64 insertions(+), 32 deletions(-) create mode 100644 kde-apps/baloo-widgets/baloo-widgets-23.04.3-r1.ebuild delete mode 100644 kde-apps/baloo-widgets/baloo-widgets-23.04.3.ebuild create mode 100644 kde-apps/baloo-widgets/files/baloo-widgets-23.04.3-exiv2-0.28.patch (limited to 'kde-apps/baloo-widgets') diff --git a/kde-apps/baloo-widgets/Manifest b/kde-apps/baloo-widgets/Manifest index 583bb7ba440d..070d467876f5 100644 --- a/kde-apps/baloo-widgets/Manifest +++ b/kde-apps/baloo-widgets/Manifest @@ -1,5 +1,6 @@ +AUX baloo-widgets-23.04.3-exiv2-0.28.patch 1176 BLAKE2B c96b5982330e230fbedab00c704605c93bb631c4c1591a738ad6b8119279e642da449ba5d3d6fc988b5377692e85a1436276e08231dd0835251c55fa12de5e45 SHA512 10ae13a52cd5347fea479b5616eb4e64984502e54edd018745f8d10af82266aded62225fb062c0ba8b06cce12dbd5cffd594774bf20f8de7d45a804a63906081 DIST baloo-widgets-23.04.2.tar.xz 275576 BLAKE2B be213c10bb99548d57c797ac599ff9364cfc51566c9b5786b6799b37d7af6a895045ae91ac4d32a44c38001f22634885898aab9ca987a642979dda779015bc2a SHA512 ff6bc7236764068b1051bcaf3a2a631af9887793f131fea3c43c91eae336f4e6a2cecd091b0e27ab0c0944a20858ea50d0e91bdeccc82b7af952ceddea9c0bbe DIST baloo-widgets-23.04.3.tar.xz 275596 BLAKE2B 6f82cb70290ae7853e8ca40f4c8c052c74203cd0a66217f848799b704195d49603f7b43fea39f2a9de96a8e63cfb4d32b2833b991fd3b12ca3ceb782a23e0fe8 SHA512 ddf93ef46adb37f61f8ef1bab462fdd4695e526350a0259fcf6448b42ef84ff1335a49b08026f0cf72dde07823a08cf4bd51e40e5fbdc699b4aed9b2800c847b EBUILD baloo-widgets-23.04.2.ebuild 722 BLAKE2B fb48aba90bea94ddffa384eb24d85ff15be4d3f2dde9f6b5b52c557f49973f78b1aa61411d075bd220fcac8439eb5094e4f43bc33ee8df14a7e3503182910e0e SHA512 393b386dc5e695a7cf9f15255646ab38e62abf9f46eb8683f20ec464b0050e1e6795622d180915674b4fd14b50a5c9b823554d8a978ff0bacb532b1aa99da3d6 -EBUILD baloo-widgets-23.04.3.ebuild 725 BLAKE2B 1cdb08e2585aee0aa2f5d8dbd13b6aef64c437950a4e69552038c3fddd65825fc45310d4d95aef7d3b016be6549932d7114dcfafc6045667f639eeb79fcb38f9 SHA512 7f3a4f2483b718babceb896d36398c7571b0172ae95710d37aa6a27e97707b5968c51b096ee3de29f314898198e9085484e57d77fcb24e4a4c43a567e33bd816 +EBUILD baloo-widgets-23.04.3-r1.ebuild 782 BLAKE2B 52891f065f0a4e7a21d213a85803525a3c30067255208c01db89f09e245763af192bf6a76efb8aefe7aa1fbfa6584c350a5e241f54947a4565e65c2014489f30 SHA512 acf455316fce7982a8ae50e706ba208babcadb5843fb7fb63a0e1d144e6557f76436e05eae4df9054d0431979d4683623a8a53356e9738ec75aabcdf591a17d8 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6 diff --git a/kde-apps/baloo-widgets/baloo-widgets-23.04.3-r1.ebuild b/kde-apps/baloo-widgets/baloo-widgets-23.04.3-r1.ebuild new file mode 100644 index 000000000000..c7c86f150aeb --- /dev/null +++ b/kde-apps/baloo-widgets/baloo-widgets-23.04.3-r1.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_TEST="forceoptional" +KFMIN=5.106.0 +QTMIN=5.15.9 +inherit ecm gear.kde.org + +DESCRIPTION="Widget library for baloo" + +LICENSE="LGPL-2+ LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )" +SLOT="5" +KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86" +IUSE="" + +RESTRICT="test" + +DEPEND=" + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtwidgets-${QTMIN}:5 + >=kde-frameworks/baloo-${KFMIN}:5 + >=kde-frameworks/kconfig-${KFMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/kfilemetadata-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kio-${KFMIN}:5 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 +" +RDEPEND="${DEPEND}" + +PATCHES=( "${FILESDIR}/${P}-exiv2-0.28.patch" ) # 23.08 diff --git a/kde-apps/baloo-widgets/baloo-widgets-23.04.3.ebuild b/kde-apps/baloo-widgets/baloo-widgets-23.04.3.ebuild deleted file mode 100644 index 81d3de418de6..000000000000 --- a/kde-apps/baloo-widgets/baloo-widgets-23.04.3.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_TEST="forceoptional" -KFMIN=5.106.0 -QTMIN=5.15.9 -inherit ecm gear.kde.org - -DESCRIPTION="Widget library for baloo" - -LICENSE="LGPL-2+ LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )" -SLOT="5" -KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86" -IUSE="" - -DEPEND=" - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=kde-frameworks/baloo-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kfilemetadata-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 -" -RDEPEND="${DEPEND}" - -RESTRICT="test" diff --git a/kde-apps/baloo-widgets/files/baloo-widgets-23.04.3-exiv2-0.28.patch b/kde-apps/baloo-widgets/files/baloo-widgets-23.04.3-exiv2-0.28.patch new file mode 100644 index 000000000000..c93b9637e917 --- /dev/null +++ b/kde-apps/baloo-widgets/files/baloo-widgets-23.04.3-exiv2-0.28.patch @@ -0,0 +1,29 @@ +From a6dda3af5180d39a823224f2aca279b580ae576a Mon Sep 17 00:00:00 2001 +From: Antonio Rojas +Date: Tue, 13 Jun 2023 11:13:13 +0000 +Subject: [PATCH] Fix displaying image dimensions with exiv2 0.28 + +Accept UInt as the dimensions type + +BUG: 470859 +(cherry picked from commit b8947e1050e25481d12e644fab02ce2df40329cf) +--- + src/filemetadataprovider.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/filemetadataprovider.cpp b/src/filemetadataprovider.cpp +index 84a01d5..7377133 100644 +--- a/src/filemetadataprovider.cpp ++++ b/src/filemetadataprovider.cpp +@@ -129,7 +129,7 @@ void FileMetaDataProvider::slotFileFetchFinished(KJob *job) + + const auto width = m_data.value(QStringLiteral("width")); + const auto height = m_data.value(QStringLiteral("height")); +- if ((width.type() == QVariant::Double || width.type() == QVariant::Int) && (height.type() == QVariant::Double || height.type() == QVariant::Int)) { ++ if (!width.isNull() && !height.isNull()) { + m_data.insert(QStringLiteral("dimensions"), i18nc("width × height", "%1 × %2", width.toInt(), height.toInt())); + } + +-- +2.41.0 + -- cgit v1.2.3