diff options
Diffstat (limited to 'kde-misc')
95 files changed, 1674 insertions, 1388 deletions
diff --git a/kde-misc/basket/basket-2.49b.ebuild b/kde-misc/basket/basket-2.49b.ebuild index a0dfd489d24c..dae7431d3b5e 100644 --- a/kde-misc/basket/basket-2.49b.ebuild +++ b/kde-misc/basket/basket-2.49b.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 ECM_TEST="true" ECM_HANDBOOK="forceoptional" @@ -19,7 +19,6 @@ SLOT="5" KEYWORDS="amd64 ~arm64 x86" IUSE="crypt git" -BDEPEND="git? ( virtual/pkgconfig )" RDEPEND=" >=dev-qt/qtdbus-${QTMIN}:5 >=dev-qt/qtgui-${QTMIN}:5 @@ -56,6 +55,7 @@ RDEPEND=" DEPEND="${RDEPEND} >=dev-qt/qtconcurrent-${QTMIN}:5 " +BDEPEND="git? ( virtual/pkgconfig )" PATCHES=( "${FILESDIR}/${P}-xdg_mime_install_dir.patch" diff --git a/kde-misc/basket/metadata.xml b/kde-misc/basket/metadata.xml index d925f2439758..d7b2c0aec42e 100644 --- a/kde-misc/basket/metadata.xml +++ b/kde-misc/basket/metadata.xml @@ -7,5 +7,6 @@ </maintainer> <upstream> <bugs-to>https://bugs.kde.org/</bugs-to> + <remote-id type="kde-invent">utilities/basket</remote-id> </upstream> </pkgmetadata> diff --git a/kde-misc/colord-kde/Manifest b/kde-misc/colord-kde/Manifest index 77f8d566962e..b1301ae71502 100644 --- a/kde-misc/colord-kde/Manifest +++ b/kde-misc/colord-kde/Manifest @@ -1,2 +1,2 @@ -DIST colord-kde-0.5.0-patches.tar.xz 9500 BLAKE2B e8f4b2f07b7e17eeaddf1cba94945b47a5485213941d7cce3fb9bd0f67bcef37467541e154dfda8babac22fd46778809e84691cc4bebc2e149888a3927e73da7 SHA512 0f153413bd55c294eef1bbb8ae0af60972cdd68df4fe41c1a6fade34c4fa37d7195766561a9570a712b87c055cb9bbc54a5c2bf725c7776066f8fa91c00563e5 -DIST colord-kde-0.5.0.tar.xz 97572 BLAKE2B 7cb5434c25e576c98e2ffbf428bf81d37605fd489199bacc2c040d443021f1f1055b3640f2698b622b021e34f4c517e168a45cd2c1006fdc2c24590789b482e3 SHA512 f285931f0f97462fcf173f64aaf2f32752bddb0b724d2055055ce5beb7dbe89ccebc62cb8c2ce455a8d68beb737fd55bf89be8e4dc7eaa37f09878b757370f07 +DIST colord-kde-23.08.5.tar.xz 112824 BLAKE2B 3f94b6a0091e8dd0f7936c86e8a2550a8ad62cea5348f29b503e257cc9338a58baba5178bccb045cd8faa191277823f3b9972645312950c02e0d0be82d5164a8 SHA512 3b53b9f6dd5043ca4007c9123d642994bdaba077dc8a4355305aa8398ca4f91f271741da44ef90580feff82053f97aa2aa2febf3020b6cbe9ecc4c90c360836b +DIST colord-kde-24.02.2.tar.xz 113708 BLAKE2B d805093bd718c568e618d68af35af90e2e2a72c444e2790d20fb226141405a9694f67e523ebbd6df7bd7c5247c38983c1e5b38f764d451801429855fff7c14e8 SHA512 d30a149a872025a5945cc399274f48651e8b9d5cf346042c37dfc028945e21b89994b7a1d57d4c8040ad7774be1be165b07b81e37bada2e52e9dfb60d8cf3a89 diff --git a/kde-misc/colord-kde/colord-kde-0.5.0-r2.ebuild b/kde-misc/colord-kde/colord-kde-23.08.5.ebuild index 81ce4ef44c0d..aa4ba2d912a8 100644 --- a/kde-misc/colord-kde/colord-kde-0.5.0-r2.ebuild +++ b/kde-misc/colord-kde/colord-kde-23.08.5.ebuild @@ -1,51 +1,61 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -KFMIN=5.60.0 -QTMIN=5.12.3 -inherit ecm kde.org +KDE_ORG_CATEGORY=graphics +KFMIN=5.106.0 +QTMIN=5.15.9 +inherit ecm gear.kde.org DESCRIPTION="Provides interfaces and session daemon to colord" HOMEPAGE="https://invent.kde.org/graphics/colord-kde" -SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz -https://dev.gentoo.org/~asturm/distfiles/${P}-patches.tar.xz" LICENSE="GPL-2+" SLOT="5" -KEYWORDS="~amd64 ~x86" -IUSE="" +KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86" +IUSE="X" COMMON_DEPEND=" >=dev-qt/qtdbus-${QTMIN}:5 >=dev-qt/qtgui-${QTMIN}:5 >=dev-qt/qtwidgets-${QTMIN}:5 - >=dev-qt/qtx11extras-${QTMIN}:5 >=kde-frameworks/kcmutils-${KFMIN}:5 >=kde-frameworks/kconfigwidgets-${KFMIN}:5 >=kde-frameworks/kcoreaddons-${KFMIN}:5 >=kde-frameworks/kdbusaddons-${KFMIN}:5 + >=kde-frameworks/kdeclarative-${KFMIN}:5 >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kitemmodels-${KFMIN}:5[qml] + >=kde-frameworks/kpackage-${KFMIN}:5 >=kde-frameworks/kservice-${KFMIN}:5 >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 media-libs/lcms:2 - x11-libs/libxcb - x11-libs/libX11 - x11-libs/libXrandr + X? ( + >=dev-qt/qtx11extras-${QTMIN}:5 + x11-libs/libX11 + x11-libs/libxcb + ) " DEPEND="${COMMON_DEPEND} - >=kde-frameworks/kwindowsystem-${KFMIN}:5 + >=kde-frameworks/kwindowsystem-${KFMIN}:5[X] " RDEPEND="${COMMON_DEPEND} - kde-plasma/kde-cli-tools:5 + dev-libs/kirigami-addons:5 + >=dev-qt/qtquickcontrols2-${QTMIN}:5 + >=kde-frameworks/kirigami-${KFMIN}:5 + kde-plasma/kde-cli-tools:* x11-misc/colord " -PATCHES=( - "${WORKDIR}/${P}-patches" - "${FILESDIR}/${P}-icon.patch" -) +PATCHES=( "${FILESDIR}/${PN}-23.08.3-without_x11.patch" ) + +src_configure() { + local mycmakeargs=( + -DWITHOUT_X11=$(usex !X) + ) + ecm_src_configure +} pkg_postinst() { ecm_pkg_postinst diff --git a/kde-misc/colord-kde/colord-kde-24.02.2.ebuild b/kde-misc/colord-kde/colord-kde-24.02.2.ebuild new file mode 100644 index 000000000000..88f99a3c4506 --- /dev/null +++ b/kde-misc/colord-kde/colord-kde-24.02.2.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +KDE_ORG_CATEGORY=graphics +KFMIN=6.0.0 +QTMIN=6.6.2 +inherit ecm gear.kde.org + +DESCRIPTION="Provides interfaces and session daemon to colord" +HOMEPAGE="https://invent.kde.org/graphics/colord-kde" + +LICENSE="GPL-2+" +SLOT="6" +KEYWORDS="~amd64" +IUSE="X" + +COMMON_DEPEND=" + >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets] + >=kde-frameworks/kcmutils-${KFMIN}:6 + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/kdbusaddons-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/kitemmodels-${KFMIN}:6 + >=kde-frameworks/kservice-${KFMIN}:6 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:6 + media-libs/lcms:2 + X? ( + x11-libs/libX11 + x11-libs/libxcb + ) +" +DEPEND="${COMMON_DEPEND} + >=kde-frameworks/kwindowsystem-${KFMIN}:6[X] +" +RDEPEND="${COMMON_DEPEND} + dev-libs/kirigami-addons:6 + >=dev-qt/qtdeclarative-${QTMIN}:6 + >=kde-frameworks/kirigami-${KFMIN}:6 + kde-plasma/kde-cli-tools:* + x11-misc/colord +" + +src_configure() { + local mycmakeargs=( + -DWITHOUT_X11=$(usex !X) + ) + ecm_src_configure +} + +pkg_postinst() { + ecm_pkg_postinst + if ! has_version "gnome-extra/gnome-color-manager"; then + elog "You may want to install gnome-extra/gnome-color-manager to add support for" + elog "colorhug calibration devices." + fi +} diff --git a/kde-misc/colord-kde/files/colord-kde-0.5.0-icon.patch b/kde-misc/colord-kde/files/colord-kde-0.5.0-icon.patch deleted file mode 100644 index bcc8ba2586ca..000000000000 --- a/kde-misc/colord-kde/files/colord-kde-0.5.0-icon.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 7ea14bbaf6b0e923496cb5e50dfcd5068c7858c5 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Bj=C3=B6rn=20Feber?= <bfeber@protonmail.com> -Date: Sun, 30 Jun 2019 17:50:38 +0200 -Subject: [colord-kde] Use more appropriate icon, because the activities icon - got changed - -Summary: -Use a more appopriate icon, because the activities icon got changed in D22155. -{F6948366} - -Test Plan: Open the Color Corrections KCM. - -Reviewers: #plasma, #vdg, ndavis - -Reviewed By: #vdg, ndavis - -Subscribers: #vdg, #plasma - -Differential Revision: https://phabricator.kde.org/D22171 ---- - colord-kcm/ColordKCM.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/colord-kcm/ColordKCM.cpp b/colord-kcm/ColordKCM.cpp -index f14b4a9..fffbf54 100644 ---- a/colord-kcm/ColordKCM.cpp -+++ b/colord-kcm/ColordKCM.cpp -@@ -158,7 +158,7 @@ ColordKCM::ColordKCM(QWidget *parent, const QVariantList &args) : - connect(watcher, &QDBusServiceWatcher::serviceOwnerChanged, - ui->profile, &Description::serviceOwnerChanged); - -- ui->devicesTb->setIcon(QIcon::fromTheme(QStringLiteral("preferences-activities"))); -+ ui->devicesTb->setIcon(QIcon::fromTheme(QStringLiteral("computer"))); - ui->profilesTb->setIcon(QIcon::fromTheme(QStringLiteral("application-vnd.iccprofile"))); - - auto signalMapper = new QSignalMapper(this); --- -cgit v1.1 diff --git a/kde-misc/colord-kde/files/colord-kde-23.08.3-without_x11.patch b/kde-misc/colord-kde/files/colord-kde-23.08.3-without_x11.patch new file mode 100644 index 000000000000..d1cfc6f1085d --- /dev/null +++ b/kde-misc/colord-kde/files/colord-kde-23.08.3-without_x11.patch @@ -0,0 +1,61 @@ +From 31e125cc80497b0dc9f16abc808859ce97fd5fd1 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Sun, 26 Mar 2023 19:25:40 +0200 +Subject: [PATCH] Add CMake option to build WITHOUT_X11 + +We want to be able to build without X11 support even if some of the used +libraries may not work w/o X11 themselves yet or need to be built with X11 +support for other reverse dependencies. + +X11_FOUND is set automagically so far, and using +-DCMAKE_DISABLE_FIND_PACKAGE_X11 will break if any dependencies list X11 +as required in their cmake config. + +Introducing this option means there is no behavior change by default, +cmake will just skip finding X11 if the option is enabled. + +Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> +--- + CMakeLists.txt | 18 +++++++++++------- + 1 file changed, 11 insertions(+), 7 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9c08b03..d491926 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -47,13 +47,17 @@ find_package(Qt${QT_MAJOR_VERSION} ${REQUIRED_QT_VERSION} CONFIG REQUIRED COMPON + Widgets + ) + +-find_package(X11) +-set_package_properties(X11 PROPERTIES +- TYPE OPTIONAL +- PURPOSE "For colord integration on X11" +-) ++option(WITHOUT_X11 "Build without colord-kded for X11 integration (skips finding X11)" OFF) ++if(NOT WITHOUT_X11) ++ find_package(X11) ++ set_package_properties(X11 PROPERTIES ++ TYPE OPTIONAL ++ PURPOSE "For colord integration on X11" ++ ) ++ set(HAVE_X11 ${X11_FOUND}) ++endif() + +-if (X11_FOUND) ++if (HAVE_X11) + find_package(XCB REQUIRED COMPONENTS XCB RANDR) + if (QT_MAJOR_VERSION STREQUAL "5") + find_package(Qt5X11Extras ${REQUIRED_QT_VERSION} NO_MODULE) +@@ -80,7 +84,7 @@ ecm_set_disabled_deprecation_versions( + KF 5.100.0) + + +-if (X11_FOUND) ++if (HAVE_X11) + add_subdirectory(colord-kded) + endif() + add_subdirectory(colord-kcm) +-- +GitLab + diff --git a/kde-misc/colord-kde/metadata.xml b/kde-misc/colord-kde/metadata.xml index d925f2439758..a63502e7ba32 100644 --- a/kde-misc/colord-kde/metadata.xml +++ b/kde-misc/colord-kde/metadata.xml @@ -7,5 +7,6 @@ </maintainer> <upstream> <bugs-to>https://bugs.kde.org/</bugs-to> + <remote-id type="kde-invent">graphics/colord-kde</remote-id> </upstream> </pkgmetadata> diff --git a/kde-misc/kclock/Manifest b/kde-misc/kclock/Manifest new file mode 100644 index 000000000000..f02101c5b441 --- /dev/null +++ b/kde-misc/kclock/Manifest @@ -0,0 +1,2 @@ +DIST kclock-23.08.5.tar.xz 642872 BLAKE2B 966a4938dedf434de7f09030b759d3baa2cad5823b4fb3fcd88b6871f4db245186502b0dc3d95238888a12b2d3b6179f7d39525cff2fcd69cedfe41dcf8d8770 SHA512 b477743b98988f40974b0b8774d28ab9216778456a4f31911b97a61f3812510fdf944fbea63c5c3b96c03e748ef9c3d95c420d0edc697e5c5e6f50989b462dcb +DIST kclock-24.02.2.tar.xz 647304 BLAKE2B ec1271fe8a2322ecd5c73ca9684fa450d1e7c98134e9dffaee215e86ce38110272b6a137f721053232eab7534c991a0a4df3e35679f488266a6d4ccc7a1d7cb9 SHA512 038ef993289d58e3c0232453fe6dd8eece9c310fc5488e92446ccb4f8f676ad196f254962050df5b87f0a10d3fd336196682b21312865640e4875e2a32f12b0f diff --git a/kde-misc/kclock/kclock-23.08.5.ebuild b/kde-misc/kclock/kclock-23.08.5.ebuild new file mode 100644 index 000000000000..55fd34f96bc2 --- /dev/null +++ b/kde-misc/kclock/kclock-23.08.5.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +KDE_ORG_CATEGORY="utilities" +KFMIN=5.106.0 +QTMIN=5.15.9 +inherit ecm gear.kde.org + +DESCRIPTION="Convergent clock application for Plasma" +HOMEPAGE="https://apps.kde.org/kclock/" + +LICENSE="CC0-1.0 CC-BY-4.0 GPL-2+ GPL-3+ LGPL-2.1+" +SLOT="0" +KEYWORDS="amd64 arm64 ~loong ~ppc64 x86" + +DEPEND=" + >=dev-libs/kirigami-addons-0.6:5 + >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtdeclarative-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtmultimedia-${QTMIN}:5[qml] + >=dev-qt/qtquickcontrols2-${QTMIN}:5 + >=dev-qt/qtwidgets-${QTMIN}:5 + >=kde-frameworks/kconfig-${KFMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/kdbusaddons-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kirigami-${KFMIN}:5 + >=kde-frameworks/knotifications-${KFMIN}:5 + >=kde-plasma/libplasma-${KFMIN}:5 +" +RDEPEND="${DEPEND} + >=dev-qt/qtgraphicaleffects-${QTMIN}:5 +" diff --git a/kde-misc/kclock/kclock-24.02.2.ebuild b/kde-misc/kclock/kclock-24.02.2.ebuild new file mode 100644 index 000000000000..42da5947cc51 --- /dev/null +++ b/kde-misc/kclock/kclock-24.02.2.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +KDE_ORG_CATEGORY="utilities" +KFMIN=6.0.0 +QTMIN=6.6.2 +inherit ecm gear.kde.org + +DESCRIPTION="Convergent clock application for Plasma" +HOMEPAGE="https://apps.kde.org/kclock/" + +LICENSE="CC0-1.0 CC-BY-4.0 GPL-2+ GPL-3+ LGPL-2.1+" +SLOT="0" +KEYWORDS="~amd64" + +DEPEND=" + dev-libs/kirigami-addons:6 + >=dev-qt/qtbase-${QTMIN}:6[gui,network,widgets] + >=dev-qt/qtdeclarative-${QTMIN}:6 + >=dev-qt/qtmultimedia-${QTMIN}:6[qml] + >=kde-frameworks/kconfig-${KFMIN}:6 + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/kdbusaddons-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/kirigami-${KFMIN}:6 + >=kde-frameworks/knotifications-${KFMIN}:6 + >=kde-frameworks/kstatusnotifieritem-${KFMIN}:6 + kde-plasma/libplasma:6 +" +RDEPEND="${DEPEND} + >=dev-qt/qt5compat-${QTMIN}:6[qml] +" diff --git a/kde-misc/plasma-applet-weather-widget/metadata.xml b/kde-misc/kclock/metadata.xml index 43c861a8409b..cd1d5dc5408d 100644 --- a/kde-misc/plasma-applet-weather-widget/metadata.xml +++ b/kde-misc/kclock/metadata.xml @@ -6,6 +6,7 @@ <name>Gentoo KDE Project</name> </maintainer> <upstream> - <remote-id type="github">kotelnik/plasma-applet-weather-widget</remote-id> + <remote-id type="kde-invent">utilities/kclock</remote-id> + <bugs-to>https://bugs.kde.org/enter_bug.cgi?product=KClock</bugs-to> </upstream> </pkgmetadata> diff --git a/kde-misc/kdeconnect/Manifest b/kde-misc/kdeconnect/Manifest index 579181c7f7cc..7e7fc0fde4bf 100644 --- a/kde-misc/kdeconnect/Manifest +++ b/kde-misc/kdeconnect/Manifest @@ -1,2 +1,2 @@ -DIST kdeconnect-kde-21.12.3.tar.xz 610608 BLAKE2B cf3bc2c502cbff03d8dc738192b36f61f30e6d223446c8117cd612b987adfe60a20aa612a2b3a6a972068f92f8b03162701ac8f8e51c374d28bb05d309c4d346 SHA512 3cb399ee13c538646650b7360fd6fb7285ad8f1f56fb41c94dce44daf72dd66815aaa2b0d54aa02cdc206336e1ed582417b0aafe806b3f67af0c9503183a86f6 -DIST kdeconnect-kde-22.04.2.tar.xz 609120 BLAKE2B 5014bb429fed7a887c1f534e694819e69c60b25dd5a7705756f77064540047b4ce993ef43189437dc45f9df070c3517a0087a12d7106d84961a25a743747ff3d SHA512 40e3c2e45f48beadf54f74b5838910fbfa02ff63889cecbbfbd99152c6ec7646bb51b752d5287bc0764e415e52cbd6388889f1d916f9e12627f656714c56911c +DIST kdeconnect-kde-23.08.5.tar.xz 657504 BLAKE2B fde6f1c023739c1c770f93d455ed8e256b1e34c78fd76276a1941364735bb1c14d7850f27a586ab8fcbc259f64223fa619d61ac65b04ab8431871664d6c6c05f SHA512 ef861ae5bf8d88acf2328a3eacac2242687b21a0e004cad137cef03fdebc9a162a2e7e54f4ff99bb1ec85247595e0007c9a35673dfe9ecf5b69ec91389b912d3 +DIST kdeconnect-kde-24.02.2.tar.xz 678664 BLAKE2B 1298c56d846efaa360ae7e9faa7342718b2ff2398ab169125edef891defa7be01b16ba7fbe1695ca4c3547f422ec019a58a5a4eea1bf14c2d900ef67855b06a5 SHA512 b1940213ccf6ace17f84674ee5acca0cd228a3a96562db895e01afeb5d0a7f5d36e8f24ce956e92826026f50f6197ee67db79a182eb2c2fe47971ca623b03097 diff --git a/kde-misc/kdeconnect/kdeconnect-22.04.2.ebuild b/kde-misc/kdeconnect/kdeconnect-22.04.2.ebuild deleted file mode 100644 index 2fbfd8a610f1..000000000000 --- a/kde-misc/kdeconnect/kdeconnect-22.04.2.ebuild +++ /dev/null @@ -1,90 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_HANDBOOK="optional" -ECM_TEST="true" -KDE_GEAR="true" -KDE_ORG_NAME="${PN}-kde" -KDE_SELINUX_MODULE="${PN}" -KFMIN=5.92.0 -QTMIN=5.15.3 -inherit ecm kde.org - -DESCRIPTION="Adds communication between KDE Plasma and your smartphone" -HOMEPAGE="https://kdeconnect.kde.org/ https://apps.kde.org/kdeconnect.kcm/" - -LICENSE="GPL-2+" -SLOT="5" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" -IUSE="bluetooth pulseaudio wayland X" - -RESTRICT="test" - -DEPEND=" - >=app-crypt/qca-2.3.0:2[ssl] - >=dev-libs/wayland-1.15.0 - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5= - >=dev-qt/qtmultimedia-${QTMIN}:5 - >=dev-qt/qtnetwork-${QTMIN}:5 - >=dev-qt/qtquickcontrols2-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=dev-qt/qtx11extras-${QTMIN}:5 - >=kde-frameworks/kcmutils-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kdbusaddons-${KFMIN}:5 - >=kde-frameworks/kguiaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kiconthemes-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/kirigami-${KFMIN}:5 - >=kde-frameworks/knotifications-${KFMIN}:5 - >=kde-frameworks/kpeople-${KFMIN}:5 - >=kde-frameworks/kservice-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 - >=kde-frameworks/plasma-${KFMIN}:5 - >=kde-frameworks/qqc2-desktop-style-${KFMIN}:5 - >=kde-frameworks/solid-${KFMIN}:5 - bluetooth? ( >=dev-qt/qtbluetooth-${QTMIN}:5 ) - X? ( - x11-libs/libfakekey - x11-libs/libX11 - x11-libs/libXtst - ) - pulseaudio? ( media-libs/pulseaudio-qt:= ) - wayland? ( >=kde-frameworks/kwayland-${KFMIN}:5 ) -" -RDEPEND="${DEPEND} - dev-libs/kpeoplevcard - >=dev-qt/qtgraphicaleffects-${QTMIN}:5 - >=dev-qt/qtmultimedia-${QTMIN}:5[qml] - >=kde-frameworks/kdeclarative-${KFMIN}:5 - net-fs/sshfs -" - -PATCHES=( "${FILESDIR}/${PN}-21.07.80-revert-disable-kpeople.patch" ) - -src_configure() { - local mycmakeargs=( - -DBLUETOOTH_ENABLED=$(usex bluetooth) - $(cmake_use_find_package pulseaudio KF5PulseAudioQt) - $(cmake_use_find_package wayland KF5Wayland) - $(cmake_use_find_package X LibFakeKey) - ) - ecm_src_configure -} - -pkg_postinst() { - ecm_pkg_postinst - - elog "The Android .apk file is available via" - elog "https://play.google.com/store/apps/details?id=org.kde.kdeconnect_tp" - elog "or via" - elog "https://f-droid.org/packages/org.kde.kdeconnect_tp/" -} diff --git a/kde-misc/kdeconnect/kdeconnect-21.12.3.ebuild b/kde-misc/kdeconnect/kdeconnect-23.08.5-r1.ebuild index a80a8efb173e..3df6ce5f4a2f 100644 --- a/kde-misc/kdeconnect/kdeconnect-21.12.3.ebuild +++ b/kde-misc/kdeconnect/kdeconnect-23.08.5-r1.ebuild @@ -1,29 +1,29 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 ECM_HANDBOOK="optional" ECM_TEST="true" -KDE_GEAR="true" KDE_ORG_NAME="${PN}-kde" KDE_SELINUX_MODULE="${PN}" -KFMIN=5.88.0 -QTMIN=5.15.2 -inherit ecm kde.org +KFMIN=5.106.0 +QTMIN=5.15.9 +inherit ecm flag-o-matic gear.kde.org DESCRIPTION="Adds communication between KDE Plasma and your smartphone" -HOMEPAGE="https://kdeconnect.kde.org/ https://apps.kde.org/kdeconnect.kcm/" +HOMEPAGE="https://kdeconnect.kde.org/ https://apps.kde.org/kdeconnect/" LICENSE="GPL-2+" SLOT="5" KEYWORDS="amd64 arm64 ~ppc64 x86" -IUSE="bluetooth pulseaudio X" +IUSE="bluetooth pulseaudio telephony X" RESTRICT="test" -DEPEND=" - >=app-crypt/qca-2.3.0:2[ssl] +COMMON_DEPEND=" + >=app-crypt/qca-2.3.0:2[qt5(+),ssl] + dev-libs/glib:2 >=dev-libs/wayland-1.15.0 >=dev-qt/qtdbus-${QTMIN}:5 >=dev-qt/qtdeclarative-${QTMIN}:5 @@ -39,6 +39,7 @@ DEPEND=" >=kde-frameworks/kconfigwidgets-${KFMIN}:5 >=kde-frameworks/kcoreaddons-${KFMIN}:5 >=kde-frameworks/kdbusaddons-${KFMIN}:5 + >=kde-frameworks/kguiaddons-${KFMIN}:5 >=kde-frameworks/ki18n-${KFMIN}:5 >=kde-frameworks/kiconthemes-${KFMIN}:5 >=kde-frameworks/kio-${KFMIN}:5 @@ -46,22 +47,28 @@ DEPEND=" >=kde-frameworks/knotifications-${KFMIN}:5 >=kde-frameworks/kpeople-${KFMIN}:5 >=kde-frameworks/kservice-${KFMIN}:5 - >=kde-frameworks/kwayland-${KFMIN}:5 >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 >=kde-frameworks/kwindowsystem-${KFMIN}:5 - >=kde-frameworks/plasma-${KFMIN}:5 >=kde-frameworks/qqc2-desktop-style-${KFMIN}:5 >=kde-frameworks/solid-${KFMIN}:5 + >=kde-plasma/libplasma-${KFMIN}:5 + x11-libs/libxkbcommon bluetooth? ( >=dev-qt/qtbluetooth-${QTMIN}:5 ) + pulseaudio? ( <media-libs/pulseaudio-qt-1.4:= ) + telephony? ( >=kde-frameworks/modemmanager-qt-${KFMIN}:5 ) X? ( x11-libs/libfakekey x11-libs/libX11 x11-libs/libXtst ) - pulseaudio? ( media-libs/pulseaudio-qt:= ) " -RDEPEND="${DEPEND} - dev-libs/kpeoplevcard +DEPEND="${COMMON_DEPEND} + dev-libs/wayland-protocols +" +RDEPEND="${COMMON_DEPEND} + dev-libs/kirigami-addons:5 + dev-libs/kpeoplevcard:5 + dev-qt/qdbus:* >=dev-qt/qtgraphicaleffects-${QTMIN}:5 >=dev-qt/qtmultimedia-${QTMIN}:5[qml] >=kde-frameworks/kdeclarative-${KFMIN}:5 @@ -70,14 +77,21 @@ RDEPEND="${DEPEND} BDEPEND=" >=dev-qt/qtwaylandscanner-${QTMIN}:5 dev-util/wayland-scanner + virtual/pkgconfig " PATCHES=( "${FILESDIR}/${PN}-21.07.80-revert-disable-kpeople.patch" ) src_configure() { + # -Werror=lto-type-mismatch + # https://bugs.gentoo.org/921648 + # https://bugs.kde.org/show_bug.cgi?id=480522 + filter-lto + local mycmakeargs=( -DBLUETOOTH_ENABLED=$(usex bluetooth) $(cmake_use_find_package pulseaudio KF5PulseAudioQt) + $(cmake_use_find_package telephony KF5ModemManagerQt) $(cmake_use_find_package X LibFakeKey) ) ecm_src_configure diff --git a/kde-misc/kdeconnect/kdeconnect-24.02.2.ebuild b/kde-misc/kdeconnect/kdeconnect-24.02.2.ebuild new file mode 100644 index 000000000000..512d9c5718fe --- /dev/null +++ b/kde-misc/kdeconnect/kdeconnect-24.02.2.ebuild @@ -0,0 +1,106 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_HANDBOOK="forceoptional" +ECM_TEST="true" +KDE_ORG_NAME="${PN}-kde" +KDE_SELINUX_MODULE="${PN}" +KFMIN=6.0.0 +QTMIN=6.6.2 +inherit ecm flag-o-matic gear.kde.org + +DESCRIPTION="Adds communication between KDE Plasma and your smartphone" +HOMEPAGE="https://kdeconnect.kde.org/ https://apps.kde.org/kdeconnect/" + +LICENSE="GPL-2+" +SLOT="6" +KEYWORDS="~amd64" +IUSE="bluetooth pulseaudio telephony zeroconf X" + +RESTRICT="test" + +# slot op: Uses Qt6::GuiPrivate for qtx11extras_p.h +COMMON_DEPEND=" + dev-libs/openssl:= + >=dev-libs/wayland-1.15.0 + >=dev-qt/qtbase-${QTMIN}:6=[dbus,gui,network,widgets] + >=dev-qt/qtdeclarative-${QTMIN}:6 + >=dev-qt/qtmultimedia-${QTMIN}:6 + >=dev-qt/qtwayland-${QTMIN}:6 + >=kde-frameworks/kcmutils-${KFMIN}:6 + >=kde-frameworks/kconfig-${KFMIN}:6 + >=kde-frameworks/kconfigwidgets-${KFMIN}:6 + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/kdbusaddons-${KFMIN}:6 + >=kde-frameworks/kguiaddons-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/kiconthemes-${KFMIN}:6 + >=kde-frameworks/kio-${KFMIN}:6 + >=kde-frameworks/kirigami-${KFMIN}:6 + >=kde-frameworks/knotifications-${KFMIN}:6 + >=kde-frameworks/kpeople-${KFMIN}:6 + >=kde-frameworks/kservice-${KFMIN}:6 + >=kde-frameworks/kstatusnotifieritem-${KFMIN}:6 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:6 + >=kde-frameworks/kwindowsystem-${KFMIN}:6 + >=kde-frameworks/qqc2-desktop-style-${KFMIN}:6 + >=kde-frameworks/solid-${KFMIN}:6 + sys-apps/dbus + x11-libs/libxkbcommon + bluetooth? ( >=dev-qt/qtconnectivity-${QTMIN}:6[bluetooth] ) + pulseaudio? ( >=media-libs/pulseaudio-qt-1.4:= ) + telephony? ( >=kde-frameworks/modemmanager-qt-${KFMIN}:6 ) + zeroconf? ( >=kde-frameworks/kdnssd-${KFMIN}:6 ) + X? ( + x11-libs/libfakekey + x11-libs/libX11 + x11-libs/libXtst + ) +" +DEPEND="${COMMON_DEPEND} + dev-libs/wayland-protocols +" +RDEPEND="${COMMON_DEPEND} + dev-libs/kirigami-addons:6 + >=dev-qt/qt5compat-${QTMIN}:6[qml] + >=dev-qt/qtmultimedia-${QTMIN}:6[qml] + || ( + >=dev-qt/qttools-${QTMIN}:6[qdbus] + dev-qt/qdbus:* + ) + >=kde-frameworks/kdeclarative-${KFMIN}:6 + kde-plasma/libplasma:6 + net-fs/sshfs +" +BDEPEND=" + >=dev-qt/qtwayland-${QTMIN}:6 + dev-util/wayland-scanner + virtual/pkgconfig +" + +src_configure() { + # -Werror=lto-type-mismatch + # https://bugs.gentoo.org/921648 + # https://bugs.kde.org/show_bug.cgi?id=480522 + filter-lto + + local mycmakeargs=( + -DMDNS_ENABLED=$(usex zeroconf) + -DBLUETOOTH_ENABLED=$(usex bluetooth) + -DWITH_PULSEAUDIO=$(usex pulseaudio) + $(cmake_use_find_package telephony KF6ModemManagerQt) + -DWITH_X11=$(usex X) + ) + ecm_src_configure +} + +pkg_postinst() { + ecm_pkg_postinst + + elog "The Android .apk file is available via" + elog "https://play.google.com/store/apps/details?id=org.kde.kdeconnect_tp" + elog "or via" + elog "https://f-droid.org/packages/org.kde.kdeconnect_tp/" +} diff --git a/kde-misc/kdeconnect/metadata.xml b/kde-misc/kdeconnect/metadata.xml index 65474bc92199..2f438743055d 100644 --- a/kde-misc/kdeconnect/metadata.xml +++ b/kde-misc/kdeconnect/metadata.xml @@ -7,9 +7,11 @@ </maintainer> <upstream> <bugs-to>https://bugs.kde.org/</bugs-to> + <remote-id type="cpe">cpe:/a:kde:kdeconnect</remote-id> </upstream> <use> - <flag name="pulseaudio">Enable system volume control plugin using <pkg>media-sound/pulseaudio</pkg></flag> + <flag name="pulseaudio">Enable system volume control plugin using <pkg>media-libs/libpulse</pkg></flag> + <flag name="telephony">Enable telephony plugin using <pkg>kde-frameworks/modemmanager-qt</pkg></flag> <flag name="X">Enable remote input mousepad plugin using <pkg>x11-libs/libfakekey</pkg></flag> </use> </pkgmetadata> diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest index a4de5faea2da..afc177001b3a 100644 --- a/kde-misc/kdiff3/Manifest +++ b/kde-misc/kdiff3/Manifest @@ -1,2 +1 @@ -DIST kdiff3-1.9.5.tar.xz 1057524 BLAKE2B ef55ce58880d8611747929214bbc2e5d718d51d71915a327d711a828c20d91ce515fa37522ad79e3beca3616770b2cad9fc066814e5d7234e06af73ae22a4d77 SHA512 4c9629b2a8bc506a5b224a566cf2ef9b733d78fc3185d69988ed387621039a3f91472b02344377a254b3f19771bea5ce3355b0fd866402594eb63fd940a68c41 -DIST kdiff3-1.9.6.tar.xz 1059880 BLAKE2B 86124e7a09324179d4952ad44adf7397db661490c9dff9da2cd3d62bed65a2f97aadb15e12c6e11b2ce74d8f93c50c1290608c6c26f25d858af796c48aaf008a SHA512 0b12d0b81cdeeccf38248ca468ae714b7baadccce658cac41e619e960f865cff5e7362c78bf67b80037f3f4c763c123dd2aa65bb32567a3bd8f56e7158d72dbf +DIST kdiff3-1.10.7.tar.xz 1131116 BLAKE2B 5aff7d24d3440b367e0d124e7db444fb1164e1e23a39cc808b83d9f872e11c78442f73e5b95199ed00ace30cf5e4d15adbba0c9d46fe79bc2f5eae693e0aa93d SHA512 ab7ce8312014de200bcc613be1a28b384289f96be08d7f2e1e640b202cede3bbfeffa7b3e53b605f8edf9be2368d2aa6c6b5ee4501577ed8560ca1c4704802db diff --git a/kde-misc/kdiff3/kdiff3-1.9.5.ebuild b/kde-misc/kdiff3/kdiff3-1.10.7.ebuild index d225cdcfffc7..ac3ba233ccfb 100644 --- a/kde-misc/kdiff3/kdiff3-1.9.5.ebuild +++ b/kde-misc/kdiff3/kdiff3-1.10.7.ebuild @@ -1,12 +1,11 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 ECM_HANDBOOK="optional" -KFMIN=5.82.0 -QTMIN=5.15.2 -VIRTUALX_REQUIRED="test" +KFMIN=5.106.0 +QTMIN=5.15.9 inherit ecm kde.org DESCRIPTION="Frontend to diff3 based on KDE Frameworks" @@ -39,3 +38,10 @@ DEPEND="${COMMON_DEPEND} RDEPEND="${COMMON_DEPEND} sys-apps/diffutils " + +src_configure() { + local mycmakeargs=( + -DBUILD_WITH_QT6=OFF + ) + ecm_src_configure +} diff --git a/kde-misc/kdiff3/kdiff3-1.9.6.ebuild b/kde-misc/kdiff3/kdiff3-1.9.6.ebuild deleted file mode 100644 index 2a6d26eb50f4..000000000000 --- a/kde-misc/kdiff3/kdiff3-1.9.6.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_HANDBOOK="optional" -KFMIN=5.82.0 -QTMIN=5.15.2 -VIRTUALX_REQUIRED="test" -inherit ecm kde.org - -DESCRIPTION="Frontend to diff3 based on KDE Frameworks" -HOMEPAGE="https://apps.kde.org/kdiff3/ https://userbase.kde.org/KDiff3" -SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="5" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" -IUSE="" - -COMMON_DEPEND=" - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtprintsupport-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kcrash-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/kparts-${KFMIN}:5 - >=kde-frameworks/ktextwidgets-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 -" -DEPEND="${COMMON_DEPEND} - dev-libs/boost -" -RDEPEND="${COMMON_DEPEND} - sys-apps/diffutils -" diff --git a/kde-misc/kdiff3/metadata.xml b/kde-misc/kdiff3/metadata.xml index ce2a33915052..b100fbb81d7e 100644 --- a/kde-misc/kdiff3/metadata.xml +++ b/kde-misc/kdiff3/metadata.xml @@ -11,5 +11,6 @@ </maintainer> <upstream> <bugs-to>https://bugs.kde.org/</bugs-to> + <remote-id type="kde-invent">sdk/kdiff3</remote-id> </upstream> </pkgmetadata> diff --git a/kde-misc/kdirstat/Manifest b/kde-misc/kdirstat/Manifest index a896fa505c85..befe8a53246d 100644 --- a/kde-misc/kdirstat/Manifest +++ b/kde-misc/kdirstat/Manifest @@ -1 +1 @@ -DIST kdirstat-3.2.1.tar.gz 249498 BLAKE2B 9c80f0460a2a8b31fe1effd2159fc3ddbfd311038ebded7973e6c4f836b7de8a1510891686d3e8efb4c4e102582697c5e57e7363b5582bb84364d7a2c1c64dc6 SHA512 db0dc98257914b7cd006c9523b83bd3e2fc1f2f1b1f842b01e6eaab4c8ec9299ee6fc97badeffda89a00385eeb0fd693921dfbafc090bb29d4e7d8cde01ea102 +DIST k4dirstat-3.4.2.tar.gz 411899 BLAKE2B 356844373c35def5421c234ae5b07bd11402f56309c30fc68a64766be634fec5f6d04a8931babe21efad6fc36ec992e8ebb08a29dc11a58b2b08f1072b3a8f18 SHA512 d29c9b18b4bc8e94af1f4b494418284a05b95a1b17dbb23614823b0e3e7cd2b470b8330d3f52c584c0c257d2c0dfd4d06914a3eb90a51f7b679437bccc695477 diff --git a/kde-misc/kdirstat/kdirstat-3.2.1.ebuild b/kde-misc/kdirstat/kdirstat-3.4.2.ebuild index c1215a4195b9..e409b1d498b0 100644 --- a/kde-misc/kdirstat/kdirstat-3.2.1.ebuild +++ b/kde-misc/kdirstat/kdirstat-3.4.2.ebuild @@ -1,23 +1,22 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 +MY_P="k4dirstat-${PV}" ECM_HANDBOOK="forceoptional" inherit ecm DESCRIPTION="GUI equivalent to the du command based on KDE Frameworks" HOMEPAGE="https://github.com/jeromerobert/k4dirstat" -SRC_URI="https://github.com/jeromerobert/k4dirstat/archive/${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI="https://github.com/jeromerobert/k4dirstat/archive/${PV}.tar.gz -> ${MY_P}.tar.gz" +S="${WORKDIR}/${MY_P}" LICENSE="GPL-2" SLOT="5" KEYWORDS="amd64 ~arm64 x86" IUSE="" -BDEPEND=" - sys-devel/gettext -" DEPEND=" dev-qt/qtgui:5 dev-qt/qtwidgets:5 @@ -33,8 +32,7 @@ DEPEND=" sys-libs/zlib " RDEPEND="${DEPEND}" - -S="${WORKDIR}/k4dirstat-${PV}" +BDEPEND="sys-devel/gettext" src_configure() { local mycmakeargs=( diff --git a/kde-misc/kio-fuse/Manifest b/kde-misc/kio-fuse/Manifest index 7584bcac2bcc..11bcbecf55ce 100644 --- a/kde-misc/kio-fuse/Manifest +++ b/kde-misc/kio-fuse/Manifest @@ -1 +1,2 @@ -DIST kio-fuse-5.0.1.tar.xz 47596 BLAKE2B 3ed4f2a17aac1743ad0c8bc7421738eb499ea95eb20088444c241763b53315b8cd8a592d0ed18c7a6180de6040774f6d53429f8d1fe515eb4769fb95e680b530 SHA512 6423c461c001bb27d4e17e6f9a69e4a28c2e7834b6702bd14e4b34db9fc3156cdbb5400ec2c3f15975e78e563abbf14412f8f1b1db05f6313a8520bab030e7bd +DIST kio-fuse-5.0.1_p20230130-46620338.tar.gz 56742 BLAKE2B 92bd7e2cd9ebe22d35b3fbd624be469411d9d86fad230c8ecba2e33cb2cede56c14c992c82297f849a911a46f2f30f363a07af260bcf76be0304f034a52260cb SHA512 7df0990ede21582a0407b15c2c6f8259c6eb9d236059e42ed8fd5c5c9d92cfefa38d54135b709279c26d65704871f192c39e1abf9a19cf4021961924d2785459 +DIST kio-fuse-5.1.0.tar.xz 48820 BLAKE2B 0b1ebbac218501931b7c160a3fecea6d45ef15feec0d67edd88ba11f13e6ee707362a1358e4effc623c6467b86ae0a95d9a5690d8f0df36d26c4d3495883bbd4 SHA512 273b75fe90f8cb31ee0f611716bf05384d78d21747cb43785bb7a91037ca9ac30233aee5081e467d46aa21aa03f4c0fc7583334fe34dec7530c89c818db41a4b diff --git a/kde-misc/kio-fuse/kio-fuse-5.0.1.ebuild b/kde-misc/kio-fuse/kio-fuse-5.0.1_p20230130.ebuild index e6d595d05d9c..8a061ccf94ea 100644 --- a/kde-misc/kio-fuse/kio-fuse-5.0.1.ebuild +++ b/kde-misc/kio-fuse/kio-fuse-5.0.1_p20230130.ebuild @@ -1,26 +1,23 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 ECM_TEST="true" -KFMIN=5.74.0 -QTMIN=5.15.2 -inherit ecm kde.org linux-info +KDE_ORG_COMMIT="46620338f6e1c21f2c29e14ccbb6a399c4cd209b" +KFMIN=5.82.0 +QTMIN=5.15.5 +inherit ecm kde.org linux-info tmpfiles DESCRIPTION="FUSE interface for KIO" HOMEPAGE="https://feverfew.home.blog/2019/12/24/kiofuse-beta-4-9-0-released/" -if [[ ${KDE_BUILD_TYPE} = release ]]; then - SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz" - KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" -fi - LICENSE="GPL-3+" SLOT="5" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" IUSE="" -RESTRICT+=" test" # depend on fuse kernel module +RESTRICT="test" # depend on fuse kernel module DEPEND=" >=dev-qt/qtdbus-${QTMIN}:5 @@ -39,3 +36,8 @@ pkg_setup() { ecm_pkg_setup } + +pkg_postinst() { + tmpfiles_process "${PN}-tmpfiles.conf" + ecm_pkg_postinst +} diff --git a/kde-misc/kio-fuse/kio-fuse-5.1.0.ebuild b/kde-misc/kio-fuse/kio-fuse-5.1.0.ebuild new file mode 100644 index 000000000000..b5a756a94e7e --- /dev/null +++ b/kde-misc/kio-fuse/kio-fuse-5.1.0.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_TEST="true" +KFMIN=5.245.0 +QTMIN=6.6.2 +inherit ecm kde.org linux-info tmpfiles + +DESCRIPTION="FUSE interface for KIO" +HOMEPAGE="https://feverfew.home.blog/2019/12/24/kiofuse-beta-4-9-0-released/" + +if [[ ${KDE_BUILD_TYPE} = release ]]; then + SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz" + KEYWORDS="~amd64" +fi + +LICENSE="GPL-3+" +SLOT="6" +IUSE="" + +RESTRICT="test" # depend on fuse kernel module + +DEPEND=" + >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets] + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/kio-${KFMIN}:6 + sys-fs/fuse:3 +" +RDEPEND="${DEPEND} + !${CATEGORY}/${PN}:5 +" + +pkg_setup() { + local CONFIG_CHECK="~FUSE_FS" + linux-info_pkg_setup + + ecm_pkg_setup +} + +pkg_postinst() { + tmpfiles_process "${PN}-tmpfiles.conf" + ecm_pkg_postinst +} diff --git a/kde-misc/kio-gdrive/Manifest b/kde-misc/kio-gdrive/Manifest index 229ff90a80c3..c88e018d50ae 100644 --- a/kde-misc/kio-gdrive/Manifest +++ b/kde-misc/kio-gdrive/Manifest @@ -1,2 +1,2 @@ -DIST kio-gdrive-21.12.3.tar.xz 71128 BLAKE2B 31139ab720a06bdb65057b41ea56c96234965e1c0f325ae37bfa506ca5db0ac56ad81496890afda1423c77905d25168ddef8d1d0cddf3c58ebab635cf60ce28a SHA512 cb2cbc10ff14aa00c1a5b64ada1dfce6bdc7070f27b39613b6ec1d9f147a5d73356329f72c6db4eca783537550e78610b257d549f013e7ad122fec917b2165c0 -DIST kio-gdrive-22.04.2.tar.xz 72036 BLAKE2B 9e0a158bb62a66bc6f43cab5d925f681ca2296cfd9a9333d6ba895f42548989913840edc0ec4c88b73958ac766c201619603061cb26ef47d8facd74618bf27bf SHA512 343501f91ef306864c39203d97f2a652ee66f1746c2fc345f39ab0c93e08bd13ed6eae42c35a9a5c665bae9c267170b7520aadb595e2e76dafb0de3ee6def00c +DIST kio-gdrive-23.08.5.tar.xz 79452 BLAKE2B 7fab730a2781a0cf534beda35a48a2663cdd9e067759991e277775d1d5a492596cbdf9b3427e67da0d10415bf717ba46dd0d3d11c143de3733065e836b4fb345 SHA512 9535e64997b026aa6a5b6a092986486f726151948614f76c1f044e9fab6c0651f861776e928613a757c656fdd12cbba529dd63d04e1f58d5a43966b8d9d448c8 +DIST kio-gdrive-24.02.2.tar.xz 80812 BLAKE2B 6b12bb4d660f8d1ef95aedb0a5ad5392aff2976b0e5c8c24c55efd9b52b836c3119d2af376f4aef47d9d30b0a0958dd528183371ef7f015f0b9179aa9a27d905 SHA512 d91a3aea2f69ab68251b53edccafbbc914edbd865fee837d26b2f3428559d983cd50c536436d91479a957242ff2f35c03f4d8e13661398acf594ce0d5a880269 diff --git a/kde-misc/kio-gdrive/files/kio-gdrive-23.08.5-kaccounts-integration-24.02.patch b/kde-misc/kio-gdrive/files/kio-gdrive-23.08.5-kaccounts-integration-24.02.patch new file mode 100644 index 000000000000..329b0f7ac503 --- /dev/null +++ b/kde-misc/kio-gdrive/files/kio-gdrive-23.08.5-kaccounts-integration-24.02.patch @@ -0,0 +1,53 @@ +From f3a8d9dbc22d3743e03b1b0092baa3b060a1c001 Mon Sep 17 00:00:00 2001 +From: Nicolas Fella <nicolas.fella@gmx.de> +Date: Sun, 10 Dec 2023 22:27:46 +0100 +Subject: [PATCH] Adapt to KAccounts API change + +--- + kaccounts/kaccountsplugin.cpp | 2 +- + kaccounts/kaccountsplugin.h | 2 +- + src/kaccountsmanager.cpp | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/kaccounts/kaccountsplugin.cpp b/kaccounts/kaccountsplugin.cpp +index 676bc4a..9ba2d17 100644 +--- a/kaccounts/kaccountsplugin.cpp ++++ b/kaccounts/kaccountsplugin.cpp +@@ -18,7 +18,7 @@ + K_PLUGIN_CLASS_WITH_JSON(GoogleDrivePlugin, "kaccountsplugin.json") + + GoogleDrivePlugin::GoogleDrivePlugin(QObject *parent, const QVariantList &args) +- : KAccountsDPlugin(parent, args) ++ : KAccounts::KAccountsDPlugin(parent, args) + { + } + +diff --git a/kaccounts/kaccountsplugin.h b/kaccounts/kaccountsplugin.h +index d330c64..748feac 100644 +--- a/kaccounts/kaccountsplugin.h ++++ b/kaccounts/kaccountsplugin.h +@@ -9,7 +9,7 @@ + + #include <KAccounts/KAccountsDPlugin> + +-class GoogleDrivePlugin : public KAccountsDPlugin ++class GoogleDrivePlugin : public KAccounts::KAccountsDPlugin + { + Q_OBJECT + public: +diff --git a/src/kaccountsmanager.cpp b/src/kaccountsmanager.cpp +index 6660a4e..c6d4273 100644 +--- a/src/kaccountsmanager.cpp ++++ b/src/kaccountsmanager.cpp +@@ -151,7 +151,7 @@ void KAccountsManager::loadAccounts() + + AccountPtr KAccountsManager::getAccountCredentials(Accounts::AccountId id, const QString& displayName) + { +- auto job = new GetCredentialsJob(id, nullptr); ++ auto job = new KAccounts::GetCredentialsJob(id, nullptr); + job->exec(); + if (job->error()) { + qCWarning(GDRIVE) << "GetCredentialsJob failed:" << job->errorString(); +-- +GitLab + diff --git a/kde-misc/kio-gdrive/kio-gdrive-22.04.2.ebuild b/kde-misc/kio-gdrive/kio-gdrive-22.04.2.ebuild deleted file mode 100644 index dd9f15769327..000000000000 --- a/kde-misc/kio-gdrive/kio-gdrive-22.04.2.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_HANDBOOK="forceoptional" -ECM_TEST="optional" -KDE_GEAR="true" -KDE_ORG_CATEGORY="network" -KFMIN=5.92.0 -QTMIN=5.15.3 -inherit ecm kde.org - -DESCRIPTION="KIO Slave for Google Drive service" -HOMEPAGE="https://apps.kde.org/kio_gdrive/" - -LICENSE="GPL-2+" -SLOT="5" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" -IUSE="+kaccounts +share" - -REQUIRED_USE="share? ( kaccounts )" - -COMMON_DEPEND=" - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=kde-apps/libkgapi-19.08.0:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/knotifications-${KFMIN}:5 - kaccounts? ( >=kde-apps/kaccounts-integration-20.08.3:5 ) - !kaccounts? ( dev-libs/qtkeychain:=[qt5(+)] ) - share? ( >=kde-frameworks/purpose-${KFMIN}:5 ) -" -DEPEND="${COMMON_DEPEND} - >=dev-qt/qtnetwork-${QTMIN}:5 -" -RDEPEND="${COMMON_DEPEND} - kaccounts? ( >=kde-apps/kaccounts-providers-20.08.3:5 ) -" -BDEPEND="dev-util/intltool" - -DOCS=( README.md ) - -src_configure() { - local mycmakeargs=( - $(cmake_use_find_package kaccounts KAccounts) - $(cmake_use_find_package share KF5Purpose) - ) - ecm_src_configure -} diff --git a/kde-misc/kio-gdrive/kio-gdrive-23.08.5-r1.ebuild b/kde-misc/kio-gdrive/kio-gdrive-23.08.5-r1.ebuild new file mode 100644 index 000000000000..86ad6360a782 --- /dev/null +++ b/kde-misc/kio-gdrive/kio-gdrive-23.08.5-r1.ebuild @@ -0,0 +1,67 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_HANDBOOK="forceoptional" +ECM_TEST="optional" +KDE_ORG_CATEGORY="network" +KFMIN=5.106.0 +QTMIN=5.15.9 +inherit ecm gear.kde.org + +DESCRIPTION="KIO worker for Google Drive service" +HOMEPAGE="https://apps.kde.org/kio_gdrive/" + +LICENSE="GPL-2+" +SLOT="5" +KEYWORDS="~amd64" +IUSE="kf6compat +share" + +COMMON_DEPEND=" + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtwidgets-${QTMIN}:5 + kde-apps/kaccounts-integration:6[qt5] + kde-apps/libkgapi:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kio-${KFMIN}:5 + >=kde-frameworks/knotifications-${KFMIN}:5 + share? ( >=kde-frameworks/purpose-${KFMIN}:5 ) +" +DEPEND="${COMMON_DEPEND} + >=dev-qt/qtnetwork-${QTMIN}:5 +" +RDEPEND="${COMMON_DEPEND} + kde-apps/kaccounts-providers:* + kf6compat? ( kde-misc/kio-gdrive:6 ) +" +BDEPEND="dev-util/intltool" + +DOCS=( README.md ) + +PATCHES=( "${FILESDIR}/${P}-kaccounts-integration-24.02.patch" ) + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package share KF5Purpose) + ) + ecm_src_configure +} + +src_install() { + ecm_src_install + + if use kf6compat; then + rm "${D}"/usr/share/accounts/services/kde/google-drive.service \ + "${D}"/usr/share/metainfo/org.kde.kio_gdrive.metainfo.xml \ + "${D}"/usr/share/remoteview/gdrive-network.desktop || die + if use handbook; then + rm -r "${D}"/usr/share/help || die + fi + if use share; then + rm -r "${D}"/usr/share/purpose/purpose_gdrive_config.qml || die + fi + rm -r "${D}"/usr/share/locale || die + fi +} diff --git a/kde-misc/kio-gdrive/kio-gdrive-21.12.3.ebuild b/kde-misc/kio-gdrive/kio-gdrive-23.08.5.ebuild index 91f97aa438eb..2c96475d1507 100644 --- a/kde-misc/kio-gdrive/kio-gdrive-21.12.3.ebuild +++ b/kde-misc/kio-gdrive/kio-gdrive-23.08.5.ebuild @@ -1,43 +1,42 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 ECM_HANDBOOK="forceoptional" ECM_TEST="optional" -KDE_GEAR="true" KDE_ORG_CATEGORY="network" -KFMIN=5.88.0 -QTMIN=5.15.2 -inherit ecm kde.org +KFMIN=5.106.0 +QTMIN=5.15.9 +inherit ecm gear.kde.org -DESCRIPTION="KIO Slave for Google Drive service" +DESCRIPTION="KIO worker for Google Drive service" HOMEPAGE="https://apps.kde.org/kio_gdrive/" LICENSE="GPL-2+" SLOT="5" -KEYWORDS="amd64 arm64 ~ppc64 x86" -IUSE="+kaccounts +share" - -REQUIRED_USE="share? ( kaccounts )" +KEYWORDS="amd64 arm64 ~x86" +IUSE="+share" COMMON_DEPEND=" >=dev-qt/qtgui-${QTMIN}:5 >=dev-qt/qtwidgets-${QTMIN}:5 - >=kde-apps/libkgapi-19.08.0:5 + || ( + kde-apps/kaccounts-integration:6[qt5] + kde-apps/kaccounts-integration:5 + ) + kde-apps/libkgapi:5 >=kde-frameworks/kcoreaddons-${KFMIN}:5 >=kde-frameworks/ki18n-${KFMIN}:5 >=kde-frameworks/kio-${KFMIN}:5 >=kde-frameworks/knotifications-${KFMIN}:5 - kaccounts? ( >=kde-apps/kaccounts-integration-20.08.3:5 ) - !kaccounts? ( dev-libs/qtkeychain:=[qt5(+)] ) share? ( >=kde-frameworks/purpose-${KFMIN}:5 ) " DEPEND="${COMMON_DEPEND} >=dev-qt/qtnetwork-${QTMIN}:5 " RDEPEND="${COMMON_DEPEND} - kaccounts? ( >=kde-apps/kaccounts-providers-20.08.3:5 ) + kde-apps/kaccounts-providers:5 " BDEPEND="dev-util/intltool" @@ -45,7 +44,6 @@ DOCS=( README.md ) src_configure() { local mycmakeargs=( - $(cmake_use_find_package kaccounts KAccounts) $(cmake_use_find_package share KF5Purpose) ) ecm_src_configure diff --git a/kde-misc/kio-gdrive/kio-gdrive-24.02.2.ebuild b/kde-misc/kio-gdrive/kio-gdrive-24.02.2.ebuild new file mode 100644 index 000000000000..b21d30509b41 --- /dev/null +++ b/kde-misc/kio-gdrive/kio-gdrive-24.02.2.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_HANDBOOK="forceoptional" +ECM_TEST="optional" +KDE_ORG_CATEGORY="network" +KFMIN=6.0.0 +QTMIN=6.6.2 +inherit ecm gear.kde.org + +DESCRIPTION="KIO worker for Google Drive service" +HOMEPAGE="https://apps.kde.org/kio_gdrive/" + +LICENSE="GPL-2+" +SLOT="6" +KEYWORDS="~amd64" +IUSE="+share" + +COMMON_DEPEND=" + >=dev-qt/qtbase-${QTMIN}:6[gui,widgets] + kde-apps/kaccounts-integration:6 + kde-apps/libkgapi:6 + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/kio-${KFMIN}:6 + >=kde-frameworks/knotifications-${KFMIN}:6 + share? ( >=kde-frameworks/purpose-${KFMIN}:6 ) +" +DEPEND="${COMMON_DEPEND} + >=dev-qt/qtbase-${QTMIN}:6[network] +" +RDEPEND="${COMMON_DEPEND} + !${CATEGORY}/${PN}:5[-kf6compat(-)] + kde-apps/kaccounts-providers:6 +" +BDEPEND="dev-util/intltool" + +DOCS=( README.md ) + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package share KF6Purpose) + ) + ecm_src_configure +} diff --git a/kde-misc/kio-gdrive/metadata.xml b/kde-misc/kio-gdrive/metadata.xml index 35ead628e97b..3517d3c77ec1 100644 --- a/kde-misc/kio-gdrive/metadata.xml +++ b/kde-misc/kio-gdrive/metadata.xml @@ -9,7 +9,7 @@ <bugs-to>https://bugs.kde.org/</bugs-to> </upstream> <use> - <flag name="kaccounts">Use <pkg>kde-apps/kaccounts-integration</pkg> backend (default) instead of <pkg>dev-libs/qtkeychain</pkg></flag> + <flag name="kf6compat">Disable components colliding with KF6, depend on KF6 components instead</flag> <flag name="share">Enable support for a share menu using <pkg>kde-frameworks/purpose</pkg></flag> </use> </pkgmetadata> diff --git a/kde-misc/kio-gopher/kio-gopher-0.1.99-r1.ebuild b/kde-misc/kio-gopher/kio-gopher-0.1.99-r1.ebuild index 483601d1c3be..2288a4e15463 100644 --- a/kde-misc/kio-gopher/kio-gopher-0.1.99-r1.ebuild +++ b/kde-misc/kio-gopher/kio-gopher-0.1.99-r1.ebuild @@ -1,14 +1,14 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 ECM_HANDBOOK="forceoptional" KFMIN=5.60.0 QTMIN=5.12.3 inherit ecm kde.org -DESCRIPTION="Gopher Kioslave for Konqueror" +DESCRIPTION="Gopher KIO worker for Konqueror" HOMEPAGE="https://userbase.kde.org/Kio_gopher" SRC_URI="mirror://kde/unstable/${PN}/${P}.tar.xz" diff --git a/kde-misc/kio-locate/files/kio-locate-0.5.3-kf5port.patch b/kde-misc/kio-locate/files/kio-locate-0.5.3-kf5port.patch index 986e8c6b0ee2..65fe2481ce9d 100644 --- a/kde-misc/kio-locate/files/kio-locate-0.5.3-kf5port.patch +++ b/kde-misc/kio-locate/files/kio-locate-0.5.3-kf5port.patch @@ -1,7 +1,9 @@ diff -Naur a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt 2010-03-07 02:38:40.000000000 +0800 +++ b/CMakeLists.txt 2015-10-19 19:28:48.185748034 +0800 -@@ -1,31 +1,38 @@ +@@ -0,31 +0,40 @@ ++cmake_minimum_required(VERSION 3.16) ++ set(KDE_MIN_VERSION "4.4.0") -find_package(KDE4 4.4.0 REQUIRED) -include (KDE4Defaults) @@ -56,7 +58,6 @@ diff -Naur a/doc/CMakeLists.txt b/doc/CMakeLists.txt @@ -1 +1 @@ -macro_optional_add_subdirectory(en) +add_subdirectory(en) -diff -Naur a/kio_locate.cpp b/kio_locate.cpp --- a/kio_locate.cpp 2010-03-20 17:05:46.000000000 +0800 +++ b/kio_locate.cpp 2015-10-19 18:49:56.251128472 +0800 @@ -290,7 +290,7 @@ @@ -86,7 +87,6 @@ diff -Naur a/kio_locate.cpp b/kio_locate.cpp dialog->setWindowIcon(SmallIcon("edit-find")); Ui::KLocateConfigWidget w1; -diff -Naur a/kio_locate.h b/kio_locate.h --- a/kio_locate.h 2010-03-20 17:05:46.000000000 +0800 +++ b/kio_locate.h 2015-10-19 18:51:19.908758859 +0800 @@ -62,6 +62,10 @@ diff --git a/kde-misc/kio-locate/kio-locate-0.5.3-r3.ebuild b/kde-misc/kio-locate/kio-locate-0.5.3-r3.ebuild index 3173e06cc4d1..09421ff4075b 100644 --- a/kde-misc/kio-locate/kio-locate-0.5.3-r3.ebuild +++ b/kde-misc/kio-locate/kio-locate-0.5.3-r3.ebuild @@ -1,12 +1,12 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 ECM_HANDBOOK="forceoptional" # not optional until !kdelibs4support inherit ecm -DESCRIPTION="Locate KIO slave" +DESCRIPTION="KIO worker for the locate command" HOMEPAGE="https://www.linux-apps.com/content/show.php/kio-locate?content=120965" SRC_URI="https://dl.opendesktop.org/api/files/download/id/1460972255/120965-${P}.tar.gz" # See also: https://github.com/reporter123/kio-locate/commits/master @@ -14,12 +14,7 @@ SRC_URI="https://dl.opendesktop.org/api/files/download/id/1460972255/120965-${P} LICENSE="GPL-2" SLOT="5" KEYWORDS="~amd64 ~arm64 ~x86" -IUSE="debug" - -PATCHES=( - "${FILESDIR}/${P}-gcc-4.7.patch" - "${FILESDIR}/${P}-kf5port.patch" -) +IUSE="" DEPEND=" dev-qt/qtgui:5 @@ -37,3 +32,8 @@ DEPEND=" RDEPEND="${DEPEND} sys-apps/mlocate " + +PATCHES=( + "${FILESDIR}/${P}-gcc-4.7.patch" + "${FILESDIR}/${P}-kf5port.patch" +) diff --git a/kde-misc/kio-stash/files/kio-stash-1.0-unused-includes.patch b/kde-misc/kio-stash/files/kio-stash-1.0-unused-includes.patch new file mode 100644 index 000000000000..93c786d7ad12 --- /dev/null +++ b/kde-misc/kio-stash/files/kio-stash-1.0-unused-includes.patch @@ -0,0 +1,33 @@ +From c49db3ddb772ae7eb5bf6fc291e5e42391c930f8 Mon Sep 17 00:00:00 2001 +From: Nicolas Fella <nicolas.fella@gmx.de> +Date: Sat, 28 Nov 2020 17:28:00 +0100 +Subject: [PATCH] Remove unused includes + +--- + src/iodaemon/stashnotifier.cpp | 8 -------- + 1 file changed, 8 deletions(-) + +diff --git a/src/iodaemon/stashnotifier.cpp b/src/iodaemon/stashnotifier.cpp +index 4cfbafc..b427836 100644 +--- a/src/iodaemon/stashnotifier.cpp ++++ b/src/iodaemon/stashnotifier.cpp +@@ -20,16 +20,8 @@ + #include "stashnotifier.h" + #include "stash_adaptor.h" + +-#include <QDir> +-#include <QFile> +-#include <QFileInfo> +-#include <QMetaType> +-#include <QDBusMetaType> +- + #include <KDirWatch> + #include <KPluginFactory> +-#include <KPluginLoader> +-#include <kdirnotify.h> + + K_PLUGIN_FACTORY_WITH_JSON(StashNotifierFactory, "stashnotifier.json", registerPlugin<StashNotifier>();) + +-- +GitLab + diff --git a/kde-misc/kio-stash/kio-stash-1.0-r1.ebuild b/kde-misc/kio-stash/kio-stash-1.0-r1.ebuild index 8d8755da8614..ba9e9501f735 100644 --- a/kde-misc/kio-stash/kio-stash-1.0-r1.ebuild +++ b/kde-misc/kio-stash/kio-stash-1.0-r1.ebuild @@ -1,14 +1,14 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 ECM_TEST="forceoptional" KFMIN=5.60.0 QTMIN=5.12.3 inherit ecm kde.org -DESCRIPTION="KIO Slave and daemon to stash discontinuous file selections" +DESCRIPTION="KIO worker and daemon to stash discontinuous file selections" HOMEPAGE="https://arnavdhamija.com/2017/07/04/kio-stash-shipped/ https://invent.kde.org/utilities/kio-stash" SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz" @@ -17,7 +17,7 @@ SLOT="0" KEYWORDS="~amd64 ~arm64" IUSE="" -RESTRICT+=" test" +RESTRICT="test" DEPEND=" >=dev-qt/qtdbus-${QTMIN}:5 @@ -31,4 +31,5 @@ RDEPEND="${DEPEND}" PATCHES=( "${FILESDIR}"/${P}-no-kf5config.patch "${FILESDIR}"/${P}-kioslave-no-desktop-app.patch + "${FILESDIR}"/${P}-unused-includes.patch ) diff --git a/kde-misc/kio-stash/metadata.xml b/kde-misc/kio-stash/metadata.xml index d925f2439758..21702b0130f5 100644 --- a/kde-misc/kio-stash/metadata.xml +++ b/kde-misc/kio-stash/metadata.xml @@ -7,5 +7,6 @@ </maintainer> <upstream> <bugs-to>https://bugs.kde.org/</bugs-to> + <remote-id type="kde-invent">utilities/kio-stash</remote-id> </upstream> </pkgmetadata> diff --git a/kde-misc/kmarkdownwebview/Manifest b/kde-misc/kmarkdownwebview/Manifest deleted file mode 100644 index 9f34f95521de..000000000000 --- a/kde-misc/kmarkdownwebview/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST kmarkdownwebview-0.5.6.tar.xz 68992 BLAKE2B cf2dd0718c6517b7ff3cebd032410b695a4ec40e6c51c93ac3f8f85cd3ffdb9a23c1922ac7f7e097412f0ea76891ea067ca2633d036dba8e45ff3fd6cc468f9b SHA512 51c99da9cb2fd0868bf0bc18e89efad75d70758343cf2b4d05e4eec00d328cc041ee9c8b90c402dc137afab5266e9dfb8877832064305de5a836c4aa94af4e4e diff --git a/kde-misc/kmarkdownwebview/kmarkdownwebview-0.5.6.ebuild b/kde-misc/kmarkdownwebview/kmarkdownwebview-0.5.6.ebuild deleted file mode 100644 index 113eeb3ce745..000000000000 --- a/kde-misc/kmarkdownwebview/kmarkdownwebview-0.5.6.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit ecm kde.org - -DESCRIPTION="KPart for rendering Markdown content" -HOMEPAGE="https://apps.kde.org/en/kmarkdownwebviewpart" -SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz" - -LICENSE="BSD LGPL-2.1+" -SLOT="5" -KEYWORDS="amd64" -IUSE="" - -DEPEND=" - dev-qt/qtgui:5 - dev-qt/qtwebchannel:5 - dev-qt/qtwebengine:5[widgets] - dev-qt/qtwidgets:5 - kde-frameworks/kconfigwidgets:5 - kde-frameworks/kcoreaddons:5 - kde-frameworks/ki18n:5 - kde-frameworks/kio:5 - kde-frameworks/kparts:5 - kde-frameworks/kxmlgui:5 -" -RDEPEND="${DEPEND}" - -src_configure() { - local mycmakeargs=( - -DUSE_QTWEBKIT=OFF - ) - ecm_src_configure -} diff --git a/kde-misc/krename/Manifest b/kde-misc/krename/Manifest index fa1e4a8e80da..7df8124fb483 100644 --- a/kde-misc/krename/Manifest +++ b/kde-misc/krename/Manifest @@ -1 +1,2 @@ -DIST krename-5.0.1.tar.xz 321556 BLAKE2B 38835e4f7ce97b4991419ac7676268701c0977feb32457c9dc5ddcea92f576012320eac06aadbe426a5e176aae6270606688afd377af4c9ea32d66bd75a74fdd SHA512 1e8b17d9b8396354da131132fb6add24c6620ac39ab7ea5954391358369a4749f83df040e8425c74442ec143d1f07b322e592e5744f80eeef4b961d72f9dd379 +DIST krename-5.0.2-patchset-1.tar.xz 6360 BLAKE2B 69e8b046885be27c77d5d315e994e8b2a31e76ed76f4ea6d030679b83133725cb0577d818841b1f41e566e757f4cbd4e08c1f479bc1d572a8391db47c4a26e8c SHA512 2de0ee19d29dadb50995b0d02e486e8efdbff3d3fda0a3a6ec69f4b5858b4c376b3d33d2018da0cf2333309fe8b4ea58f4de21f6d2864c2c22b60830b5ac9bcf +DIST krename-5.0.2.tar.xz 337908 BLAKE2B 2fb7a96ca3f3f3b193d0924dd1131a7442b32149c1f62387734c47680077b6f77e3cf32b940b85d6f688d24f24af08ac39a8ccc86f10f5ec1d65b53fc9631108 SHA512 c065d6de90c43e5297db2773d8569279535b007d3b00b99a252329e78c90dc949678ecd2f2ecaa74e72394fa0e848b8774f6f387d4a7f367b367b1dd38405545 diff --git a/kde-misc/krename/files/krename-5.0.1-no-kjs.patch b/kde-misc/krename/files/krename-5.0.1-no-kjs.patch deleted file mode 100644 index f4b7eb786890..000000000000 --- a/kde-misc/krename/files/krename-5.0.1-no-kjs.patch +++ /dev/null @@ -1,519 +0,0 @@ -From 407b612a93128b9f935a686d5ff82c7ee06087f5 Mon Sep 17 00:00:00 2001 -From: Harald Sitter <sitter@kde.org> -Date: Thu, 17 Dec 2020 13:19:56 +0100 -Subject: [PATCH 1/5] reduce nesting - -easier on the eyes ---- - src/scriptplugin.cpp | 63 +++++++++++++++++++++++--------------------- - 1 file changed, 33 insertions(+), 30 deletions(-) - -diff --git a/src/scriptplugin.cpp b/src/scriptplugin.cpp -index 0790fd4..8f4b11e 100644 ---- a/src/scriptplugin.cpp -+++ b/src/scriptplugin.cpp -@@ -175,36 +175,39 @@ void ScriptPlugin::initKRenameVars(const KRenameFile &file, int index) - file.srcDirectory()); - - // User definitions, set them only on first file -- if (index == 0) { -- for (int i = 0; i < m_widget->listVariables->topLevelItemCount(); i++) { -- // TODO, we have to know the type of the variable! -- QTreeWidgetItem *item = m_widget->listVariables->topLevelItem(i); -- if (item) { -- EVarType eVarType = static_cast<EVarType>(item->data(1, Qt::UserRole).toInt()); -- const QString &name = item->text(0); -- const QString &value = item->text(1); -- switch (eVarType) { -- default: -- case eVarType_String: -- m_interpreter->globalObject().setProperty(m_interpreter->globalContext(), -- name, value.toUtf8().data()); -- break; -- case eVarType_Int: -- m_interpreter->globalObject().setProperty(m_interpreter->globalContext(), -- name, value.toInt()); -- break; -- case eVarType_Double: -- m_interpreter->globalObject().setProperty(m_interpreter->globalContext(), -- name, value.toDouble()); -- break; -- case eVarType_Bool: -- m_interpreter->globalObject().setProperty(m_interpreter->globalContext(), -- name, -- (value.toLower() == "true" ? true : false)); -- break; -- -- } -- } -+ if (index != 0) { -+ return; -+ } -+ -+ for (int i = 0; i < m_widget->listVariables->topLevelItemCount(); i++) { -+ // TODO, we have to know the type of the variable! -+ QTreeWidgetItem *item = m_widget->listVariables->topLevelItem(i); -+ if (!item) { -+ continue; -+ } -+ -+ EVarType eVarType = static_cast<EVarType>(item->data(1, Qt::UserRole).toInt()); -+ const QString &name = item->text(0); -+ const QString &value = item->text(1); -+ switch (eVarType) { -+ default: -+ case eVarType_String: -+ m_interpreter->globalObject().setProperty(m_interpreter->globalContext(), -+ name, value.toUtf8().data()); -+ break; -+ case eVarType_Int: -+ m_interpreter->globalObject().setProperty(m_interpreter->globalContext(), -+ name, value.toInt()); -+ break; -+ case eVarType_Double: -+ m_interpreter->globalObject().setProperty(m_interpreter->globalContext(), -+ name, value.toDouble()); -+ break; -+ case eVarType_Bool: -+ m_interpreter->globalObject().setProperty(m_interpreter->globalContext(), -+ name, -+ (value.toLower() == "true" ? true : false)); -+ break; - } - } - } --- -2.29.2 - - -From f80de4b81846da45c4cc16c585a159872dcc2c29 Mon Sep 17 00:00:00 2001 -From: Harald Sitter <sitter@kde.org> -Date: Thu, 17 Dec 2020 13:24:37 +0100 -Subject: [PATCH 2/5] don't needlessly use qpointer - -for one it has no value, scopedpointer might. we don't need a pointer -at all though, simply put qdialog on the stack and let the compiler -take care of it ---- - src/scriptplugin.cpp | 44 ++++++++++++++++++++++---------------------- - 1 file changed, 22 insertions(+), 22 deletions(-) - -diff --git a/src/scriptplugin.cpp b/src/scriptplugin.cpp -index 8f4b11e..fec61e7 100644 ---- a/src/scriptplugin.cpp -+++ b/src/scriptplugin.cpp -@@ -28,7 +28,6 @@ - #include <QTemporaryFile> - #include <QFile> - #include <QMenu> --#include <QPointer> - #include <QTextStream> - #include <QVariant> - #include <QFileDialog> -@@ -228,7 +227,7 @@ void ScriptPlugin::slotEnableControls() - - void ScriptPlugin::slotAdd() - { -- QPointer<QDialog> dialog = new QDialog(); -+ QDialog dialog; - Ui::ScriptPluginDialog dlg; - - QStringList types; -@@ -238,32 +237,33 @@ void ScriptPlugin::slotAdd() - types << i18n("Double"); - types << i18n("Boolean"); - -- dlg.setupUi(dialog); -+ dlg.setupUi(&dialog); - dlg.comboType->addItems(types); - -- if (dialog->exec() == QDialog::Accepted) { -- QString name = dlg.lineName->text(); -- QString value = dlg.lineValue->text(); -+ if (dialog.exec() != QDialog::Accepted) { -+ return; -+ } - -- // Build a Java script statement -- QString script = name + " = " + value + ';'; -+ QString name = dlg.lineName->text(); -+ QString value = dlg.lineValue->text(); - -- KJSInterpreter interpreter; -- KJSResult result = m_interpreter->evaluate(script, nullptr); -- if (result.isException()) { -- KMessageBox::error(m_parent, -- i18n("A JavaScript error has occurred: ") + -- result.errorMessage(), this->name()); -- } else { -- QTreeWidgetItem *item = new QTreeWidgetItem(); -- item->setText(0, name); -- item->setText(1, value); -- item->setData(1, Qt::UserRole, QVariant(dlg.comboType->currentIndex())); -+ // Build a Java script statement -+ QString script = name + " = " + value + ';'; - -- m_widget->listVariables->addTopLevelItem(item); -- } -+ KJSInterpreter interpreter; -+ KJSResult result = m_interpreter->evaluate(script, nullptr); -+ if (result.isException()) { -+ KMessageBox::error(m_parent, -+ i18n("A JavaScript error has occurred: ") + -+ result.errorMessage(), this->name()); -+ } else { -+ QTreeWidgetItem *item = new QTreeWidgetItem(); -+ item->setText(0, name); -+ item->setText(1, value); -+ item->setData(1, Qt::UserRole, QVariant(dlg.comboType->currentIndex())); -+ -+ m_widget->listVariables->addTopLevelItem(item); - } -- delete dialog; - } - - void ScriptPlugin::slotRemove() --- -2.29.2 - - -From 5979b30da5b385008894ff5577da917dd888959e Mon Sep 17 00:00:00 2001 -From: Harald Sitter <sitter@kde.org> -Date: Thu, 17 Dec 2020 13:32:41 +0100 -Subject: [PATCH 3/5] fix dangerously implicit int->int->enum mapping - -the type order in the qstringlist was implicitly the int values of the -type enum. incredibly scary. instead push the items into the combobox -along with their enum value as Qt::UserRole and then pass that along. -this ensures (kind of) that the int we cast back to enum in -initKRenameVars will be an actual enum value ---- - src/scriptplugin.cpp | 15 ++++++--------- - 1 file changed, 6 insertions(+), 9 deletions(-) - -diff --git a/src/scriptplugin.cpp b/src/scriptplugin.cpp -index fec61e7..1933bc6 100644 ---- a/src/scriptplugin.cpp -+++ b/src/scriptplugin.cpp -@@ -4,6 +4,7 @@ - begin : Fri Nov 9 2007 - copyright : (C) 2007 by Dominik Seichter - email : domseichter@web.de -+ copyright : (C) 2020 by Harald Sitter <sitter@kde.org> - ***************************************************************************/ - - /*************************************************************************** -@@ -230,15 +231,11 @@ void ScriptPlugin::slotAdd() - QDialog dialog; - Ui::ScriptPluginDialog dlg; - -- QStringList types; -- -- types << i18n("String"); -- types << i18n("Int"); -- types << i18n("Double"); -- types << i18n("Boolean"); -- - dlg.setupUi(&dialog); -- dlg.comboType->addItems(types); -+ dlg.comboType->addItem(i18n("String"), eVarType_String); -+ dlg.comboType->addItem(i18n("Int"), eVarType_Int); -+ dlg.comboType->addItem(i18n("Double"), eVarType_Double); -+ dlg.comboType->addItem(i18n("Boolean"), eVarType_Bool); - - if (dialog.exec() != QDialog::Accepted) { - return; -@@ -260,7 +257,7 @@ void ScriptPlugin::slotAdd() - QTreeWidgetItem *item = new QTreeWidgetItem(); - item->setText(0, name); - item->setText(1, value); -- item->setData(1, Qt::UserRole, QVariant(dlg.comboType->currentIndex())); -+ item->setData(1, Qt::UserRole, dlg.comboType->currentData()); - - m_widget->listVariables->addTopLevelItem(item); - } --- -2.29.2 - - -From 82161c323b7b0d4b77602551923118f304c5c536 Mon Sep 17 00:00:00 2001 -From: Harald Sitter <sitter@kde.org> -Date: Thu, 17 Dec 2020 15:05:49 +0100 -Subject: [PATCH 4/5] port away from stringy QMenu::addAction to functor based - API - -was introdcued in 5.6 so is fine to use and loads safer ---- - src/previewlist.cpp | 8 ++++---- - src/progressdialog.cpp | 8 ++++---- - src/scriptplugin.cpp | 10 +++++----- - 3 files changed, 13 insertions(+), 13 deletions(-) - -diff --git a/src/previewlist.cpp b/src/previewlist.cpp -index df8097b..0d3ccb6 100644 ---- a/src/previewlist.cpp -+++ b/src/previewlist.cpp -@@ -28,12 +28,12 @@ PreviewList::PreviewList(QWidget *parent) - : QTreeView(parent), m_model(nullptr) - { - m_menu = new QMenu("KRename", this); // we need any text here so that we have a title -- m_menu->addAction(i18n("&Change filename manually..."), this, SLOT(slotManually()), QKeySequence("F2")); -+ m_menu->addAction(i18n("&Change filename manually..."), this, &PreviewList::slotManually, QKeySequence("F2")); - m_menu->addSeparator(); -- m_menu->addAction(i18n("&Open"), this, SLOT(slotOpen())); -+ m_menu->addAction(i18n("&Open"), this, &PreviewList::slotOpen); - m_menu->addSeparator(); -- m_menu->addAction(i18n("&Add..."), this, SIGNAL(addFiles())); -- m_menu->addAction(i18n("&Remove"), this, SLOT(slotRemove())); -+ m_menu->addAction(i18n("&Add..."), this, &PreviewList::addFiles); -+ m_menu->addAction(i18n("&Remove"), this, &PreviewList::slotRemove); - - connect(this, &PreviewList::activated, this, &PreviewList::slotManually); - } -diff --git a/src/progressdialog.cpp b/src/progressdialog.cpp -index 4eaaf1a..d217614 100644 ---- a/src/progressdialog.cpp -+++ b/src/progressdialog.cpp -@@ -49,11 +49,11 @@ ProgressDialog::ProgressDialog(ESplitMode eSplitMode, unsigned int dot, QWidget - qApp, &QApplication::quit, Qt::QueuedConnection); - - QMenu *menu = new QMenu(this); -- menu->addAction(i18n("Restart &KRename..."), this, SLOT(slotRestartKRename())); -+ menu->addAction(i18n("Restart &KRename..."), this, &ProgressDialog::slotRestartKRename); - menu->addSeparator(); -- m_actProcessed = menu->addAction(i18n("Rename Processed Files &Again..."), this, SLOT(slotRenameProcessedAgain())); -- m_actUnprocessed = menu->addAction(i18n("Rename &Unprocessed Files Again..."), this, SLOT(slotRenameUnprocessedAgain())); -- menu->addAction(i18n("&Rename All Files Again..."), this, SLOT(slotRenameAllAgain())); -+ m_actProcessed = menu->addAction(i18n("Rename Processed Files &Again..."), this, &ProgressDialog::slotRenameProcessedAgain); -+ m_actUnprocessed = menu->addAction(i18n("Rename &Unprocessed Files Again..."), this, &ProgressDialog::slotRenameUnprocessedAgain); -+ menu->addAction(i18n("&Rename All Files Again..."), this, &ProgressDialog::slotRenameAllAgain); - - m_buttonMore->setMenu(menu); - } -diff --git a/src/scriptplugin.cpp b/src/scriptplugin.cpp -index 1933bc6..46b27ca 100644 ---- a/src/scriptplugin.cpp -+++ b/src/scriptplugin.cpp -@@ -68,11 +68,11 @@ ScriptPlugin::ScriptPlugin(PluginLoader *loader) - - m_help.append("[js;4+5];;" + i18n("Insert a snippet of JavaScript code (4+5 in this case)")); - -- m_menu->addAction(i18n("Index of the current file"), this, SLOT(slotInsertIndex())); -- m_menu->addAction(i18n("URL of the current file"), this, SLOT(slotInsertUrl())); -- m_menu->addAction(i18n("Filename of the current file"), this, SLOT(slotInsertFilename())); -- m_menu->addAction(i18n("Extension of the current file"), this, SLOT(slotInsertExtension())); -- m_menu->addAction(i18n("Directory of the current file"), this, SLOT(slotInsertDirectory())); -+ m_menu->addAction(i18n("Index of the current file"), this, &ScriptPlugin::slotInsertIndex); -+ m_menu->addAction(i18n("URL of the current file"), this, &ScriptPlugin::slotInsertUrl); -+ m_menu->addAction(i18n("Filename of the current file"), this, &ScriptPlugin::slotInsertFilename); -+ m_menu->addAction(i18n("Extension of the current file"), this, &ScriptPlugin::slotInsertExtension); -+ m_menu->addAction(i18n("Directory of the current file"), this, &ScriptPlugin::slotInsertDirectory); - } - - ScriptPlugin::~ScriptPlugin() --- -2.29.2 - - -From e0a93830d0ea0c71ab649b7e68af0238bd48eb10 Mon Sep 17 00:00:00 2001 -From: Harald Sitter <sitter@kde.org> -Date: Thu, 17 Dec 2020 13:45:07 +0100 -Subject: [PATCH 5/5] port from deprecated kjs to qjsengine - -for kf6 todo https://phabricator.kde.org/T11604 - -kjs is deprecated and we want to move away from it. this ports to -qjsengine which does what we need for krename just fine and is also -supported in qt6 still - -all use cases of the js plugin still seem to work fine. variable -definition, function definition and using either in the replacement. -same for the implicit global variables. ---- - CMakeLists.txt | 2 +- - src/CMakeLists.txt | 2 +- - src/scriptplugin.cpp | 55 ++++++++++++++------------------------------ - src/scriptplugin.h | 6 +++-- - 4 files changed, 23 insertions(+), 42 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 2b39e18..e1673e1 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -17,7 +17,7 @@ include(FeatureSummary) - include(KDECompilerSettings NO_POLICY_SCOPE) - include(FeatureSummary) - --find_package(Qt5 REQUIRED COMPONENTS Core Widgets) -+find_package(Qt5 REQUIRED COMPONENTS Core Qml Widgets) - find_package(KF5 REQUIRED COMPONENTS - Completion - Config -@@ -27,7 +27,6 @@ find_package(KF5 REQUIRED COMPONENTS - IconThemes - ItemViews - JobWidgets -- JS - KIO - Service - WidgetsAddons -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 3f262b3..bee7378 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -128,9 +128,9 @@ target_link_libraries(krename - KF5::KIOCore - KF5::KIOFileWidgets - KF5::I18n -- KF5::JSApi - KF5::IconThemes - Qt5::Widgets -+ Qt5::Qml - ) - if(TAGLIB_FOUND) - target_link_libraries(krename -diff --git a/src/scriptplugin.cpp b/src/scriptplugin.cpp -index d7f7125..651e656 100644 ---- a/src/scriptplugin.cpp -+++ b/src/scriptplugin.cpp -@@ -18,8 +18,7 @@ - #include <QTextStream> - #include <QVariant> - #include <QFileDialog> -- --#include <kjs/kjsinterpreter.h> -+#include <QDebug> - - #include "ui_scriptplugindialog.h" - #include "ui_scriptpluginwidget.h" -@@ -46,7 +45,6 @@ ScriptPlugin::ScriptPlugin(PluginLoader *loader) - { - m_name = i18n("JavaScript Plugin"); - m_icon = "applications-development"; -- m_interpreter = new KJSInterpreter(); - m_menu = new QMenu(); - m_widget = new Ui::ScriptPluginWidget(); - -@@ -65,7 +63,6 @@ ScriptPlugin::~ScriptPlugin() - { - delete m_widget; - delete m_menu; -- delete m_interpreter; - } - - QString ScriptPlugin::processFile(BatchRenamer *b, int index, -@@ -90,13 +87,13 @@ QString ScriptPlugin::processFile(BatchRenamer *b, int index, - // Make sure definitions are executed first - script = definitions + '\n' + script; - -- KJSResult result = m_interpreter->evaluate(script, nullptr); -- if (result.isException()) { -- qDebug("JavaScript Error: %s", result.errorMessage().toUtf8().data()); -+ const QJSValue result = m_engine.evaluate(script); -+ if (result.isError()) { -+ qDebug() << "JavaScript Error:" << result.toString(); - return QString(); - } - -- return result.value().toString(m_interpreter->globalContext()); -+ return result.toString(); - } - - return QString(); -@@ -144,21 +141,11 @@ void ScriptPlugin::createUI(QWidget *parent) const - void ScriptPlugin::initKRenameVars(const KRenameFile &file, int index) - { - // KRename definitions -- m_interpreter->globalObject().setProperty(m_interpreter->globalContext(), -- ScriptPlugin::s_pszVarNameIndex, -- index); -- m_interpreter->globalObject().setProperty(m_interpreter->globalContext(), -- ScriptPlugin::s_pszVarNameUrl, -- file.srcUrl().url()); -- m_interpreter->globalObject().setProperty(m_interpreter->globalContext(), -- ScriptPlugin::s_pszVarNameFilename, -- file.srcFilename()); -- m_interpreter->globalObject().setProperty(m_interpreter->globalContext(), -- ScriptPlugin::s_pszVarNameExtension, -- file.srcExtension()); -- m_interpreter->globalObject().setProperty(m_interpreter->globalContext(), -- ScriptPlugin::s_pszVarNameDirectory, -- file.srcDirectory()); -+ m_engine.globalObject().setProperty(ScriptPlugin::s_pszVarNameIndex, index); -+ m_engine.globalObject().setProperty(ScriptPlugin::s_pszVarNameUrl, file.srcUrl().url()); -+ m_engine.globalObject().setProperty(ScriptPlugin::s_pszVarNameFilename, file.srcFilename()); -+ m_engine.globalObject().setProperty(ScriptPlugin::s_pszVarNameExtension, file.srcExtension()); -+ m_engine.globalObject().setProperty(ScriptPlugin::s_pszVarNameDirectory, file.srcDirectory()); - - // User definitions, set them only on first file - if (index != 0) { -@@ -178,21 +165,16 @@ void ScriptPlugin::initKRenameVars(const KRenameFile &file, int index) - switch (eVarType) { - default: - case eVarType_String: -- m_interpreter->globalObject().setProperty(m_interpreter->globalContext(), -- name, value.toUtf8().data()); -+ m_engine.globalObject().setProperty(name, value); - break; - case eVarType_Int: -- m_interpreter->globalObject().setProperty(m_interpreter->globalContext(), -- name, value.toInt()); -+ m_engine.globalObject().setProperty(name, value.toInt()); - break; - case eVarType_Double: -- m_interpreter->globalObject().setProperty(m_interpreter->globalContext(), -- name, value.toDouble()); -+ m_engine.globalObject().setProperty(name, value.toDouble()); - break; - case eVarType_Bool: -- m_interpreter->globalObject().setProperty(m_interpreter->globalContext(), -- name, -- (value.toLower() == "true" ? true : false)); -+ m_engine.globalObject().setProperty(name, (value.toLower() == "true" ? true : false)); - break; - } - } -@@ -233,12 +215,9 @@ void ScriptPlugin::slotAdd() - // Build a Java script statement - QString script = name + " = " + value + ';'; - -- KJSInterpreter interpreter; -- KJSResult result = m_interpreter->evaluate(script, nullptr); -- if (result.isException()) { -- KMessageBox::error(m_parent, -- i18n("A JavaScript error has occurred: ") + -- result.errorMessage(), this->name()); -+ const QJSValue result = m_engine.evaluate(script); -+ if (result.isError()) { -+ KMessageBox::error(m_parent, i18n("A JavaScript error has occurred: ") + result.toString(), this->name()); - } else { - QTreeWidgetItem *item = new QTreeWidgetItem(); - item->setText(0, name); -diff --git a/src/scriptplugin.h b/src/scriptplugin.h -index 367310b..f91e79b 100644 ---- a/src/scriptplugin.h -+++ b/src/scriptplugin.h -@@ -3,9 +3,10 @@ - - #include "plugin.h" - -+#include <QJSEngine> -+ - class QMenu; - --class KJSInterpreter; - class KRenameFile; - - namespace Ui -@@ -171,7 +173,7 @@ private: - - QStringList m_keys; - QStringList m_help; -- KJSInterpreter *m_interpreter; -+ QJSEngine m_engine; - QWidget *m_parent; - QMenu *m_menu; - --- -2.29.2 - diff --git a/kde-misc/krename/files/krename-5.0.2-podofo-0.10.patch b/kde-misc/krename/files/krename-5.0.2-podofo-0.10.patch new file mode 100644 index 000000000000..3410e3f20c2d --- /dev/null +++ b/kde-misc/krename/files/krename-5.0.2-podofo-0.10.patch @@ -0,0 +1,319 @@ +From 0528606297a82aae46cb5e44a2bb406cbc033615 Mon Sep 17 00:00:00 2001 +From: Antonio Rojas <arojas@archlinux.org> +Date: Mon, 17 Jul 2023 20:29:37 +0000 +Subject: [PATCH 1/2] Support podofo 0.10 + +Version 0.10 of podofo is a complete rewrite. krename's use of it is minimal, so porting is easy. + +Switch the cmake module to use pkgconfig, which is available since 0.9.5 (release in 2017). + +Unfortunately, the hack to find the version number is still needed, since the pc file is buggy and ships an empty "Version" field. +--- + cmake/modules/FindPoDoFo.cmake | 31 +++++++++++++++---------------- + src/podofoplugin.cpp | 20 ++++++++++++++++++++ + 2 files changed, 35 insertions(+), 16 deletions(-) + +diff --git a/cmake/modules/FindPoDoFo.cmake b/cmake/modules/FindPoDoFo.cmake +index 3d044f0..c771149 100644 +--- a/cmake/modules/FindPoDoFo.cmake ++++ b/cmake/modules/FindPoDoFo.cmake +@@ -36,15 +36,8 @@ + # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +-find_path(PoDoFo_INCLUDE_DIRS +- NAMES podofo/podofo.h +-) +-find_library(PoDoFo_LIBRARIES +- NAMES libpodofo podofo +-) +- +-include(FindPackageHandleStandardArgs) +-find_package_handle_standard_args(PoDoFo DEFAULT_MSG PoDoFo_LIBRARIES PoDoFo_INCLUDE_DIRS) ++include(FindPkgConfig) ++pkg_search_module(PoDoFo libpodofo libpodofo-0) + + set(PoDoFo_DEFINITIONS) + if(PoDoFo_FOUND) +@@ -61,17 +54,19 @@ if(PoDoFo_FOUND) + endif() + endif() + +- # PoDoFo-0.9.5 unconditionally includes openssl/opensslconf.h in a public +- # header. The fix is in https://sourceforge.net/p/podofo/code/1830/ and will +- # hopefully be released soon with 0.9.6. Note that krename doesn't use +- # OpenSSL in any way. +- file(STRINGS "${PoDoFo_INCLUDE_DIRS}/podofo/base/podofo_config.h" PoDoFo_MAJOR_VER_LINE REGEX "^#define[ \t]+PODOFO_VERSION_MAJOR[ \t]+[0-9]+$") +- file(STRINGS "${PoDoFo_INCLUDE_DIRS}/podofo/base/podofo_config.h" PoDoFo_MINOR_VER_LINE REGEX "^#define[ \t]+PODOFO_VERSION_MINOR[ \t]+[0-9]+$") +- file(STRINGS "${PoDoFo_INCLUDE_DIRS}/podofo/base/podofo_config.h" PoDoFo_PATCH_VER_LINE REGEX "^#define[ \t]+PODOFO_VERSION_PATCH[ \t]+[0-9]+$") ++ find_file(PoDoFo_CONFIG podofo_config.h PATHS ${PoDoFo_INCLUDE_DIRS} PATH_SUFFIXES auxiliary base) ++ file(STRINGS "${PoDoFo_CONFIG}" PoDoFo_MAJOR_VER_LINE REGEX "^#define[ \t]+PODOFO_VERSION_MAJOR[ \t]+[0-9]+$") ++ file(STRINGS "${PoDoFo_CONFIG}" PoDoFo_MINOR_VER_LINE REGEX "^#define[ \t]+PODOFO_VERSION_MINOR[ \t]+[0-9]+$") ++ file(STRINGS "${PoDoFo_CONFIG}" PoDoFo_PATCH_VER_LINE REGEX "^#define[ \t]+PODOFO_VERSION_PATCH[ \t]+[0-9]+$") + string(REGEX REPLACE "^#define[ \t]+PODOFO_VERSION_MAJOR[ \t]+([0-9]+)$" "\\1" PoDoFo_MAJOR_VER "${PoDoFo_MAJOR_VER_LINE}") + string(REGEX REPLACE "^#define[ \t]+PODOFO_VERSION_MINOR[ \t]+([0-9]+)$" "\\1" PoDoFo_MINOR_VER "${PoDoFo_MINOR_VER_LINE}") + string(REGEX REPLACE "^#define[ \t]+PODOFO_VERSION_PATCH[ \t]+([0-9]+)$" "\\1" PoDoFo_PATCH_VER "${PoDoFo_PATCH_VER_LINE}") + set(PoDoFo_VERSION "${PoDoFo_MAJOR_VER}.${PoDoFo_MINOR_VER}.${PoDoFo_PATCH_VER}") ++ ++ # PoDoFo-0.9.5 unconditionally includes openssl/opensslconf.h in a public ++ # header. The fix is in https://sourceforge.net/p/podofo/code/1830/ and will ++ # hopefully be released soon with 0.9.6. Note that krename doesn't use ++ # OpenSSL in any way. + if(PoDoFo_VERSION VERSION_EQUAL "0.9.5") + find_package(OpenSSL) + if (OpenSSL_FOUND) +@@ -84,4 +79,8 @@ if(PoDoFo_FOUND) + endif() + endif() + ++if(PoDoFo_VERSION VERSION_GREATER_EQUAL 0.10.0) ++ set(CMAKE_CXX_STANDARD 17) ++endif() ++ + mark_as_advanced(PoDoFo_INCLUDE_DIRS PoDoFo_LIBRARIES PoDoFo_DEFINITIONS) +diff --git a/src/podofoplugin.cpp b/src/podofoplugin.cpp +index 9bcce21..79fd735 100644 +--- a/src/podofoplugin.cpp ++++ b/src/podofoplugin.cpp +@@ -61,6 +61,25 @@ QString PodofoPlugin::processFile(BatchRenamer *b, int index, const QString &fil + try { + PdfMemDocument doc; + doc.Load(filename.toUtf8().data()); ++#if (PODOFO_VERSION_MINOR>=10 || PODOFO_VERSION_MAJOR>=1) ++ const PdfInfo *info = doc.GetInfo(); ++ ++ if (token == "pdfauthor") { ++ return info->GetAuthor().has_value() ? QString::fromUtf8(info->GetAuthor()->GetString().c_str()) : QString(); ++ } else if (token == "pdfcreator") { ++ return info->GetCreator().has_value() ? QString::fromUtf8(info->GetCreator()->GetString().c_str()) : QString(); ++ } else if (token == "pdfkeywords") { ++ return info->GetKeywords().has_value() ? QString::fromUtf8(info->GetKeywords()->GetString().c_str()) : QString(); ++ } else if (token == "pdfsubject") { ++ return info->GetSubject().has_value() ? QString::fromUtf8(info->GetSubject()->GetString().c_str()) : QString(); ++ } else if (token == "pdftitle") { ++ return info->GetTitle().has_value() ? QString::fromUtf8(info->GetTitle()->GetString().c_str()) : QString(); ++ } else if (token == "pdfproducer") { ++ return info->GetProducer().has_value() ? QString::fromUtf8(info->GetProducer()->GetString().c_str()) : QString(); ++ } else if (token == "pdfpages") { ++ return QString::number(doc.GetPages().GetCount()); ++ } ++#else + PdfInfo *info = doc.GetInfo(); + + if (token == "pdfauthor") { +@@ -78,6 +97,7 @@ QString PodofoPlugin::processFile(BatchRenamer *b, int index, const QString &fil + } else if (token == "pdfpages") { + return QString::number(doc.GetPageCount()); + } ++#endif + } catch (PdfError &error) { + return QString::fromUtf8(error.what()); + } +-- +2.42.0 + + +From a054a825521698f1de4b387949ef56a15e78feb6 Mon Sep 17 00:00:00 2001 +From: Heiko Becker <heiko.becker@kde.org> +Date: Sat, 15 Jul 2023 18:20:06 +0200 +Subject: [PATCH 2/2] cmake: Improve FindPoDoFo + +Add some rst based documentation and provide an imported target for +example. +I've dropped -DUSING_SHARED_PODOFO, which looks weird nowadays and +seems to exist because of Windows, which I can't test. So comment it out +for now, but it'll probably be removed in the future, if nobody turns up +who cares about Windows and can comment on it. +--- + CMakeLists.txt | 5 +- + cmake/modules/FindPoDoFo.cmake | 121 ++++++++++++++++++++++++--------- + src/CMakeLists.txt | 7 +- + 3 files changed, 91 insertions(+), 42 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a772b6a..9d736be 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -63,10 +63,7 @@ endif() + + # Find podofo + find_package(PoDoFo) +-set_package_properties(PoDoFo PROPERTIES +- DESCRIPTION "A library to access PDF metadata" +- URL "http://podofo.sourceforge.net/" +- TYPE OPTIONAL) ++set_package_properties(PoDoFo PROPERTIES TYPE OPTIONAL) + + # Find freetype + find_package(Freetype) +diff --git a/cmake/modules/FindPoDoFo.cmake b/cmake/modules/FindPoDoFo.cmake +index c771149..dce7473 100644 +--- a/cmake/modules/FindPoDoFo.cmake ++++ b/cmake/modules/FindPoDoFo.cmake +@@ -1,17 +1,5 @@ +-# - Try to find the PoDoFo library +-# +-# Windows users MUST set when building: +-# +-# PoDoFo_USE_SHARED - whether use PoDoFo as shared library +-# +-# Once done this will define: +-# +-# PoDoFo_FOUND - system has the PoDoFo library +-# PoDoFo_INCLUDE_DIRS - the PoDoFo include directory +-# PoDoFo_LIBRARIES - the libraries needed to use PoDoFo +-# PoDoFo_DEFINITIONS - the definitions needed to use PoDoFo +-# + # Copyright 2016 Pino Toscano <pino@kde.org> ++# Copyright 2023 Heiko Becker <heiko.becker@kde.org> + # + # Redistribution and use in source and binary forms, with or without + # modification, are permitted provided that the following conditions +@@ -36,23 +24,63 @@ + # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +-include(FindPkgConfig) +-pkg_search_module(PoDoFo libpodofo libpodofo-0) +- +-set(PoDoFo_DEFINITIONS) +-if(PoDoFo_FOUND) +- if(WIN32) +- if(NOT DEFINED PoDoFo_USE_SHARED) +- message(SEND_ERROR "Win32 users MUST set PoDoFo_USE_SHARED") +- message(SEND_ERROR "Set -DPoDoFo_USE_SHARED=0 if linking to a static library PoDoFo") +- message(SEND_ERROR "or -DPoDoFo_USE_SHARED=1 if linking to a DLL build of PoDoFo") +- message(FATAL_ERROR "PoDoFo_USE_SHARED unset on win32 build") +- else() +- if(PoDoFo_USE_SHARED) +- set(PoDoFo_DEFINITIONS "${PoDoFo_DEFINITIONS} -DUSING_SHARED_PODOFO") +- endif(PoDoFo_USE_SHARED) +- endif() +- endif() ++#[=======================================================================[.rst: ++FindPoDoFo ++------------ ++ ++Try to find PoDoFo, a C++ library to work with the PDF file format ++ ++This will define the following variables: ++ ++``PoDoFo_FOUND`` ++ True if PoDoFo is available ++``PoDoFo_VERSION`` ++ The version of PoDoFo ++``PoDoFo_LIBRARIES`` ++ The libraries of PoDoFofor use with target_link_libraries() ++``PoDoFo_INCLUDE_DIRS`` ++ The include dirs of PoDoFo for use with target_include_directories() ++ ++If ``PoDoFo_FOUND`` is TRUE, it will also define the following imported ++target: ++ ++``PoDoFo::PoDoFo`` ++ The PoDoFo library ++ ++In general we recommend using the imported target, as it is easier to use. ++Bear in mind, however, that if the target is in the link interface of an ++exported library, it must be made available by the package config file. ++ ++#]=======================================================================] ++ ++find_package(PkgConfig QUIET) ++pkg_search_module(PC_PoDoFo QUIET libpodofo libpodofo-0) ++ ++find_library(PoDoFo_LIBRARIES ++ NAMES podofo ++ HINTS ${PC_PoDoFo_LIBRARY_DIRS} ++) ++ ++find_path(PoDoFo_INCLUDE_DIRS ++ NAMES podofo.h ++ HINTS ${PC_PoDoFo_INCLUDE_DIRS} ++) ++ ++if(PoDoFo_INCLUDE_DIRS) ++ # NOTE: I have no idea if that's still needed and no possibility to test on ++ # Windows. ++ #if(WIN32) ++ # if(NOT DEFINED PoDoFo_USE_SHARED) ++ # message(SEND_ERROR "Win32 users MUST set PoDoFo_USE_SHARED") ++ # message(SEND_ERROR "Set -DPoDoFo_USE_SHARED=0 if linking to a static library PoDoFo") ++ # message(SEND_ERROR "or -DPoDoFo_USE_SHARED=1 if linking to a DLL build of PoDoFo") ++ # message(FATAL_ERROR "PoDoFo_USE_SHARED unset on win32 build") ++ # else() ++ # if(PoDoFo_USE_SHARED) ++ # set(PoDoFo_DEFINITIONS "${PoDoFo_DEFINITIONS} -DUSING_SHARED_PODOFO") ++ # endif(PoDoFo_USE_SHARED) ++ # endif() ++ #endif() + + find_file(PoDoFo_CONFIG podofo_config.h PATHS ${PoDoFo_INCLUDE_DIRS} PATH_SUFFIXES auxiliary base) + file(STRINGS "${PoDoFo_CONFIG}" PoDoFo_MAJOR_VER_LINE REGEX "^#define[ \t]+PODOFO_VERSION_MAJOR[ \t]+[0-9]+$") +@@ -80,7 +108,36 @@ if(PoDoFo_FOUND) + endif() + + if(PoDoFo_VERSION VERSION_GREATER_EQUAL 0.10.0) +- set(CMAKE_CXX_STANDARD 17) ++ set(CMAKE_CXX_STANDARD 17) ++endif() ++ ++include(FindPackageHandleStandardArgs) ++find_package_handle_standard_args(PoDoFo ++ FOUND_VAR ++ PoDoFo_FOUND ++ REQUIRED_VARS ++ PoDoFo_LIBRARIES ++ PoDoFo_INCLUDE_DIRS ++ VERSION_VAR ++ PoDoFo_VERSION ++) ++ ++if(PoDoFo_FOUND AND NOT TARGET PoDoFo::PoDoFo) ++ add_library(PoDoFo::PoDoFo UNKNOWN IMPORTED) ++ set_target_properties(PoDoFo::PoDoFo PROPERTIES ++ IMPORTED_LOCATION "${PoDoFo_LIBRARIES}" ++ INTERFACE_COMPILE_OPTIONS "${PC_PoDoFo_CFLAGS}" ++ INTERFACE_INCLUDE_DIRECTORIES "${PoDoFo_INCLUDE_DIRS}" ++ ) ++ if(TARGET PkgConfig::PC_PoDoFo) ++ target_link_libraries(PoDoFo::PoDoFo INTERFACE PkgConfig::PC_PoDoFo) ++ endif() + endif() + +-mark_as_advanced(PoDoFo_INCLUDE_DIRS PoDoFo_LIBRARIES PoDoFo_DEFINITIONS) ++mark_as_advanced(PoDoFo_LIBRARIES PoDoFo_INCLUDE_DIRS PoDoFo_VERSION) ++ ++include(FeatureSummary) ++set_package_properties(PoDoFo PROPERTIES ++ DESCRIPTION "A C++ libary to work with the PDF file format" ++ URL "https://github.com/podofo/podofo" ++) +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index e4b00ac..cffe7fb 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -14,11 +14,6 @@ if(EXIV2_FOUND) + include_directories(${EXIV2_INCLUDE_DIR}) + endif() + +-if(PoDoFo_FOUND) +- include_directories(${PoDoFo_INCLUDE_DIRS}) +- add_definitions(${PoDoFo_DEFINITIONS}) +-endif() +- + if(FREETYPE_FOUND) + include_directories(${FREETYPE_INCLUDE_DIRS}) + endif() +@@ -138,7 +133,7 @@ if(LibExiv2_FOUND) + endif() + if(PoDoFo_FOUND) + target_link_libraries(krename +- ${PoDoFo_LIBRARIES} ++ PoDoFo::PoDoFo + ) + endif() + if(FREETYPE_FOUND) +-- +2.42.0 + diff --git a/kde-misc/krename/krename-5.0.1-r1.ebuild b/kde-misc/krename/krename-5.0.2-r1.ebuild index 05dfc961804d..fc67232d79aa 100644 --- a/kde-misc/krename/krename-5.0.1-r1.ebuild +++ b/kde-misc/krename/krename-5.0.2-r1.ebuild @@ -1,18 +1,19 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 ECM_TEST="true" -KFMIN=5.70.0 -QTMIN=5.14.2 +KFMIN=5.82.0 +QTMIN=5.15.5 inherit ecm kde.org DESCRIPTION="Powerful batch file renamer" HOMEPAGE="https://apps.kde.org/krename/ https://userbase.kde.org/KRename" if [[ ${KDE_BUILD_TYPE} != live ]]; then - SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz" + SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz + https://dev.gentoo.org/~asturm/distfiles/${P}-patchset-1.tar.xz" KEYWORDS="amd64 ~arm64 x86" fi @@ -20,7 +21,6 @@ LICENSE="GPL-2" SLOT="5" IUSE="exif pdf taglib truetype" -BDEPEND="sys-devel/gettext" DEPEND=" >=dev-qt/qtdeclarative-${QTMIN}:5 >=dev-qt/qtgui-${QTMIN}:5 @@ -44,8 +44,12 @@ DEPEND=" truetype? ( media-libs/freetype:2 ) " RDEPEND="${DEPEND}" +BDEPEND="sys-devel/gettext" -PATCHES=( "${FILESDIR}/${P}-no-kjs.patch" ) +PATCHES=( + "${WORKDIR}/${P}-patchset-1" # upstream, git master + "${FILESDIR}/${P}-podofo-0.10.patch" # bug 914497 +) src_configure() { local mycmakeargs=( diff --git a/kde-misc/krusader/Manifest b/kde-misc/krusader/Manifest index cb913c4ca11f..86a99b4bb509 100644 --- a/kde-misc/krusader/Manifest +++ b/kde-misc/krusader/Manifest @@ -1 +1,2 @@ -DIST krusader-2.7.2.tar.xz 2912396 BLAKE2B d2675dbde007f002e7dd3730b806e30443ae9e6923d7255ea6c5582370aeb5783822ca0893fc01985fccca209cd0e88e8ada2234d18011d3f90a7e74bffe84ae SHA512 8af90a9067c7c92abc9dcc866e1eb1e1f1bd2a4c45968c260b6b01cc079d3125d6db6d49b530d90a2f91d3c99c577fa7f1ff47d12abc3400a75e2d52e7ae477b +DIST krusader-2.8.0.tar.xz 3029352 BLAKE2B 08f8def0f2a2904cb80820b80005289d596d1cc2777fa122777fafe47f11ebfc0f5742b64d26be5ff9f3f393437d533c3ce91eb1442d1e90d9768ca4f40e71b7 SHA512 40a8736e91756153c649defaaef956f4d65664b4a86e64f861f34744980cdebb2da8d31f596fdc53ea911a7b7ea1a4f1875b8e564976770558bf64e77ff25583 +DIST krusader-2.8.1.tar.xz 3104068 BLAKE2B 7bb3c27a67b1ac8c1875039d6b3f10d1515cd6f65f9a82c195b8e794cfaa3d8b152ec82bae4e25fb13d50ebee6afab889932e4d3787cdf2b78063724f3cd355e SHA512 36a0b1ea3f2c00fd9093ae45e8a3cf196eeb51ac3cc5a006c611f6eee4209ec8fd10f6c9590bb22f381e68e7457ea8f62b0296338271b826d2071add126cb7bb diff --git a/kde-misc/krusader/files/krusader-2.8.0-icon-dimming-w-hidpi.patch b/kde-misc/krusader/files/krusader-2.8.0-icon-dimming-w-hidpi.patch new file mode 100644 index 000000000000..e0bf516bbdfb --- /dev/null +++ b/kde-misc/krusader/files/krusader-2.8.0-icon-dimming-w-hidpi.patch @@ -0,0 +1,26 @@ +From 7ea9f1f0dbdd07cd5c5baae56bb672a7be519932 Mon Sep 17 00:00:00 2001 +From: Wladimir Palant <fqcgithub@palant.de> +Date: Wed, 8 Mar 2023 17:07:15 +0100 +Subject: [PATCH] Fixed dimming of file icons in HiDPI environments + +Discussion: https://invent.kde.org/utilities/krusader/-/merge_requests/119 +--- + app/Panel/PanelView/krview.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/app/Panel/PanelView/krview.cpp b/app/Panel/PanelView/krview.cpp +index a974b1ad2..a5b1b3872 100644 +--- a/app/Panel/PanelView/krview.cpp ++++ b/app/Panel/PanelView/krview.cpp +@@ -297,7 +297,7 @@ QPixmap KrView::processIcon(const QPixmap &icon, bool dim, const QColor & dimCol + p.fillRect(0, 0, icon.width(), icon.height(), dimColor); + p.setCompositionMode(QPainter::CompositionMode_SourceOver); + p.setOpacity((qreal)dimFactor / (qreal)100); +- p.drawPixmap(0, 0, icon.width(), icon.height(), pixmap); ++ p.drawPixmap(0, 0, pixmap); + + return QPixmap::fromImage(dimmed, Qt::ColorOnly | Qt::ThresholdDither | + Qt::ThresholdAlphaDither | Qt::NoOpaqueDetection ); +-- +GitLab + diff --git a/kde-misc/krusader/files/krusader-2.8.0-icon-render-w-app-scaling.patch b/kde-misc/krusader/files/krusader-2.8.0-icon-render-w-app-scaling.patch new file mode 100644 index 000000000000..b56bc567a2ce --- /dev/null +++ b/kde-misc/krusader/files/krusader-2.8.0-icon-render-w-app-scaling.patch @@ -0,0 +1,50 @@ +From 2bd5cd0db362db944bdea639bf0be33f6f439268 Mon Sep 17 00:00:00 2001 +From: Evgeny Brazgin <xapienz@phystech.edu> +Date: Sun, 5 Mar 2023 22:48:27 -0800 +Subject: [PATCH 1/2] Add workaround for icon size in HiDPI environment + +--- + app/Panel/PanelView/listmodel.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/app/Panel/PanelView/listmodel.cpp b/app/Panel/PanelView/listmodel.cpp +index d6ad6c5f8..7731e8951 100644 +--- a/app/Panel/PanelView/listmodel.cpp ++++ b/app/Panel/PanelView/listmodel.cpp +@@ -177,7 +177,7 @@ QVariant ListModel::data(const QModelIndex& index, int role) const + if (properties()->displayIcons) { + if (_justForSizeHint) + return QPixmap(_view->fileIconSize(), _view->fileIconSize()); +- return _view->getIcon(fileitem); ++ return QIcon(_view->getIcon(fileitem)); + } + break; + } +-- +GitLab + + +From f447f96f14fdb4f86ccc1286692accbec535ecb0 Mon Sep 17 00:00:00 2001 +From: Evgeny Brazgin <xapienz@phystech.edu> +Date: Sun, 12 Mar 2023 21:35:27 -0700 +Subject: [PATCH 2/2] Don't set QStyle::State_None for brief view + +--- + app/Panel/PanelView/krinterbriefview.cpp | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/app/Panel/PanelView/krinterbriefview.cpp b/app/Panel/PanelView/krinterbriefview.cpp +index 69496f890..4042c163c 100644 +--- a/app/Panel/PanelView/krinterbriefview.cpp ++++ b/app/Panel/PanelView/krinterbriefview.cpp +@@ -401,7 +401,6 @@ void KrInterBriefView::paintEvent(QPaintEvent *e) + intersectionSet(area, intersectVector); + + foreach(const QModelIndex &mndx, intersectVector) { +- option.state = QStyle::State_None; + option.rect = visualRect(mndx); + painter.save(); + +-- +GitLab + diff --git a/kde-misc/krusader/files/krusader-2.8.0-segfault.patch b/kde-misc/krusader/files/krusader-2.8.0-segfault.patch new file mode 100644 index 000000000000..ac53d8772270 --- /dev/null +++ b/kde-misc/krusader/files/krusader-2.8.0-segfault.patch @@ -0,0 +1,63 @@ +From 2938db287f95a772792420f887dec2d88413409b Mon Sep 17 00:00:00 2001 +From: Pavel Karelin <hkarel@yandex.ru> +Date: Fri, 25 Nov 2022 22:02:00 +0300 +Subject: [PATCH] Fixed segmentation fault when using CTRL+Left/Right on a + panel with invalid path + +FIXED: [ 462086 ] Segmentation fault when using CTRL+Left/Right on a panel with invalid path +BUG: 462086 + +Discussion: https://invent.kde.org/utilities/krusader/-/merge_requests/117 +--- + app/Panel/listpanel.cpp | 30 +++++++++++++++--------------- + 1 file changed, 15 insertions(+), 15 deletions(-) + +diff --git a/app/Panel/listpanel.cpp b/app/Panel/listpanel.cpp +index dde22a257..be785a49f 100644 +--- a/app/Panel/listpanel.cpp ++++ b/app/Panel/listpanel.cpp +@@ -913,26 +913,26 @@ void ListPanel::keyPressEvent(QKeyEvent *e) + // user pressed CTRL+Right/Left - refresh other panel to the selected path if it's a + // directory otherwise as this one + if ((isLeft() && e->key() == Qt::Key_Right) || (!isLeft() && e->key() == Qt::Key_Left)) { +- QUrl newPath; +- KrViewItem *it = view->getCurrentKrViewItem(); +- +- if (it->name() == "..") { +- newPath = KIO::upUrl(virtualPath()); +- } else { +- FileItem *v = func->getFileItem(it); +- // If it's a directory different from ".." +- if (v && v->isDir() && v->getName() != "..") { +- newPath = v->getUrl(); ++ if (KrViewItem *it = view->getCurrentKrViewItem()) { ++ QUrl newPath; ++ if (it->name() == "..") { ++ newPath = KIO::upUrl(virtualPath()); + } else { +- // If it's a supported compressed file +- if (v && KrArcHandler::arcSupported(v->getMime())) { +- newPath = func->browsableArchivePath(v->getUrl().fileName()); ++ FileItem *v = func->getFileItem(it); ++ // If it's a directory different from ".." ++ if (v && v->isDir() && v->getName() != "..") { ++ newPath = v->getUrl(); + } else { +- newPath = virtualPath(); ++ // If it's a supported compressed file ++ if (v && KrArcHandler::arcSupported(v->getMime())) { ++ newPath = func->browsableArchivePath(v->getUrl().fileName()); ++ } else { ++ newPath = virtualPath(); ++ } + } + } ++ otherPanel()->func->openUrl(newPath); + } +- otherPanel()->func->openUrl(newPath); + } else { + func->openUrl(otherPanel()->virtualPath()); + } +-- +GitLab + diff --git a/kde-misc/krusader/krusader-2.8.0-r1.ebuild b/kde-misc/krusader/krusader-2.8.0-r1.ebuild new file mode 100644 index 000000000000..2761dc096e83 --- /dev/null +++ b/kde-misc/krusader/krusader-2.8.0-r1.ebuild @@ -0,0 +1,84 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_HANDBOOK="forceoptional" +KFMIN=5.106.0 +QTMIN=5.15.9 +inherit ecm kde.org optfeature + +if [[ ${KDE_BUILD_TYPE} = release ]]; then + SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz" + KEYWORDS="amd64 ~arm64 ~ppc64 x86" +fi + +DESCRIPTION="Advanced twin-panel (commander-style) file-manager with many extras" +HOMEPAGE="https://krusader.org/" + +LICENSE="GPL-2+" +SLOT="5" +IUSE="" + +COMMON_DEPEND=" + >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtprintsupport-${QTMIN}:5 + >=dev-qt/qtwidgets-${QTMIN}:5 + >=dev-qt/qtxml-${QTMIN}:5 + >=kde-frameworks/karchive-${KFMIN}:5 + >=kde-frameworks/kbookmarks-${KFMIN}:5 + >=kde-frameworks/kcodecs-${KFMIN}:5 + >=kde-frameworks/kcompletion-${KFMIN}:5 + >=kde-frameworks/kconfig-${KFMIN}:5 + >=kde-frameworks/kconfigwidgets-${KFMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/kguiaddons-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kiconthemes-${KFMIN}:5 + >=kde-frameworks/kio-${KFMIN}:5 + >=kde-frameworks/kitemviews-${KFMIN}:5 + >=kde-frameworks/kjobwidgets-${KFMIN}:5 + >=kde-frameworks/knotifications-${KFMIN}:5 + >=kde-frameworks/kparts-${KFMIN}:5 + >=kde-frameworks/kservice-${KFMIN}:5 + >=kde-frameworks/ktextwidgets-${KFMIN}:5 + >=kde-frameworks/kwallet-${KFMIN}:5 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 + >=kde-frameworks/kwindowsystem-${KFMIN}:5 + >=kde-frameworks/kxmlgui-${KFMIN}:5 + >=kde-frameworks/solid-${KFMIN}:5 + sys-apps/acl + sys-libs/zlib +" +DEPEND="${COMMON_DEPEND} + >=dev-qt/qtconcurrent-${QTMIN}:5 +" +RDEPEND="${COMMON_DEPEND} + || ( + kde-apps/kio-extras-kf5:5 + kde-apps/kio-extras:5 + ) +" + +PATCHES=( + "${FILESDIR}/${P}-icon-dimming-w-hidpi.patch" + "${FILESDIR}/${P}-icon-render-w-app-scaling.patch" + "${FILESDIR}/${P}-segfault.patch" +) + +src_prepare() { + ecm_src_prepare + use handbook || cmake_comment_add_subdirectory doc/handbook +} + +pkg_postinst() { + if [[ -z "${REPLACING_VERSIONS}" ]]; then + optfeature "konsole view" "kde-apps/konsolepart:5" "kde-apps/konsole:5" + optfeature "Markdown text previews" "kde-misc/markdownpart:${SLOT}" + optfeature "PDF/PS and RAW image thumbnails" "kde-apps/thumbnailers:${SLOT}" + optfeature "video thumbnails" "kde-apps/ffmpegthumbs:${SLOT}" + optfeature "bookmarks support" "kde-apps/keditbookmarks:${SLOT}" + fi + ecm_pkg_postinst +} diff --git a/kde-misc/krusader/krusader-2.7.2.ebuild b/kde-misc/krusader/krusader-2.8.1.ebuild index 5c06921ef956..00f4457bcd2d 100644 --- a/kde-misc/krusader/krusader-2.7.2.ebuild +++ b/kde-misc/krusader/krusader-2.8.1.ebuild @@ -1,16 +1,16 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 ECM_HANDBOOK="forceoptional" -KFMIN=5.60.0 -QTMIN=5.12.3 -inherit ecm kde.org +KFMIN=5.115.0 +QTMIN=5.15.12 +inherit ecm kde.org optfeature if [[ ${KDE_BUILD_TYPE} = release ]]; then SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz" - KEYWORDS="amd64 ~arm64 ~ppc64 x86" + KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" fi DESCRIPTION="Advanced twin-panel (commander-style) file-manager with many extras" @@ -55,20 +55,25 @@ DEPEND="${COMMON_DEPEND} >=dev-qt/qtconcurrent-${QTMIN}:5 " RDEPEND="${COMMON_DEPEND} - kde-apps/kio-extras:5 + || ( + kde-apps/kio-extras-kf5:5 + kde-apps/kio-extras:5 + ) + >=kde-frameworks/ktexteditor-${KFMIN}:5 " -pkg_postinst() { - ecm_pkg_postinst - - if ! has_version kde-apps/thumbnailers:${SLOT} || - ! has_version kde-apps/ffmpegthumbs:${SLOT} ; then - elog "For PDF/PS, RAW and video thumbnails support, install:" - elog " kde-apps/thumbnailers:${SLOT}" - elog " kde-apps/ffmpegthumbs:${SLOT}" - fi +src_prepare() { + ecm_src_prepare + use handbook || cmake_comment_add_subdirectory doc/handbook +} - if ! has_version kde-apps/keditbookmarks:${SLOT} ; then - elog "For bookmarks support, install kde-apps/keditbookmarks:${SLOT}" +pkg_postinst() { + if [[ -z "${REPLACING_VERSIONS}" ]]; then + optfeature "konsole view" "kde-apps/konsolepart:5" "kde-apps/konsole:5" + optfeature "Markdown text previews" "kde-misc/markdownpart:${SLOT}" + optfeature "PDF/PS and RAW image thumbnails" "kde-apps/thumbnailers:${SLOT}" + optfeature "video thumbnails" "kde-apps/ffmpegthumbs:${SLOT}" + optfeature "bookmarks support" "kde-apps/keditbookmarks:${SLOT}" fi + ecm_pkg_postinst } diff --git a/kde-misc/krusader/metadata.xml b/kde-misc/krusader/metadata.xml index d925f2439758..d41cf0fbf8b4 100644 --- a/kde-misc/krusader/metadata.xml +++ b/kde-misc/krusader/metadata.xml @@ -7,5 +7,6 @@ </maintainer> <upstream> <bugs-to>https://bugs.kde.org/</bugs-to> + <remote-id type="cpe">cpe:/a:krusader:krusader</remote-id> </upstream> </pkgmetadata> diff --git a/kde-misc/kshutdown/kshutdown-5.2.ebuild b/kde-misc/kshutdown/kshutdown-5.2.ebuild index e5b8c2af525d..fd3e3a9ae572 100644 --- a/kde-misc/kshutdown/kshutdown-5.2.ebuild +++ b/kde-misc/kshutdown/kshutdown-5.2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit cmake kde.org xdg +inherit cmake xdg DESCRIPTION="Shutdown manager for desktop environments like KDE Plasma" HOMEPAGE="https://kshutdown.sourceforge.io" @@ -14,11 +14,6 @@ SLOT="5" KEYWORDS="amd64 ~arm64 x86" IUSE="+kde" -BDEPEND=" - app-arch/unzip - sys-devel/gettext - kde? ( kde-frameworks/extra-cmake-modules:5 ) -" DEPEND=" dev-qt/qtcore:5 dev-qt/qtdbus:5 @@ -45,10 +40,11 @@ RDEPEND="${DEPEND} kde-frameworks/oxygen-icons:* ) " - -src_prepare() { - cmake_src_prepare -} +BDEPEND=" + app-arch/unzip + sys-devel/gettext + kde? ( kde-frameworks/extra-cmake-modules:0 ) +" src_configure() { local mycmakeargs=( diff --git a/kde-misc/ktoshiba/ktoshiba-5.3.1.ebuild b/kde-misc/ktoshiba/ktoshiba-5.3.1.ebuild index f12ad75a97c7..d4a43e5654c2 100644 --- a/kde-misc/ktoshiba/ktoshiba-5.3.1.ebuild +++ b/kde-misc/ktoshiba/ktoshiba-5.3.1.ebuild @@ -1,24 +1,21 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 KFMIN=5.60.0 QTMIN=5.12.3 inherit ecm DESCRIPTION="Function key (FN) monitoring for Toshiba laptops" -HOMEPAGE="http://ktoshiba.sourceforge.net/" -SRC_URI="http://prdownloads.sourceforge.net/${PN}/${P}.tar.xz" +HOMEPAGE="https://ktoshiba.sourceforge.net/" +SRC_URI="https://prdownloads.sourceforge.net/${PN}/${P}.tar.xz" LICENSE="GPL-2" SLOT="5" KEYWORDS="~amd64" IUSE="" -BDEPEND=" - sys-devel/gettext -" DEPEND=" >=dev-qt/qtdbus-${QTMIN}:5 >=dev-qt/qtgui-${QTMIN}:5 @@ -35,6 +32,7 @@ DEPEND=" net-libs/libmnl " RDEPEND="${DEPEND}" +BDEPEND="sys-devel/gettext" PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" ) diff --git a/kde-misc/kweather/Manifest b/kde-misc/kweather/Manifest new file mode 100644 index 000000000000..c5d0f404db00 --- /dev/null +++ b/kde-misc/kweather/Manifest @@ -0,0 +1,2 @@ +DIST kweather-23.08.5.tar.xz 946796 BLAKE2B 1fcafac557c28dddd6cd4c345733bb38ac3a03496c78537338fa16b39037c28938bdbb0e89846f0e1fa0bd3725c0e9ec03b8b9b78fe5977e8666c6316ca738bc SHA512 75787edbfecf7137eefa071f3b339b87110744876fdc3fb7ea56cf976bdd95912ed4001cee474ccf29e385202b9e56fd04ddaa8077b4509c14a1059c6f22e255 +DIST kweather-24.02.2.tar.xz 947712 BLAKE2B 25591c930bfada0ac3cd6e17bbf0a5e42f355c25fbcb959528940a55eb88d0a8838d91046e445d57b56dac0897b31c0e67c9b590b9a9eb0e034689dc6c3d1032 SHA512 d0207acf1b16009ffeb2f12391337988e9a09e12ee37e4ff23b86eec5caeace3fa1a710b99a428da87c31c96c056ea1eb1454e47fb95fe9e9cfc9cbd79b61bb9 diff --git a/kde-misc/kweather/kweather-23.08.5.ebuild b/kde-misc/kweather/kweather-23.08.5.ebuild new file mode 100644 index 000000000000..0a11a99bcfe7 --- /dev/null +++ b/kde-misc/kweather/kweather-23.08.5.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +KDE_ORG_CATEGORY="utilities" +ECM_TEST="false" +KFMIN=5.106.0 +QTMIN=5.15.9 +inherit ecm gear.kde.org + +DESCRIPTION="Weather forecast application for Plasma with flat and dynamic/animated views" +HOMEPAGE="https://apps.kde.org/kweather/" + +LICENSE="GPL-2+" +SLOT="5" +KEYWORDS="amd64 arm64 ~loong ~ppc64 x86" + +DEPEND=" + >=dev-libs/kirigami-addons-0.6:5 + >=dev-libs/kweathercore-0.6:5 + >=dev-qt/qtcharts-${QTMIN}:5[qml] + >=dev-qt/qtdeclarative-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtnetwork-${QTMIN}:5 + >=dev-qt/qtquickcontrols2-${QTMIN}:5 + >=dev-qt/qtsvg-${QTMIN}:5 + >=dev-qt/qtwidgets-${QTMIN}:5 + >=kde-frameworks/kconfig-${KFMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/kholidays-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kirigami-${KFMIN}:5 + >=kde-frameworks/knotifications-${KFMIN}:5 + >=kde-plasma/libplasma-${KFMIN}:5 +" +RDEPEND="${DEPEND} + >=dev-qt/qtgraphicaleffects-${QTMIN}:5 + >=dev-qt/qtpositioning-${QTMIN}:5[geoclue] +" + +src_prepare() { + ecm_src_prepare + + sed -e "/include(ECMCheckOutboundLicense)/s/^/#DONT /" \ + -e "/ecm_check_outbound_license/s/^/#DONT /" \ + -i CMakeLists.txt || die # avoid cmake spam about python, reusetool +} + +src_configure() { + local mycmakeargs=( + -DBUILD_PLASMOID=ON + ) + ecm_src_configure +} diff --git a/kde-misc/kweather/kweather-24.02.2.ebuild b/kde-misc/kweather/kweather-24.02.2.ebuild new file mode 100644 index 000000000000..b0bf19607286 --- /dev/null +++ b/kde-misc/kweather/kweather-24.02.2.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +KDE_ORG_CATEGORY="utilities" +ECM_TEST="false" +KFMIN=6.0.0 +QTMIN=6.6.2 +inherit ecm gear.kde.org + +DESCRIPTION="Weather forecast application for Plasma with flat and dynamic/animated views" +HOMEPAGE="https://apps.kde.org/kweather/" + +LICENSE="GPL-2+" +SLOT="6" +KEYWORDS="~amd64" + +DEPEND=" + dev-libs/kirigami-addons:6 + dev-libs/kweathercore:6 + >=dev-qt/qtbase-${QTMIN}:6[gui,network,opengl,widgets] + >=dev-qt/qtcharts-${QTMIN}:6[qml] + >=dev-qt/qtdeclarative-${QTMIN}:6 + >=dev-qt/qtsvg-${QTMIN}:6 + >=kde-frameworks/kconfig-${KFMIN}:6 + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/kholidays-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/kirigami-${KFMIN}:6 + >=kde-frameworks/knotifications-${KFMIN}:6 + kde-plasma/libplasma:6 +" +RDEPEND="${DEPEND} + >=dev-qt/qt5compat-${QTMIN}:6[qml] + >=dev-qt/qtpositioning-${QTMIN}:6[geoclue] +" + +src_prepare() { + ecm_src_prepare + + sed -e "/include(ECMCheckOutboundLicense)/s/^/#DONT /" \ + -e "/ecm_check_outbound_license/s/^/#DONT /" \ + -i CMakeLists.txt || die # avoid cmake spam about python, reusetool +} + +src_configure() { + local mycmakeargs=( + -DBUILD_PLASMOID=ON + ) + ecm_src_configure +} diff --git a/kde-misc/kmarkdownwebview/metadata.xml b/kde-misc/kweather/metadata.xml index d925f2439758..d925f2439758 100644 --- a/kde-misc/kmarkdownwebview/metadata.xml +++ b/kde-misc/kweather/metadata.xml diff --git a/kde-misc/latte-dock/Manifest b/kde-misc/latte-dock/Manifest index dd07b93eeee7..0e1738fd3b1f 100644 --- a/kde-misc/latte-dock/Manifest +++ b/kde-misc/latte-dock/Manifest @@ -1 +1 @@ -DIST latte-dock-0.10.8.tar.xz 1001964 BLAKE2B 225692e9dce8a839cb37277c3627819272cd1edbec4717339f3d1e9801d2fccbb87411638790a078533372a4c597c92e8108c3b814b05ac4682e32781b73965b SHA512 a1148401477d7c2a5123694820443313cd13196a8a2f86815aa89900ac5fb1f8196fc3b99b861ee2c30211071f474965093c0dae42f4b02bb4071c71e8d7bed5 +DIST latte-dock-0.10.77_p20230115-957fece0.tar.gz 1938731 BLAKE2B dc62d40e948af2d97aeb834a9c52b2ce07f375b64a0a4ede085c900f6151cd075d215856715aab887855c09155232333a57d327551b8cc7b9318af12280398ec SHA512 b84d8dbf4d926072d0586056fa9e5145f686659cac7a9df82c51c29b94efd5540e672e8e65c71147861d9afc7870d8b520bf2bfe2a7463a57e0be058c8f7aad8 diff --git a/kde-misc/latte-dock/latte-dock-0.10.8.ebuild b/kde-misc/latte-dock/latte-dock-0.10.77_p20230115.ebuild index 4ed9f302f8d8..524b0cd1ad7b 100644 --- a/kde-misc/latte-dock/latte-dock-0.10.8.ebuild +++ b/kde-misc/latte-dock/latte-dock-0.10.77_p20230115.ebuild @@ -1,32 +1,30 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -KFMIN=5.82.0 -QTMIN=5.15.2 +KDE_ORG_COMMIT=957fece0ca2a5c56e301578c102191a33a1384f6 +KFMIN=5.99.0 +QTMIN=5.15.5 inherit ecm kde.org -if [[ ${KDE_BUILD_TYPE} = release ]]; then - SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz" - KEYWORDS="amd64 ~arm64 ~ppc64 x86" -fi - DESCRIPTION="Elegant dock, based on KDE Frameworks" HOMEPAGE="https://apps.kde.org/latte-dock/" LICENSE="GPL-2+" SLOT="0" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" IUSE="" -DEPEND=" +COMMON_DEPEND=" + >=dev-libs/wayland-1.21.0 >=dev-qt/qtdbus-${QTMIN}:5 >=dev-qt/qtdeclarative-${QTMIN}:5 >=dev-qt/qtgraphicaleffects-${QTMIN}:5 >=dev-qt/qtgui-${QTMIN}:5[X] + >=dev-qt/qtwayland-${QTMIN}:5 >=dev-qt/qtwidgets-${QTMIN}:5 >=dev-qt/qtx11extras-${QTMIN}:5 - >=kde-frameworks/kactivities-${KFMIN}:5 >=kde-frameworks/karchive-${KFMIN}:5 >=kde-frameworks/kconfig-${KFMIN}:5 >=kde-frameworks/kcoreaddons-${KFMIN}:5 @@ -42,19 +40,27 @@ DEPEND=" >=kde-frameworks/knewstuff-${KFMIN}:5 >=kde-frameworks/knotifications-${KFMIN}:5 >=kde-frameworks/kpackage-${KFMIN}:5 - >=kde-frameworks/kwayland-${KFMIN}:5 + >=kde-plasma/kwayland-${KFMIN}:5 >=kde-frameworks/kwindowsystem-${KFMIN}:5 >=kde-frameworks/kxmlgui-${KFMIN}:5 - >=kde-frameworks/plasma-${KFMIN}:5[X] + >=kde-plasma/libplasma-${KFMIN}:5[X(+)] + >=kde-plasma/plasma-activities-${KFMIN}:5 x11-libs/libSM x11-libs/libX11 x11-libs/libxcb x11-libs/xcb-util " -RDEPEND="${DEPEND} +DEPEND="${COMMON_DEPEND} + >=dev-libs/plasma-wayland-protocols-1.6 +" +RDEPEND="${COMMON_DEPEND} >=dev-qt/qtquickcontrols-${QTMIN}:5 >=dev-qt/qtquickcontrols2-${QTMIN}:5 " +BDEPEND=" + >=dev-qt/qtwaylandscanner-${QTMIN}:5 + dev-util/wayland-scanner +" DOCS=( CHANGELOG.md README.md ) diff --git a/kde-misc/latte-dock/metadata.xml b/kde-misc/latte-dock/metadata.xml index 583a31bb3f66..1cbca9a2f480 100644 --- a/kde-misc/latte-dock/metadata.xml +++ b/kde-misc/latte-dock/metadata.xml @@ -6,6 +6,6 @@ <name>Gentoo KDE Project</name> </maintainer> <upstream> - <remote-id type="github">psifidotos/Latte-Dock</remote-id> + <remote-id type="kde-invent">plasma/latte-dock</remote-id> </upstream> </pkgmetadata> diff --git a/kde-misc/markdownpart/Manifest b/kde-misc/markdownpart/Manifest index b1185fc29353..5610d8b84782 100644 --- a/kde-misc/markdownpart/Manifest +++ b/kde-misc/markdownpart/Manifest @@ -1,2 +1,2 @@ -DIST markdownpart-21.12.3.tar.xz 28372 BLAKE2B 0db8e5fec9db009186b00b5b6d74661b0e9af7607eca94a3a20c697210fa0d3415e04f29a9a78254c3944b364a161e8c8795b0657f818a5f8ab703326b5dac8e SHA512 00c33c46cb9188ea3ff9615dc0f3bb5692196208a5157c3f0ae8934042d405204ee83353d136281b73a713fa438c2fcefbab2777ebe5c29bd50ea3f8dcdfda23 -DIST markdownpart-22.04.2.tar.xz 29092 BLAKE2B 6a357d41282b7ab4e7165072fd7327f3ea3d9c321f98c57620777faff5cf6bb22d5754db91402efa498aa6839b97af3b98930fe7f89d03cb6ab6cb80530fe9d0 SHA512 5e70f6bf4cb0088a8c934f617614246c802b758ceee3cb040945b725414696e1572e4b306d6e3a1f30d8d264ad52901ce2775213683049de80311142b91a3fda +DIST markdownpart-23.08.5.tar.xz 31544 BLAKE2B b7830e0b9083a5436a84596138881b891e527cd4f2ba16fc84a3de2f1a3a5911950db3973af0e5e9a9411d8ce994e4055dbde66f9393c7d72b8ac317c91706d5 SHA512 81cf38f47b977d625c3914403ba0aa34611464d9e1503088392a064b8f074d856b35cc456949a6da37e04628f4387c49d83290da993730a0dadf24afc31b074d +DIST markdownpart-24.02.2.tar.xz 33156 BLAKE2B 56dcebed8e5aa7337b906c77ff076a55c6d872dde871ada45f7d53a92e2b5e59033cddeefb87c6e88daebe6de40714d63cc92794c1c40a0d5115a5ce2b01853b SHA512 7365dcde7a6d59711ae9e92dcb1cb77d34eedc6a7eb3000ac6379493ee75e9ad420bb7cd38106d01f2760cc3475fd4b59e9bc1da52eaf5e5b1719136def02d01 diff --git a/kde-misc/markdownpart/markdownpart-22.04.2.ebuild b/kde-misc/markdownpart/markdownpart-22.04.2.ebuild deleted file mode 100644 index e981f3499e64..000000000000 --- a/kde-misc/markdownpart/markdownpart-22.04.2.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -KDE_GEAR="true" -KDE_ORG_CATEGORY=utilities -KFMIN=5.92.0 -QTMIN=5.15.3 -inherit ecm kde.org - -DESCRIPTION="Markdown viewer KParts plugin based on QTextDocument" -HOMEPAGE="https://apps.kde.org/markdownpart/" - -LICENSE="LGPL-2.1+" -SLOT="5" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" -IUSE="" - -DEPEND=" - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/kparts-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 -" -RDEPEND="${DEPEND}" diff --git a/kde-misc/markdownpart/markdownpart-21.12.3.ebuild b/kde-misc/markdownpart/markdownpart-23.08.5.ebuild index 12484381a991..5615cebef8e0 100644 --- a/kde-misc/markdownpart/markdownpart-21.12.3.ebuild +++ b/kde-misc/markdownpart/markdownpart-23.08.5.ebuild @@ -1,20 +1,19 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -KDE_GEAR="true" KDE_ORG_CATEGORY=utilities -KFMIN=5.88.0 -QTMIN=5.15.2 -inherit ecm kde.org +KFMIN=5.106.0 +QTMIN=5.15.9 +inherit ecm gear.kde.org DESCRIPTION="Markdown viewer KParts plugin based on QTextDocument" HOMEPAGE="https://apps.kde.org/markdownpart/" LICENSE="LGPL-2.1+" SLOT="5" -KEYWORDS="amd64 arm64 ~ppc64 x86" +KEYWORDS="amd64 arm64 ~loong ~ppc64 x86" IUSE="" DEPEND=" diff --git a/kde-misc/markdownpart/markdownpart-24.02.2.ebuild b/kde-misc/markdownpart/markdownpart-24.02.2.ebuild new file mode 100644 index 000000000000..15f9bc517523 --- /dev/null +++ b/kde-misc/markdownpart/markdownpart-24.02.2.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +KDE_ORG_CATEGORY=utilities +KFMIN=6.0.0 +QTMIN=6.6.2 +inherit ecm gear.kde.org + +DESCRIPTION="Markdown viewer KParts plugin based on QTextDocument" +HOMEPAGE="https://apps.kde.org/markdownpart/" + +LICENSE="LGPL-2.1+" +SLOT="6" +KEYWORDS="~amd64" +IUSE="" + +DEPEND=" + >=dev-qt/qtbase-${QTMIN}:6[gui,widgets] + >=kde-frameworks/kconfigwidgets-${KFMIN}:6 + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/kio-${KFMIN}:6 + >=kde-frameworks/kparts-${KFMIN}:6 + >=kde-frameworks/kxmlgui-${KFMIN}:6 +" +RDEPEND="${DEPEND}" diff --git a/kde-misc/openofficeorg-thumbnail/openofficeorg-thumbnail-1.0.0-r500.ebuild b/kde-misc/openofficeorg-thumbnail/openofficeorg-thumbnail-1.0.0-r500.ebuild index 37412f3eeaa1..c845d223c4e5 100644 --- a/kde-misc/openofficeorg-thumbnail/openofficeorg-thumbnail-1.0.0-r500.ebuild +++ b/kde-misc/openofficeorg-thumbnail/openofficeorg-thumbnail-1.0.0-r500.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 MY_P="OpenOfficeorgThumbnail-${PV}" KFMIN=5.60.0 @@ -11,6 +11,7 @@ inherit ecm DESCRIPTION="Thumbnail-plugin that generates thumbnails for ODF files" HOMEPAGE="https://www.kde-apps.org/content/show.php?content=110864" SRC_URI="http://arielch.fedorapeople.org/devel/src/${MY_P}.tar.gz" +S=${WORKDIR}/${MY_P} LICENSE="LGPL-3" SLOT="5" @@ -24,6 +25,4 @@ DEPEND=" " RDEPEND="${DEPEND}" -S=${WORKDIR}/${MY_P} - PATCHES=( "${FILESDIR}"/${P}-kf5-support.patch ) diff --git a/kde-misc/plasma-applet-network-monitor/plasma-applet-network-monitor-1.7.3-r1.ebuild b/kde-misc/plasma-applet-network-monitor/plasma-applet-network-monitor-1.7.3-r1.ebuild index be6fc2cc159b..a1b1a25e95fe 100644 --- a/kde-misc/plasma-applet-network-monitor/plasma-applet-network-monitor-1.7.3-r1.ebuild +++ b/kde-misc/plasma-applet-network-monitor/plasma-applet-network-monitor-1.7.3-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit ecm @@ -21,9 +21,7 @@ LICENSE="GPL-2+" SLOT="5" IUSE="" -DEPEND=" - >=kde-frameworks/plasma-5.60.0:5 -" +DEPEND=">=kde-plasma/libplasma-5.60.0:5" RDEPEND="${DEPEND}" PATCHES=( diff --git a/kde-misc/plasma-applet-weather-widget/Manifest b/kde-misc/plasma-applet-weather-widget/Manifest deleted file mode 100644 index 2755fc313d7f..000000000000 --- a/kde-misc/plasma-applet-weather-widget/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST plasma-applet-weather-widget-1.6.10.tar.gz 107848 BLAKE2B a434a7c6c26effa5daee37ae1d03e26793543112404b9e607346ac2f34405bcc068a201b9c371606d60cd129fda45e2dbb6d7cadf038365e1b2a5cdfc1813b1a SHA512 5db4c2e426b9b8296b70ec4edf5fc2dbc5e8056f66327569008a77b05201896ed23039aae063807726376e203d637053884bfeeac78c59c519b7fc5685797331 diff --git a/kde-misc/plasma-applet-weather-widget/plasma-applet-weather-widget-1.6.10-r1.ebuild b/kde-misc/plasma-applet-weather-widget/plasma-applet-weather-widget-1.6.10-r1.ebuild deleted file mode 100644 index 0c2ac70e2ced..000000000000 --- a/kde-misc/plasma-applet-weather-widget/plasma-applet-weather-widget-1.6.10-r1.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit ecm - -if [[ ${PV} = *9999* ]] ; then - EGIT_REPO_URI="https://github.com/kotelnik/${PN}.git" - inherit git-r3 -else - SRC_URI="https://github.com/kotelnik/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm64" -fi - -DESCRIPTION="Plasma 5 applet for weather forecasts" -HOMEPAGE="https://store.kde.org/p/998917/ -https://github.com/kotelnik/plasma-applet-weather-widget" - -LICENSE="GPL-2+" -SLOT="5" -IUSE="" - -DEPEND=" - >=dev-qt/qtxmlpatterns-5.12.1-r1:5[qml(+)] - >=kde-frameworks/plasma-5.60.0:5 -" -RDEPEND="${DEPEND}" - -DOCS=( README.md ) diff --git a/kde-misc/plasma-pass/Manifest b/kde-misc/plasma-pass/Manifest index 5b88fa30eb64..804170d2cf94 100644 --- a/kde-misc/plasma-pass/Manifest +++ b/kde-misc/plasma-pass/Manifest @@ -1 +1,2 @@ -DIST plasma-pass-1.2.0.tar.xz 34324 BLAKE2B a6fce04ca5b29066f026e01bb62a2ba4f312795bc4e0676fad82e7a7612ac29386b34047b74cda68ee1cef1fe08cb28ccda6c214565f18573594c281a3dd8658 SHA512 4ac72af97a8026022459c46eb3d8dec1489dedf0ea47ab8c71a5ab92a9c5e2faca92ef2ed512e5cd0cc181a6aa7b6ab802ae98ce525e97818704e0bf58e4603a +DIST plasma-pass-1.2.1.tar.xz 41608 BLAKE2B eb7f73be34bf014f6947029976a2922548ee307356da3f42bbb96ff6b14db91be98df2d0656a4bdc04b5d03d899f6eec06f4de5450f6d9f528a150c88530f670 SHA512 eff989e045ece776a5f2696c09381ecd8f49ba83cf7de89840ab1cad89bd15e33b9b331d9c91d16956a3d5b8e5f67f52a1aa176abf1d8023b57c18573c8ce5f9 +DIST plasma-pass-1.2.2.tar.xz 42776 BLAKE2B c9956304665b1f355d04ca1f89d55296f920f2260013aabd42066f41d527aa45097802898d8942df40477ebc0ac4efa577ead1cfd03d7c06796a3a65d2c2219a SHA512 40a6ee175ff1801cee84947639414f3e01c1fc28ad08ef54bbf1b131ecb8239236274ef10ae6c0aab600ccdc25c17bca24a245e78506331d416ee6d9b5e874be diff --git a/kde-misc/plasma-pass/files/plasma-pass-1.2.0-no-werror.patch b/kde-misc/plasma-pass/files/plasma-pass-1.2.0-no-werror.patch deleted file mode 100644 index 42c40bfe923a..000000000000 --- a/kde-misc/plasma-pass/files/plasma-pass-1.2.0-no-werror.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 468db75d4a4f2620921c00ebd91fd7d12e7a2bce Mon Sep 17 00:00:00 2001 -From: David Faure <faure@kde.org> -Date: Sat, 1 May 2021 21:58:56 +0200 -Subject: [PATCH] Remove -Werror, one can't predict what future compilers will - do - -I assume this was supposed to be set only temporarily. - -CCMAIL: dvratil@kde.org ---- - CMakeLists.txt | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 8131494..26cea6e 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -46,8 +46,8 @@ find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS - add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050d00) - add_definitions(-DQT_NO_FOREACH) - --set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Werror -pedantic") --set(CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Werror -pedantic") -+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -pedantic") -+set(CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS} -Wall -pedantic") - - # plasmoid - plasma_install_package(package org.kde.plasma.pass) --- -GitLab - diff --git a/kde-misc/plasma-pass/metadata.xml b/kde-misc/plasma-pass/metadata.xml index d925f2439758..452492989a23 100644 --- a/kde-misc/plasma-pass/metadata.xml +++ b/kde-misc/plasma-pass/metadata.xml @@ -7,5 +7,6 @@ </maintainer> <upstream> <bugs-to>https://bugs.kde.org/</bugs-to> + <remote-id type="kde-invent">plasma/plasma-pass</remote-id> </upstream> </pkgmetadata> diff --git a/kde-misc/plasma-pass/plasma-pass-1.2.0.ebuild b/kde-misc/plasma-pass/plasma-pass-1.2.1.ebuild index b62a307e42dd..6ae238bba32f 100644 --- a/kde-misc/plasma-pass/plasma-pass-1.2.0.ebuild +++ b/kde-misc/plasma-pass/plasma-pass-1.2.1.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -KFMIN=5.74.0 -QTMIN=5.15.2 +KFMIN=5.102.0 +QTMIN=5.15.5 inherit ecm kde.org DESCRIPTION="Plasma applet to access password from pass" @@ -12,7 +12,7 @@ HOMEPAGE="https://www.dvratil.cz/2018/05/plasma-pass/ https://invent.kde.org/pla if [[ ${KDE_BUILD_TYPE} != live ]] ; then SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz" - KEYWORDS="amd64 ~ppc64" + KEYWORDS="amd64 ~ppc64 ~riscv" fi LICENSE="LGPL-2.1+" @@ -20,6 +20,7 @@ SLOT="5" IUSE="" DEPEND=" + app-crypt/gpgme:=[cxx,qt5] >=dev-qt/qtconcurrent-${QTMIN}:5 >=dev-qt/qtdbus-${QTMIN}:5 >=dev-qt/qtdeclarative-${QTMIN}:5 @@ -28,12 +29,10 @@ DEPEND=" >=kde-frameworks/kcoreaddons-${KFMIN}:5 >=kde-frameworks/ki18n-${KFMIN}:5 >=kde-frameworks/kitemmodels-${KFMIN}:5 - >=kde-frameworks/plasma-${KFMIN}:5 + >=kde-plasma/libplasma-${KFMIN}:5 sys-auth/oath-toolkit " RDEPEND="${DEPEND} >=dev-qt/qtquickcontrols2-${QTMIN}:5 >=kde-frameworks/kirigami-${KFMIN}:5 " - -PATCHES=( "${FILESDIR}"/${P}-no-werror.patch ) # bug 785832 diff --git a/kde-misc/plasma-pass/plasma-pass-1.2.2.ebuild b/kde-misc/plasma-pass/plasma-pass-1.2.2.ebuild new file mode 100644 index 000000000000..f6e20837066c --- /dev/null +++ b/kde-misc/plasma-pass/plasma-pass-1.2.2.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +KFMIN=5.249.0 +QTMIN=6.6.2 +inherit ecm kde.org + +DESCRIPTION="Plasma applet to access password from pass" +HOMEPAGE="https://www.dvratil.cz/2018/05/plasma-pass/ https://invent.kde.org/plasma/plasma-pass" + +if [[ ${KDE_BUILD_TYPE} != live ]] ; then + SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz" + KEYWORDS="~amd64" +fi + +LICENSE="LGPL-2.1+" +SLOT="6" +IUSE="" + +DEPEND=" + >=app-crypt/gpgme-1.23.1-r1:=[cxx,qt6] + >=dev-qt/qt5compat-${QTMIN}:6[qml] + >=dev-qt/qtbase-${QTMIN}:6[concurrent,dbus,gui] + >=dev-qt/qtdeclarative-${QTMIN}:6 + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/kio-${KFMIN}:6 + >=kde-frameworks/kitemmodels-${KFMIN}:6 + kde-plasma/libplasma:6 + kde-plasma/plasma5support:6 + sys-auth/oath-toolkit +" +RDEPEND="${DEPEND} + !${CATEGORY}/${PN}:5 + >=kde-frameworks/kirigami-${KFMIN}:6 +" diff --git a/kde-misc/rsibreak/Manifest b/kde-misc/rsibreak/Manifest index f5dd209b086e..545a5bdc7186 100644 --- a/kde-misc/rsibreak/Manifest +++ b/kde-misc/rsibreak/Manifest @@ -1,2 +1 @@ -DIST rsibreak-0.12.14.tar.xz 562176 BLAKE2B 1c0a687c3df8eba116eba64ed502a52ab66f5e77183a31fbb18b8ac3e1bc6ff43e8bb1e50303bcdd78536d415b61730b2dc561c72bc92544dd5855f5a937e317 SHA512 10de87ce892b0320dc6f5115985125c1e1e156022d6d0159dc64721ba2f4dbfdea0f8d2138d450fbfef8c11bedcd564df850cbeb7900dc480c94d44bf15ae997 DIST rsibreak-0.12.15.tar.xz 591600 BLAKE2B 9c3b455c64e5c07d340dc134e3d9f31ae97a1326568b5d4a8837c42a0c6a943de59ff615346b15277db8e491ea013d62024bf899ee76547bf7056dc1b0f94773 SHA512 8178387716b9d611a33ce72070bae1c3d55ad098100a701fcae9f40a8db4bb29eda364a799223a6fea5671e44e0a5a41aa2b6dff2fb50a832221e468c17de87b diff --git a/kde-misc/rsibreak/rsibreak-0.12.14.ebuild b/kde-misc/rsibreak/rsibreak-0.12.14.ebuild deleted file mode 100644 index 5a652a89162a..000000000000 --- a/kde-misc/rsibreak/rsibreak-0.12.14.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ECM_HANDBOOK="forceoptional" -KFMIN=5.74.0 -QTMIN=5.15.2 -VIRTUALX_REQUIRED="test" -inherit ecm kde.org - -DESCRIPTION="Small utility which bothers you at certain intervals" -HOMEPAGE="https://apps.kde.org/rsibreak/ https://userbase.kde.org/RSIBreak" - -if [[ ${KDE_BUILD_TYPE} = release ]]; then - SRC_URI="mirror://kde/stable/${PN}/$(ver_cut 1-2)/${P}.tar.xz" - KEYWORDS="amd64 ~arm64 x86" -fi - -LICENSE="GPL-2+ handbook? ( FDL-1.2 )" -SLOT="5" -IUSE="" - -DEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kcrash-${KFMIN}:5 - >=kde-frameworks/kdbusaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kidletime-${KFMIN}:5 - >=kde-frameworks/knotifications-${KFMIN}:5 - >=kde-frameworks/knotifyconfig-${KFMIN}:5 - >=kde-frameworks/ktextwidgets-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 -" -# bug 587170 for frameworkintegration -RDEPEND="${DEPEND} - >=kde-frameworks/frameworkintegration-${KFMIN}:5 -" -BDEPEND="sys-devel/gettext" diff --git a/kde-misc/rsibreak/rsibreak-0.12.15.ebuild b/kde-misc/rsibreak/rsibreak-0.12.15.ebuild index ba9a485368d3..8116b20ead86 100644 --- a/kde-misc/rsibreak/rsibreak-0.12.15.ebuild +++ b/kde-misc/rsibreak/rsibreak-0.12.15.ebuild @@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/rsibreak/ https://userbase.kde.org/RSIBreak" if [[ ${KDE_BUILD_TYPE} = release ]]; then SRC_URI="mirror://kde/stable/${PN}/$(ver_cut 1-2)/${P}.tar.xz" - KEYWORDS="~amd64 ~arm64 ~x86" + KEYWORDS="amd64 ~arm64 x86" fi LICENSE="GPL-2+ handbook? ( FDL-1.2 )" diff --git a/kde-misc/skanlite/Manifest b/kde-misc/skanlite/Manifest index 07eaadf519c8..67e76bd5ebdd 100644 --- a/kde-misc/skanlite/Manifest +++ b/kde-misc/skanlite/Manifest @@ -1,2 +1,2 @@ -DIST skanlite-21.12.3.tar.xz 2443624 BLAKE2B 2ff355b69cf406cd2f116ca6155e3cf726b7dd55b1dcc806fc667bcc0b98c478f104206c25c01dd3a7513bb2a4b58772903b8ca5143a87891724c4060c3c6ca7 SHA512 590218efb5030a0f1e15a1d9380dcea287722fac6f6ebb156ad75953cc4dfcec1919b1ac92209bc2b070c145e4889e9ea0900862290e38b61b508479fa7c7682 -DIST skanlite-22.04.2.tar.xz 2441152 BLAKE2B a5973b3d510810c04bc0ca5a4fdb0e086b75a22cb17c637cf8009a555426519861545ac87d49496f2d4a31c5ca9e6580032acb3b3fb210baefd6023c29c3fcba SHA512 8d83fab908d6580f6cb3e3e5c3ee9aa681f4e92245e6bc46f98de19470a1b2bdb4e6d1448b1b7b582a1d5833f87f9c54b6b37289693467aa4ade2ff06f80e92c +DIST skanlite-23.08.5.tar.xz 2452072 BLAKE2B b492195519404268492fb8a44a431fb7e7a1aa493fe16ae71ab18e7068fd2e7ef9e51a6b6f9ee0223454e05d76ccfe134d3a5659efbe3dd6107a1fe3b3d92b0a SHA512 f449d4be0d34c241fbe1b91d5adac4a55d2007af2bc05dc13fbe58c84506f0ac2d6714fb40376ecf5b223ff2b2e7a8d0d53c5c0c572ddc6a06b1ce6301acaa09 +DIST skanlite-24.02.2.tar.xz 2451520 BLAKE2B e5af2deb7f8f2ecc9fa0e92e27b2e65d1a1c2fd08b6cc76269bc7154fa7ca9d593445614f6ad64fb6c2c1e93447c778bc5f40934905d7c341912389a7c56f75a SHA512 53e395d8f7199840393b6c5e427fa8989eebd9a6c9474e88c0e2c1428e7c858acf19ee32d6865f154ecba259f8a0b03da5e38f75122f36ea47efcbc92fd8bceb diff --git a/kde-misc/skanlite/skanlite-21.12.3.ebuild b/kde-misc/skanlite/skanlite-23.08.5.ebuild index 873e20fd4bfc..177b1ea5d963 100644 --- a/kde-misc/skanlite/skanlite-21.12.3.ebuild +++ b/kde-misc/skanlite/skanlite-23.08.5.ebuild @@ -1,16 +1,15 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -ECM_HANDBOOK="forceoptional" -ECM_TEST="forceoptional" -KDE_GEAR="true" +ECM_HANDBOOK="optional" +ECM_TEST="true" KDE_ORG_CATEGORY="graphics" PVCUT=$(ver_cut 1-3) -KFMIN=5.88.0 -QTMIN=5.15.2 -inherit ecm kde.org +KFMIN=5.106.0 +QTMIN=5.15.9 +inherit ecm gear.kde.org DESCRIPTION="Simple image scanning application based on libksane and KDE Frameworks" HOMEPAGE="https://apps.kde.org/skanlite/" diff --git a/kde-misc/skanlite/skanlite-22.04.2.ebuild b/kde-misc/skanlite/skanlite-24.02.2.ebuild index d7614c303b1a..557be243b41d 100644 --- a/kde-misc/skanlite/skanlite-22.04.2.ebuild +++ b/kde-misc/skanlite/skanlite-24.02.2.ebuild @@ -1,16 +1,15 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 ECM_HANDBOOK="optional" ECM_TEST="true" -KDE_GEAR="true" KDE_ORG_CATEGORY="graphics" PVCUT=$(ver_cut 1-3) -KFMIN=5.92.0 -QTMIN=5.15.3 -inherit ecm kde.org +KFMIN=5.115.0 +QTMIN=5.15.12 +inherit ecm gear.kde.org DESCRIPTION="Simple image scanning application based on libksane and KDE Frameworks" HOMEPAGE="https://apps.kde.org/skanlite/" diff --git a/kde-misc/tellico/Manifest b/kde-misc/tellico/Manifest index 1eaf159c108f..8d8a3afaf2c7 100644 --- a/kde-misc/tellico/Manifest +++ b/kde-misc/tellico/Manifest @@ -1 +1,2 @@ -DIST tellico-3.4.4.tar.xz 6600432 BLAKE2B 4bac2df68284c9beb9ddbdbcf5824ac22d4a56066c371d7eaea962b81307f96d7ceba1fd446a4f640867a314c357c13d16a2e167356701241007e5a682ecb60b SHA512 6c9f16217ce5ff2d944d3eea3a5f5641b9717cd7d85835fd8b9559e90f6e920046085e8c9e14734d2ffa0a96ee6b8b241e0ccf1739aa2469af7e1bb88667f1d4 +DIST tellico-3.5.3.tar.xz 6767436 BLAKE2B ccfbb60635201def188aba93a861301384f301d28c9211215d5ba08803653f45421a84e07f5beafe5969f713b0cd8e357a3d0573fd1c2fd776655c801018da88 SHA512 158ea7a8a4cc47435df0e9f7e439f489e886735098133fdbaef8de2de46ecfd3245ab312ab62f3020a3b4665eb68d9e6b98a3cfd121820233b4762361bef89ea +DIST tellico-3.5.4.tar.xz 6768904 BLAKE2B 61242fa43287f8e37990040f1a94df631a3596527a4d2e3d7b61c7c34e50005ba2529acdde6d44acffef6127bfd634e86bd5d66c21e4623496daf31d80b6fbe3 SHA512 b38405feb59107c4022158fee5a0435b61ea5e66c9265f930d1cb3be22d66e972b107f2f7eddb0cdf07f044f4d1428e2df879aaa67270045c8c30dd678dd83b9 diff --git a/kde-misc/tellico/metadata.xml b/kde-misc/tellico/metadata.xml index 56be78214659..3b630b3606fb 100644 --- a/kde-misc/tellico/metadata.xml +++ b/kde-misc/tellico/metadata.xml @@ -7,6 +7,7 @@ </maintainer> <upstream> <bugs-to>https://bugs.kde.org/</bugs-to> + <remote-id type="kde-invent">office/tellico</remote-id> </upstream> <longdescription lang="en"> Tellico is a KDE application for organizing your collections. It provides diff --git a/kde-misc/tellico/tellico-3.4.4.ebuild b/kde-misc/tellico/tellico-3.5.3.ebuild index 5ae2ebe86576..0aa93ad473c1 100644 --- a/kde-misc/tellico/tellico-3.4.4.ebuild +++ b/kde-misc/tellico/tellico-3.5.3.ebuild @@ -1,11 +1,10 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 ECM_HANDBOOK="forceoptional" ECM_TEST="forceoptional" -VIRTUALX_REQUIRED="test" inherit ecm kde.org DESCRIPTION="Collection manager based on KDE Frameworks" @@ -13,7 +12,7 @@ HOMEPAGE="https://tellico-project.org/" if [[ ${KDE_BUILD_TYPE} != live ]]; then SRC_URI="https://tellico-project.org/files/${P}.tar.xz" - KEYWORDS="amd64 ~arm64 x86" + KEYWORDS="amd64 ~arm64 ~x86" fi LICENSE="|| ( GPL-2 GPL-3 )" @@ -65,13 +64,11 @@ RDEPEND=" semantic-desktop? ( kde-frameworks/kfilemetadata:5 ) taglib? ( >=media-libs/taglib-1.5 ) v4l? ( >=media-libs/libv4l-0.8.3 ) - xmp? ( >=media-libs/exempi-2 ) + xmp? ( >=media-libs/exempi-2:= ) yaz? ( >=dev-libs/yaz-2:0= ) " DEPEND="${RDEPEND}" -BDEPEND=" - sys-devel/gettext -" +BDEPEND="sys-devel/gettext" src_configure() { local mycmakeargs=( diff --git a/kde-misc/tellico/tellico-3.5.4.ebuild b/kde-misc/tellico/tellico-3.5.4.ebuild new file mode 100644 index 000000000000..fd374511ce98 --- /dev/null +++ b/kde-misc/tellico/tellico-3.5.4.ebuild @@ -0,0 +1,89 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_HANDBOOK="forceoptional" +ECM_TEST="forceoptional" +inherit ecm kde.org + +DESCRIPTION="Collection manager based on KDE Frameworks" +HOMEPAGE="https://tellico-project.org/" + +if [[ ${KDE_BUILD_TYPE} != live ]]; then + SRC_URI="https://tellico-project.org/files/${P}.tar.xz" + KEYWORDS="~amd64 ~arm64 ~x86" +fi + +LICENSE="|| ( GPL-2 GPL-3 )" +SLOT="5" +IUSE="bibtex cddb discid pdf scanner semantic-desktop taglib v4l xmp yaz" + +# tests need network access +RESTRICT="test" + +RDEPEND=" + dev-libs/libxml2 + dev-libs/libxslt + dev-qt/qtcharts:5 + dev-qt/qtdbus:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtprintsupport:5 + dev-qt/qtwebengine:5[widgets] + dev-qt/qtwidgets:5 + dev-qt/qtxml:5 + kde-frameworks/karchive:5 + kde-frameworks/kcodecs:5 + kde-frameworks/kcompletion:5 + kde-frameworks/kconfig:5 + kde-frameworks/kconfigwidgets:5 + kde-frameworks/kcoreaddons:5 + kde-frameworks/kcrash:5 + kde-frameworks/kguiaddons:5 + kde-frameworks/kiconthemes:5 + kde-frameworks/kitemmodels:5 + kde-frameworks/ki18n:5 + kde-frameworks/kjobwidgets:5 + kde-frameworks/kio:5 + kde-frameworks/knewstuff:5 + kde-frameworks/kparts:5 + kde-frameworks/kservice:5 + kde-frameworks/ktextwidgets:5 + kde-frameworks/kwallet:5 + kde-frameworks/kwidgetsaddons:5 + kde-frameworks/kwindowsystem:5 + kde-frameworks/kxmlgui:5 + kde-frameworks/solid:5 + kde-frameworks/sonnet:5 + bibtex? ( >=dev-perl/Text-BibTeX-0.780.0-r1 ) + cddb? ( kde-apps/libkcddb:5 ) + discid? ( dev-libs/libcdio:= ) + pdf? ( app-text/poppler[qt5] ) + scanner? ( kde-apps/libksane:5 ) + semantic-desktop? ( kde-frameworks/kfilemetadata:5 ) + taglib? ( >=media-libs/taglib-1.5 ) + v4l? ( >=media-libs/libv4l-0.8.3 ) + xmp? ( >=media-libs/exempi-2:= ) + yaz? ( >=dev-libs/yaz-2:0= ) +" +DEPEND="${RDEPEND}" +BDEPEND="sys-devel/gettext" + +src_configure() { + local mycmakeargs=( + -DCMAKE_DISABLE_FIND_PACKAGE_Csv=ON + -DENABLE_BTPARSE=$(usex bibtex) + $(cmake_use_find_package cddb KF5Cddb) + $(cmake_use_find_package discid CDIO) + $(cmake_use_find_package pdf Poppler) + $(cmake_use_find_package scanner KF5Sane) + $(cmake_use_find_package semantic-desktop KF5FileMetaData) + $(cmake_use_find_package taglib Taglib) + -DENABLE_WEBCAM=$(usex v4l) + $(cmake_use_find_package xmp Exempi) + $(cmake_use_find_package yaz Yaz) + ) + + ecm_src_configure +} diff --git a/kde-misc/ultimate-gmail-feed/Manifest b/kde-misc/ultimate-gmail-feed/Manifest deleted file mode 100644 index 262853c2d063..000000000000 --- a/kde-misc/ultimate-gmail-feed/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST ultimate-gmail-feed-2.1.tar.gz 26416 BLAKE2B eb6da2c2968a8fda9a758daf77c55f2cc28cb939bb542c757e99f839c4b252339ce3ef936fac13b16e046a60617ba2f0fbdc6aca41ce723ad0c04d68ed1c712b SHA512 dcf8ebd76c8d02d8c359153b3bd06cc25608111c6fa832160858d77bf7a996dc75ba17d59fbfcacbea311a3ceee642ff36fe0f2bf78bf1b6dd108ed4408a079e diff --git a/kde-misc/ultimate-gmail-feed/metadata.xml b/kde-misc/ultimate-gmail-feed/metadata.xml deleted file mode 100644 index 152bdb7ff651..000000000000 --- a/kde-misc/ultimate-gmail-feed/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>kde@gentoo.org</email> - <name>Gentoo KDE Project</name> - </maintainer> - <upstream> - <remote-id type="github">anthon38/gmailfeed</remote-id> - </upstream> -</pkgmetadata> diff --git a/kde-misc/ultimate-gmail-feed/ultimate-gmail-feed-2.1.ebuild b/kde-misc/ultimate-gmail-feed/ultimate-gmail-feed-2.1.ebuild deleted file mode 100644 index 62796ae711ea..000000000000 --- a/kde-misc/ultimate-gmail-feed/ultimate-gmail-feed-2.1.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -MY_PN="plasmoid-${PN}" -inherit ecm - -DESCRIPTION="Plasma 5 widget showing your Gmail feed" -HOMEPAGE="https://www.pling.com/p/1248550/ -https://github.com/Intika-KDE-Plasmoids/plasmoid-ultimate-gmail-feed" -SRC_URI="https://github.com/Intika-KDE-Plasmoids/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3+" -SLOT="5" -KEYWORDS="~amd64" -IUSE="" - -S="${WORKDIR}/${MY_PN}-${PV}" - -DEPEND=" - dev-qt/qtdeclarative:5 - dev-qt/qtnetwork:5 - kde-frameworks/knotifications:5 - kde-frameworks/plasma:5 -" -RDEPEND="${DEPEND} - dev-qt/qtquickcontrols:5 - dev-qt/qtxmlpatterns:5[qml] -" diff --git a/kde-misc/wacomtablet/Manifest b/kde-misc/wacomtablet/Manifest deleted file mode 100644 index b1170c608238..000000000000 --- a/kde-misc/wacomtablet/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST wacomtablet-3.2.0-patchset-1.tar.xz 7796 BLAKE2B 4fa998a0f4376579d1e0d06a8aa9edababedca22d579dbdae651eee3699decc880a7a1d277f04c2bc24adba87908c07ab711989a5985b68af5b295d3b3260d33 SHA512 ff96f05831e4760ce99920061f0dc927aa6a2d5ef4b7443c3129bb1431262cb4bc1434097595976672393e3b611438014ccb528fc948e7c0407fc9a2d52ade8d -DIST wacomtablet-3.2.0.tar.xz 728468 BLAKE2B f741c8989f94cdc5b4839df5d91a6728c48308880c489e031d4615a58e82dddda75dcd1cd04b941035c1aece3ed4f7889508629100852cbcaafc063d7e0f8d1e SHA512 acbabd6d6546bc85f0ed4e245668dc89b1c2ecaedd3754bf7ad8027b90f3ae81e5312395376de272dcbd416a9a1115bff2481351bd3f418bef7fa06d0db0c5a6 diff --git a/kde-misc/wacomtablet/metadata.xml b/kde-misc/wacomtablet/metadata.xml deleted file mode 100644 index d925f2439758..000000000000 --- a/kde-misc/wacomtablet/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>kde@gentoo.org</email> - <name>Gentoo KDE Project</name> - </maintainer> - <upstream> - <bugs-to>https://bugs.kde.org/</bugs-to> - </upstream> -</pkgmetadata> diff --git a/kde-misc/wacomtablet/wacomtablet-3.2.0-r2.ebuild b/kde-misc/wacomtablet/wacomtablet-3.2.0-r2.ebuild deleted file mode 100644 index 733a1d4001c9..000000000000 --- a/kde-misc/wacomtablet/wacomtablet-3.2.0-r2.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_HANDBOOK="forceoptional" -KFMIN=5.82.0 -QTMIN=5.15.2 -VIRTUALX_REQUIRED="test" -inherit ecm kde.org - -DESCRIPTION="System settings module for Wacom tablets" -HOMEPAGE="https://apps.kde.org/wacomtablet/ -https://userbase.kde.org/Wacomtablet" -SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz -https://dev.gentoo.org/~asturm/distfiles/${P}-patchset-1.tar.xz" - -LICENSE="GPL-2" -SLOT="5" -KEYWORDS="amd64 x86" - -RDEPEND=" - >=dev-libs/libwacom-0.30:= - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=dev-qt/qtx11extras-${QTMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kdbusaddons-${KFMIN}:5 - >=kde-frameworks/kglobalaccel-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/knotifications-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 - >=kde-frameworks/plasma-${KFMIN}:5 - >=x11-drivers/xf86-input-wacom-0.20.0 - x11-libs/libXi - x11-libs/libxcb -" -DEPEND="${RDEPEND} - x11-base/xorg-proto - x11-libs/libX11 -" -BDEPEND="sys-devel/gettext" - -PATCHES=( - "${WORKDIR}/${P}-qt-5.15.patch" - "${WORKDIR}/${P}-qt-5.15-obsoletions.patch" - "${WORKDIR}/${P}-no-override-screenspace-w-missing-screen.patch" # KDE-bug 419392 - "${WORKDIR}/${P}-fix-xsetwacom-adapter.patch" - "${WORKDIR}/${P}-Intuos-M-bluetooth.patch" # KDE-bug 418827 - "${WORKDIR}/${P}-correct-icons.patch" - "${WORKDIR}/${P}-drop-empty-X-KDE-PluginInfo-Depends.patch" - "${WORKDIR}/${P}-fix-QProcess-invocation.patch" - "${WORKDIR}/${P}-turn-off-gesture-support-by-default.patch" # KDE-bug 440556 - "${WORKDIR}/${P}-only-show-on-X11.patch" -) - -src_test() { - # test needs DBus, bug 675548 - local myctestargs=( - -E "(Test.KDED.DBusTabletService)" - ) - - ecm_src_test -} diff --git a/kde-misc/wacomtablet/wacomtablet-3.2.0.ebuild b/kde-misc/wacomtablet/wacomtablet-3.2.0.ebuild deleted file mode 100644 index 2c3d6a622b77..000000000000 --- a/kde-misc/wacomtablet/wacomtablet-3.2.0.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_HANDBOOK="forceoptional" -KFMIN=5.60.0 -QTMIN=5.12.3 -VIRTUALX_REQUIRED="test" -inherit ecm kde.org - -DESCRIPTION="System settings module for Wacom tablets" -HOMEPAGE="https://apps.kde.org/wacomtablet/ -https://userbase.kde.org/Wacomtablet" -SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz -https://dev.gentoo.org/~asturm/distfiles/${P}-patchset-1.tar.xz" - -LICENSE="GPL-2" -SLOT="5" -KEYWORDS="amd64 x86" - -RDEPEND=" - >=dev-libs/libwacom-0.30:= - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=dev-qt/qtx11extras-${QTMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kdbusaddons-${KFMIN}:5 - >=kde-frameworks/kglobalaccel-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/knotifications-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 - >=kde-frameworks/plasma-${KFMIN}:5 - >=x11-drivers/xf86-input-wacom-0.20.0 - x11-libs/libXi - x11-libs/libxcb -" -DEPEND="${RDEPEND} - x11-base/xorg-proto - x11-libs/libX11 -" -BDEPEND="sys-devel/gettext" - -PATCHES=( "${WORKDIR}/${P}-qt-5.15.patch" ) - -src_test() { - # test needs DBus, bug 675548 - local myctestargs=( - -E "(Test.KDED.DBusTabletService)" - ) - - ecm_src_test -} diff --git a/kde-misc/zanshin/Manifest b/kde-misc/zanshin/Manifest index f1a9cbad6304..398d0f45e890 100644 --- a/kde-misc/zanshin/Manifest +++ b/kde-misc/zanshin/Manifest @@ -1,2 +1,2 @@ -DIST zanshin-21.12.3.tar.xz 352460 BLAKE2B 5ed8ee58da0c87f954d86854408555de0a481363eb9b4299bbd587049bcc0389e0ea321e2f9de7f31db4f6948fc02e331372f574ff138fa3d989996fcfd44c54 SHA512 0455c19401c1a3f1be061980c5d96c851f32655db55663ff6735cb39b8a20849bd95253f659517918197c9d6d6db1ee0b8ce305f249e4640b2907814b9a0441b -DIST zanshin-22.04.2.tar.xz 353576 BLAKE2B 11767eac056ecacee0aa844154a21b35005bb1d2686af812f217b11eee5ca65b14f2561c011a1eedab7a9ad5fd4906801da383accac536a42a02457c16be4101 SHA512 cab11e556eb94adcdf042b65e0b646c012330b5fe06eed15e6b9f97c999c3e5722d7e95d96b336488444dcd4d62e9386af986648a9271c6d16cd9230e0133aa2 +DIST zanshin-23.08.5.tar.xz 365784 BLAKE2B e13ab967a3ed42626033401e7a88695554cde43156a2d7c3fbc7e5d77f846503bb5203a1c7517a8baf96a3849a038017368928972b9357021d0a17ffdd8d59aa SHA512 db9706902dc2733859f7af56ca6885f0b9731ca4ca692abe66f36e8dfadb9e2b65556600e79bb84bb19425681f9b457c29e0589c7701bf31b015f66cb825474e +DIST zanshin-24.02.2.tar.xz 371616 BLAKE2B 484774879242582c45a9ee1b27066dc67a5b8760b36435bf46d6f0a5c9c5a0fb3e6176a4c3b06af74dfb339a12908b5d7f6c78f8679710c41c1cafde5fd2160a SHA512 1d5026288c6f280580f2a8bbfaf8cf69ad5ec218927f393d951bda8a13690c1ca3cfcd11edc2c18260e6602e5710476464f71f83ad5b0475674204a95d588a62 diff --git a/kde-misc/zanshin/zanshin-21.12.3.ebuild b/kde-misc/zanshin/zanshin-21.12.3.ebuild deleted file mode 100644 index b805ba4b9559..000000000000 --- a/kde-misc/zanshin/zanshin-21.12.3.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_TEST="forceoptional" -KDE_GEAR="true" -KDE_ORG_CATEGORY="pim" -PVCUT=$(ver_cut 1-3) -KFMIN=5.88.0 -QTMIN=5.15.2 -VIRTUALX_REQUIRED="test" -inherit ecm kde.org - -DESCRIPTION="Getting things done application by KDE" -HOMEPAGE="https://zanshin.kde.org/ https://apps.kde.org/zanshin/ -https://userbase.kde.org/Zanshin" - -LICENSE="|| ( GPL-2 GPL-3 )" -SLOT="5" -KEYWORDS="amd64 arm64 ~ppc64 x86" -IUSE="" - -RESTRICT="test" # bug 785844 - -COMMON_DEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtnetwork-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=kde-apps/akonadi-${PVCUT}:5 - >=kde-apps/akonadi-calendar-${PVCUT}:5 - >=kde-apps/akonadi-contacts-${PVCUT}:5 - >=kde-apps/kmime-${PVCUT}:5 - >=kde-apps/kontactinterface-${PVCUT}:5 - >=kde-frameworks/kcalendarcore-${KFMIN}:5 - >=kde-frameworks/kcodecs-${KFMIN}:5 - >=kde-frameworks/kcompletion-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcontacts-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/kitemmodels-${KFMIN}:5 - >=kde-frameworks/kitemviews-${KFMIN}:5 - >=kde-frameworks/kjobwidgets-${KFMIN}:5 - >=kde-frameworks/kparts-${KFMIN}:5 - >=kde-frameworks/krunner-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 -" -DEPEND="${COMMON_DEPEND} - dev-libs/boost -" -RDEPEND="${COMMON_DEPEND} - >=kde-apps/kdepim-runtime-${PVCUT}:5 -" -BDEPEND=" - test? ( >=kde-apps/akonadi-${PVCUT}:5[tools] ) -" diff --git a/kde-misc/zanshin/zanshin-22.04.2.ebuild b/kde-misc/zanshin/zanshin-23.08.5.ebuild index f643371f63f0..47f221ba2a28 100644 --- a/kde-misc/zanshin/zanshin-22.04.2.ebuild +++ b/kde-misc/zanshin/zanshin-23.08.5.ebuild @@ -1,16 +1,14 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 ECM_TEST="forceoptional" -KDE_GEAR="true" KDE_ORG_CATEGORY="pim" PVCUT=$(ver_cut 1-3) -KFMIN=5.92.0 -QTMIN=5.15.3 -VIRTUALX_REQUIRED="test" -inherit ecm kde.org +KFMIN=5.106.0 +QTMIN=5.15.9 +inherit ecm gear.kde.org DESCRIPTION="Getting things done application by KDE" HOMEPAGE="https://zanshin.kde.org/ https://apps.kde.org/zanshin/ @@ -18,11 +16,12 @@ https://userbase.kde.org/Zanshin" LICENSE="|| ( GPL-2 GPL-3 )" SLOT="5" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" +KEYWORDS="amd64 arm64 ~x86" IUSE="" RESTRICT="test" # bug 785844 +# kde-frameworks/kwindowsystem[X]: Unconditional use of KX11Extras COMMON_DEPEND=" >=dev-qt/qtdbus-${QTMIN}:5 >=dev-qt/qtgui-${QTMIN}:5 @@ -48,7 +47,7 @@ COMMON_DEPEND=" >=kde-frameworks/kparts-${KFMIN}:5 >=kde-frameworks/krunner-${KFMIN}:5 >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 + >=kde-frameworks/kwindowsystem-${KFMIN}:5[X] >=kde-frameworks/kxmlgui-${KFMIN}:5 " DEPEND="${COMMON_DEPEND} diff --git a/kde-misc/zanshin/zanshin-24.02.2.ebuild b/kde-misc/zanshin/zanshin-24.02.2.ebuild new file mode 100644 index 000000000000..d35a957ee710 --- /dev/null +++ b/kde-misc/zanshin/zanshin-24.02.2.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_TEST="forceoptional" +KDE_ORG_CATEGORY="pim" +PVCUT=$(ver_cut 1-3) +KFMIN=6.0.0 +QTMIN=6.6.2 +inherit ecm gear.kde.org + +DESCRIPTION="Getting things done application by KDE" +HOMEPAGE="https://zanshin.kde.org/ https://apps.kde.org/zanshin/ +https://userbase.kde.org/Zanshin" + +LICENSE="|| ( GPL-2 GPL-3 )" +SLOT="6" +KEYWORDS="~amd64" +IUSE="" + +RESTRICT="test" # bug 785844 + +# kde-frameworks/kwindowsystem[X]: Unconditional use of KX11Extras +COMMON_DEPEND=" + >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets] + >=kde-apps/akonadi-${PVCUT}:6 + >=kde-apps/akonadi-calendar-${PVCUT}:6 + >=kde-apps/akonadi-contacts-${PVCUT}:6 + >=kde-apps/kmime-${PVCUT}:6 + >=kde-apps/kontactinterface-${PVCUT}:6 + >=kde-frameworks/kcalendarcore-${KFMIN}:6 + >=kde-frameworks/kcodecs-${KFMIN}:6 + >=kde-frameworks/kcompletion-${KFMIN}:6 + >=kde-frameworks/kconfig-${KFMIN}:6 + >=kde-frameworks/kconfigwidgets-${KFMIN}:6 + >=kde-frameworks/kcontacts-${KFMIN}:6 + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/kio-${KFMIN}:6 + >=kde-frameworks/kitemmodels-${KFMIN}:6 + >=kde-frameworks/kitemviews-${KFMIN}:6 + >=kde-frameworks/kjobwidgets-${KFMIN}:6 + >=kde-frameworks/kparts-${KFMIN}:6 + >=kde-frameworks/krunner-${KFMIN}:6 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:6 + >=kde-frameworks/kwindowsystem-${KFMIN}:6[X] + >=kde-frameworks/kxmlgui-${KFMIN}:6 +" +DEPEND="${COMMON_DEPEND} + dev-libs/boost +" +RDEPEND="${COMMON_DEPEND} + >=kde-apps/kdepim-runtime-${PVCUT}:6 +" +BDEPEND=" + test? ( >=kde-apps/akonadi-${PVCUT}:6[tools] ) +" |