diff options
Diffstat (limited to 'kde-frameworks')
338 files changed, 2937 insertions, 4478 deletions
diff --git a/kde-frameworks/attica/Manifest b/kde-frameworks/attica/Manifest index 9698616be106..697693aaf4de 100644 --- a/kde-frameworks/attica/Manifest +++ b/kde-frameworks/attica/Manifest @@ -1,2 +1,2 @@ -DIST attica-5.96.0.tar.xz 69896 BLAKE2B 1f707b2262ada63825eab246dc5db355f89f6dd42e50b10bffc3096af3d184b59477030bc3fcf347a04d4e2e62d2ecfcac3fb83aa01c3979c76db9f47be92559 SHA512 2dc8e32594e95d7d7beb4ce3125e4e81f9e11068b7c0c017b1473dcaa08661f3ed1f3c4d6627bb2dfcddeaff584e8f8ab3fe703d234faecac392653d6a185a0d -DIST attica-5.98.0.tar.xz 69428 BLAKE2B 733668c1ab5a51cce0a1ce1ea8be5d40c2fcda83eb78907f2387c51aee4d846dffbc35a8b66c14dac9cf4118400b2d15406bdf67cc55444056797fd6cbb85021 SHA512 778a6bc38ea57421fa8e342fa6cc7ad47dbc7c32d7696e35df3a3ae76b06b88eefa9d9b5e9b4ae5e1e25bcb3ba6cbc9afcb24c2b517d83d5500443de16a00802 +DIST attica-5.115.0.tar.xz 69520 BLAKE2B 55eff477f7de3117db0b8186d81787ac85c4ac95697218e1ce83d2b66b50055c7e631c3310a9bf7b81cbf0d2c10e473b7783a34f966e6d0ccfc7aa1dd89fa040 SHA512 9d530ae6425b0edf7831fa9aa25573da66c8813fbf7776c6d300445c54ec175e91b6c4abbfc6f4985a0f003b41c5e3218ca560466a6b0fc3177d3951151e6cab +DIST attica-6.1.0.tar.xz 68848 BLAKE2B f4f59a63cdb9facdec4d1cce25a3765cc2e188bb6b3ba737a25c8779c11f8ca917799e6df1b6dfb74922f796dae7af209db20f130f7d500cdb5d5d9b507e5673 SHA512 25cf795e81e96065c6f25b5dbb77fea93eeb14a3475bc5b61472618d0d8703c5d913742bf7f7058dfb9ade2af414437d7ac18bd90b96c55458c727a0c4087e13 diff --git a/kde-frameworks/attica/attica-5.96.0.ebuild b/kde-frameworks/attica/attica-5.115.0.ebuild index 996fbe274159..91d02f3c8d0f 100644 --- a/kde-frameworks/attica/attica-5.96.0.ebuild +++ b/kde-frameworks/attica/attica-5.115.0.ebuild @@ -1,26 +1,21 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -QTMIN=5.15.4 +QTMIN=5.15.9 inherit ecm frameworks.kde.org DESCRIPTION="Framework providing access to Open Collaboration Services" + LICENSE="LGPL-2.1+" KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" IUSE="" -RDEPEND=" - >=dev-qt/qtnetwork-${QTMIN}:5 -" +RDEPEND=">=dev-qt/qtnetwork-${QTMIN}:5" DEPEND="${RDEPEND}" -src_test() { +CMAKE_SKIP_TESTS=( # requires network access, bug #661230 - local myctestargs=( - -E "(providertest)" - ) - - ecm_src_test -} + providertest +) diff --git a/kde-frameworks/attica/attica-5.98.0.ebuild b/kde-frameworks/attica/attica-6.1.0.ebuild index 56c7708d5d60..c6a7e11d4893 100644 --- a/kde-frameworks/attica/attica-5.98.0.ebuild +++ b/kde-frameworks/attica/attica-6.1.0.ebuild @@ -1,26 +1,21 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -QTMIN=5.15.5 +QTMIN=6.6.2 inherit ecm frameworks.kde.org DESCRIPTION="Framework providing access to Open Collaboration Services" + LICENSE="LGPL-2.1+" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" +KEYWORDS="~amd64" IUSE="" -RDEPEND=" - >=dev-qt/qtnetwork-${QTMIN}:5 -" +RDEPEND=">=dev-qt/qtbase-${QTMIN}:6[network]" DEPEND="${RDEPEND}" -src_test() { +CMAKE_SKIP_TESTS=( # requires network access, bug #661230 - local myctestargs=( - -E "(providertest)" - ) - - ecm_src_test -} + providertest +) diff --git a/kde-frameworks/baloo/Manifest b/kde-frameworks/baloo/Manifest index 7a611199f346..0093b39649f8 100644 --- a/kde-frameworks/baloo/Manifest +++ b/kde-frameworks/baloo/Manifest @@ -1,2 +1,2 @@ -DIST baloo-5.96.0.tar.xz 290372 BLAKE2B 97458de69b414bb441eb00123cefe59646be4ef28dbad762a38ea83f643ea4f482009f5d366024a556c72f07b76f510de5c5b73fbc5eb72716d46f2d51f678a8 SHA512 b529720173cd739805b56e311158e288cffd6f6ef866d4f4a87ff01c2f186016c6a79c27f47626ce5437fedcd025a9cbac933bfebf98575fa71257af48c8afc0 -DIST baloo-5.98.0.tar.xz 293288 BLAKE2B 50d0541c5d64ccc0c89a7d4875ff91342d2e9a77e4708c35945acb0eb76e33443df031ba91cdb7bb4bda4485be186a391e5052de62cde3e4b14d67e9ad91cf74 SHA512 44680ceee15c642f50d2a9c1c0bda8af9990d4cf8061de0aa78741a9b0a644e94299eb42450ef043f336ba36d3e0cb5f9a02673346f4a644e463d1d328112fde +DIST baloo-5.115.0.tar.xz 311360 BLAKE2B 6092b85cbde534f1cf3fc344fe913b945900c4bbd1db4516e690a4090e890b02e35cd56f9e235605494e0c007fd61c5bb3c2d8be5e8974aa354c69771ee7e8c8 SHA512 43130d873845a3d8f0a7a25b04a032e7cd834170b5f67b7b18396a800086801ce0910865dc7efc333dd0764121b65c8fddcec4e072af6503e0b1bc55c642f4d6 +DIST baloo-6.1.0.tar.xz 319828 BLAKE2B 21427c4f4e79e9168f747ecba1c64cc5d409e5138c1de110030763c97dff92460ca9d7300d82c17faab428208dd8088947479badd3aff233601cd164d5cbf344 SHA512 a755a52ace391235bb2231b51a192ba6e32b682670ce761b57c858b10231cee0965c3d9657a27198e4be86a07460660b064e16e2c952c40d880f1dcc32d7eb27 diff --git a/kde-frameworks/baloo/baloo-5.96.0.ebuild b/kde-frameworks/baloo/baloo-5.115.0.ebuild index cf7023661375..d97623004882 100644 --- a/kde-frameworks/baloo/baloo-5.96.0.ebuild +++ b/kde-frameworks/baloo/baloo-5.115.0.ebuild @@ -1,18 +1,18 @@ -# 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" PVCUT=$(ver_cut 1-2) -QTMIN=5.15.4 -VIRTUALX_REQUIRED="test" +QTMIN=5.15.9 inherit ecm frameworks.kde.org DESCRIPTION="Framework for searching and managing metadata" + LICENSE="LGPL-2+" KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" -IUSE="" +IUSE="kf6compat" RESTRICT="test" # bug 624250 @@ -32,4 +32,14 @@ DEPEND=" =kde-frameworks/kio-${PVCUT}*:5 =kde-frameworks/solid-${PVCUT}*:5 " -RDEPEND="${DEPEND}" +RDEPEND="${DEPEND} + kf6compat? ( kde-frameworks/baloo:6 ) +" + +src_configure() { + local mycmakeargs=( + -DBUILD_INDEXER_SERVICE=$(usex !kf6compat) + ) + + ecm_src_configure +} diff --git a/kde-frameworks/baloo/baloo-5.98.0.ebuild b/kde-frameworks/baloo/baloo-5.98.0.ebuild deleted file mode 100644 index 57b1d8281d59..000000000000 --- a/kde-frameworks/baloo/baloo-5.98.0.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_TEST="forceoptional" -PVCUT=$(ver_cut 1-2) -QTMIN=5.15.5 -VIRTUALX_REQUIRED="test" -inherit ecm frameworks.kde.org - -DESCRIPTION="Framework for searching and managing metadata" -LICENSE="LGPL-2+" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" -IUSE="" - -RESTRICT="test" # bug 624250 - -DEPEND=" - >=dev-db/lmdb-0.9.17 - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - =kde-frameworks/kconfig-${PVCUT}*:5 - =kde-frameworks/kcoreaddons-${PVCUT}*:5 - =kde-frameworks/kcrash-${PVCUT}*:5 - =kde-frameworks/kdbusaddons-${PVCUT}*:5 - =kde-frameworks/kfilemetadata-${PVCUT}*:5 - =kde-frameworks/ki18n-${PVCUT}*:5 - =kde-frameworks/kidletime-${PVCUT}*:5 - =kde-frameworks/kio-${PVCUT}*:5 - =kde-frameworks/solid-${PVCUT}*:5 -" -RDEPEND="${DEPEND}" diff --git a/kde-frameworks/baloo/baloo-6.1.0.ebuild b/kde-frameworks/baloo/baloo-6.1.0.ebuild new file mode 100644 index 000000000000..d98f5ec95bd3 --- /dev/null +++ b/kde-frameworks/baloo/baloo-6.1.0.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_TEST="forceoptional" +PVCUT=$(ver_cut 1-2) +QTMIN=6.6.2 +inherit ecm frameworks.kde.org + +DESCRIPTION="Framework for searching and managing metadata" + +LICENSE="LGPL-2+" +KEYWORDS="~amd64" +IUSE="" + +RESTRICT="test" # bug 624250 + +DEPEND=" + >=dev-db/lmdb-0.9.17 + >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets] + >=dev-qt/qtdeclarative-${QTMIN}:6 + =kde-frameworks/kconfig-${PVCUT}*:6 + =kde-frameworks/kcoreaddons-${PVCUT}*:6 + =kde-frameworks/kcrash-${PVCUT}*:6 + =kde-frameworks/kdbusaddons-${PVCUT}*:6 + =kde-frameworks/kfilemetadata-${PVCUT}*:6 + =kde-frameworks/ki18n-${PVCUT}*:6 + =kde-frameworks/kidletime-${PVCUT}*:6 + =kde-frameworks/kio-${PVCUT}*:6 + =kde-frameworks/solid-${PVCUT}*:6 +" +RDEPEND="${DEPEND} + !${CATEGORY}/${PN}:5[-kf6compat(-)] +" diff --git a/kde-frameworks/baloo/metadata.xml b/kde-frameworks/baloo/metadata.xml index 506ecf605bc4..36ef35ac2598 100644 --- a/kde-frameworks/baloo/metadata.xml +++ b/kde-frameworks/baloo/metadata.xml @@ -8,6 +8,9 @@ <upstream> <bugs-to>https://bugs.kde.org/</bugs-to> </upstream> + <use> + <flag name="kf6compat">Disable components colliding with KF6, depend on KF6 components instead</flag> + </use> <slots> <subslots> Must only be used by packages that are known to use private parts of the Frameworks API. diff --git a/kde-frameworks/bluez-qt/Manifest b/kde-frameworks/bluez-qt/Manifest index d1afafafd686..a5ef882c8e2f 100644 --- a/kde-frameworks/bluez-qt/Manifest +++ b/kde-frameworks/bluez-qt/Manifest @@ -1,2 +1,2 @@ -DIST bluez-qt-5.96.0.tar.xz 113964 BLAKE2B 43174bc0c444e970e1265de3695c7558da65d418e6add255a679d9f81ea9816edf84be56ac38312ea5d043f8da832cbb0704791006e19967c27b1283bf8e7beb SHA512 7bb47fdada886b3561fd46884216c184acb1a233f898f6b7de30a98743dbddeb52f02374213d4e2ee71fa0a9cf6cffc0eedac52de83146454050b70b9060e7ff -DIST bluez-qt-5.98.0.tar.xz 114000 BLAKE2B af42a00400d1404897824fd56c21ecbaa4d1327f74d7201177554575e7cc7809a67684609891e360ebdaa1639c0fc73c12f37701cd2be62c319bd71d7186fc93 SHA512 22c7409489e0896184609a59e925c891db996b74b5ac9c57a81bf8aac77307a1b54b009357a64ae69937a781c1d8ec1465c02f608394bc586d4b0be72b3b240b +DIST bluez-qt-5.115.0.tar.xz 114776 BLAKE2B b89c25e6384d95d71f22cd3bebf899c0543eef5f559f28e35d95793587cf3aed79cde73a83e43c276111bdf4b0a11dc5f9cb27ebe5c58bc1e3278ed5132fd9d3 SHA512 b56ffb59d1fdabfc5bc76ae888a591eb24b1b7d145d9a1efd7c0aafb51f47c49ba98f375ab461a141f321e7e4811b8c6928faeef07001a4ee46b49540441b985 +DIST bluez-qt-6.1.0.tar.xz 116788 BLAKE2B d606410f10f535e6922358f343fb0f322ddfd5fc90d13bc25bff9a5b8de5ae2171a01858ad3f158939adc9be487d934198ff40369eb31807a3901557dfaa5bd4 SHA512 68bb245313c8394bbca5d5c0e38953f26e2afc094bc82b1c961f726cd00d9b22a3dedb9b980a9e25a128e9d227d84152a8bc8095ff763bff361aae270015b506 diff --git a/kde-frameworks/bluez-qt/bluez-qt-5.96.0.ebuild b/kde-frameworks/bluez-qt/bluez-qt-5.115.0.ebuild index 9a639a7898e4..a8f9498cf479 100644 --- a/kde-frameworks/bluez-qt/bluez-qt-5.96.0.ebuild +++ b/kde-frameworks/bluez-qt/bluez-qt-5.115.0.ebuild @@ -1,10 +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 -QTMIN=5.15.4 -VIRTUALX_REQUIRED="test" +QTMIN=5.15.9 +VIRTUALX_REQUIRED="test" # bug 910062 (tests hang) inherit ecm frameworks.kde.org udev DESCRIPTION="Qt wrapper for Bluez 5 DBus API" @@ -29,13 +29,12 @@ src_configure() { } src_test() { - # parallel tests fail, bug 609248; managertest hangs, bug 668196 - local myctestargs=( - -j1 - -E "(managertest)" + local CMAKE_SKIP_TESTS=( + # bug 668196, hangs + managertest ) - - ecm_src_test + # parallel tests fail, bug 609248 + ecm_src_test -j1 } pkg_postinst() { diff --git a/kde-frameworks/bluez-qt/bluez-qt-5.98.0.ebuild b/kde-frameworks/bluez-qt/bluez-qt-6.1.0.ebuild index 74ff4c175d2d..d6a3372e536c 100644 --- a/kde-frameworks/bluez-qt/bluez-qt-5.98.0.ebuild +++ b/kde-frameworks/bluez-qt/bluez-qt-6.1.0.ebuild @@ -1,22 +1,20 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -QTMIN=5.15.5 -VIRTUALX_REQUIRED="test" +QTMIN=6.6.2 inherit ecm frameworks.kde.org udev DESCRIPTION="Qt wrapper for Bluez 5 DBus API" LICENSE="LGPL-2" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" +KEYWORDS="~amd64" IUSE="" DEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtnetwork-${QTMIN}:5 + >=dev-qt/qtbase-${QTMIN}:6[dbus,network] + >=dev-qt/qtdeclarative-${QTMIN}:6 " RDEPEND="${DEPEND}" @@ -29,13 +27,12 @@ src_configure() { } src_test() { - # parallel tests fail, bug 609248; managertest hangs, bug 668196 - local myctestargs=( - -j1 - -E "(managertest)" + local CMAKE_SKIP_TESTS=( + # bug 668196, hangs + managertest ) - - ecm_src_test + # parallel tests fail, bug 609248 + ecm_src_test -j1 } pkg_postinst() { diff --git a/kde-frameworks/breeze-icons-rcc/Manifest b/kde-frameworks/breeze-icons-rcc/Manifest index 0da9eec0893d..f43e5a7e9081 100644 --- a/kde-frameworks/breeze-icons-rcc/Manifest +++ b/kde-frameworks/breeze-icons-rcc/Manifest @@ -1,2 +1 @@ -DIST breeze-icons-5.96.0.tar.xz 2153664 BLAKE2B ecb8e1b19674c5bedcd78c2e1c9950c4129f2e422e9ee0b0031fc42c85d4791c572c0bbb01d967ac74f74ae5535e1b5053029a1afa706cf20836a7416312da15 SHA512 116388d8670a1b45c01252fafe2d316bf5045207d8c4d282ac1a9e87882bb512f69419aaea65895cf310112de0f514199f1b698d28a48d0c5074e14add0a25b2 -DIST breeze-icons-5.98.0.tar.xz 2156244 BLAKE2B 93d016bc152fb21098ff4cb310f78f6bd1974f32c3545a80e8ce3479e51c18612ec5805a70d181c24e48a1445a2d4e2498a29d4d2052844eb6ec18d72c46bab2 SHA512 3983baac054b576b3c8a4172ef07b4422a7ebafb9b624194ad40c11a37d111c2981df87e001b42196ae1e9ac4479c0b44e36838bbba53e19874e1a1e95e5894c +DIST breeze-icons-5.115.0.tar.xz 2173528 BLAKE2B 712c9cabb74bbdf9feb9a889fddda6ea654fd2a618f5c36a4aa782b5389032b829919ca5ef69a3310749ac10e2dc381700474d56e7cbc1478ae51030248d8789 SHA512 f4b5f54bb80dcd2bba6edd02a412eb675b02d438ba0ee82d6dc4eaac1ed2aceb11b46ce143bbe825c26f823d5b897619e02c26b23addf2de05830a320dd124f8 diff --git a/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.96.0.ebuild b/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.115.0.ebuild index 05542a7a224c..2d648b47b47f 100644 --- a/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.96.0.ebuild +++ b/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.115.0.ebuild @@ -1,27 +1,27 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 KDE_ORG_NAME="breeze-icons" PVCUT=$(ver_cut 1-2) -PYTHON_COMPAT=( python3_{8..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit cmake frameworks.kde.org python-any-r1 DESCRIPTION="Breeze SVG icon theme binary resource" LICENSE="LGPL-3" -KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86" +KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv x86" IUSE="test" RESTRICT="!test? ( test )" +DEPEND="test? ( dev-qt/qttest:5 )" BDEPEND="${PYTHON_DEPS} $(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]') dev-qt/qtcore:5 - >=kde-frameworks/extra-cmake-modules-${PVCUT}:5 + >=kde-frameworks/extra-cmake-modules-${PVCUT}:0 test? ( app-misc/fdupes ) " -DEPEND="test? ( dev-qt/qttest:5 )" python_check_deps() { python_has_version "dev-python/lxml[${PYTHON_USEDEP}]" @@ -40,3 +40,10 @@ src_configure() { ) cmake_src_configure } + +src_install() { + cmake_src_install + + # provided by kde-frameworks/breeze-icons + rm -rv "${ED}"/usr/$(get_libdir)/cmake/KF5BreezeIcons || die +} diff --git a/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.98.0.ebuild b/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.98.0.ebuild deleted file mode 100644 index c789434f7917..000000000000 --- a/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.98.0.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -KDE_ORG_NAME="breeze-icons" -PVCUT=$(ver_cut 1-2) -PYTHON_COMPAT=( python3_{8..11} ) -inherit cmake frameworks.kde.org python-any-r1 - -DESCRIPTION="Breeze SVG icon theme binary resource" -LICENSE="LGPL-3" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" -IUSE="test" - -RESTRICT="!test? ( test )" - -BDEPEND="${PYTHON_DEPS} - $(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]') - dev-qt/qtcore:5 - >=kde-frameworks/extra-cmake-modules-${PVCUT}:5 - test? ( app-misc/fdupes ) -" -DEPEND="test? ( dev-qt/qttest:5 )" - -python_check_deps() { - python_has_version "dev-python/lxml[${PYTHON_USEDEP}]" -} - -src_prepare() { - cmake_src_prepare - use test || cmake_comment_add_subdirectory autotests -} - -src_configure() { - local mycmakeargs=( - -DPython_EXECUTABLE="${PYTHON}" - -DBINARY_ICONS_RESOURCE=ON - -DSKIP_INSTALL_ICONS=ON - ) - cmake_src_configure -} diff --git a/kde-frameworks/breeze-icons/Manifest b/kde-frameworks/breeze-icons/Manifest index 0da9eec0893d..74bd506c8570 100644 --- a/kde-frameworks/breeze-icons/Manifest +++ b/kde-frameworks/breeze-icons/Manifest @@ -1,2 +1,2 @@ -DIST breeze-icons-5.96.0.tar.xz 2153664 BLAKE2B ecb8e1b19674c5bedcd78c2e1c9950c4129f2e422e9ee0b0031fc42c85d4791c572c0bbb01d967ac74f74ae5535e1b5053029a1afa706cf20836a7416312da15 SHA512 116388d8670a1b45c01252fafe2d316bf5045207d8c4d282ac1a9e87882bb512f69419aaea65895cf310112de0f514199f1b698d28a48d0c5074e14add0a25b2 -DIST breeze-icons-5.98.0.tar.xz 2156244 BLAKE2B 93d016bc152fb21098ff4cb310f78f6bd1974f32c3545a80e8ce3479e51c18612ec5805a70d181c24e48a1445a2d4e2498a29d4d2052844eb6ec18d72c46bab2 SHA512 3983baac054b576b3c8a4172ef07b4422a7ebafb9b624194ad40c11a37d111c2981df87e001b42196ae1e9ac4479c0b44e36838bbba53e19874e1a1e95e5894c +DIST breeze-icons-5.115.0.tar.xz 2173528 BLAKE2B 712c9cabb74bbdf9feb9a889fddda6ea654fd2a618f5c36a4aa782b5389032b829919ca5ef69a3310749ac10e2dc381700474d56e7cbc1478ae51030248d8789 SHA512 f4b5f54bb80dcd2bba6edd02a412eb675b02d438ba0ee82d6dc4eaac1ed2aceb11b46ce143bbe825c26f823d5b897619e02c26b23addf2de05830a320dd124f8 +DIST breeze-icons-6.1.0.tar.xz 2253668 BLAKE2B 6003d2b96d0d42dff7b14214620c7821b410ec40a0d111150207fe3810265598db8df88ecea901b340a846318019ccd7157484ac6332fdcc9d5665d1cb2a89dc SHA512 9592b75d22aef6437d03f13fb242d012977b665d043b8066a5f7f49f1f4b282a921bda29b99b8b63156a3bd3a9f616b9bc1eba8423d547d595ff9156d5053d66 diff --git a/kde-frameworks/breeze-icons/breeze-icons-5.96.0.ebuild b/kde-frameworks/breeze-icons/breeze-icons-5.115.0.ebuild index 9e2d562c15d4..da876a1dbb42 100644 --- a/kde-frameworks/breeze-icons/breeze-icons-5.96.0.ebuild +++ b/kde-frameworks/breeze-icons/breeze-icons-5.115.0.ebuild @@ -1,25 +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 PVCUT=$(ver_cut 1-2) -PYTHON_COMPAT=( python3_{8..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit cmake frameworks.kde.org python-any-r1 xdg-utils DESCRIPTION="Breeze SVG icon theme" LICENSE="LGPL-3" -KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ppc64 ~riscv x86" IUSE="test" RESTRICT="!test? ( test )" -DEPEND="test? ( dev-qt/qttest:5 )" +DEPEND=" + test? ( + dev-qt/qtcore:5 + dev-qt/qttest:5 + ) +" BDEPEND="${PYTHON_DEPS} $(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]') - dev-qt/qtcore:5 - >=kde-frameworks/extra-cmake-modules-${PVCUT}:5 + >=kde-frameworks/extra-cmake-modules-${PVCUT}:0 test? ( app-misc/fdupes ) " diff --git a/kde-frameworks/breeze-icons/breeze-icons-5.98.0.ebuild b/kde-frameworks/breeze-icons/breeze-icons-6.1.0.ebuild index 710e68087705..8e96af91da95 100644 --- a/kde-frameworks/breeze-icons/breeze-icons-5.98.0.ebuild +++ b/kde-frameworks/breeze-icons/breeze-icons-6.1.0.ebuild @@ -1,25 +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 PVCUT=$(ver_cut 1-2) -PYTHON_COMPAT=( python3_{8..11} ) -inherit cmake frameworks.kde.org python-any-r1 xdg-utils +PYTHON_COMPAT=( python3_{10..12} ) +inherit cmake frameworks.kde.org python-any-r1 xdg DESCRIPTION="Breeze SVG icon theme" LICENSE="LGPL-3" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" +KEYWORDS="~amd64" IUSE="test" RESTRICT="!test? ( test )" -DEPEND="test? ( dev-qt/qttest:5 )" +RDEPEND=" + !kde-frameworks/${PN}:5 + !kde-frameworks/${PN}-rcc:5 + !kde-frameworks/${PN}-rcc:6 +" BDEPEND="${PYTHON_DEPS} $(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]') - dev-qt/qtcore:5 - >=kde-frameworks/extra-cmake-modules-${PVCUT}:5 + dev-qt/qtbase:6 + >=kde-frameworks/extra-cmake-modules-${PVCUT}:* test? ( app-misc/fdupes ) " @@ -35,7 +39,8 @@ src_prepare() { src_configure() { local mycmakeargs=( -DPython_EXECUTABLE="${PYTHON}" - -DBINARY_ICONS_RESOURCE=OFF + -DBINARY_ICONS_RESOURCE=ON + -DSKIP_INSTALL_ICONS=OFF ) cmake_src_configure } @@ -46,11 +51,3 @@ src_install() { find "${ED}"/usr/share/icons/ -type d -empty -delete || die find "${ED}"/usr/share/icons/ -xtype l -delete || die } - -pkg_postinst() { - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_icon_cache_update -} diff --git a/kde-frameworks/countryflags/Manifest b/kde-frameworks/countryflags/Manifest index 3b1985a669e1..b28a15aba8d1 100644 --- a/kde-frameworks/countryflags/Manifest +++ b/kde-frameworks/countryflags/Manifest @@ -1,2 +1 @@ -DIST kdelibs4support-5.96.0.tar.xz 3657280 BLAKE2B 5450ad4aced1e73b68dab9ce5f858f65765b96d98b2d977a796d13f148f31e8cb6d2562713569b4694afa163e3fac2d93ee94e6bd1592710e1141e6095320761 SHA512 25d80c003b6cc661058d24e3af4b9ef43c05029375c74ea2aedd1b4cbb8a09896404d2e2cb4eca884ad091f7d26b9afebd1a0ff13c96b9d793c40880300fb59d -DIST kdelibs4support-5.98.0.tar.xz 3667136 BLAKE2B 2afe48da81073c45040036cf2a3cdb3c1c0d96a19ec5a1f1c3b6659af24946bbc5f6134079dc93fbeda762b36f604c7bdfcdad0a3501fed7babc6a89750fac76 SHA512 e721ce662c9961a643c82b734d51c09935888545d8298abde93066db14d06d694aaabc2fad7bb98e3b6053e1d668ca32dbc2d85755df009fd724c1a59c0aa542 +DIST kdelibs4support-5.115.0.tar.xz 3723592 BLAKE2B efb5a384b71f781d666d78c3157188179eaf54237d6a8c442217273e5b4b1b604d86f5db73cce6528d991f669d6ddb6cf156035d5606d1eb03912c7b99ddf26b SHA512 511e14975c2810217e8f08d14a800cfdd04654399303b04a45d69b2f1959cf482027f2444c9e8202bdda60f1779fe572af0a55fae1b3692ec49cea97beeb894f diff --git a/kde-frameworks/countryflags/countryflags-5.96.0.ebuild b/kde-frameworks/countryflags/countryflags-5.115.0.ebuild index 8f6d87c4fc23..0482a7e8be0d 100644 --- a/kde-frameworks/countryflags/countryflags-5.96.0.ebuild +++ b/kde-frameworks/countryflags/countryflags-5.115.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 diff --git a/kde-frameworks/countryflags/countryflags-5.98.0.ebuild b/kde-frameworks/countryflags/countryflags-5.98.0.ebuild deleted file mode 100644 index 18e69f8238bb..000000000000 --- a/kde-frameworks/countryflags/countryflags-5.98.0.ebuild +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_QTHELP="false" -ECM_TEST="false" -KDE_ORG_NAME="kdelibs4support" -inherit ecm frameworks.kde.org - -DESCRIPTION="Icons of flags for various countries" - -LICENSE="LGPL-2+" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" - -CMAKE_USE_DIR="${S}/src/l10n" - -# https://phabricator.kde.org/T13722 -# https://invent.kde.org/frameworks/breeze-icons/-/issues/1 -PATCHES=( "${FILESDIR}/${PN}-5.90.0-standalone.patch" ) - -RDEPEND="!<kde-frameworks/kdelibs4support-5.90.0:5" diff --git a/kde-frameworks/extra-cmake-modules/Manifest b/kde-frameworks/extra-cmake-modules/Manifest index 1929dae4a52f..29ab50ec462d 100644 --- a/kde-frameworks/extra-cmake-modules/Manifest +++ b/kde-frameworks/extra-cmake-modules/Manifest @@ -1,2 +1,2 @@ -DIST extra-cmake-modules-5.96.0.tar.xz 331584 BLAKE2B 7fc907d9feff750d45c6ddedea223ae632d4a70b437df8f9638e6e7ae08c0bf0422ec2696eaea1b1632b472aef50bf71cc3e9e559d9206828ff3d425dcb308a8 SHA512 55625f68453c88b2a5a8ebb6b8ab0b480e9c3681bebdafdf66816499e38dd815cd919bf15b16120be0a2ee8bf50fb3c67e2aa1d652083639ed87fc7ad8c2f705 -DIST extra-cmake-modules-5.98.0.tar.xz 331728 BLAKE2B 320c48baa4e23defc5ba7e6c25a386d89d6a0c13be0a42f5270fb4a8acb5f3cfac968b1fe02d79b0adedb226def48bd480205d90c42440a6be081933a6668ab7 SHA512 1926f55ad3f3ce03464d0fbeb359a0f824a2c46d95db477e9eed8af79c3d154707dbc81863e1acfcc2f4dd53e39b28068b7120d70a7961241d2bc54b2e576f4b +DIST extra-cmake-modules-5.115.0.tar.xz 332504 BLAKE2B e76e2dcd990f95cb96f9ae049c0a22e05d3eb9d87e419ff80b4e5f2f2adb06f6fc9f09c69101f1e9155d6c31c4062eafe5d3c90ac94f3cc95f80ea889f0965c8 SHA512 53c44d8ccb58266bdf72014467cd57de86acb89ba272f1fb09f80af1c858a442cb59347fbff95cb3188c14a5cc520f9e952d1b396f2c5f2ed99aa070beacac22 +DIST extra-cmake-modules-6.1.0.tar.xz 341972 BLAKE2B 95a39b94d1e16bb78e6f6ce290baf2801d3eee7eaafa2f2c45ec6276cfa83916a5894aab7ea3bf7e96c5fb270e1b8b35562bcbfdd4228b8677d080b093e1d650 SHA512 8e31c576e461de927b5f9ff7a0f6c368f95b66c721ef1fb810ae2f2e6ea486e0fe23766023c223c65c2a3cacc62466f0e38d6353c65cfa1db5a7f55f4e3a5820 diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.96.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.115.0.ebuild index 83620fe6072e..b3f9beee0ee6 100644 --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.96.0.ebuild +++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.115.0.ebuild @@ -1,21 +1,22 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{8..11} ) -QTMIN=5.15.4 +PYTHON_COMPAT=( python3_{10..12} ) +QTMIN=5.15.9 inherit cmake frameworks.kde.org python-any-r1 DESCRIPTION="Extra modules and scripts for CMake" HOMEPAGE="https://invent.kde.org/frameworks/extra-cmake-modules" LICENSE="BSD" -KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ppc ppc64 ~riscv x86" +KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv x86" IUSE="doc test" RESTRICT="!test? ( test )" +RDEPEND="app-arch/libarchive[bzip2]" BDEPEND=" doc? ( ${PYTHON_DEPS} @@ -27,14 +28,12 @@ BDEPEND=" >=dev-qt/qtcore-${QTMIN}:5 ) " -RDEPEND=" - app-arch/libarchive[bzip2] -" PATCHES=( "${FILESDIR}/${PN}-5.49.0-no-fatal-warnings.patch" "${FILESDIR}/${PN}-5.93.0-skip-ecm_add_test-early.patch" "${FILESDIR}/${PN}-5.93.0-disable-qmlplugindump.patch" + "${FILESDIR}/${PN}-5.112.0-disable-tests-requiring-PyQt5.patch" # bug 680256 ) python_check_deps() { @@ -45,13 +44,6 @@ pkg_setup() { use doc && python-any-r1_pkg_setup } -src_prepare() { - cmake_src_prepare - # Requires PyQt5, bug #680256 - sed -i -e "/^if(NOT SIP_Qt5Core_Mod_FILE)/s/NOT SIP_Qt5Core_Mod_FILE/TRUE/" \ - tests/CMakeLists.txt || die "failed to disable GenerateSipBindings tests" -} - src_configure() { local mycmakeargs=( -DDOC_INSTALL_DIR=/usr/share/doc/"${PF}" @@ -65,14 +57,14 @@ src_configure() { } src_test() { - # ECMToolchainAndroidTest passes but then breaks src_install - # ECMPoQmToolsTest is broken, bug #627806 - # KDEFetchTranslations can not possibly succeed in releases, bug #764953 - # possible race condition with multiple jobs, bug #701854 - local myctestargs=( - -j1 - -E "(ECMToolchainAndroidTest|ECMPoQmToolsTest|KDEFetchTranslations)" + local CMAKE_SKIP_TESTS=( + # passes, but then breaks src_install + ECMToolchainAndroidTest + # broken, bug #627806 + ECMPoQmToolsTest + # can not possibly succeed in releases, bug #764953 + KDEFetchTranslations ) - - cmake_src_test + # possible race condition with multiple jobs, bug #701854 + cmake_src_test -j1 } diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.98.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-6.1.0.ebuild index eec8444546c2..ecb22352a8b3 100644 --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.98.0.ebuild +++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-6.1.0.ebuild @@ -1,10 +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 -PYTHON_COMPAT=( python3_{8..11} ) -QTMIN=5.15.5 +PYTHON_COMPAT=( python3_{10..12} ) +QTMIN=6.6.2 inherit cmake frameworks.kde.org python-any-r1 DESCRIPTION="Extra modules and scripts for CMake" @@ -16,25 +16,24 @@ IUSE="doc test" RESTRICT="!test? ( test )" +RDEPEND="app-arch/libarchive[bzip2]" BDEPEND=" doc? ( ${PYTHON_DEPS} $(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]') - >=dev-qt/qthelp-${QTMIN}:5 + >=dev-qt/qttools-${QTMIN}:6[assistant] ) test? ( - >=dev-qt/linguist-tools-${QTMIN}:5 - >=dev-qt/qtcore-${QTMIN}:5 + >=dev-qt/qttools-${QTMIN}:6[linguist] + >=dev-qt/qtbase-${QTMIN}:6 ) " -RDEPEND=" - app-arch/libarchive[bzip2] -" PATCHES=( "${FILESDIR}/${PN}-5.49.0-no-fatal-warnings.patch" "${FILESDIR}/${PN}-5.93.0-skip-ecm_add_test-early.patch" - "${FILESDIR}/${PN}-5.93.0-disable-qmlplugindump.patch" + "${FILESDIR}/${PN}-5.112.0-disable-tests-requiring-PyQt5.patch" # bug 680256 + "${FILESDIR}/${PN}-5.245.0-disable-qmlplugindump.patch" ) python_check_deps() { @@ -45,13 +44,6 @@ pkg_setup() { use doc && python-any-r1_pkg_setup } -src_prepare() { - cmake_src_prepare - # Requires PyQt5, bug #680256 - sed -i -e "/^if(NOT SIP_Qt5Core_Mod_FILE)/s/NOT SIP_Qt5Core_Mod_FILE/TRUE/" \ - tests/CMakeLists.txt || die "failed to disable GenerateSipBindings tests" -} - src_configure() { local mycmakeargs=( -DDOC_INSTALL_DIR=/usr/share/doc/"${PF}" @@ -65,14 +57,14 @@ src_configure() { } src_test() { - # ECMToolchainAndroidTest passes but then breaks src_install - # ECMPoQmToolsTest is broken, bug #627806 - # KDEFetchTranslations can not possibly succeed in releases, bug #764953 - # possible race condition with multiple jobs, bug #701854 - local myctestargs=( - -j1 - -E "(ECMToolchainAndroidTest|ECMPoQmToolsTest|KDEFetchTranslations)" + local CMAKE_SKIP_TESTS=( + # passes, but then breaks src_install + ECMToolchainAndroidTest + # broken, bug #627806 + ECMPoQmToolsTest + # can not possibly succeed in releases, bug #764953 + KDEFetchTranslations ) - - cmake_src_test + # possible race condition with multiple jobs, bug #701854 + cmake_src_test -j1 } diff --git a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.112.0-disable-tests-requiring-PyQt5.patch b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.112.0-disable-tests-requiring-PyQt5.patch new file mode 100644 index 000000000000..17d60448056f --- /dev/null +++ b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.112.0-disable-tests-requiring-PyQt5.patch @@ -0,0 +1,27 @@ +From 35d209b5662e468aa2f613ffdb9b91bc2e7f7e26 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Sat, 18 Nov 2023 17:58:36 +0100 +Subject: [PATCH] Disable tests requiring PyQt5 + +Gentoo-bug: https://bugs.gentoo.org/680256 +Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> +--- + tests/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt +index 1415bb91..09d998e4 100644 +--- a/tests/CMakeLists.txt ++++ b/tests/CMakeLists.txt +@@ -79,7 +79,7 @@ find_file(SIP_Qt5Core_Mod_FILE + PATH_SUFFIXES share/sip/PyQt5/QtCore + ) + +-if(NOT SIP_Qt5Core_Mod_FILE) ++if(TRUE) + message(STATUS "WARNING: skipping tests that require PyQt") + else() + find_package(PythonModuleGeneration) +-- +2.42.1 + diff --git a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.245.0-disable-qmlplugindump.patch b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.245.0-disable-qmlplugindump.patch new file mode 100644 index 000000000000..a684745d3965 --- /dev/null +++ b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.245.0-disable-qmlplugindump.patch @@ -0,0 +1,43 @@ +From 528cdf38261239d8475e2a3e82dd1b5cb73c770b Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Sun, 8 Dec 2019 15:01:33 +0100 +Subject: [PATCH] ECMFindQMLModule.cmake.in: Add ECM_DISABLE_QMLPLUGINDUMP to + avoid sandbox violations + +See also: https://phabricator.kde.org/D25812 + +Backstory: https://bugzilla.gnome.org/show_bug.cgi?id=744135 +BUG: 387753 +--- + modules/ECMFindQmlModule.cmake.in | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/modules/ECMFindQmlModule.cmake.in b/modules/ECMFindQmlModule.cmake.in +index 3da55ced..46e8b0ce 100644 +--- a/modules/ECMFindQmlModule.cmake.in ++++ b/modules/ECMFindQmlModule.cmake.in +@@ -9,6 +9,13 @@ include(FindPackageHandleStandardArgs) + include("${ECM_MODULE_DIR}/QtVersionOption.cmake") + include("${ECM_MODULE_DIR}/ECMQueryQt.cmake") + ++option (ECM_DISABLE_QMLPLUGINDUMP "Do not use qmlplugindump which may segfault in some sandboxed environments" OFF) ++ ++if(ECM_DISABLE_QMLPLUGINDUMP) ++ message(NOTICE "@GENMODULE@: qmlplugindump disabled - assuming dependency is available as >= @VERSION@.") ++ set(@GENMODULE@_FOUND TRUE) ++ set(@GENMODULE@_VERSION @VERSION@) ++else() + if (QT_MAJOR_VERSION EQUAL "6") + include(${ECM_MODULE_DIR}/ECMQmlModule.cmake) + # Get the qmldir file +@@ -68,6 +75,7 @@ if (NOT CMAKE_CROSSCOMPILING AND NOT MODULE_NOTFOUND AND NOT @GENMODULE@_FOUND) + set(@GENMODULE@_FOUND FALSE) + endif() + endif() ++endif() + + set(@GENMODULE@_FOUND ${@GENMODULE@_FOUND} PARENT_SCOPE) + set(@GENMODULE@_VERSION ${@GENMODULE@_VERSION} PARENT_SCOPE) +-- +2.42.1 + diff --git a/kde-frameworks/extra-cmake-modules/metadata.xml b/kde-frameworks/extra-cmake-modules/metadata.xml index 007a8286d371..465dd12c5a8d 100644 --- a/kde-frameworks/extra-cmake-modules/metadata.xml +++ b/kde-frameworks/extra-cmake-modules/metadata.xml @@ -7,6 +7,7 @@ </maintainer> <upstream> <bugs-to>https://bugs.kde.org/</bugs-to> + <remote-id type="kde-invent">frameworks/extra-cmake-modules</remote-id> </upstream> <slots> <subslots> diff --git a/kde-frameworks/frameworkintegration/Manifest b/kde-frameworks/frameworkintegration/Manifest index cfb14e15f512..a96bf08863d4 100644 --- a/kde-frameworks/frameworkintegration/Manifest +++ b/kde-frameworks/frameworkintegration/Manifest @@ -1,2 +1,2 @@ -DIST frameworkintegration-5.96.0.tar.xz 1759604 BLAKE2B 24d4806432487e35e01645da97195f700e086c68c6d2f39e7e5e86d00f10a982224fff2fa2eb7d7808fadad4d7524fd2318f67f8d47759e2533a261aa8589470 SHA512 cdc521ff7ba5d3c37d239fb7575a8c1e5b66b1bcba9e315da857b3ddd25b9a7cabc3dc0338186b23b9606badef7c7153c117b92618b626eb54b95c540cc2e680 -DIST frameworkintegration-5.98.0.tar.xz 1759612 BLAKE2B 8b70ce428822918275ce68ff466940ef15332727a7fd2486b44d257547974b50c72a7f2ae0181eacfe7bf893d325eb33abaa15007a17a92651e6de7a8e6417e1 SHA512 bbf7e20615df6f7613c271da683bd3065df78bbd1231bdbf96991bb674923b40586013bcc8c6191f6b2f4ed2547dbf26e0c4f48eeccef233768ce4c89d00d2e5 +DIST frameworkintegration-5.115.0.tar.xz 1760436 BLAKE2B 59127e732c3b1786e54a079315bf7d47b5025bd653348c67c167afdc2b6291ceb595d85f49c62cc080475fb0963851c07fd95aa2c344b8f0cc76610b701b5be8 SHA512 83cc9d4e1063cd1496dbe373f30f706dcb2ce2515735d7b82cd45cf35b20a8e6c51625b752c6e9a53033db1b0573f2f3159bd569becc707b3a2e7250ce7fd20a +DIST frameworkintegration-6.1.0.tar.xz 54792 BLAKE2B 7c9d9c0bee425d3d2719949daf7642785bb8fab714c590cc02f0e85638e20ee1c2f166f66271148e6f0f65ba21ed83b441305d3c4c32f6eeb42cd1feb4caabb2 SHA512 2f16528997b54ebb95e2fde1fe94133d672e72ef91bb2e607887b733fef128ea9c3e57b1f3f8cbf0ba74835dab6e145729725746918eaac98b643446a0cb3391 diff --git a/kde-frameworks/frameworkintegration/frameworkintegration-5.96.0.ebuild b/kde-frameworks/frameworkintegration/frameworkintegration-5.115.0.ebuild index 8efef5f84547..a9ffe580bd72 100644 --- a/kde-frameworks/frameworkintegration/frameworkintegration-5.96.0.ebuild +++ b/kde-frameworks/frameworkintegration/frameworkintegration-5.115.0.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_QTHELP="false" PVCUT=$(ver_cut 1-2) -QTMIN=5.15.4 -VIRTUALX_REQUIRED="test" +QTMIN=5.15.9 inherit ecm frameworks.kde.org DESCRIPTION="Framework for integrating Qt applications with KDE Plasma workspaces" diff --git a/kde-frameworks/frameworkintegration/frameworkintegration-5.98.0.ebuild b/kde-frameworks/frameworkintegration/frameworkintegration-5.98.0.ebuild deleted file mode 100644 index e4e34fce95e5..000000000000 --- a/kde-frameworks/frameworkintegration/frameworkintegration-5.98.0.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_QTHELP="false" -PVCUT=$(ver_cut 1-2) -QTMIN=5.15.5 -VIRTUALX_REQUIRED="test" -inherit ecm frameworks.kde.org - -DESCRIPTION="Framework for integrating Qt applications with KDE Plasma workspaces" - -LICENSE="LGPL-2+" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" -IUSE="" - -# requires running Plasma environment -RESTRICT="test" - -RDEPEND=" - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - =kde-frameworks/kconfig-${PVCUT}*:5 - =kde-frameworks/kconfigwidgets-${PVCUT}*:5 - =kde-frameworks/ki18n-${PVCUT}*:5 - =kde-frameworks/kiconthemes-${PVCUT}*:5 - =kde-frameworks/knewstuff-${PVCUT}*:5 - =kde-frameworks/knotifications-${PVCUT}*:5 -" -DEPEND="${RDEPEND} - =kde-frameworks/kpackage-${PVCUT}*:5 - =kde-frameworks/kwidgetsaddons-${PVCUT}*:5 -" - -src_configure() { - local mycmakeargs=( - -DCMAKE_DISABLE_FIND_PACKAGE_AppStreamQt=ON - -DCMAKE_DISABLE_FIND_PACKAGE_packagekitqt5=ON - ) - - ecm_src_configure -} diff --git a/kde-frameworks/frameworkintegration/frameworkintegration-6.1.0.ebuild b/kde-frameworks/frameworkintegration/frameworkintegration-6.1.0.ebuild new file mode 100644 index 000000000000..e34dff31968e --- /dev/null +++ b/kde-frameworks/frameworkintegration/frameworkintegration-6.1.0.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_QTHELP="false" +PVCUT=$(ver_cut 1-2) +QTMIN=6.6.2 +inherit ecm frameworks.kde.org + +DESCRIPTION="Framework for integrating Qt applications with KDE Plasma workspaces" + +LICENSE="LGPL-2+" +KEYWORDS="~amd64" +IUSE="" + +# requires running Plasma environment +RESTRICT="test" + +RDEPEND=" + >=dev-qt/qtbase-${QTMIN}:6[gui,widgets] + =kde-frameworks/kcolorscheme-${PVCUT}*:6 + =kde-frameworks/kconfig-${PVCUT}*:6 + =kde-frameworks/ki18n-${PVCUT}*:6 + =kde-frameworks/kiconthemes-${PVCUT}*:6 + =kde-frameworks/knewstuff-${PVCUT}*:6 + =kde-frameworks/knotifications-${PVCUT}*:6 + =kde-frameworks/kwidgetsaddons-${PVCUT}*:6 +" +DEPEND="${RDEPEND} + =kde-frameworks/kpackage-${PVCUT}*:6 +" + +src_configure() { + local mycmakeargs=( + -DCMAKE_DISABLE_FIND_PACKAGE_AppStreamQt=ON + -DCMAKE_DISABLE_FIND_PACKAGE_packagekitqt6=ON + ) + + ecm_src_configure +} diff --git a/kde-frameworks/frameworkintegration/metadata.xml b/kde-frameworks/frameworkintegration/metadata.xml index 506ecf605bc4..f8b37b05993a 100644 --- a/kde-frameworks/frameworkintegration/metadata.xml +++ b/kde-frameworks/frameworkintegration/metadata.xml @@ -7,6 +7,7 @@ </maintainer> <upstream> <bugs-to>https://bugs.kde.org/</bugs-to> + <remote-id type="kde-invent">frameworks/frameworkintegration</remote-id> </upstream> <slots> <subslots> diff --git a/kde-frameworks/kactivities-stats/Manifest b/kde-frameworks/kactivities-stats/Manifest deleted file mode 100644 index e0bb168aedaa..000000000000 --- a/kde-frameworks/kactivities-stats/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST kactivities-stats-5.96.0.tar.xz 84568 BLAKE2B 59d72ad9b0222606230d2f4c787e6afe7c52c080fbf7605221a3a85b906765d6de5df2fda5642abcd5505e1393c2ee569822337ab45f2d1dcc98be722fda5500 SHA512 96c3ca473521a4a00aa06118dc30adb8270b57970581c2c19e78baeb2f93ed6814713149b71e31a46e2502a63716aa06c6fb4d6b2a1e8d924e3092d66c65c0a9 -DIST kactivities-stats-5.98.0.tar.xz 84528 BLAKE2B 079201bc5d6f099c39c162b9e6da12298270714758616e44bb58044df45f86f9a348cad42878f51e70a8b2fe55ace55a49c8427a632ef97a5dc32bcb6c3a5d05 SHA512 b0358a9438fdf5304e6c2b78f5500040663c522592e9ccb1ad01cba79c3beef6cbbb3d31e2cd28f505a9b1864dcc6aa8fbdb08b097b06c32910d7f147f4b96dc diff --git a/kde-frameworks/kactivities-stats/kactivities-stats-5.96.0.ebuild b/kde-frameworks/kactivities-stats/kactivities-stats-5.96.0.ebuild deleted file mode 100644 index 2bb796f50220..000000000000 --- a/kde-frameworks/kactivities-stats/kactivities-stats-5.96.0.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PVCUT=$(ver_cut 1-2) -QTMIN=5.15.4 -inherit ecm frameworks.kde.org - -DESCRIPTION="Framework for getting the usage statistics collected by the activities service" -LICENSE="LGPL-2+" -KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" -IUSE="" - -RDEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtsql-${QTMIN}:5 - =kde-frameworks/kactivities-${PVCUT}*:5 - =kde-frameworks/kconfig-${PVCUT}*:5 -" -DEPEND="${RDEPEND} - test? ( dev-libs/boost ) -" diff --git a/kde-frameworks/kactivities-stats/kactivities-stats-5.98.0.ebuild b/kde-frameworks/kactivities-stats/kactivities-stats-5.98.0.ebuild deleted file mode 100644 index f7c9a5e199bd..000000000000 --- a/kde-frameworks/kactivities-stats/kactivities-stats-5.98.0.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PVCUT=$(ver_cut 1-2) -QTMIN=5.15.5 -inherit ecm frameworks.kde.org - -DESCRIPTION="Framework for getting the usage statistics collected by the activities service" -LICENSE="LGPL-2+" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" -IUSE="" - -RDEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtsql-${QTMIN}:5 - =kde-frameworks/kactivities-${PVCUT}*:5 - =kde-frameworks/kconfig-${PVCUT}*:5 -" -DEPEND="${RDEPEND} - test? ( dev-libs/boost ) -" diff --git a/kde-frameworks/kactivities/Manifest b/kde-frameworks/kactivities/Manifest deleted file mode 100644 index a05698832d5c..000000000000 --- a/kde-frameworks/kactivities/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST kactivities-5.96.0.tar.xz 73816 BLAKE2B d1af0702bca84d9e734d58a9ef0b7d6992f2a0d0eabd15cad86bd82a6bd3b2ad2696509aa05674ab7a2cdf68889f248e12163d1c532f32085f04d441cdc0634d SHA512 4e820ea8197c286e7c7628850b7ca64679b91382a99f1013bda75ca071a13a8292b2693365c838a4853197b29ae9f1f6fdc636c4aa08e5d8337454448d8fd04c -DIST kactivities-5.98.0.tar.xz 73504 BLAKE2B 9b24914a8d118d3bea6a102a88a52962bc9725f28e7f7bd2337153ba2e4ee81dd2daca127c27d87994ef48c8aefd38f31bde69855022f85705a34eb8376e6cdc SHA512 9a191b428550b58d364155504112438f3a3a329a4b595e9873510d38f7724204493f0b3f57da5753277cd012d9bf0b26d4a4cf73d7cf72f082188becbe1b6ee1 diff --git a/kde-frameworks/kactivities/kactivities-5.96.0.ebuild b/kde-frameworks/kactivities/kactivities-5.96.0.ebuild deleted file mode 100644 index fa64f6e1801f..000000000000 --- a/kde-frameworks/kactivities/kactivities-5.96.0.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PVCUT=$(ver_cut 1-2) -PLASMA_MINIMAL=5.16.5 -QTMIN=5.15.4 -inherit ecm frameworks.kde.org - -DESCRIPTION="Framework for working with KDE activities" -LICENSE="|| ( LGPL-2.1 LGPL-3 )" -KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" -IUSE="" - -COMMON_DEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtdeclarative-${QTMIN}:5[widgets] - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtsql-${QTMIN}:5 - =kde-frameworks/kconfig-${PVCUT}*:5 - =kde-frameworks/kcoreaddons-${PVCUT}*:5 -" -RDEPEND="${COMMON_DEPEND} - >=kde-plasma/kactivitymanagerd-${PLASMA_MINIMAL}:5 -" -DEPEND="${COMMON_DEPEND} - dev-libs/boost -" diff --git a/kde-frameworks/kactivities/kactivities-5.98.0.ebuild b/kde-frameworks/kactivities/kactivities-5.98.0.ebuild deleted file mode 100644 index 2a94ec710271..000000000000 --- a/kde-frameworks/kactivities/kactivities-5.98.0.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PVCUT=$(ver_cut 1-2) -PLASMA_MINIMAL=5.16.5 -QTMIN=5.15.5 -inherit ecm frameworks.kde.org - -DESCRIPTION="Framework for working with KDE activities" -LICENSE="|| ( LGPL-2.1 LGPL-3 )" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" -IUSE="" - -COMMON_DEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtdeclarative-${QTMIN}:5[widgets] - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtsql-${QTMIN}:5 - =kde-frameworks/kconfig-${PVCUT}*:5 - =kde-frameworks/kcoreaddons-${PVCUT}*:5 -" -RDEPEND="${COMMON_DEPEND} - >=kde-plasma/kactivitymanagerd-${PLASMA_MINIMAL}:5 -" -DEPEND="${COMMON_DEPEND} - dev-libs/boost -" diff --git a/kde-frameworks/kapidox/Manifest b/kde-frameworks/kapidox/Manifest index 51ba0fa13b39..6b08ff50ba7f 100644 --- a/kde-frameworks/kapidox/Manifest +++ b/kde-frameworks/kapidox/Manifest @@ -1,2 +1 @@ -DIST kapidox-5.96.0.tar.xz 197492 BLAKE2B 05c5aa7c9b216a0a2c848b205df95d20f0b9e36929a5ceca00503b9acfd916943b5351193832f13523084463ecc38022a10f5734476e46ecb34c943713a5d853 SHA512 40b33c28b92af472c7d8e8150bfc43328239a6c9191c687713b7c017b245ef3d223e77b64278a0bb312770d78627072a9291309f8272f97fc257214862b10737 -DIST kapidox-5.98.0.tar.xz 198520 BLAKE2B a663ff03a026c81f228c8cc779185013aa54db6f60546939cb1533f7251ba4b4445c81a24d71f7223b427bef52c8ea8e6d6d84054095f31a2f438d0be2d1f8b0 SHA512 ff93ccc275dd1f123c12176354356458d3e5d1ebb17eb66854db241639a70bdf9d3a7cfdadff459396cd90fc45f32b878b957529d45b2d2dbff2a08dc9ce7f59 +DIST kapidox-5.115.0.tar.xz 198860 BLAKE2B d310501d9ae678426373f4e42c5c4e0b1918ae00787a9cef2fab2f48b0238fed2ec1bf53d7fdbe39ae5ddc24f271e1a3aa02eb87a67b653af091e01b112f1904 SHA512 6e2911a619e9520b679987deb4a3460d5ef57887185dbb7a72b91196441a8f8d0d3e0ddef5d41bdc74c4c05823c4cc23f620faeb973ae7ff83bed06b17d43710 diff --git a/kde-frameworks/kapidox/kapidox-5.96.0.ebuild b/kde-frameworks/kapidox/kapidox-5.115.0.ebuild index 5faa208670df..799700285a19 100644 --- a/kde-frameworks/kapidox/kapidox-5.96.0.ebuild +++ b/kde-frameworks/kapidox/kapidox-5.115.0.ebuild @@ -1,21 +1,21 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -DISTUTILS_SINGLE_IMPL="true" -DISTUTILS_USE_SETUPTOOLS="bdepend" -PYTHON_COMPAT=( python3_{8..11} ) +DISTUTILS_SINGLE_IMPL=1 +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..12} ) inherit frameworks.kde.org distutils-r1 DESCRIPTION="Framework for building KDE API documentation in a standard format and style" LICENSE="BSD-2" -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" IUSE="" RDEPEND=" - app-doc/doxygen + app-text/doxygen $(python_gen_cond_dep ' dev-python/jinja[${PYTHON_USEDEP}] dev-python/pyyaml[${PYTHON_USEDEP}] diff --git a/kde-frameworks/kapidox/kapidox-5.98.0.ebuild b/kde-frameworks/kapidox/kapidox-5.98.0.ebuild deleted file mode 100644 index ce5808eca01a..000000000000 --- a/kde-frameworks/kapidox/kapidox-5.98.0.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_SINGLE_IMPL="true" -DISTUTILS_USE_SETUPTOOLS="bdepend" -PYTHON_COMPAT=( python3_{8..11} ) -inherit frameworks.kde.org distutils-r1 - -DESCRIPTION="Framework for building KDE API documentation in a standard format and style" - -LICENSE="BSD-2" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" -IUSE="" - -RDEPEND=" - app-doc/doxygen - $(python_gen_cond_dep ' - dev-python/jinja[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] - ') - media-gfx/graphviz[python,${PYTHON_SINGLE_USEDEP}] -" diff --git a/kde-frameworks/karchive/Manifest b/kde-frameworks/karchive/Manifest index 3d0e43ef50e1..ebfe8960a105 100644 --- a/kde-frameworks/karchive/Manifest +++ b/kde-frameworks/karchive/Manifest @@ -1,2 +1,2 @@ -DIST karchive-5.96.0.tar.xz 986668 BLAKE2B 6b32a69bcd98115b128e00763130790139cfbdc2e09af5560001e4f9a7404915d53e3d71c76043ae1ddbcf16996da22e4e433a8579aca4101a9ebb598128604e SHA512 9629cf22ed761f37a7abe60129ed36c1665ba8b8ff6497ca214e4b88a84b324def9acf48d680300250ddc25e246d013d2bdc7b2452b2718eb0584fb55d2142ca -DIST karchive-5.98.0.tar.xz 986608 BLAKE2B e8939cfc1bb36104317284aa443c8d6d10d424b87d0ac9334e4607d55892269469a61e6ed57d5d34b387af7a1d433e07abac2ac2f4e5459b37db87dad88fe5fc SHA512 98892391845882dc1c68763bb125249cee543a47eef522c86209fb5c16b643112e8dda4468fd3dbeeda4c284aed24ab9232a1ade6293bc987e25a60af70455d2 +DIST karchive-5.115.0.tar.xz 1025336 BLAKE2B 5a3a2d0fef2aefbe7121b313d11f28859a95aeb3296eb7dbb254b7159d3420849985a20cf0560443e8cf4e6b5bc5883e0b0f2f77f970d0962bb4e8c7b9829bc3 SHA512 f17baaaa850368ae517d0750a5100020448a21276c1ed5f304628b34b6e2634a9c151985f28306e0217ac17a4e91afa82562afe5cd5ec4558d16074e161e6e5a +DIST karchive-6.1.0.tar.xz 1031284 BLAKE2B 3d3c9503d1c732bf2d9e4b424f3e847a65bc33a36c5894e8e91f85abb154cca0b0df90d0490811ab31e570401a27b7667c3de55fd5521635be990c4f912a2725 SHA512 14af2a3335de1ef320f838a8dc4176cfea9fc861576ea6ba3e8d072d422432b08d5e01fa2c681b26e11798da4970749516785d7dbaf5f4137c2b2bcb45f62f12 diff --git a/kde-frameworks/karchive/karchive-5.98.0.ebuild b/kde-frameworks/karchive/karchive-5.115.0.ebuild index f1a14d479b54..3536cd132ca7 100644 --- a/kde-frameworks/karchive/karchive-5.98.0.ebuild +++ b/kde-frameworks/karchive/karchive-5.115.0.ebuild @@ -1,13 +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 +QTMIN=5.15.9 inherit ecm frameworks.kde.org DESCRIPTION="Framework for reading, creation, and manipulation of various archive formats" + LICENSE="GPL-2 LGPL-2.1" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86" IUSE="+zstd" DEPEND=" @@ -17,7 +19,10 @@ DEPEND=" zstd? ( app-arch/zstd:= ) " RDEPEND="${DEPEND}" -BDEPEND="zstd? ( virtual/pkgconfig )" +BDEPEND=" + >=dev-qt/linguist-tools-${QTMIN}:5 + zstd? ( virtual/pkgconfig ) +" src_prepare() { ecm_src_prepare diff --git a/kde-frameworks/karchive/karchive-5.96.0.ebuild b/kde-frameworks/karchive/karchive-6.1.0.ebuild index c7f7120cb2df..f708b8a282d1 100644 --- a/kde-frameworks/karchive/karchive-5.96.0.ebuild +++ b/kde-frameworks/karchive/karchive-6.1.0.ebuild @@ -1,13 +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 +QTMIN=6.6.2 inherit ecm frameworks.kde.org DESCRIPTION="Framework for reading, creation, and manipulation of various archive formats" + LICENSE="GPL-2 LGPL-2.1" -KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" +KEYWORDS="~amd64" IUSE="+zstd" DEPEND=" @@ -17,7 +19,10 @@ DEPEND=" zstd? ( app-arch/zstd:= ) " RDEPEND="${DEPEND}" -BDEPEND="zstd? ( virtual/pkgconfig )" +BDEPEND=" + >=dev-qt/qttools-${QTMIN}:6[linguist] + zstd? ( virtual/pkgconfig ) +" src_prepare() { ecm_src_prepare diff --git a/kde-frameworks/kauth/Manifest b/kde-frameworks/kauth/Manifest index 1763c25331f8..563b91d0e864 100644 --- a/kde-frameworks/kauth/Manifest +++ b/kde-frameworks/kauth/Manifest @@ -1,2 +1,2 @@ -DIST kauth-5.96.0.tar.xz 91188 BLAKE2B 12bb41387cc07b63bb33137746a1482058335505008b5b6759e51b5be1b1426cda55004f1378dee752302dfca73ad3feadd69d20c85ea9d35566e3f222997366 SHA512 ebee1ba35b3dfa439b79c1aab6a51ec968837253e07e913edb4813214744427baffa5d2be661d66f40c7c25b09184dc6dea1773854caede1a263327d9f582204 -DIST kauth-5.98.0.tar.xz 91044 BLAKE2B 01071279dd92a11c01e43f8061637b0297cf5f501eda37d0995bf9d3b7629f6016968c75db96293bf3526f405e2a8c5a77327c305ffe07bdb1161f34611ebc24 SHA512 7d5fe4fe79f1d7d9533fd28a7629449fd20927fddea0d72b2f8e41b5b1cc30c9ed3e6b0697f20879ea2eaf258af56194d7bf44816ac91abc56c7d36071f87140 +DIST kauth-5.115.0.tar.xz 2307844 BLAKE2B a4d8ec60f0cc4728ea42b876c1f3b7a233280b99d8ff5608297e80920e6c1a287839c4a88916d0e19121a49d2d47c9c2c049c93b490b4cfed31b4d67ab79a300 SHA512 ace9bcefdba0425dc4e2fc4dfe90bd8faad91b1e5b6ed16ec5b7870f3f22e4384d4b1776c97da501eefb5dc7ed31412593c59a5567cb394e11838d8cfe118fde +DIST kauth-6.1.0.tar.xz 2303944 BLAKE2B ca25a6ac2b0abcef4029a181ce8f67415c2ce4e815e8833a7285a5ae271bc4f381d410deedccde698cde9941dac82225957c7e17567ba6bc860f40007dc0eb96 SHA512 c9c13280cada75ec2f8b2e6add95ab2afe8086b16b3a8d464722202ea97c86e107395abfaac690fa77934fdf2e98eab9c60c31d000ecb7f1c62636af9abe0e6d diff --git a/kde-frameworks/kauth/kauth-5.96.0.ebuild b/kde-frameworks/kauth/kauth-5.115.0.ebuild index 25c479c324e3..30cab0cc4dd4 100644 --- a/kde-frameworks/kauth/kauth-5.96.0.ebuild +++ b/kde-frameworks/kauth/kauth-5.115.0.ebuild @@ -1,30 +1,33 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 PVCUT=$(ver_cut 1-2) -QTMIN=5.15.4 -VIRTUALX_REQUIRED="test" +QTMIN=5.15.9 inherit ecm frameworks.kde.org DESCRIPTION="Framework to let applications perform actions as a privileged user" + LICENSE="LGPL-2.1+" -KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" -IUSE="nls +policykit" +KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86" +IUSE="+policykit" -BDEPEND=" - nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 ) -" DEPEND=" >=dev-qt/qtdbus-${QTMIN}:5 >=dev-qt/qtgui-${QTMIN}:5 >=dev-qt/qtwidgets-${QTMIN}:5 =kde-frameworks/kcoreaddons-${PVCUT}*:5 - policykit? ( >=sys-auth/polkit-qt-0.113.0 ) + policykit? ( >=sys-auth/polkit-qt-0.113.0[qt5(+)] ) " RDEPEND="${DEPEND}" -PDEPEND="policykit? ( kde-plasma/polkit-kde-agent )" +BDEPEND=">=dev-qt/linguist-tools-${QTMIN}:5" +PDEPEND="policykit? ( kde-plasma/polkit-kde-agent:* )" + +CMAKE_SKIP_TESTS=( + # KAuthHelperTest test fails, bug 654842 + KAuthHelperTest +) src_configure() { local mycmakeargs=( @@ -33,12 +36,3 @@ src_configure() { ecm_src_configure } - -src_test() { - # KAuthHelperTest test fails, bug 654842 - local myctestargs=( - -E "(KAuthHelperTest)" - ) - - ecm_src_test -} diff --git a/kde-frameworks/kauth/kauth-5.98.0.ebuild b/kde-frameworks/kauth/kauth-5.98.0.ebuild deleted file mode 100644 index 9253dd27e63a..000000000000 --- a/kde-frameworks/kauth/kauth-5.98.0.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PVCUT=$(ver_cut 1-2) -QTMIN=5.15.5 -VIRTUALX_REQUIRED="test" -inherit ecm frameworks.kde.org - -DESCRIPTION="Framework to let applications perform actions as a privileged user" -LICENSE="LGPL-2.1+" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" -IUSE="nls +policykit" - -BDEPEND=" - nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 ) -" -DEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - =kde-frameworks/kcoreaddons-${PVCUT}*:5 - policykit? ( >=sys-auth/polkit-qt-0.113.0 ) -" -RDEPEND="${DEPEND}" -PDEPEND="policykit? ( kde-plasma/polkit-kde-agent )" - -src_configure() { - local mycmakeargs=( - $(cmake_use_find_package policykit PolkitQt5-1) - ) - - ecm_src_configure -} - -src_test() { - # KAuthHelperTest test fails, bug 654842 - local myctestargs=( - -E "(KAuthHelperTest)" - ) - - ecm_src_test -} diff --git a/kde-frameworks/kauth/kauth-6.1.0.ebuild b/kde-frameworks/kauth/kauth-6.1.0.ebuild new file mode 100644 index 000000000000..ae4082ded7af --- /dev/null +++ b/kde-frameworks/kauth/kauth-6.1.0.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PVCUT=$(ver_cut 1-2) +QTMIN=6.6.2 +inherit ecm frameworks.kde.org + +DESCRIPTION="Framework to let applications perform actions as a privileged user" + +LICENSE="LGPL-2.1+" +KEYWORDS="~amd64" +IUSE="+policykit" + +DEPEND=" + >=dev-qt/qtbase-${QTMIN}:6[dbus,gui] + =kde-frameworks/kcoreaddons-${PVCUT}*:6 + policykit? ( >=sys-auth/polkit-qt-0.113.0[qt6(-)] ) +" +RDEPEND="${DEPEND}" +BDEPEND=">=dev-qt/qttools-${QTMIN}:6[linguist]" +PDEPEND="policykit? ( kde-plasma/polkit-kde-agent:* )" + +CMAKE_SKIP_TESTS=( + # KAuthHelperTest test fails, bug 654842 + KAuthHelperTest +) + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package policykit PolkitQt6-1) + ) + + ecm_src_configure +} diff --git a/kde-frameworks/kauth/metadata.xml b/kde-frameworks/kauth/metadata.xml index 506ecf605bc4..48cd37476321 100644 --- a/kde-frameworks/kauth/metadata.xml +++ b/kde-frameworks/kauth/metadata.xml @@ -7,6 +7,7 @@ </maintainer> <upstream> <bugs-to>https://bugs.kde.org/</bugs-to> + <remote-id type="cpe">cpe:/a:kde:kauth</remote-id> </upstream> <slots> <subslots> diff --git a/kde-frameworks/kbookmarks/Manifest b/kde-frameworks/kbookmarks/Manifest index 1b2e10a8a72a..a55bcf92305f 100644 --- a/kde-frameworks/kbookmarks/Manifest +++ b/kde-frameworks/kbookmarks/Manifest @@ -1,2 +1,2 @@ -DIST kbookmarks-5.96.0.tar.xz 130240 BLAKE2B e1bd5d95f118e15ba0ab014e4e06ad77f38c57093f92b18959eac57f5eb4186831986e8af13c863893a4168a70e48bba8bdb9a88b0372e68da2c32b45c023a0d SHA512 031c8f7cc0ba51c1c222983f8200ac0bf2fcbfab69cb43ca3a6cb865c70e53dd9b090969df55dcec778be3ccec80d2e13487f6cd2c0c6f8258316ea04ed47cce -DIST kbookmarks-5.98.0.tar.xz 130080 BLAKE2B af1928f61d60224c3de361782afe4e195d9c4fc0ae8e9867f4d99cc9dcef38ed9f7642fdb3b1c2abd1c1e4dda5915b7ef52536eae09bdfd61923b2fdfd75f792 SHA512 218cd3d4695ee48f02e1e03558f49244a25efb993d9556a2f5af5c2fd0aa0063c579a8c62b6053b2aeddaa8393fadce8eb12888e1e98cf3abcea01447196c98d +DIST kbookmarks-5.115.0.tar.xz 1125188 BLAKE2B eee16cddeba27aa03a0b226055032b107883e8eee724f1e021a6869d803b8c5d85e8c9532e1a07a324b62830011879e512066e863111215d626df1b1c30106fd SHA512 5a8354bdd425e6891d133d9b77e85c31567356aeedeb996fbb187d64acb8835d560629b8874ce805312fbbd8f0f8737ede35a9c8cecfc6ac0ee218005f0367d2 +DIST kbookmarks-6.1.0.tar.xz 1110592 BLAKE2B 4fd40b64360dcd92024e054dbd510880ebbcbb10ceb0fdd960766257a4227cb4119d11be5db7acbfd860793ace54ab21c148deffd916548f9cba65d6a92d732e SHA512 4d70b78149e515a4e03f7ef4e1349d1fba5792527bad0a1521e436689e4b059c194a4846a79fe135b44e4d707e30ad10b28cd6f52a52c5e19c09ebe654d5393a diff --git a/kde-frameworks/kbookmarks/kbookmarks-5.96.0.ebuild b/kde-frameworks/kbookmarks/kbookmarks-5.115.0.ebuild index 980343738389..8b785c11e8cf 100644 --- a/kde-frameworks/kbookmarks/kbookmarks-5.96.0.ebuild +++ b/kde-frameworks/kbookmarks/kbookmarks-5.115.0.ebuild @@ -1,22 +1,18 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 PVCUT=$(ver_cut 1-2) -QTMIN=5.15.4 -VIRTUALX_REQUIRED="test" +QTMIN=5.15.9 inherit ecm frameworks.kde.org DESCRIPTION="Framework for managing bookmarks stored in XBEL format" LICENSE="LGPL-2+" -KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" -IUSE="nls" +KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86" +IUSE="" -BDEPEND=" - nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 ) -" RDEPEND=" >=dev-qt/qtdbus-${QTMIN}:5 >=dev-qt/qtgui-${QTMIN}:5 @@ -32,3 +28,4 @@ RDEPEND=" DEPEND="${RDEPEND} >=kde-frameworks/kconfigwidgets-${PVCUT}:5 " +BDEPEND=">=dev-qt/linguist-tools-${QTMIN}:5" diff --git a/kde-frameworks/kbookmarks/kbookmarks-5.98.0.ebuild b/kde-frameworks/kbookmarks/kbookmarks-5.98.0.ebuild deleted file mode 100644 index 10d9cbc24a07..000000000000 --- a/kde-frameworks/kbookmarks/kbookmarks-5.98.0.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PVCUT=$(ver_cut 1-2) -QTMIN=5.15.5 -VIRTUALX_REQUIRED="test" -inherit ecm frameworks.kde.org - -DESCRIPTION="Framework for managing bookmarks stored in XBEL format" - -LICENSE="LGPL-2+" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" -IUSE="nls" - -BDEPEND=" - nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 ) -" -RDEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=dev-qt/qtxml-${QTMIN}:5 - =kde-frameworks/kcodecs-${PVCUT}*:5 - =kde-frameworks/kconfig-${PVCUT}*:5 - =kde-frameworks/kcoreaddons-${PVCUT}*:5 - =kde-frameworks/kiconthemes-${PVCUT}*:5 - =kde-frameworks/kwidgetsaddons-${PVCUT}*:5 - =kde-frameworks/kxmlgui-${PVCUT}*:5 -" -DEPEND="${RDEPEND} - >=kde-frameworks/kconfigwidgets-${PVCUT}:5 -" diff --git a/kde-frameworks/kbookmarks/kbookmarks-6.1.0.ebuild b/kde-frameworks/kbookmarks/kbookmarks-6.1.0.ebuild new file mode 100644 index 000000000000..5f2868f98599 --- /dev/null +++ b/kde-frameworks/kbookmarks/kbookmarks-6.1.0.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PVCUT=$(ver_cut 1-2) +QTMIN=6.6.2 +inherit ecm frameworks.kde.org + +DESCRIPTION="Framework for managing bookmarks stored in XBEL format" + +LICENSE="LGPL-2+" +KEYWORDS="~amd64" +IUSE="" + +RDEPEND=" + >=dev-qt/qtbase-${QTMIN}:6[gui,widgets,xml] + =kde-frameworks/kconfig-${PVCUT}*:6 + =kde-frameworks/kcoreaddons-${PVCUT}*:6 + =kde-frameworks/kiconthemes-${PVCUT}*:6 + =kde-frameworks/kwidgetsaddons-${PVCUT}*:6 +" +DEPEND="${RDEPEND} + >=kde-frameworks/kconfigwidgets-${PVCUT}:6 +" +BDEPEND=">=dev-qt/qttools-${QTMIN}:6[linguist]" diff --git a/kde-frameworks/kcalendarcore/Manifest b/kde-frameworks/kcalendarcore/Manifest index c6b9bcc11331..33c26c1cd2c4 100644 --- a/kde-frameworks/kcalendarcore/Manifest +++ b/kde-frameworks/kcalendarcore/Manifest @@ -1,2 +1,2 @@ -DIST kcalendarcore-5.96.0.tar.xz 265908 BLAKE2B ea3bfa22339113679c7d99197ffa02273e98f8f717b0b75fb2dc22ad332e1c19b5f919601c535d504e485fb0b03d4b33a40372fd3c837d61acaf77acaf966833 SHA512 91540c29b32b65156d62a5da4ce2b1efa62232de917866204d2d709b0da41234907af0a68e3a4a434d06cfa6403897b9869345018fc5316e7034dd4f29f133c3 -DIST kcalendarcore-5.98.0.tar.xz 268736 BLAKE2B b737aeec6d6dca3367d3a487e1e13deb3e7a7fa75f7f2b9a9adfd18aee9d058b20a8fa5911e63acfb2eed295e512d02fa81f0d3e46912144423c8ba59994b060 SHA512 6f0cd17a1619d119ee6de18cb9a15a2f7af15e2a118add7ecc86fe9a8266deaf55d111631143a2b3496336c1d7bab85f6b469e97f06d6d7806d8b446a4afc36e +DIST kcalendarcore-5.115.0.tar.xz 268372 BLAKE2B f1be69ae1a9f09b1d67eda3922ceb0c6e8584e27ce62a3f8879aa8ddc5738bdd6bd1f7c0531c2887d467f5cedb87a74ebfef994262f295c007e6ecec5389ffb7 SHA512 20a47d83a8eedc62e307f8ff49e42d9c74cb4867c15b8ad52a1a20442c839d1a1484abb8c76e17cc0c189578a71f4f40e3cff5e591118904cf3c738b18a03e24 +DIST kcalendarcore-6.1.0.tar.xz 261344 BLAKE2B cb3dd6f22e093d4b407569038f8337aa0f678a25500e10a1136f207bda22d3061fd23f7fdc92e2ec49a05c4ecf4c13c0c8f46644a37c070c7607f2db3b6052ed SHA512 f7390829497719d7a3be9fadb24807bbc510856bf5aefcf50bd44e90031b9889e5aeb275bc7787f0889a0404ebf3c00819116c1403b54188f739050011a35e85 diff --git a/kde-frameworks/kcalendarcore/kcalendarcore-5.96.0.ebuild b/kde-frameworks/kcalendarcore/kcalendarcore-5.115.0.ebuild index e6b6749bf349..b823fd3f8483 100644 --- a/kde-frameworks/kcalendarcore/kcalendarcore-5.96.0.ebuild +++ b/kde-frameworks/kcalendarcore/kcalendarcore-5.115.0.ebuild @@ -1,16 +1,16 @@ -# 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="true" -QTMIN=5.15.4 -VIRTUALX_REQUIRED="test" +QTMIN=5.15.9 inherit ecm frameworks.kde.org DESCRIPTION="Library for interfacing with calendars" + LICENSE="GPL-2+ test? ( LGPL-3+ )" -KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86" +KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv x86" IUSE="" RESTRICT="test" # multiple tests fail or hang indefinitely @@ -20,4 +20,4 @@ DEPEND=" >=dev-qt/qtgui-${QTMIN}:5 " RDEPEND="${DEPEND}" -BDEPEND="sys-devel/bison" +BDEPEND="app-alternatives/yacc" diff --git a/kde-frameworks/kcalendarcore/kcalendarcore-5.98.0.ebuild b/kde-frameworks/kcalendarcore/kcalendarcore-6.1.0.ebuild index db528e82f1e2..9805f5615ca7 100644 --- a/kde-frameworks/kcalendarcore/kcalendarcore-5.98.0.ebuild +++ b/kde-frameworks/kcalendarcore/kcalendarcore-6.1.0.ebuild @@ -1,23 +1,23 @@ -# 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="true" -QTMIN=5.15.5 -VIRTUALX_REQUIRED="test" +QTMIN=6.6.2 inherit ecm frameworks.kde.org DESCRIPTION="Library for interfacing with calendars" + LICENSE="GPL-2+ test? ( LGPL-3+ )" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" +KEYWORDS="~amd64" IUSE="" RESTRICT="test" # multiple tests fail or hang indefinitely DEPEND=" >=dev-libs/libical-3.0.5:= - >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtbase-${QTMIN}:6[gui] " RDEPEND="${DEPEND}" -BDEPEND="sys-devel/bison" +BDEPEND="app-alternatives/yacc" diff --git a/kde-frameworks/kcmutils/Manifest b/kde-frameworks/kcmutils/Manifest index 4b0e6ff826cf..41f35e2651fe 100644 --- a/kde-frameworks/kcmutils/Manifest +++ b/kde-frameworks/kcmutils/Manifest @@ -1,2 +1,2 @@ -DIST kcmutils-5.96.0.tar.xz 186272 BLAKE2B 6c0996883d36431aa3bed2b6c83a8efef8791fd3d347d773e94a75c390c060ba3d0ef92eef8dac8902c9a734b9a348fcf0c8d912f8d15a316e2fa282921ace23 SHA512 75470dfbd9191f4ccdf8cea9078486c708135ff41407f6a9cc3c4d2b045501b36b3e874761f322e82eb052f806e3bf8ff1263860a36e7678e46a580c2413b0b3 -DIST kcmutils-5.98.0.tar.xz 189408 BLAKE2B f63d6263b71f5205b1b32285ded62c648bf0edca4980ee674224a2d82a3e2a6a38af8fb1256ba463fa64f63f80b4d651679a406a888816d7faffd688f2434346 SHA512 1ce163437aff7eec5ef3d8479621cfd28893a9f4e7b24990fd3fc93b7d6754cf4618743e8849538e9286992da2fb713bcc0d9331f47c92b8677a9b49d97c8b2f +DIST kcmutils-5.115.0.tar.xz 2483684 BLAKE2B 2fd6f1abd993abf34f6c03b11729e1504a972c70bbeb78648b413b0ad8da117dd5962be8e95072abb5ba80ffdd0bf4b610983c472c365af47d91e5af648b268f SHA512 69e91cf73587365d2861d54e90860adbe8de254473fd86da04a34aabed0623d5ee4500eebc691bcb68d3f271eafab67b32389745992c25d0b9f2b1383ee4511c +DIST kcmutils-6.1.0.tar.xz 2472384 BLAKE2B ad5ea4080e52fcb663fd2206e26e6f7a57b197cafd9c04aa303606606ac57f4a9ccc644dfc77d1f29066467417bad31e146a1cd8aa6ce64e79286193df7a3518 SHA512 676724395781a44a57d224b55a36b9afa450ce502b0a6bd24127d5e638dbfcfc3165ebe7ccf10bf40460fde80d189058cd9f5fa17527b07d573ef97984ccf7a6 diff --git a/kde-frameworks/kcmutils/kcmutils-5.96.0.ebuild b/kde-frameworks/kcmutils/kcmutils-5.115.0.ebuild index 6b0837d03bfe..59b6cfe16a0e 100644 --- a/kde-frameworks/kcmutils/kcmutils-5.96.0.ebuild +++ b/kde-frameworks/kcmutils/kcmutils-5.115.0.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_TEST="forceoptional" PVCUT=$(ver_cut 1-2) -QTMIN=5.15.4 -VIRTUALX_REQUIRED="test" +QTMIN=5.15.9 inherit ecm frameworks.kde.org DESCRIPTION="Framework to work with KDE System Settings modules" diff --git a/kde-frameworks/kcmutils/kcmutils-5.98.0.ebuild b/kde-frameworks/kcmutils/kcmutils-5.98.0.ebuild deleted file mode 100644 index fa090204161c..000000000000 --- a/kde-frameworks/kcmutils/kcmutils-5.98.0.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_TEST="forceoptional" -PVCUT=$(ver_cut 1-2) -QTMIN=5.15.5 -VIRTUALX_REQUIRED="test" -inherit ecm frameworks.kde.org - -DESCRIPTION="Framework to work with KDE System Settings modules" -LICENSE="LGPL-2" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" -IUSE="" - -DEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtdeclarative-${QTMIN}:5[widgets] - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - =kde-frameworks/kauth-${PVCUT}*:5 - =kde-frameworks/kconfig-${PVCUT}*:5 - =kde-frameworks/kconfigwidgets-${PVCUT}*:5 - =kde-frameworks/kcoreaddons-${PVCUT}*:5 - =kde-frameworks/kdeclarative-${PVCUT}*:5 - =kde-frameworks/kguiaddons-${PVCUT}*:5 - =kde-frameworks/ki18n-${PVCUT}*:5 - =kde-frameworks/kitemviews-${PVCUT}*:5 - =kde-frameworks/kservice-${PVCUT}*:5 - =kde-frameworks/kwidgetsaddons-${PVCUT}*:5 - =kde-frameworks/kxmlgui-${PVCUT}*:5 -" -RDEPEND="${DEPEND}" diff --git a/kde-frameworks/kcmutils/kcmutils-6.1.0.ebuild b/kde-frameworks/kcmutils/kcmutils-6.1.0.ebuild new file mode 100644 index 000000000000..3fedf3df984f --- /dev/null +++ b/kde-frameworks/kcmutils/kcmutils-6.1.0.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_TEST="forceoptional" +PVCUT=$(ver_cut 1-2) +QTMIN=6.6.2 +inherit ecm frameworks.kde.org + +DESCRIPTION="Framework to work with KDE System Settings modules" + +LICENSE="LGPL-2" +KEYWORDS="~amd64" +IUSE="" + +DEPEND=" + >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets] + >=dev-qt/qtdeclarative-${QTMIN}:6[widgets] + =kde-frameworks/kconfig-${PVCUT}*:6 + =kde-frameworks/kconfigwidgets-${PVCUT}*:6 + =kde-frameworks/kcoreaddons-${PVCUT}*:6 + =kde-frameworks/kguiaddons-${PVCUT}*:6 + =kde-frameworks/ki18n-${PVCUT}*:6 + =kde-frameworks/kio-${PVCUT}*:6 + =kde-frameworks/kitemviews-${PVCUT}*:6 + =kde-frameworks/kwidgetsaddons-${PVCUT}*:6 + =kde-frameworks/kxmlgui-${PVCUT}*:6 +" +RDEPEND="${DEPEND}" diff --git a/kde-frameworks/kcodecs/Manifest b/kde-frameworks/kcodecs/Manifest index 6b69bc18e124..6c018d734148 100644 --- a/kde-frameworks/kcodecs/Manifest +++ b/kde-frameworks/kcodecs/Manifest @@ -1,2 +1,2 @@ -DIST kcodecs-5.96.0.tar.xz 237132 BLAKE2B 3a9c9105df830d933ea7ed1e56f11bf3972fb48ca3882afceec4b9fd6cf3dd217dee814d41c5713ee79378f796d298bdfe2d38e277224236ebba4fa58f6a2edb SHA512 24e467fba8c61834987a6deb7b4ffe60691e7671118c6e55cf901660921d8798bca214f67b9a5e8676881aec95d832770708ceca9787175ab5658231c302a097 -DIST kcodecs-5.98.0.tar.xz 237388 BLAKE2B 40a6a74190ad93059900599f3842f0829360420c75b8a55232a0258809d03b1df75aefc5fb2716373a68a7a69faf6e7f7ede4d2717c8f7a6e87ad352f2c23cb9 SHA512 c9e2904d0b2090af184863999775fab314971a76671e8b52ad48bbdadc6a593d80bcc0ee904c48993bac1685f2e38c722f0bf40e1aa7a6e29f0b5645d3c5a632 +DIST kcodecs-5.115.0.tar.xz 2507248 BLAKE2B d0788d92fe882aa8a5d9b44c3f963f2cd551a69f9bb51f390ef8c2226987880489c6fcfcb9f66f19e61b91809075a4572a002ed621f4b187f5e5c288482671c5 SHA512 e2fb8a82c38e1038cd6bb230b658c45af8e4fd42dca29ee0f775f7c44154895ba4e983f26a98ab30ab394f246f6c7960642178b2a8b0d50d701b66945e798041 +DIST kcodecs-6.1.0.tar.xz 2503120 BLAKE2B 611d5ee69b3459c0105765690b62a1077fbedfbc683a3901e26b8587c72b4f58e5aa2fc7b4aba3c7dedbfcf09f1646d7e00589dd82edd6d9537dc06d38de3df5 SHA512 a2eb61b15849270df76ea78bbf289ca32792b6fc9b6710cd146a09eff36e7d4ff4dc1540a2baef59f29c1949cd5a5887064d9d070754c4987a6aa3ed0d4d5451 diff --git a/kde-frameworks/kcodecs/kcodecs-5.96.0.ebuild b/kde-frameworks/kcodecs/kcodecs-5.115.0.ebuild index 629cc312b368..5abde2678ee2 100644 --- a/kde-frameworks/kcodecs/kcodecs-5.96.0.ebuild +++ b/kde-frameworks/kcodecs/kcodecs-5.115.0.ebuild @@ -1,17 +1,17 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -QTMIN=5.15.4 +QTMIN=5.15.9 inherit ecm frameworks.kde.org DESCRIPTION="Framework for manipulating strings using various encodings" LICENSE="GPL-2+ LGPL-2+" -KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" -IUSE="nls" +KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86" +IUSE="" BDEPEND=" + >=dev-qt/linguist-tools-${QTMIN}:5 dev-util/gperf - nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 ) " diff --git a/kde-frameworks/kcodecs/kcodecs-5.98.0.ebuild b/kde-frameworks/kcodecs/kcodecs-6.1.0.ebuild index 9cf40af65ff1..55c07e671523 100644 --- a/kde-frameworks/kcodecs/kcodecs-5.98.0.ebuild +++ b/kde-frameworks/kcodecs/kcodecs-6.1.0.ebuild @@ -1,17 +1,18 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -QTMIN=5.15.5 +QTMIN=6.6.2 inherit ecm frameworks.kde.org DESCRIPTION="Framework for manipulating strings using various encodings" + LICENSE="GPL-2+ LGPL-2+" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" -IUSE="nls" +KEYWORDS="~amd64" +IUSE="" BDEPEND=" + >=dev-qt/qttools-${QTMIN}:6[linguist] dev-util/gperf - nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 ) " diff --git a/kde-frameworks/kcolorscheme/Manifest b/kde-frameworks/kcolorscheme/Manifest new file mode 100644 index 000000000000..4127c7945d85 --- /dev/null +++ b/kde-frameworks/kcolorscheme/Manifest @@ -0,0 +1 @@ +DIST kcolorscheme-6.1.0.tar.xz 44212 BLAKE2B 957090716f262be3eedfa0cd45133a1a9470cc8e1be07de50b838875679f06c62056e20338456eea9c2a85fcfad2ba472ba9bf546faa8a0429935365ceb3a326 SHA512 0a23e54f0575fe6bd353b8559869683e273288413bcc0549915ae29572390780f7c2b1eacb39df08d80601669b380a07f126b5be909b1d8a6f8fe20e391a31f8 diff --git a/kde-frameworks/kcolorscheme/kcolorscheme-6.1.0.ebuild b/kde-frameworks/kcolorscheme/kcolorscheme-6.1.0.ebuild new file mode 100644 index 000000000000..922838ee94f4 --- /dev/null +++ b/kde-frameworks/kcolorscheme/kcolorscheme-6.1.0.ebuild @@ -0,0 +1,24 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_TEST="false" +PVCUT=$(ver_cut 1-2) +QTMIN=6.6.2 +inherit ecm frameworks.kde.org + +DESCRIPTION="Framework for downloading and sharing additional application data" + +LICENSE="LGPL-2+" +KEYWORDS="~amd64" +IUSE="" + +DEPEND=" + >=dev-qt/qtbase-${QTMIN}:6[gui] + >=dev-qt/qtdeclarative-${QTMIN}:6 + =kde-frameworks/kconfig-${PVCUT}*:6 + =kde-frameworks/ki18n-${PVCUT}*:6 + =kde-frameworks/kguiaddons-${PVCUT}*:6 +" +RDEPEND="${DEPEND}" diff --git a/kde-frameworks/kactivities-stats/metadata.xml b/kde-frameworks/kcolorscheme/metadata.xml index 506ecf605bc4..506ecf605bc4 100644 --- a/kde-frameworks/kactivities-stats/metadata.xml +++ b/kde-frameworks/kcolorscheme/metadata.xml diff --git a/kde-frameworks/kcompletion/Manifest b/kde-frameworks/kcompletion/Manifest index 31c5c6a48d77..a4ca22bcfe57 100644 --- a/kde-frameworks/kcompletion/Manifest +++ b/kde-frameworks/kcompletion/Manifest @@ -1,2 +1,2 @@ -DIST kcompletion-5.96.0.tar.xz 124448 BLAKE2B ad4631da59558fecd04065cd48b5e3b76d2e70afa7419ca8aa1502da61a961f4daa05ee3a87c562830208dc582b961fbbe2ed68b1a4a4f6a1be457567b25168b SHA512 be7d6f2cc5b58fa476994d6236ebf2e2a3c5071b1cbc33415db3dc9e437d88f5ba8e471b64291254824676cc0e4fe5614dbfe0b64d7fea9de2c8661ea3144c18 -DIST kcompletion-5.98.0.tar.xz 124504 BLAKE2B 828219d454f2b2e06ca188cb8185c467812b868bdeb2c580232a8265d54e2feb9317bf5fa7e4b0abbf66f20558ed24f8d78a4b296e6bd7436b493f9abe5d941e SHA512 90631fec92d3651cc06936fdc62f6dee426721c395146017d2c714039d1aca6cc8ed77bed668505b71a0a05c865cf642ef709b624d2a01749be106d3988be833 +DIST kcompletion-5.115.0.tar.xz 2337732 BLAKE2B 30c3d99b5c81c72aefd4e4872ac94b85c77ea1e2c1612d6450939c5754befafd9311b01914d01d844a1df1e246227d3bae7faf4a2e426ba20a462ed1ba35ede8 SHA512 0d54721fcb35740df8cafa3969b9e4a74d16cd624aa19b3e60ac67e633d10c7efa95f6692b9111aeea9f2708a642fea0ca6587d802b7a99845e880414c169bb6 +DIST kcompletion-6.1.0.tar.xz 2332432 BLAKE2B 285451527b6feb49f5786bb454bd8029b105aca9362a172be5286650c8cb2502e46d9ec5aa20ca6d0985c8670fd86ded4df9673d0c8e9521da35b98b05733678 SHA512 a9732b69a85cad3b300219b08020a1701b6cfb44a841e8474204bf4b30b5f254ccffa5fa14646641e675b9f2a60fb2b8d0533130b83b8db932ef5e3f3bff92c0 diff --git a/kde-frameworks/kcompletion/kcompletion-5.96.0.ebuild b/kde-frameworks/kcompletion/kcompletion-5.115.0.ebuild index 70a6db0eabe8..47f95c7634cb 100644 --- a/kde-frameworks/kcompletion/kcompletion-5.96.0.ebuild +++ b/kde-frameworks/kcompletion/kcompletion-5.115.0.ebuild @@ -1,19 +1,18 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 ECM_DESIGNERPLUGIN="true" PVCUT=$(ver_cut 1-2) -QTMIN=5.15.4 -VIRTUALX_REQUIRED="test" +QTMIN=5.15.9 inherit ecm frameworks.kde.org DESCRIPTION="Framework for common completion tasks such as filename or URL completion" LICENSE="LGPL-2+" -KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" -IUSE="nls" +KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86" +IUSE="" DEPEND=" >=dev-qt/qtgui-${QTMIN}:5 @@ -22,4 +21,4 @@ DEPEND=" =kde-frameworks/kwidgetsaddons-${PVCUT}*:5 " RDEPEND="${DEPEND}" -BDEPEND="nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )" +BDEPEND=">=dev-qt/linguist-tools-${QTMIN}:5" diff --git a/kde-frameworks/kcompletion/kcompletion-5.98.0.ebuild b/kde-frameworks/kcompletion/kcompletion-5.98.0.ebuild deleted file mode 100644 index c318e0b7fe25..000000000000 --- a/kde-frameworks/kcompletion/kcompletion-5.98.0.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_DESIGNERPLUGIN="true" -PVCUT=$(ver_cut 1-2) -QTMIN=5.15.5 -VIRTUALX_REQUIRED="test" -inherit ecm frameworks.kde.org - -DESCRIPTION="Framework for common completion tasks such as filename or URL completion" - -LICENSE="LGPL-2+" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" -IUSE="nls" - -DEPEND=" - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - =kde-frameworks/kconfig-${PVCUT}*:5 - =kde-frameworks/kwidgetsaddons-${PVCUT}*:5 -" -RDEPEND="${DEPEND}" -BDEPEND="nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )" diff --git a/kde-frameworks/kcompletion/kcompletion-6.1.0.ebuild b/kde-frameworks/kcompletion/kcompletion-6.1.0.ebuild new file mode 100644 index 000000000000..540f12bb312b --- /dev/null +++ b/kde-frameworks/kcompletion/kcompletion-6.1.0.ebuild @@ -0,0 +1,25 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_DESIGNERPLUGIN="true" +PVCUT=$(ver_cut 1-2) +QTMIN=6.6.2 +inherit ecm frameworks.kde.org + +DESCRIPTION="Framework for common completion tasks such as filename or URL completion" + +LICENSE="LGPL-2+" +KEYWORDS="~amd64" +IUSE="" + +DEPEND=" + >=dev-qt/qtbase-${QTMIN}:6[gui] + =kde-frameworks/kcodecs-${PVCUT}*:6 + =kde-frameworks/kconfig-${PVCUT}*:6 + =kde-frameworks/kcoreaddons-${PVCUT}*:6 + =kde-frameworks/kwidgetsaddons-${PVCUT}*:6 +" +RDEPEND="${DEPEND}" +BDEPEND=">=dev-qt/qttools-${QTMIN}:6[linguist]" diff --git a/kde-frameworks/kconfig/Manifest b/kde-frameworks/kconfig/Manifest index cfcd0f63cc10..e8916f14200c 100644 --- a/kde-frameworks/kconfig/Manifest +++ b/kde-frameworks/kconfig/Manifest @@ -1,2 +1,2 @@ -DIST kconfig-5.96.0.tar.xz 283284 BLAKE2B 8bbe511db0badd7338694c22485c97015c2f42172f72c37c31cffc322ee90aa9940ef3f8c9a5c55a67e5775fd704d133cedbb62fcda8d7df710e3c64caafaac9 SHA512 6eac947ce3392e0863faf7a67f9c161c652fa1eb4e7f508a42dc08ccc79c602c2946fb87feff0e5ac0cda626b1de910abf6218069f5e3910ec72700f7458743e -DIST kconfig-5.98.0.tar.xz 283628 BLAKE2B 1f51f971ffd02c71361185adbdc768774aec0a47fb414a51e24883082659b8e8c2644293ccb9b253143fa2143043fc32cdb3d101de2554f868797f7672d73d2e SHA512 df3950714dbf2b9edb3051fb0dc26bd4564503c8a5253712345cbd774f326cd1b49119218b1ab7c574f37455fac09c36928962fd7c49d82e810b88c305591826 +DIST kconfig-5.115.0.tar.xz 295620 BLAKE2B 5daf3dc5c5e8696260dbbd3688e02010bf70f3cb5470ae08b9d712a6248901c4500e467321c639dbc437dfa1d2fe37e06baf087c6be27c24e74b10c99fe999a8 SHA512 e06df4c057ba4e03dd88e444c20e3f9481a8bea53fedb049796b9efb59ddd81569368608c98ca3434ad0249b7a7dd6774d5150966117da2c37e988e43395bbbf +DIST kconfig-6.1.0.tar.xz 293324 BLAKE2B 3812eddf5fe7b940bcd3ce4307aba899df03c5ce1ec18f316178df47d680faf6618d2494aeb58aa8803516e26895044eaa5954bdcd13cffca6a09c5df3cb1cc9 SHA512 e7eafb0d66e93a4aa20dfc3a006cafdea2cbd5815eb8fe83fa7ebf3e9fb891621bc4b1063bd2904b1443889706ca9505cf2bf40ae0d87e1b95e5ca4dbdad15c5 diff --git a/kde-frameworks/kconfig/kconfig-5.98.0.ebuild b/kde-frameworks/kconfig/kconfig-5.115.0.ebuild index 879e6a4266d1..6ae5945ed05a 100644 --- a/kde-frameworks/kconfig/kconfig-5.98.0.ebuild +++ b/kde-frameworks/kconfig/kconfig-5.115.0.ebuild @@ -1,17 +1,16 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -QTMIN=5.15.5 -VIRTUALX_REQUIRED="test" +QTMIN=5.15.9 inherit ecm frameworks.kde.org DESCRIPTION="Framework for reading and writing configuration" LICENSE="LGPL-2+" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" -IUSE="dbus nls qml" +KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86" +IUSE="dbus qml" # bug 560086 RESTRICT="test" @@ -25,7 +24,7 @@ RDEPEND=" DEPEND="${RDEPEND} test? ( >=dev-qt/qtconcurrent-${QTMIN}:5 ) " -BDEPEND="nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )" +BDEPEND=">=dev-qt/linguist-tools-${QTMIN}:5" DOCS=( DESIGN docs/{DESIGN.kconfig,options.md} ) diff --git a/kde-frameworks/kconfig/kconfig-5.96.0.ebuild b/kde-frameworks/kconfig/kconfig-5.96.0.ebuild deleted file mode 100644 index de23488da81f..000000000000 --- a/kde-frameworks/kconfig/kconfig-5.96.0.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -QTMIN=5.15.4 -VIRTUALX_REQUIRED="test" -inherit ecm frameworks.kde.org - -DESCRIPTION="Framework for reading and writing configuration" - -LICENSE="LGPL-2+" -KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" -IUSE="dbus nls qml" - -# bug 560086 -RESTRICT="test" - -RDEPEND=" - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtxml-${QTMIN}:5 - dbus? ( >=dev-qt/qtdbus-${QTMIN}:5 ) - qml? ( >=dev-qt/qtdeclarative-${QTMIN}:5 ) -" -DEPEND="${RDEPEND} - test? ( >=dev-qt/qtconcurrent-${QTMIN}:5 ) -" -BDEPEND=" - nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 ) -" - -DOCS=( DESIGN docs/{DESIGN.kconfig,options.md} ) - -src_configure() { - local mycmakeargs=( - -DKCONFIG_USE_DBUS=$(usex dbus) - $(cmake_use_find_package qml Qt5Qml) - ) - ecm_src_configure -} diff --git a/kde-frameworks/kconfig/kconfig-6.1.0.ebuild b/kde-frameworks/kconfig/kconfig-6.1.0.ebuild new file mode 100644 index 000000000000..56d42d7cf0e5 --- /dev/null +++ b/kde-frameworks/kconfig/kconfig-6.1.0.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +QTMIN=6.6.2 +inherit ecm frameworks.kde.org + +DESCRIPTION="Framework for reading and writing configuration" + +LICENSE="LGPL-2+" +KEYWORDS="~amd64" +IUSE="dbus qml" + +# bug 560086 +RESTRICT="test" + +RDEPEND=" + >=dev-qt/qtbase-${QTMIN}:6[dbus?,gui,xml] + qml? ( >=dev-qt/qtdeclarative-${QTMIN}:6 ) +" +DEPEND="${RDEPEND} + test? ( >=dev-qt/qtbase-${QTMIN}:6[concurrent] ) +" +BDEPEND=">=dev-qt/qttools-${QTMIN}:6[linguist]" + +DOCS=( DESIGN docs/{DESIGN.kconfig,options.md} ) + +src_configure() { + local mycmakeargs=( + -DKCONFIG_USE_DBUS=$(usex dbus) + -DKCONFIG_USE_QML=$(usex qml) + ) + ecm_src_configure +} diff --git a/kde-frameworks/kconfig/metadata.xml b/kde-frameworks/kconfig/metadata.xml index 6709562d0d64..d99f466aae3e 100644 --- a/kde-frameworks/kconfig/metadata.xml +++ b/kde-frameworks/kconfig/metadata.xml @@ -7,6 +7,7 @@ </maintainer> <upstream> <bugs-to>https://bugs.kde.org/</bugs-to> + <remote-id type="cpe">cpe:/a:kde:kconfig</remote-id> </upstream> <use> <flag name="qml">Enable QML/QtQuick support via <pkg>dev-qt/qtdeclarative</pkg></flag> diff --git a/kde-frameworks/kconfigwidgets/Manifest b/kde-frameworks/kconfigwidgets/Manifest index 3a519e59c6ff..24723cd7ea49 100644 --- a/kde-frameworks/kconfigwidgets/Manifest +++ b/kde-frameworks/kconfigwidgets/Manifest @@ -1,2 +1,2 @@ -DIST kconfigwidgets-5.96.0.tar.xz 417908 BLAKE2B d788ca055f2df23293df53dd38362498c13df206ae4b23dcc36809f018535fc64a1a48c42ef7e33fa1429f2630bcd551060a01640fe5105fa4c1f45d1e2d799c SHA512 964bda7ece8d3455f585ee4aa12bf90dbc8d00c792cff29e0f02be34ebf02daaf540abfef4ce9382592f09abaafb404387dcebff2007bc5bc78b665d3aee7cb6 -DIST kconfigwidgets-5.98.0.tar.xz 419828 BLAKE2B ac9906131d12d49ba97c1588d78d77df30db902847ba08de96985031a04d43ccc30f00f39dadb7d1d76bfc8e684a7e10bc17a8aed85ed92c008f566269cee08a SHA512 4e4ba4aa51ecbf0b740cb6dab5ca92afccb160b5726ecd84bbc1c84028cb8dc8e2c9f79342771cd4bd909fdc8b9982c9f6c17352c4a188131625a877d2f2a41e +DIST kconfigwidgets-5.115.0.tar.xz 2614352 BLAKE2B f77f0d0add151e651479fdc8e454a448af6ed5c0c81fd6e9932cf47f3a59c235a4e1f9075a12779227fcffd406c75b3ca95d338255b489e1ab5934504c8a5e68 SHA512 2491e0dead8fc5b2ea5bb64587405383f5d8f5eec2dc289cd9d404e797f8d9fda7cbe3d56846c6253f035db54f1f262f29e7dcfb68266f3734303d393e94209e +DIST kconfigwidgets-6.1.0.tar.xz 2565676 BLAKE2B 27a1b19ba2bef500f035bacb755b62b24ac74736051002b29d6274ba659228a0507d5cd3a341c808d8e516899ff728cb1560a29facca6bec5ae6ad30b117fb21 SHA512 546c4399537d6b65a58c4fe302bd7d3186161b10fe38b008b42b344c57455941e0d007d7a51fa4cec93fc9e404e2bfce39121b6810d6c45e8ac2c83751c1661a diff --git a/kde-frameworks/kconfigwidgets/kconfigwidgets-5.96.0.ebuild b/kde-frameworks/kconfigwidgets/kconfigwidgets-5.115.0.ebuild index 7034d6c41837..572423485d96 100644 --- a/kde-frameworks/kconfigwidgets/kconfigwidgets-5.96.0.ebuild +++ b/kde-frameworks/kconfigwidgets/kconfigwidgets-5.115.0.ebuild @@ -1,21 +1,20 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 ECM_DESIGNERPLUGIN="true" PVCUT=$(ver_cut 1-2) -QTMIN=5.15.4 -VIRTUALX_REQUIRED="test" +QTMIN=5.15.9 inherit ecm frameworks.kde.org DESCRIPTION="Framework providing an assortment of configuration-related widgets" LICENSE="LGPL-2+" -KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" +KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86" IUSE="+man" -DEPEND=" +RDEPEND=" >=dev-qt/qtdbus-${QTMIN}:5 >=dev-qt/qtgui-${QTMIN}:5 >=dev-qt/qtwidgets-${QTMIN}:5 @@ -27,9 +26,16 @@ DEPEND=" =kde-frameworks/ki18n-${PVCUT}*:5 =kde-frameworks/kwidgetsaddons-${PVCUT}*:5 " -RDEPEND="${DEPEND}" +DEPEND="${RDEPEND} + test? ( =kde-frameworks/kconfig-${PVCUT}*:5[dbus] ) +" BDEPEND="man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )" +CMAKE_SKIP_TESTS=( + # bugs: 864250 + kstandardactiontest +) + src_configure() { local mycmakeargs=( $(cmake_use_find_package man KF5DocTools) diff --git a/kde-frameworks/kconfigwidgets/kconfigwidgets-5.98.0.ebuild b/kde-frameworks/kconfigwidgets/kconfigwidgets-5.98.0.ebuild deleted file mode 100644 index 65d4f6d78b8e..000000000000 --- a/kde-frameworks/kconfigwidgets/kconfigwidgets-5.98.0.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_DESIGNERPLUGIN="true" -PVCUT=$(ver_cut 1-2) -QTMIN=5.15.5 -VIRTUALX_REQUIRED="test" -inherit ecm frameworks.kde.org - -DESCRIPTION="Framework providing an assortment of configuration-related widgets" - -LICENSE="LGPL-2+" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" -IUSE="+man" - -DEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - =kde-frameworks/kauth-${PVCUT}*:5 - =kde-frameworks/kcodecs-${PVCUT}*:5 - =kde-frameworks/kconfig-${PVCUT}*:5 - =kde-frameworks/kcoreaddons-${PVCUT}*:5 - =kde-frameworks/kguiaddons-${PVCUT}*:5 - =kde-frameworks/ki18n-${PVCUT}*:5 - =kde-frameworks/kwidgetsaddons-${PVCUT}*:5 -" -RDEPEND="${DEPEND}" -BDEPEND="man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )" - -src_configure() { - local mycmakeargs=( - $(cmake_use_find_package man KF5DocTools) - ) - - ecm_src_configure -} diff --git a/kde-frameworks/kconfigwidgets/kconfigwidgets-6.1.0.ebuild b/kde-frameworks/kconfigwidgets/kconfigwidgets-6.1.0.ebuild new file mode 100644 index 000000000000..ff1ddada473a --- /dev/null +++ b/kde-frameworks/kconfigwidgets/kconfigwidgets-6.1.0.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_DESIGNERPLUGIN="true" +PVCUT=$(ver_cut 1-2) +QTMIN=6.6.2 +inherit ecm frameworks.kde.org + +DESCRIPTION="Framework providing an assortment of configuration-related widgets" + +LICENSE="LGPL-2+" +KEYWORDS="~amd64" +IUSE="" + +CMAKE_SKIP_TESTS=( + # bugs: 864250 + kstandardactiontest +) + +RDEPEND=" + >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets] + =kde-frameworks/kcodecs-${PVCUT}*:6 + =kde-frameworks/kcolorscheme-${PVCUT}*:6 + =kde-frameworks/kconfig-${PVCUT}*:6 + =kde-frameworks/kcoreaddons-${PVCUT}*:6 + =kde-frameworks/kguiaddons-${PVCUT}*:6 + =kde-frameworks/ki18n-${PVCUT}*:6 + =kde-frameworks/kwidgetsaddons-${PVCUT}*:6 +" +DEPEND="${RDEPEND} + test? ( =kde-frameworks/kconfig-${PVCUT}*:6[dbus] ) +" diff --git a/kde-frameworks/kcontacts/Manifest b/kde-frameworks/kcontacts/Manifest index eba6f32628ea..293c814740ba 100644 --- a/kde-frameworks/kcontacts/Manifest +++ b/kde-frameworks/kcontacts/Manifest @@ -1,2 +1,2 @@ -DIST kcontacts-5.96.0.tar.xz 193856 BLAKE2B b01fe643f103751e7c6740b23e9de3dedf828d388a009a16e332dfe12cedc7ed37aff18ad5dcc7ab9f8d336e1552a717188a7a18a775675e3a451f38e8a42984 SHA512 0d7b02301389d942a87d3a77a1bbae202e9897ab7cad156e33d9e0a46d7a77d32bc0a9829cd08b4a4d44e073297cd3d98a9e0b00937f49bbb9b3fd968cc74055 -DIST kcontacts-5.98.0.tar.xz 193940 BLAKE2B 861830da74afd6264b86aa2e7dab56f874a30e8cd6adb7a25310c6127b2f2b9b8ded1931aa58adc8fc30bc394e4fd7b558d4b52969d280c20b6dab819bba1538 SHA512 64691b192d97ebc62eefdd4ecd84015906effd6551da286c0d58e63cae7b7c36f2acdc452ea1943900afe8cfeb4e11daaba7561c4e726fcbd72e66821af750c9 +DIST kcontacts-5.115.0.tar.xz 214204 BLAKE2B 6f1ed98c1bc899ad6f173be7f6038405c54086838e67425d919150490dde11865a2a51a46da792214aaa7f528ddcf95aaa055c56963537e859e4e8617ae51df1 SHA512 7e53ed4810fb82a34ae3bf46aeb1b4ae1c70b46500928a15748a3b8a4762a3d86b95c7ca70d7387dd92f25c7e10d6c991de4c837c8efaf52ff0b69478391b1df +DIST kcontacts-6.1.0.tar.xz 207172 BLAKE2B 4a287437f52a098383de42353de424bd54320635542848cdd12f4bfbaf7d69efc6fdecaebbbfbc0942b31ee0792bface0103a11858ecd67748ea57a282aaf5b0 SHA512 3173f9bb6cd55fb5e0035c6fd828a9ab26dbfeb7df54c215c45f60674a12005e15c4597e7a0365b964df5797c9cb430a489e8e08559510a4e1242663a2dd9c00 diff --git a/kde-frameworks/kcontacts/kcontacts-5.96.0.ebuild b/kde-frameworks/kcontacts/kcontacts-5.115.0.ebuild index 483333f4a38d..694a642e5dc4 100644 --- a/kde-frameworks/kcontacts/kcontacts-5.96.0.ebuild +++ b/kde-frameworks/kcontacts/kcontacts-5.115.0.ebuild @@ -1,18 +1,17 @@ -# 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="true" PVCUT=$(ver_cut 1-2) -QTMIN=5.15.4 -VIRTUALX_REQUIRED="test" +QTMIN=5.15.9 inherit ecm frameworks.kde.org DESCRIPTION="Address book API based on KDE Frameworks" LICENSE="GPL-2+" -KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86" +KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv x86" IUSE="" RDEPEND=" @@ -26,11 +25,9 @@ DEPEND="${RDEPEND} test? ( >=dev-qt/qtdeclarative-${QTMIN}:5 ) " -src_test() { +CMAKE_SKIP_TESTS=( # bug #566648 (access to /dev/dri/card0 denied) + kcontacts-picturetest # bug #838502 (again some Qt translations loading related err...) - local myctestargs=( - -E "(kcontacts-addresstest|kcontacts-picturetest)" - ) - ecm_src_test -} + kcontacts-addresstest +) diff --git a/kde-frameworks/kcontacts/kcontacts-5.98.0.ebuild b/kde-frameworks/kcontacts/kcontacts-5.98.0.ebuild deleted file mode 100644 index 4c6925aa77b9..000000000000 --- a/kde-frameworks/kcontacts/kcontacts-5.98.0.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_TEST="true" -PVCUT=$(ver_cut 1-2) -QTMIN=5.15.5 -VIRTUALX_REQUIRED="test" -inherit ecm frameworks.kde.org - -DESCRIPTION="Address book API based on KDE Frameworks" - -LICENSE="GPL-2+" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" -IUSE="" - -RDEPEND=" - >=dev-qt/qtgui-${QTMIN}:5 - =kde-frameworks/kcodecs-${PVCUT}*:5 - =kde-frameworks/kconfig-${PVCUT}*:5 - =kde-frameworks/kcoreaddons-${PVCUT}*:5 - =kde-frameworks/ki18n-${PVCUT}*:5 -" -DEPEND="${RDEPEND} - test? ( >=dev-qt/qtdeclarative-${QTMIN}:5 ) -" - -src_test() { - # bug #566648 (access to /dev/dri/card0 denied) - # bug #838502 (again some Qt translations loading related err...) - local myctestargs=( - -E "(kcontacts-addresstest|kcontacts-picturetest)" - ) - ecm_src_test -} diff --git a/kde-frameworks/kcontacts/kcontacts-6.1.0.ebuild b/kde-frameworks/kcontacts/kcontacts-6.1.0.ebuild new file mode 100644 index 000000000000..d463d85e0655 --- /dev/null +++ b/kde-frameworks/kcontacts/kcontacts-6.1.0.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_TEST="true" +PVCUT=$(ver_cut 1-2) +QTMIN=6.6.2 +inherit ecm frameworks.kde.org + +DESCRIPTION="Address book API based on KDE Frameworks" + +LICENSE="GPL-2+" +KEYWORDS="~amd64" +IUSE="" + +RDEPEND=" + >=dev-qt/qtbase-${QTMIN}:6[gui] + =kde-frameworks/kcodecs-${PVCUT}*:6 + =kde-frameworks/kconfig-${PVCUT}*:6 + =kde-frameworks/kcoreaddons-${PVCUT}*:6 + =kde-frameworks/ki18n-${PVCUT}*:6 +" +DEPEND="${RDEPEND} + test? ( >=dev-qt/qtdeclarative-${QTMIN}:6 ) +" + +CMAKE_SKIP_TESTS=( + # bug #566648 (access to /dev/dri/card0 denied) + kcontacts-picturetest + # bug #838502 (again some Qt translations loading related err...) + kcontacts-addresstest +) diff --git a/kde-frameworks/kcoreaddons/Manifest b/kde-frameworks/kcoreaddons/Manifest index f57fca2e6d89..ecfcb25fad23 100644 --- a/kde-frameworks/kcoreaddons/Manifest +++ b/kde-frameworks/kcoreaddons/Manifest @@ -1,2 +1,2 @@ -DIST kcoreaddons-5.96.0.tar.xz 465840 BLAKE2B 0801913b454a3de50b08009780c1d254413d83f28ea98d99667109ad26ce60554347f3477f5ffb342ec360f033f4481b8a031e9976a0ee1a8e930f2435ddcc66 SHA512 2f673b3352d89bf11ffbe68e5dae7ca22b0f18661fda113c7b7ca15889b6ca2b9e1f9ebe42fdf60bcd3b6edff257ed7f0efc142d3f11de311defe0861b5a5a1c -DIST kcoreaddons-5.98.0.tar.xz 468928 BLAKE2B 93c61c2469b12ad9e4ce6598086334cfd07028a22c68b2e6bcc8eeed02891ba93140f7ec0aac454e0096afcf437578b3babb0303e1ea4eeee97d87d63bc00e01 SHA512 7370860c300a2ceb009622a3ed543ffda7cd36ae4a339abc6fb4bc39a08abbbd8d09eb5da08b2702e9dfa2db3c35572df654ff265275d3cd96b076123a022198 +DIST kcoreaddons-5.115.0.tar.xz 2611124 BLAKE2B d547ca61b96a52b1da49b4773d18765886fe93ab9a0bf7e17ff32ba8de4e0a0e28db30b9a80f771ee96e56b7bd8eda0cb517b0446ab19409cc4ce05c0557d2e5 SHA512 66a209496de8370a3f69549462f101dfca76f87c6bb4e2ad5e616e5fd6b460d17ea3e93386d6450992e6ca3759868d1818bc29987af780b466100a9389504939 +DIST kcoreaddons-6.1.0.tar.xz 2576112 BLAKE2B bca50bf6c68e63f755282a33adcb6537bca3f89a9b9072400e5b2af80c0e9e432585e1dcfdd4dcc2466768314b690d638e9ad3fd26b4b17243ce3e7abec510eb SHA512 1f9aa728898ed9e1e3bbff96b300a895022065d51fd21a15e68e7a71eb09c1b507e69c6723511ce66a8e6cdac29b8839535226764e819cc3541ee0b675cc064a diff --git a/kde-frameworks/kcoreaddons/kcoreaddons-5.96.0.ebuild b/kde-frameworks/kcoreaddons/kcoreaddons-5.115.0.ebuild index 730c3d75f1dd..8cf3bbd2347b 100644 --- a/kde-frameworks/kcoreaddons/kcoreaddons-5.96.0.ebuild +++ b/kde-frameworks/kcoreaddons/kcoreaddons-5.115.0.ebuild @@ -1,26 +1,27 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -QTMIN=5.15.4 +QTMIN=5.15.9 inherit ecm frameworks.kde.org xdg-utils DESCRIPTION="Framework for solving common problems such as caching, randomisation, and more" LICENSE="LGPL-2+" -KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" -IUSE="dbus fam nls" +KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86" +IUSE="dbus fam" DEPEND=" >=dev-qt/qtcore-${QTMIN}:5[icu] + virtual/libudev:= dbus? ( >=dev-qt/qtdbus-${QTMIN}:5 ) fam? ( virtual/fam ) " RDEPEND="${DEPEND} - nls? ( >=dev-qt/qttranslations-${QTMIN}:5 ) + >=dev-qt/qttranslations-${QTMIN}:5 " -BDEPEND="nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )" +BDEPEND=">=dev-qt/linguist-tools-${QTMIN}:5" src_configure() { local mycmakeargs=( @@ -33,13 +34,17 @@ src_configure() { } src_test() { - # bugs: 619656, 632398, 647414, 665682 - local myctestargs=( - -j1 - -E "(kautosavefiletest|kdirwatch_qfswatch_unittest|kdirwatch_stat_unittest|kformattest)" + local CMAKE_SKIP_TESTS=( + # bug 632398 + kautosavefiletest + # bug 647414 + kdirwatch_qfswatch_unittest + kdirwatch_stat_unittest + # bugs 665682 + kformattest ) - - ecm_src_test + # bug 619656 + ecm_src_test -j1 } pkg_postinst() { diff --git a/kde-frameworks/kcoreaddons/kcoreaddons-5.98.0.ebuild b/kde-frameworks/kcoreaddons/kcoreaddons-5.98.0.ebuild deleted file mode 100644 index c3fadf6687b7..000000000000 --- a/kde-frameworks/kcoreaddons/kcoreaddons-5.98.0.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -QTMIN=5.15.5 -inherit ecm frameworks.kde.org xdg-utils - -DESCRIPTION="Framework for solving common problems such as caching, randomisation, and more" - -LICENSE="LGPL-2+" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" -IUSE="dbus fam nls" - -DEPEND=" - >=dev-qt/qtcore-${QTMIN}:5[icu] - dbus? ( >=dev-qt/qtdbus-${QTMIN}:5 ) - fam? ( virtual/fam ) -" -RDEPEND="${DEPEND} - nls? ( >=dev-qt/qttranslations-${QTMIN}:5 ) -" -BDEPEND="nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )" - -src_configure() { - local mycmakeargs=( - -D_KDE4_DEFAULT_HOME_POSTFIX=4 - $(cmake_use_find_package fam FAM) - $(cmake_use_find_package dbus Qt5DBus) - ) - - ecm_src_configure -} - -src_test() { - # bugs: 619656, 632398, 647414, 665682 - local myctestargs=( - -j1 - -E "(kautosavefiletest|kdirwatch_qfswatch_unittest|kdirwatch_stat_unittest|kformattest)" - ) - - ecm_src_test -} - -pkg_postinst() { - ecm_pkg_postinst - xdg_mimeinfo_database_update -} - -pkg_postrm() { - ecm_pkg_postrm - xdg_mimeinfo_database_update -} diff --git a/kde-frameworks/kcoreaddons/kcoreaddons-6.1.0.ebuild b/kde-frameworks/kcoreaddons/kcoreaddons-6.1.0.ebuild new file mode 100644 index 000000000000..2f8f3781828e --- /dev/null +++ b/kde-frameworks/kcoreaddons/kcoreaddons-6.1.0.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +QTMIN=6.6.2 +inherit ecm frameworks.kde.org xdg-utils + +DESCRIPTION="Framework for solving common problems such as caching, randomisation, and more" + +LICENSE="LGPL-2+" +KEYWORDS="~amd64" +IUSE="dbus" + +DEPEND=" + >=dev-qt/qtbase-${QTMIN}:6[dbus?,icu] + >=dev-qt/qtdeclarative-${QTMIN}:6 + virtual/libudev:= +" +RDEPEND="${DEPEND} + >=dev-qt/qttranslations-${QTMIN}:6 +" +BDEPEND=">=dev-qt/qttools-${QTMIN}:6[linguist]" + +src_configure() { + local mycmakeargs=( + -DKCOREADDONS_USE_QML=ON + $(cmake_use_find_package dbus Qt6DBus) + ) + + ecm_src_configure +} + +src_test() { + local CMAKE_SKIP_TESTS=( + # bug 632398 + kautosavefiletest + # bug 647414 + kdirwatch_qfswatch_unittest + kdirwatch_stat_unittest + # bugs 665682 + kformattest + ) + # bug 619656 + ecm_src_test -j1 +} + +pkg_postinst() { + ecm_pkg_postinst + xdg_mimeinfo_database_update +} + +pkg_postrm() { + ecm_pkg_postrm + xdg_mimeinfo_database_update +} diff --git a/kde-frameworks/kcrash/Manifest b/kde-frameworks/kcrash/Manifest index 5e893eb63cb9..e3a2a1793cec 100644 --- a/kde-frameworks/kcrash/Manifest +++ b/kde-frameworks/kcrash/Manifest @@ -1,2 +1,2 @@ -DIST kcrash-5.96.0.tar.xz 28372 BLAKE2B 9b09b9923d37d4242a9cdc178f1f85b23a4dba54f4f1f31b465d3908dde3ad871d786a12a8a9093dae2d8f296d3eb058323b4b372d6600e4c7167c57b2686b65 SHA512 8ad68c4e32fad319b7c9fc17b0daab05bf0e963f97a22b3662c58de4841e602c60f3406289410318992af2bff8ff07130f6b54ad074367f161c03f6106c9de9f -DIST kcrash-5.98.0.tar.xz 28380 BLAKE2B fe3d80aa88b5e2bf73d8c98b2705f4b63bbe6d8e607ff2b664fb1eb900f51272bf4abdd4764c6154de6a134661de21a22a8809ca5bede54db7cb9f3863933c87 SHA512 cf8a20605ac0130ea852a39f2cb52bfcf93607ad1d7c1cc0f0fe3d9a66a083d467b6d6fa97c783649949d81ccf346b8d0e18c7e7f0b7d2273b9fd1949dea762a +DIST kcrash-5.115.0.tar.xz 28288 BLAKE2B f9297149410458a81b21ff8220a0b13facba11340d4c17c09fd03cccc0a8ae3ce7c5aa54d8627fa07f805718b31a63c90c2f439ba82da630cf8373dcfa8c202f SHA512 a8c9d9676433f6017681328b93a9218a6e87794712488a905ba6a783c4b370a3d65b9efe6e8c77d809f72cde0fa28a43020b3e0ef909197918c76d94592b3233 +DIST kcrash-6.1.0.tar.xz 29132 BLAKE2B 1f995cf4559260bcf5732574c709ffa13c1b25df1e7e9bbdbcd8bea6e28361dc920999a831d52e9bf92537e6b2fce2d29a72886d83ee041f8184e92e46533ccd SHA512 6334c6924e5f78f97cd433ea1d41f82db51fb3abc9205320d5c3ffd4034383d9bb2c1810cc71c7d3639e53294a819be2b96a53469d826d132f6faf2d49ed97a4 diff --git a/kde-frameworks/kcrash/kcrash-5.96.0.ebuild b/kde-frameworks/kcrash/kcrash-5.115.0.ebuild index 85fd3c555be0..a0f0b6842ece 100644 --- a/kde-frameworks/kcrash/kcrash-5.96.0.ebuild +++ b/kde-frameworks/kcrash/kcrash-5.115.0.ebuild @@ -1,18 +1,18 @@ -# 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" PVCUT=$(ver_cut 1-2) -QTMIN=5.15.4 -VIRTUALX_REQUIRED="test" +QTMIN=5.15.9 inherit ecm frameworks.kde.org DESCRIPTION="Framework for intercepting and handling application crashes" + LICENSE="LGPL-2+" -KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" -IUSE="nls X" +KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86" +IUSE="X" # requires running Plasma environment RESTRICT="test" @@ -20,7 +20,6 @@ RESTRICT="test" RDEPEND=" >=dev-qt/qtgui-${QTMIN}:5 =kde-frameworks/kcoreaddons-${PVCUT}*:5 - =kde-frameworks/kwindowsystem-${PVCUT}*:5 X? ( >=dev-qt/qtx11extras-${QTMIN}:5 x11-libs/libX11 @@ -30,9 +29,7 @@ DEPEND="${RDEPEND} X? ( x11-base/xorg-proto ) test? ( >=dev-qt/qtwidgets-${QTMIN}:5 ) " -BDEPEND=" - nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 ) -" +BDEPEND=">=dev-qt/linguist-tools-${QTMIN}:5" src_configure() { local mycmakeargs=( diff --git a/kde-frameworks/kcrash/kcrash-5.98.0.ebuild b/kde-frameworks/kcrash/kcrash-6.1.0.ebuild index bc93f71a3c35..66b242efadce 100644 --- a/kde-frameworks/kcrash/kcrash-5.98.0.ebuild +++ b/kde-frameworks/kcrash/kcrash-6.1.0.ebuild @@ -1,38 +1,32 @@ -# 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" PVCUT=$(ver_cut 1-2) -QTMIN=5.15.5 -VIRTUALX_REQUIRED="test" +QTMIN=6.6.2 inherit ecm frameworks.kde.org DESCRIPTION="Framework for intercepting and handling application crashes" + LICENSE="LGPL-2+" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" -IUSE="nls X" +KEYWORDS="~amd64" +IUSE="X" # requires running Plasma environment RESTRICT="test" RDEPEND=" - >=dev-qt/qtgui-${QTMIN}:5 - =kde-frameworks/kcoreaddons-${PVCUT}*:5 - =kde-frameworks/kwindowsystem-${PVCUT}*:5 - X? ( - >=dev-qt/qtx11extras-${QTMIN}:5 - x11-libs/libX11 - ) + >=dev-qt/qtbase-${QTMIN}:6[gui] + =kde-frameworks/kcoreaddons-${PVCUT}*:6 + X? ( x11-libs/libX11 ) " DEPEND="${RDEPEND} X? ( x11-base/xorg-proto ) - test? ( >=dev-qt/qtwidgets-${QTMIN}:5 ) -" -BDEPEND=" - nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 ) + test? ( >=dev-qt/qtbase-${QTMIN}:6[widgets] ) " +BDEPEND=">=dev-qt/qttools-${QTMIN}:6[linguist]" src_configure() { local mycmakeargs=( diff --git a/kde-frameworks/kdav/Manifest b/kde-frameworks/kdav/Manifest index 5cad30142bc3..1fc40126331d 100644 --- a/kde-frameworks/kdav/Manifest +++ b/kde-frameworks/kdav/Manifest @@ -1,2 +1,2 @@ -DIST kdav-5.96.0.tar.xz 65520 BLAKE2B 18e2c19d0a08c008d52c0342ef25ff98998f0e5eddf108b1fcbc072ac4d6d1c025ce349c3719be4594cce05e7a62a96efad40da19faf759d168ed333b00f2e69 SHA512 6ce34a85ccb289d64141bd24f06ba1bdeba66a57dd7c8fd5254975d01ebe7bc9c0890329f86c662cc8878f9c820a1be79d74428e62db17cd26b5ecbc2749fb40 -DIST kdav-5.98.0.tar.xz 65636 BLAKE2B 2e7767816120d14a213db4ca667e52383a9869e153ed04deb39356e162e3a2fb717b5c806420a9aa664425a10cf8e3bc9c25bd3e7f71e8714f104277db24b318 SHA512 cea1666648f300edfc3dad1195bdd5ab16d82b24e8edb56b78cd8faf59097466e6f33620659abd5047d7890a15b397902d09160eae729096db3a18fee03dcf89 +DIST kdav-5.115.0.tar.xz 66476 BLAKE2B c7550c0281e97d29d2cbb8e18ce29e1503506afb46d3e8600c1fdfa6a8f444028b6c12984ef61e58a5789919f771d0648c4cfc3c120fe1b7c113aacb5c98c786 SHA512 62e25deaa926c5f927e40e7d3baa06d536b1cf143515ff5607987808a3153295d7415519036239683614662a52a390aae7722b43d8e623a32231bf2811abad03 +DIST kdav-6.1.0.tar.xz 68220 BLAKE2B 136f53d87da69779179fbf9dfd3d235c92001c2f32f410a869a843e3310dda595d69cd22c1e6ec361c9584f1d8998ac004509a3f642d9f94e724615d296eb619 SHA512 f7e37640f7048d0da6a4377d1eabc3a4d817dd9c22ab7df8fbb1cf22f641fadbd2cc34014948341261fc8c5782586b01d9526526657fd2ef818898218254c4d7 diff --git a/kde-frameworks/kdav/kdav-5.96.0.ebuild b/kde-frameworks/kdav/kdav-5.115.0.ebuild index 9d0f69bac7da..a18a5efa9c00 100644 --- a/kde-frameworks/kdav/kdav-5.96.0.ebuild +++ b/kde-frameworks/kdav/kdav-5.115.0.ebuild @@ -1,36 +1,33 @@ -# 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" PVCUT=$(ver_cut 1-2) -QTMIN=5.15.4 -VIRTUALX_REQUIRED="test" +QTMIN=5.15.9 inherit ecm frameworks.kde.org DESCRIPTION="DAV protocol implemention with KJobs" LICENSE="LGPL-2+" -KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86" +KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv x86" IUSE="" -DEPEND=" +RDEPEND=" >=dev-qt/qtgui-${QTMIN}:5 >=dev-qt/qtxml-${QTMIN}:5 >=kde-frameworks/kcoreaddons-${PVCUT}:5 >=kde-frameworks/ki18n-${PVCUT}:5 >=kde-frameworks/kio-${PVCUT}:5 " -RDEPEND="${DEPEND} - !kde-apps/kdav:5 -" +DEPEND="${RDEPEND}" -src_test() { - # bug 616808 - DavItemFetchJobTest requires D-Bus - # bug 653602 - DavItemsListJobTest mimetypes unsupported - local myctestargs=( - -E "(kdav-davitemfetchjob|kdav-davitemslistjob)" - ) - ecm_src_test -} +CMAKE_SKIP_TESTS=( + # bug 616808: requires D-Bus + kdav-davitemfetchjob + # bug 653602: mimetypes unsupported + kdav-davitemslistjob + # bug 765061 + kdav-davcollectionsmultifetchjobtest +) diff --git a/kde-frameworks/kdav/kdav-5.98.0.ebuild b/kde-frameworks/kdav/kdav-5.98.0.ebuild deleted file mode 100644 index 2b93ee465c34..000000000000 --- a/kde-frameworks/kdav/kdav-5.98.0.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_TEST="forceoptional" -PVCUT=$(ver_cut 1-2) -QTMIN=5.15.5 -VIRTUALX_REQUIRED="test" -inherit ecm frameworks.kde.org - -DESCRIPTION="DAV protocol implemention with KJobs" - -LICENSE="LGPL-2+" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" -IUSE="" - -DEPEND=" - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtxml-${QTMIN}:5 - >=kde-frameworks/kcoreaddons-${PVCUT}:5 - >=kde-frameworks/ki18n-${PVCUT}:5 - >=kde-frameworks/kio-${PVCUT}:5 -" -RDEPEND="${DEPEND} - !kde-apps/kdav:5 -" - -src_test() { - # bug 616808 - DavItemFetchJobTest requires D-Bus - # bug 653602 - DavItemsListJobTest mimetypes unsupported - local myctestargs=( - -E "(kdav-davitemfetchjob|kdav-davitemslistjob)" - ) - ecm_src_test -} diff --git a/kde-frameworks/kdav/kdav-6.1.0.ebuild b/kde-frameworks/kdav/kdav-6.1.0.ebuild new file mode 100644 index 000000000000..4ae8f4047b29 --- /dev/null +++ b/kde-frameworks/kdav/kdav-6.1.0.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_TEST="forceoptional" +PVCUT=$(ver_cut 1-2) +QTMIN=6.6.2 +inherit ecm frameworks.kde.org + +DESCRIPTION="DAV protocol implemention with KJobs" + +LICENSE="LGPL-2+" +KEYWORDS="~amd64" +IUSE="" + +RDEPEND=" + >=dev-qt/qtbase-${QTMIN}:6[gui,xml] + >=kde-frameworks/kcoreaddons-${PVCUT}:6 + >=kde-frameworks/ki18n-${PVCUT}:6 + >=kde-frameworks/kio-${PVCUT}:6 +" +DEPEND="${RDEPEND}" + +CMAKE_SKIP_TESTS=( + # bug 616808: requires D-Bus + kdav-davitemfetchjob + # bug 653602: mimetypes unsupported + kdav-davitemslistjob + # bug 765061 + kdav-davcollectionsmultifetchjobtest +) diff --git a/kde-frameworks/kdbusaddons/Manifest b/kde-frameworks/kdbusaddons/Manifest index c1ada3b6f287..2cc402f392c6 100644 --- a/kde-frameworks/kdbusaddons/Manifest +++ b/kde-frameworks/kdbusaddons/Manifest @@ -1,2 +1,2 @@ -DIST kdbusaddons-5.96.0.tar.xz 48360 BLAKE2B 274c2d80a407323b1a1164212e901c34b1342114ce746d6edf26881bb257ee81f0b8d7a5d451eb945b1b568396f6d0279bb210eace0e9077da9026a21821c5eb SHA512 24d3e245157b33ea21d637609e8d8bad77ae80c142004590ef9b2071e362271787b9b62dc97ff9f0590ecf9e95c1a973063ac35cbb0cc13168294f1be0d70ca2 -DIST kdbusaddons-5.98.0.tar.xz 48376 BLAKE2B e8d2cd222876d3227e2066d67c9dd410a8535592f9baeee12c4b948b5cae48df76571949dc00f711d75a67e2fcf117faa173e58622859505df56635c2d319094 SHA512 a77f470343be80ef9f9c277caa058cf05b837cd14fda5df2bbf9ce03b47201ee5abe72008a9899e555116f44bec7e80b27ec8f38c390b4859307e4b705572cb0 +DIST kdbusaddons-5.115.0.tar.xz 48924 BLAKE2B d781b8a42b80abc3096f10e7fe2ae8bd5d6d7306e0d6c0cd61b82c28719c8ecdfb9652388bcd29d49e614fdfdf448ac4cfbf7de7abbb7ea7f8cc1f632ce565b4 SHA512 4d43d39300652a7923a8f2a66dab18e606c2472c18f9629d3481bfc9329ff60b0d53f463de88d6dabfa106cebf68422184a4dc76b35c95f05050271eac29654e +DIST kdbusaddons-6.1.0.tar.xz 46420 BLAKE2B b22b3e59dbd47b774ef7226ee4d6ade506c3ca7c6e25658efeba62ad6729643345b6d3ff2d33b1225dc57eec61977eb94fc56d3859c7d72488a1f80c120f1a42 SHA512 924d21179c624fdeed9de230c22b12d4682980b8578e81a8473bb95a1d251a104d5d6dd7e999e01caf5652a60a6b78ad2baf07e98d1d1d60c5ed2c4c7e6a844d diff --git a/kde-frameworks/kdbusaddons/kdbusaddons-5.96.0.ebuild b/kde-frameworks/kdbusaddons/kdbusaddons-5.115.0.ebuild index 5742f4f2baa9..1576a302b9fe 100644 --- a/kde-frameworks/kdbusaddons/kdbusaddons-5.96.0.ebuild +++ b/kde-frameworks/kdbusaddons/kdbusaddons-5.115.0.ebuild @@ -1,25 +1,24 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -QTMIN=5.15.4 +QTMIN=5.15.9 VIRTUALDBUS_TEST="true" inherit ecm frameworks.kde.org DESCRIPTION="Framework for registering services and applications per freedesktop standards" + LICENSE="LGPL-2+" -KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" -IUSE="nls X" +KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86" +IUSE="X" -BDEPEND=" - nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 ) -" DEPEND=" >=dev-qt/qtdbus-${QTMIN}:5 X? ( >=dev-qt/qtx11extras-${QTMIN}:5 ) " RDEPEND="${DEPEND}" +BDEPEND=">=dev-qt/linguist-tools-${QTMIN}:5" src_configure() { local mycmakeargs=( diff --git a/kde-frameworks/kdbusaddons/kdbusaddons-5.98.0.ebuild b/kde-frameworks/kdbusaddons/kdbusaddons-6.1.0.ebuild index 393adeb20f9f..8022427363d4 100644 --- a/kde-frameworks/kdbusaddons/kdbusaddons-5.98.0.ebuild +++ b/kde-frameworks/kdbusaddons/kdbusaddons-6.1.0.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 -QTMIN=5.15.5 +QTMIN=6.6.2 VIRTUALDBUS_TEST="true" inherit ecm frameworks.kde.org DESCRIPTION="Framework for registering services and applications per freedesktop standards" + LICENSE="LGPL-2+" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" -IUSE="nls X" +KEYWORDS="~amd64" +IUSE="X" -BDEPEND=" - nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 ) -" +# slot op: Uses Qt6::GuiPrivate for qtx11extras_p.h DEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - X? ( >=dev-qt/qtx11extras-${QTMIN}:5 ) + >=dev-qt/qtbase-${QTMIN}:6[dbus] + X? ( >=dev-qt/qtbase-${QTMIN}:6=[gui] ) " RDEPEND="${DEPEND}" +BDEPEND=">=dev-qt/qttools-${QTMIN}:6[linguist]" src_configure() { local mycmakeargs=( - $(cmake_use_find_package X Qt5X11Extras) + -DWITH_X11=$(usex X) ) ecm_src_configure diff --git a/kde-frameworks/kdeclarative/Manifest b/kde-frameworks/kdeclarative/Manifest index 1321c9a0b0cc..c79f6efd48a1 100644 --- a/kde-frameworks/kdeclarative/Manifest +++ b/kde-frameworks/kdeclarative/Manifest @@ -1,2 +1,2 @@ -DIST kdeclarative-5.96.0.tar.xz 206840 BLAKE2B d966d39ff585384c1ae86ee1636a17c88fa6ce6b63668ecd34ce592bb02cd3b248fcc3bb1099bc2f628d48ba39a5acb79f1c3b8ea111621634faa80b6c593e85 SHA512 088359b8f46703c5238ba632325b955d7c5f8e32bb1471f4841f821b07672f1022c144fc619c00029011dce12d0dbd45bf9d2e894861ad679b07c851d85a6096 -DIST kdeclarative-5.98.0.tar.xz 207124 BLAKE2B b44dfc0c367dba17d0747c5806c6a504abedb5841d612f146cd45283794db731ca8ba362a1c6087e099ba84aa70456add643997858f5a1a43427afd2f7ee0446 SHA512 2302d076effe7799dbdc3069aa891c1f8569d0b5e34af230ba158a77e3801156ad788d63649073922b0c5f740162926a5de0e9b35c85c5761155147039d79855 +DIST kdeclarative-5.115.0.tar.xz 2492688 BLAKE2B 26c140a97a362ccc97d8c193c889fbf83b445532708c6e4ca99b7f5e85daeb4c13b9feb28731d48eeed1f81a8f55e2aab3c2e2360cc44191b0ff222ea4caf480 SHA512 e744d970605de5c0f32485ae471f52950c4af72a7e0e3fc3011b2320f7c951ea3e1a1a80f84916ba0fd1d4019c009b66967af70f06e5aa9ea758189c221310ce +DIST kdeclarative-6.1.0.tar.xz 2436156 BLAKE2B 9dfb3eb1916fef53020e6a57292c86a17ae273785659c73d50c4b400af728e4349e3efdea7ac0164a2dfbfa73b89170725fe73faf39430efa34532601314a5c7 SHA512 cba39ef2f03f80a1ef739b53fe2c8843574b4a67ab2ed185033295a2e6c04a76d9769a207f333d5e95944c311c73ae72bf1855cda5288a2d3f6491d6ec60c74b diff --git a/kde-frameworks/kdeclarative/kdeclarative-5.98.0.ebuild b/kde-frameworks/kdeclarative/kdeclarative-5.115.0.ebuild index 9dd0ded5315a..84a8b4088efe 100644 --- a/kde-frameworks/kdeclarative/kdeclarative-5.98.0.ebuild +++ b/kde-frameworks/kdeclarative/kdeclarative-5.115.0.ebuild @@ -1,17 +1,17 @@ -# 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="false" PVCUT=$(ver_cut 1-2) -QTMIN=5.15.5 +QTMIN=5.15.9 inherit ecm frameworks.kde.org DESCRIPTION="Framework providing integration of QML and KDE work spaces" LICENSE="LGPL-2+" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86" IUSE="" DEPEND=" @@ -22,6 +22,7 @@ DEPEND=" =kde-frameworks/kconfig-${PVCUT}*:5 =kde-frameworks/kcoreaddons-${PVCUT}*:5 =kde-frameworks/kglobalaccel-${PVCUT}*:5 + =kde-frameworks/kguiaddons-${PVCUT}*:5 =kde-frameworks/ki18n-${PVCUT}*:5 =kde-frameworks/kiconthemes-${PVCUT}*:5 =kde-frameworks/kio-${PVCUT}*:5 diff --git a/kde-frameworks/kdeclarative/kdeclarative-5.96.0.ebuild b/kde-frameworks/kdeclarative/kdeclarative-5.96.0.ebuild deleted file mode 100644 index 6b4c837493bb..000000000000 --- a/kde-frameworks/kdeclarative/kdeclarative-5.96.0.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_TEST="false" -PVCUT=$(ver_cut 1-2) -QTMIN=5.15.4 -inherit ecm frameworks.kde.org - -DESCRIPTION="Framework providing integration of QML and KDE work spaces" - -LICENSE="LGPL-2+" -KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" -IUSE="" - -DEPEND=" - >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtnetwork-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - =kde-frameworks/kconfig-${PVCUT}*:5 - =kde-frameworks/kcoreaddons-${PVCUT}*:5 - =kde-frameworks/kglobalaccel-${PVCUT}*:5 - =kde-frameworks/ki18n-${PVCUT}*:5 - =kde-frameworks/kiconthemes-${PVCUT}*:5 - =kde-frameworks/kio-${PVCUT}*:5 - =kde-frameworks/knotifications-${PVCUT}*:5 - =kde-frameworks/kpackage-${PVCUT}*:5 - =kde-frameworks/kservice-${PVCUT}*:5 - =kde-frameworks/kwidgetsaddons-${PVCUT}*:5 - =kde-frameworks/kwindowsystem-${PVCUT}*:5 - media-libs/libepoxy -" -RDEPEND="${DEPEND}" diff --git a/kde-frameworks/kdeclarative/kdeclarative-6.1.0.ebuild b/kde-frameworks/kdeclarative/kdeclarative-6.1.0.ebuild new file mode 100644 index 000000000000..100291c53016 --- /dev/null +++ b/kde-frameworks/kdeclarative/kdeclarative-6.1.0.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_TEST="false" +PVCUT=$(ver_cut 1-2) +QTMIN=6.6.2 +inherit ecm frameworks.kde.org + +DESCRIPTION="Framework providing integration of QML and KDE work spaces" + +LICENSE="LGPL-2+" +KEYWORDS="~amd64" +IUSE="" + +DEPEND=" + >=dev-qt/qtbase-${QTMIN}:6[gui] + >=dev-qt/qtdeclarative-${QTMIN}:6 + =kde-frameworks/kconfig-${PVCUT}*:6 + =kde-frameworks/kcoreaddons-${PVCUT}*:6 + =kde-frameworks/kglobalaccel-${PVCUT}*:6 + =kde-frameworks/kguiaddons-${PVCUT}*:6 + =kde-frameworks/ki18n-${PVCUT}*:6 + =kde-frameworks/kservice-${PVCUT}*:6 + =kde-frameworks/kwidgetsaddons-${PVCUT}*:6 +" +RDEPEND="${DEPEND}" diff --git a/kde-frameworks/kded/Manifest b/kde-frameworks/kded/Manifest index 47b20728e4d0..f362f87d532e 100644 --- a/kde-frameworks/kded/Manifest +++ b/kde-frameworks/kded/Manifest @@ -1,2 +1,2 @@ -DIST kded-5.96.0.tar.xz 39316 BLAKE2B bd7013ce795a2f04bd1bf56fbb30668e7913fc7792dd226fe5f73d11121e89b400338f3681b4963b92c64116faef8e718f372a544a1b2aeb69d8cc6e10137c79 SHA512 125840a238232befe68705d7051baecb83a5a9f046ce9be496351ae9b7f31d2719966fd26c8bb0c82666374fa9d32d0b4a002a2108510c15013dba6b1a096b11 -DIST kded-5.98.0.tar.xz 39552 BLAKE2B 601a53c7a3b40044c6e5385fe889edc62e1d3fa3a3be03d88c1d02337423950d79c6e4a77735f18799e6f63d31c0ca99d3325f7031509d2868b300b89869c082 SHA512 9987936e9e6206bd4d18c1ff83a1bed574ff97e87134b0b26933e6824dbcf09fe222dbc54225a426be9df0db536100772e283a4d2b8b211938ec8f6c9d96c07c +DIST kded-5.115.0.tar.xz 41064 BLAKE2B bbff8afe58d72f43ac6daab92e5b981465ca1b95d2e28089a847301430c958d6fa1f7909b5e05e3422bc219ba2c22ec8ba073b510b45680e0d948af6d5317da7 SHA512 880fb068bcd0ebbbc07ec0396a58d763a8b9f5f431874748b4f8d88c79c06d670cd01fc706e60f2f87816a7bc64b4b4e4e367eedc04bc2c160a1a64fe7f68fdb +DIST kded-6.1.0.tar.xz 32232 BLAKE2B 4d25a26f747b11a232b48a37a31a0d956aaddca4b60c1e020cc86db56f61e283c5345fe1194127490c101340c505835725b559a9f70e47f7a88abea69f4b1f74 SHA512 d0832122f3d81ffb79079881cd735230b9d3e4cbaef2b2cc5cc35bfec872145e8ba85b29d7ac3eda3f2966256d1a3c8a8d7df50c3c096094dc3344e432b6408e diff --git a/kde-frameworks/kded/kded-5.96.0.ebuild b/kde-frameworks/kded/kded-5.115.0.ebuild index dc7e7950c146..c92e19f9d173 100644 --- a/kde-frameworks/kded/kded-5.96.0.ebuild +++ b/kde-frameworks/kded/kded-5.115.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -6,29 +6,27 @@ EAPI=8 ECM_QTHELP="false" ECM_TEST="false" PVCUT=$(ver_cut 1-2) -QTMIN=5.15.4 +QTMIN=5.15.9 inherit ecm frameworks.kde.org DESCRIPTION="Central daemon of KDE workspaces" + LICENSE="LGPL-2+" -KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" +KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86" IUSE="+man" -BDEPEND=" - man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 ) -" DEPEND=" >=dev-qt/qtdbus-${QTMIN}:5 >=dev-qt/qtgui-${QTMIN}:5 >=dev-qt/qtwidgets-${QTMIN}:5 - =kde-frameworks/kconfig-${PVCUT}*:5 + =kde-frameworks/kconfig-${PVCUT}*:5[dbus] =kde-frameworks/kcoreaddons-${PVCUT}*:5 =kde-frameworks/kcrash-${PVCUT}*:5 =kde-frameworks/kdbusaddons-${PVCUT}*:5 - =kde-frameworks/kinit-${PVCUT}*:5 =kde-frameworks/kservice-${PVCUT}*:5 " RDEPEND="${DEPEND}" +BDEPEND="man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )" src_configure() { local mycmakeargs=( diff --git a/kde-frameworks/kded/kded-5.98.0.ebuild b/kde-frameworks/kded/kded-5.98.0.ebuild deleted file mode 100644 index 1c5405af027d..000000000000 --- a/kde-frameworks/kded/kded-5.98.0.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_QTHELP="false" -ECM_TEST="false" -PVCUT=$(ver_cut 1-2) -QTMIN=5.15.5 -inherit ecm frameworks.kde.org - -DESCRIPTION="Central daemon of KDE workspaces" -LICENSE="LGPL-2+" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" -IUSE="+man" - -BDEPEND=" - man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 ) -" -DEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - =kde-frameworks/kconfig-${PVCUT}*:5 - =kde-frameworks/kcoreaddons-${PVCUT}*:5 - =kde-frameworks/kcrash-${PVCUT}*:5 - =kde-frameworks/kdbusaddons-${PVCUT}*:5 - =kde-frameworks/kinit-${PVCUT}*:5 - =kde-frameworks/kservice-${PVCUT}*:5 -" -RDEPEND="${DEPEND}" - -src_configure() { - local mycmakeargs=( - $(cmake_use_find_package man KF5DocTools) - ) - - ecm_src_configure -} diff --git a/kde-frameworks/kded/kded-6.1.0.ebuild b/kde-frameworks/kded/kded-6.1.0.ebuild new file mode 100644 index 000000000000..6532602ce5bc --- /dev/null +++ b/kde-frameworks/kded/kded-6.1.0.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_QTHELP="false" +ECM_TEST="false" +PVCUT=$(ver_cut 1-2) +QTMIN=6.6.2 +inherit ecm frameworks.kde.org + +DESCRIPTION="Central daemon of KDE workspaces" + +LICENSE="LGPL-2+" +KEYWORDS="~amd64" +IUSE="+man" + +DEPEND=" + >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets] + =kde-frameworks/kconfig-${PVCUT}*:6[dbus] + =kde-frameworks/kcoreaddons-${PVCUT}*:6 + =kde-frameworks/kcrash-${PVCUT}*:6 + =kde-frameworks/kdbusaddons-${PVCUT}*:6 + =kde-frameworks/kservice-${PVCUT}*:6 +" +RDEPEND="${DEPEND}" +BDEPEND="man? ( >=kde-frameworks/kdoctools-${PVCUT}:6 )" + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package man KF6DocTools) + ) + + ecm_src_configure +} diff --git a/kde-frameworks/kdelibs4support/Manifest b/kde-frameworks/kdelibs4support/Manifest index 3b1985a669e1..b28a15aba8d1 100644 --- a/kde-frameworks/kdelibs4support/Manifest +++ b/kde-frameworks/kdelibs4support/Manifest @@ -1,2 +1 @@ -DIST kdelibs4support-5.96.0.tar.xz 3657280 BLAKE2B 5450ad4aced1e73b68dab9ce5f858f65765b96d98b2d977a796d13f148f31e8cb6d2562713569b4694afa163e3fac2d93ee94e6bd1592710e1141e6095320761 SHA512 25d80c003b6cc661058d24e3af4b9ef43c05029375c74ea2aedd1b4cbb8a09896404d2e2cb4eca884ad091f7d26b9afebd1a0ff13c96b9d793c40880300fb59d -DIST kdelibs4support-5.98.0.tar.xz 3667136 BLAKE2B 2afe48da81073c45040036cf2a3cdb3c1c0d96a19ec5a1f1c3b6659af24946bbc5f6134079dc93fbeda762b36f604c7bdfcdad0a3501fed7babc6a89750fac76 SHA512 e721ce662c9961a643c82b734d51c09935888545d8298abde93066db14d06d694aaabc2fad7bb98e3b6053e1d668ca32dbc2d85755df009fd724c1a59c0aa542 +DIST kdelibs4support-5.115.0.tar.xz 3723592 BLAKE2B efb5a384b71f781d666d78c3157188179eaf54237d6a8c442217273e5b4b1b604d86f5db73cce6528d991f669d6ddb6cf156035d5606d1eb03912c7b99ddf26b SHA512 511e14975c2810217e8f08d14a800cfdd04654399303b04a45d69b2f1959cf482027f2444c9e8202bdda60f1779fe572af0a55fae1b3692ec49cea97beeb894f diff --git a/kde-frameworks/kdelibs4support/kdelibs4support-5.96.0.ebuild b/kde-frameworks/kdelibs4support/kdelibs4support-5.115.0.ebuild index d2e6ffee9a80..d76a8b156bcf 100644 --- a/kde-frameworks/kdelibs4support/kdelibs4support-5.96.0.ebuild +++ b/kde-frameworks/kdelibs4support/kdelibs4support-5.115.0.ebuild @@ -1,19 +1,20 @@ -# 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="true" +ECM_HANDBOOK_DIR="docs" ECM_QTHELP="false" PVCUT=$(ver_cut 1-2) -QTMIN=5.15.4 -VIRTUALX_REQUIRED="test" +QTMIN=5.15.9 inherit ecm frameworks.kde.org DESCRIPTION="Framework easing the development transition from KDELibs 4 to KF 5" + LICENSE="LGPL-2+" KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" -IUSE="X" +IUSE="networkmanager X" RESTRICT="test" @@ -45,16 +46,17 @@ COMMON_DEPEND=" =kde-frameworks/kio-${PVCUT}*:5 =kde-frameworks/kitemviews-${PVCUT}*:5 =kde-frameworks/kjobwidgets-${PVCUT}*:5 - =kde-frameworks/knotifications-${PVCUT}*:5[X=] + =kde-frameworks/knotifications-${PVCUT}*:5[X?] =kde-frameworks/kparts-${PVCUT}*:5 =kde-frameworks/kservice-${PVCUT}*:5 =kde-frameworks/ktextwidgets-${PVCUT}*:5 =kde-frameworks/kunitconversion-${PVCUT}*:5 =kde-frameworks/kwidgetsaddons-${PVCUT}*:5 - =kde-frameworks/kwindowsystem-${PVCUT}*:5[X=] + =kde-frameworks/kwindowsystem-${PVCUT}*:5[X?] =kde-frameworks/kxmlgui-${PVCUT}*:5 =kde-frameworks/solid-${PVCUT}*:5 virtual/libintl + networkmanager? ( net-misc/networkmanager ) X? ( >=dev-qt/qtx11extras-${QTMIN}:5 x11-libs/libICE @@ -79,6 +81,7 @@ BDEPEND=" " PATCHES=( + # downstream patches "${FILESDIR}/${PN}-5.80.0-no-kdesignerplugin.patch" # bug 755956 "${FILESDIR}/${PN}-5.86.0-unused-dep.patch" # bug 755956 ) @@ -95,7 +98,8 @@ src_prepare() { src_configure() { local mycmakeargs=( - $(cmake_use_find_package X X11) + -DWITH_X11=$(usex X) + $(cmake_use_find_package networkmanager NetworkManager) ) ecm_src_configure diff --git a/kde-frameworks/kdelibs4support/kdelibs4support-5.98.0.ebuild b/kde-frameworks/kdelibs4support/kdelibs4support-5.98.0.ebuild deleted file mode 100644 index 90fd9ac526a5..000000000000 --- a/kde-frameworks/kdelibs4support/kdelibs4support-5.98.0.ebuild +++ /dev/null @@ -1,102 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_HANDBOOK="true" -ECM_QTHELP="false" -PVCUT=$(ver_cut 1-2) -QTMIN=5.15.5 -VIRTUALX_REQUIRED="test" -inherit ecm frameworks.kde.org - -DESCRIPTION="Framework easing the development transition from KDELibs 4 to KF 5" -LICENSE="LGPL-2+" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" -IUSE="X" - -RESTRICT="test" - -COMMON_DEPEND=" - app-text/docbook-xml-dtd:4.2 - dev-libs/openssl:0 - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtnetwork-${QTMIN}:5[ssl] - >=dev-qt/qtprintsupport-${QTMIN}:5 - >=dev-qt/qtsvg-${QTMIN}:5 - >=dev-qt/qttest-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - =kde-frameworks/kauth-${PVCUT}*:5 - =kde-frameworks/kcodecs-${PVCUT}*:5 - =kde-frameworks/kcompletion-${PVCUT}*:5 - =kde-frameworks/kconfig-${PVCUT}*:5 - =kde-frameworks/kconfigwidgets-${PVCUT}*:5 - =kde-frameworks/kcoreaddons-${PVCUT}*:5 - =kde-frameworks/kcrash-${PVCUT}*:5 - =kde-frameworks/kdbusaddons-${PVCUT}*:5 - >=kde-frameworks/kded-${PVCUT}:5 - =kde-frameworks/kdoctools-${PVCUT}*:5 - =kde-frameworks/kemoticons-${PVCUT}*:5 - =kde-frameworks/kglobalaccel-${PVCUT}*:5 - =kde-frameworks/kguiaddons-${PVCUT}*:5 - =kde-frameworks/ki18n-${PVCUT}*:5 - =kde-frameworks/kiconthemes-${PVCUT}*:5 - =kde-frameworks/kio-${PVCUT}*:5 - =kde-frameworks/kitemviews-${PVCUT}*:5 - =kde-frameworks/kjobwidgets-${PVCUT}*:5 - =kde-frameworks/knotifications-${PVCUT}*:5[X=] - =kde-frameworks/kparts-${PVCUT}*:5 - =kde-frameworks/kservice-${PVCUT}*:5 - =kde-frameworks/ktextwidgets-${PVCUT}*:5 - =kde-frameworks/kunitconversion-${PVCUT}*:5 - =kde-frameworks/kwidgetsaddons-${PVCUT}*:5 - =kde-frameworks/kwindowsystem-${PVCUT}*:5[X=] - =kde-frameworks/kxmlgui-${PVCUT}*:5 - =kde-frameworks/solid-${PVCUT}*:5 - virtual/libintl - X? ( - >=dev-qt/qtx11extras-${QTMIN}:5 - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libxcb - ) -" -DEPEND="${COMMON_DEPEND} - test? ( >=dev-qt/qtconcurrent-${QTMIN}:5 ) - X? ( x11-base/xorg-proto ) -" -RDEPEND="${COMMON_DEPEND} - >=dev-qt/qtxml-${QTMIN}:5 - >=kde-frameworks/countryflags-${PVCUT}:5 - =kde-frameworks/kinit-${PVCUT}*:5 - =kde-frameworks/kitemmodels-${PVCUT}*:5 -" -BDEPEND=" - dev-lang/perl - dev-perl/URI -" - -PATCHES=( - "${FILESDIR}/${PN}-5.80.0-no-kdesignerplugin.patch" # bug 755956 - "${FILESDIR}/${PN}-5.86.0-unused-dep.patch" # bug 755956 -) - -src_prepare() { - ecm_src_prepare - - if ! use handbook; then - sed -e "/kdoctools_install/ s/^/#DONT/" -i CMakeLists.txt || die - fi - - cmake_run_in src cmake_comment_add_subdirectory l10n -} - -src_configure() { - local mycmakeargs=( - $(cmake_use_find_package X X11) - ) - - ecm_src_configure -} diff --git a/kde-frameworks/kdesu/Manifest b/kde-frameworks/kdesu/Manifest index 75515235b942..324353b29b32 100644 --- a/kde-frameworks/kdesu/Manifest +++ b/kde-frameworks/kdesu/Manifest @@ -1,2 +1,2 @@ -DIST kdesu-5.96.0.tar.xz 56032 BLAKE2B 976d7fd5def2e358107d834a092e76bda29776b87ec0e2c7a5b990ddc49e399dfbeabc951ec9a71c3da6660a8b8a33c0f899f80add7ab9784a12893f3fbf3d63 SHA512 8ccaebb8e0276fc6e661d15f57271ff05ed83309fc601301796a60f36346a2f105026e43f7c71b2692b0d1d3b7ba0447518e8500ace1c01c9f7c33b0d24e3d8e -DIST kdesu-5.98.0.tar.xz 55972 BLAKE2B a699e74179b57028e3d6b413dbd3955d6a8ecf0976f6adf79ef056a99a202f8577cafec35d7459e8f34ba60982f558ed07aec600c49c3e5ad51bb226db5bfd0c SHA512 0e6b7a52822dbde4ca88df91f4112605b9099a5ec10d547f74e945dbcc56a9cd8469c11923c7ce73c1debefa91e37c7cf8bc2bb1b4f1dc0f613361e0cb7f50c5 +DIST kdesu-5.115.0.tar.xz 56812 BLAKE2B d37c45d6ff7d0fa1f2dcc452c7ce3bfb1daca057d691c33b91c08aff1eb53686d99a089ba901cc3e001c7f019bb23bde999d66e5b449252c831de8cad8aab682 SHA512 097a4ad960fd6f47600a70b6117f8f3517bc627c3bd32616b95acedddb75d49cf44ac07ecd7fad139ac366463741e3358b96e0d2b1af7ab6fc46e009bdbf3e3d +DIST kdesu-6.1.0.tar.xz 56920 BLAKE2B e5ee0ca91d3fa6669ea1c2f3a85be70812b6756517d6e8ca2f0c13175a785a9dfb7e6b71ef8f470829c783d5ddcb16676bca87dfa0f3a039fa5bbb0c93b53433 SHA512 6ea4e6ae3f648915e8ad63d605e56fd504954138e8c663e0d41fbe1a2bd9da738f5b9024e1be631171fb38b1af7eff1af2db11cd5418a8602862a81a2da5ed2d diff --git a/kde-frameworks/kdesu/kdesu-5.96.0.ebuild b/kde-frameworks/kdesu/kdesu-5.115.0.ebuild index 034331706632..98794005bd5f 100644 --- a/kde-frameworks/kdesu/kdesu-5.96.0.ebuild +++ b/kde-frameworks/kdesu/kdesu-5.115.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -10,7 +10,7 @@ inherit ecm frameworks.kde.org DESCRIPTION="Framework to handle super user actions" LICENSE="LGPL-2" -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" IUSE="X" RDEPEND=" diff --git a/kde-frameworks/kdesu/kdesu-5.98.0.ebuild b/kde-frameworks/kdesu/kdesu-6.1.0.ebuild index 119bcceef447..dc1ef8cc42ab 100644 --- a/kde-frameworks/kdesu/kdesu-5.98.0.ebuild +++ b/kde-frameworks/kdesu/kdesu-6.1.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -10,14 +10,14 @@ inherit ecm frameworks.kde.org DESCRIPTION="Framework to handle super user actions" LICENSE="LGPL-2" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" +KEYWORDS="~amd64" IUSE="X" RDEPEND=" - =kde-frameworks/kconfig-${PVCUT}*:5 - =kde-frameworks/kcoreaddons-${PVCUT}*:5 - =kde-frameworks/ki18n-${PVCUT}*:5 - =kde-frameworks/kpty-${PVCUT}*:5 + =kde-frameworks/kconfig-${PVCUT}*:6 + =kde-frameworks/kcoreaddons-${PVCUT}*:6 + =kde-frameworks/ki18n-${PVCUT}*:6 + =kde-frameworks/kpty-${PVCUT}*:6 X? ( x11-libs/libX11 ) " DEPEND="${RDEPEND} diff --git a/kde-frameworks/kdnssd/Manifest b/kde-frameworks/kdnssd/Manifest index 4221e8f30b35..638fa9a52cdd 100644 --- a/kde-frameworks/kdnssd/Manifest +++ b/kde-frameworks/kdnssd/Manifest @@ -1,2 +1,2 @@ -DIST kdnssd-5.96.0.tar.xz 61156 BLAKE2B 8741378afd1edb776d4875a591f2f2954d1a44afdd4e38f4066e677c5c21b7ce076d93f86753a9e1d8c0496873e87a1656188746faeb736bd28fe48607463425 SHA512 1f1f43efa19c842e242c1a8eac26b7bd1035abf4dfb1bae0f4be14ee467be28d4fa35432785f088394fd749910851c22fe7908f4fb8a0a881c0c8f4e8147c296 -DIST kdnssd-5.98.0.tar.xz 61076 BLAKE2B 168f25a03faf39468fe23fc7694a10c5608de84a536fd0a9cd937df6514915836c730fc63bd54ff4bfa44d7aec6f4915310b6fa7f9b8e646f8e9bcd9b927fe52 SHA512 b11c91b0eb39dfef458a60570f63685657f822a2c36047a208b58ca347fda1e65446247f128f88d561ed451210f7a3ce0ee0486cfe0ca0de9f1c11c0ceb6d252 +DIST kdnssd-5.115.0.tar.xz 2280800 BLAKE2B 44d103bc5273815f2e40fddbfc5d097a570620994c47834bab29bf85edb332f7b8331ad3d3c4d3c68b7bf4ae1736534548722bfacaf8fcd596ab1872da4f74b4 SHA512 f78ed9a9f4434ec1b071363de35df57d7ad4f114ed91fb9ce361aa0100c42e345ad08c8190c33cefea8d2ed46186b28e2ca9236e319615f6f65855835afdb1d7 +DIST kdnssd-6.1.0.tar.xz 2277964 BLAKE2B d177963cc3a31ad0ae3d349a48e35c093671a7af6f0d672fccc2819f5299820bb39fb611b3c00c69af8814c44c846a94a1d51bd4f89d0599d72db1413c03aa10 SHA512 8d20f5b481872e52746a1605194354f4d0a56fefe091679c07e39e7d96330ab67b49b424c8568e74a027c028f8c01064311bdce6be8fe87fb81558a29326fb9f diff --git a/kde-frameworks/kdnssd/kdnssd-5.96.0.ebuild b/kde-frameworks/kdnssd/kdnssd-5.115.0.ebuild index e356d34fdf31..1dc0f052dc8d 100644 --- a/kde-frameworks/kdnssd/kdnssd-5.96.0.ebuild +++ b/kde-frameworks/kdnssd/kdnssd-5.115.0.ebuild @@ -1,19 +1,17 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -QTMIN=5.15.4 +QTMIN=5.15.9 inherit ecm frameworks.kde.org DESCRIPTION="Framework for network service discovery using Zeroconf" + LICENSE="LGPL-2+" KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" -IUSE="nls zeroconf" +IUSE="zeroconf" -BDEPEND=" - nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 ) -" DEPEND=" >=dev-qt/qtnetwork-${QTMIN}:5 zeroconf? ( @@ -22,6 +20,7 @@ DEPEND=" ) " RDEPEND="${DEPEND}" +BDEPEND=">=dev-qt/linguist-tools-${QTMIN}:5" src_configure() { local mycmakeargs=( diff --git a/kde-frameworks/kdnssd/kdnssd-5.98.0.ebuild b/kde-frameworks/kdnssd/kdnssd-6.1.0.ebuild index f22dfe5d5b8e..b3a404c71ce4 100644 --- a/kde-frameworks/kdnssd/kdnssd-5.98.0.ebuild +++ b/kde-frameworks/kdnssd/kdnssd-6.1.0.ebuild @@ -1,27 +1,26 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -QTMIN=5.15.5 +QTMIN=6.6.2 inherit ecm frameworks.kde.org DESCRIPTION="Framework for network service discovery using Zeroconf" + LICENSE="LGPL-2+" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" -IUSE="nls zeroconf" +KEYWORDS="~amd64" +IUSE="zeroconf" -BDEPEND=" - nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 ) -" DEPEND=" - >=dev-qt/qtnetwork-${QTMIN}:5 + >=dev-qt/qtbase-${QTMIN}:6[network] zeroconf? ( - >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtbase-${QTMIN}:6[dbus] net-dns/avahi[mdnsresponder-compat] ) " RDEPEND="${DEPEND}" +BDEPEND=">=dev-qt/qttools-${QTMIN}:6[linguist]" src_configure() { local mycmakeargs=( diff --git a/kde-frameworks/kdoctools/Manifest b/kde-frameworks/kdoctools/Manifest index 3484d619c6f6..2a89afa930f1 100644 --- a/kde-frameworks/kdoctools/Manifest +++ b/kde-frameworks/kdoctools/Manifest @@ -1,2 +1,2 @@ -DIST kdoctools-5.96.0.tar.xz 440328 BLAKE2B ed7672eacd056ffc81ed334313f8beaf45dfd1efbd96721ae5b2f6aa7c734dd4bf7b2f304c1ffefa4abd0a88c4e950eed6f736df61808a691d979589b7e0157c SHA512 cf0dea4b872513a1b79db6b4c7b58b56e5c73267cd89668e843ea10ecb3c544614bb22d1af9739436d192805a8f643d9e51374034f529c6be4fb518741f6eaa7 -DIST kdoctools-5.98.0.tar.xz 440760 BLAKE2B f366557773c48a6b54fad1fb1ed6daa6702f607412eab4aa32b9a76132393fa74e38fd11e3877399b9664f59fc1108232785832a0bfc02dc586fa60fe6e8d8aa SHA512 5ebc7a012a2cdd68e5b9e39616f970f9508cca149653f8a2f3d9867228136b13a041e37d1163b977e785a846899090558b0ae69ae073ebdb578584f73fd4e3f2 +DIST kdoctools-5.115.0.tar.xz 465436 BLAKE2B bf7af3333a8fbf121e326eaa2c54c16f9a9ba1552a982061337c365d57eb9d5beab8952f0360b6bb2c0bda07afd42fae050072a3ae9fafe32a54e77df4dce48d SHA512 f7c95c090899fa8d7ea0d730e48a87a4881f271a37bb1d0af6f67aaa52954613e957e04a91b94b985bf993c0b9db3736aa922033d100d2c8beb2f24ae50b2caf +DIST kdoctools-6.1.0.tar.xz 460212 BLAKE2B 154f3b322ab2dbb19e3cfecb186a58db931324ebcfdaa72fcafadc7f2d564b685efe871836e0e0ecab5db4a0b2282581432686b1223d5c0bda1d194f2375b67b SHA512 51ea89b116502aa07ddc848d952247112d8aed0ff2d6f4b401a9b2d4ff2da65517f4cf1d973382b55428502ba5f1b2383b26aab878d5784764785779f72d42bf diff --git a/kde-frameworks/kdoctools/kdoctools-5.96.0.ebuild b/kde-frameworks/kdoctools/kdoctools-5.115.0.ebuild index d90d679eb1f4..e0ad7364b427 100644 --- a/kde-frameworks/kdoctools/kdoctools-5.96.0.ebuild +++ b/kde-frameworks/kdoctools/kdoctools-5.115.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -10,7 +10,7 @@ inherit ecm frameworks.kde.org DESCRIPTION="Tools to generate documentation in various formats from DocBook files" LICENSE="MIT" -KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" +KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86" IUSE="nls" BDEPEND=" @@ -28,6 +28,11 @@ DEPEND=" " RDEPEND="${DEPEND}" +CMAKE_SKIP_TESTS=( + # bug 665622 + kdoctools_install +) + PATCHES=( "${FILESDIR}/${PN}-5.54.0-gentoo-docbundledir.patch" ) src_configure() { @@ -37,12 +42,3 @@ src_configure() { ecm_src_configure } - -src_test() { - # bug 665622 - local myctestargs=( - -E "(kdoctools_install)" - ) - - ecm_src_test -} diff --git a/kde-frameworks/kdoctools/kdoctools-5.98.0.ebuild b/kde-frameworks/kdoctools/kdoctools-6.1.0.ebuild index fe72dddcecef..95efa167a741 100644 --- a/kde-frameworks/kdoctools/kdoctools-5.98.0.ebuild +++ b/kde-frameworks/kdoctools/kdoctools-6.1.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -10,39 +10,35 @@ inherit ecm frameworks.kde.org DESCRIPTION="Tools to generate documentation in various formats from DocBook files" LICENSE="MIT" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" +KEYWORDS="~amd64" IUSE="nls" -BDEPEND=" - dev-lang/perl - dev-perl/URI - nls? ( >=kde-frameworks/ki18n-${PVCUT}:5 ) -" DEPEND=" app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets app-text/sgml-common dev-libs/libxml2:2 dev-libs/libxslt - =kde-frameworks/karchive-${PVCUT}*:5 + =kde-frameworks/karchive-${PVCUT}*:6 " RDEPEND="${DEPEND}" +BDEPEND=" + dev-lang/perl + dev-perl/URI + nls? ( >=kde-frameworks/ki18n-${PVCUT}:6 ) +" + +CMAKE_SKIP_TESTS=( + # bug 665622 + kdoctools_install +) PATCHES=( "${FILESDIR}/${PN}-5.54.0-gentoo-docbundledir.patch" ) src_configure() { local mycmakeargs=( - $(cmake_use_find_package nls KF5I18n) + $(cmake_use_find_package nls KF6I18n) ) ecm_src_configure } - -src_test() { - # bug 665622 - local myctestargs=( - -E "(kdoctools_install)" - ) - - ecm_src_test -} diff --git a/kde-frameworks/kemoticons/Manifest b/kde-frameworks/kemoticons/Manifest index 93a75207214b..09e68c3e3466 100644 --- a/kde-frameworks/kemoticons/Manifest +++ b/kde-frameworks/kemoticons/Manifest @@ -1,2 +1 @@ -DIST kemoticons-5.96.0.tar.xz 1700784 BLAKE2B dcdea458fa5ef6fa20142a3b7953a505afc8043a6af1f7e86f0ccd6f9f968149adbfda714729a28120394113737d279db6c31435ff5254be9858f2ac9c5be5d7 SHA512 4db2c2ef25effa8f52729cac58002ef8f201d64ee1a7442432e3738d20e13fb52cb71605c1985a731b41b2990d2d4eafb551b119c1421af0c0acfd958b95b62b -DIST kemoticons-5.98.0.tar.xz 1700700 BLAKE2B fcc9dc23564768dc096348184084368aad0181c7c95221fa307a7d9cec7fc2d62774d7d667b3f6a951a0eaebc44d5f4408e491b55671592d9b0a91e1d15bc0e9 SHA512 2b128d3ab9a52a9d4e5a3e6c70b4e41d774922a8506b4aa601994ef3d859eb179bb06ba4ce8a0927e883bdfa20673aef56a396426d8f789daab1a201627430bb +DIST kemoticons-5.115.0.tar.xz 1700720 BLAKE2B 06a62962f007e273d8d3dcff9c4bec24c4982707f11931a19a87e8712ce7589fd325bfb42dc974e6907df79078a4445711549522d052834f61f395d93ccc689f SHA512 412729a4c236f27d584d508de5104b7a9ac451758427d5595c44ff07c045b91c69f024ea589b3b1f8eca95eb827deab789870ca36acb5cf6a06b3b22169604dc diff --git a/kde-frameworks/kemoticons/kemoticons-5.96.0.ebuild b/kde-frameworks/kemoticons/kemoticons-5.115.0.ebuild index 9ef3813d0d72..350625768951 100644 --- a/kde-frameworks/kemoticons/kemoticons-5.96.0.ebuild +++ b/kde-frameworks/kemoticons/kemoticons-5.115.0.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 PVCUT=$(ver_cut 1-2) -QTMIN=5.15.4 -VIRTUALX_REQUIRED="test" +QTMIN=5.15.9 inherit ecm frameworks.kde.org DESCRIPTION="Framework for converting text emoticons to graphical representations" diff --git a/kde-frameworks/kemoticons/kemoticons-5.98.0.ebuild b/kde-frameworks/kemoticons/kemoticons-5.98.0.ebuild deleted file mode 100644 index 6ba8306059f3..000000000000 --- a/kde-frameworks/kemoticons/kemoticons-5.98.0.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PVCUT=$(ver_cut 1-2) -QTMIN=5.15.5 -VIRTUALX_REQUIRED="test" -inherit ecm frameworks.kde.org - -DESCRIPTION="Framework for converting text emoticons to graphical representations" -LICENSE="LGPL-2.1+" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" -IUSE="" - -# requires running kde environment -RESTRICT="test" - -DEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtxml-${QTMIN}:5 - =kde-frameworks/karchive-${PVCUT}*:5 - =kde-frameworks/kconfig-${PVCUT}*:5 - =kde-frameworks/kcoreaddons-${PVCUT}*:5 - =kde-frameworks/kservice-${PVCUT}*:5 -" -RDEPEND="${DEPEND}" diff --git a/kde-frameworks/kf-env/kf-env-5.ebuild b/kde-frameworks/kf-env/kf-env-5.ebuild index fd8f92cd8b4a..f0edd769011e 100644 --- a/kde-frameworks/kf-env/kf-env-5.ebuild +++ b/kde-frameworks/kf-env/kf-env-5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,7 +9,7 @@ SRC_URI="" LICENSE="GPL-2" SLOT="5" -KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv x86" +KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv x86" IUSE="" RDEPEND=">=x11-misc/xdg-utils-1.1.1-r1" diff --git a/kde-frameworks/kfilemetadata/Manifest b/kde-frameworks/kfilemetadata/Manifest index 54faf98d5288..be5a50d8ca6b 100644 --- a/kde-frameworks/kfilemetadata/Manifest +++ b/kde-frameworks/kfilemetadata/Manifest @@ -1,2 +1,2 @@ -DIST kfilemetadata-5.96.0.tar.xz 437292 BLAKE2B e0c34856128ad8b78cde050d97a594ae0e0a841ae7a02f7946730cbe808de163e55a3ac2e31e1c0cace9b2726d0cb630b3c230a895a9e8620ba28c89f3bc73bb SHA512 c0331f50799b17828fc5f34223be7e2d4f27b9347709115a3f6bda5c56324ead3d70021089a7078c4d4104f7d0d8fc5b04fb22cca7e30bf682d08a0f5bd4fafe -DIST kfilemetadata-5.98.0.tar.xz 437964 BLAKE2B c7958dc738b78443cbbce9abb7fadedfd89de076b4f4fd38d98e951c7220310b6027eb7c0077010bdf951fb711e535942598de6f41d24a448970bc8f705abbb3 SHA512 49e6606ee11c971a612b33647d025f0ecaf567c61e4b71651b6461350e329c0970035aa253f82fd5d47390f5cfcf9fbc930e6a4dcbd3c493bcd0b3be0dbdf167 +DIST kfilemetadata-5.115.0.tar.xz 526912 BLAKE2B a6c80153d451e242f5e16ddbed9cccb3b6f64700f1081de954aeac64f814ef74b1ea4a9960be1e0f83d7217f67034b57b25cd8ea7cd1df9a6f717a607a8fb8f0 SHA512 db7fc7e79abf358ee0def12601de140e8f5d62d939f5580b7940a492780eea8d5b4eb2f679ed15ab02134277d15353d24511a6e41260751811af52398ee037e4 +DIST kfilemetadata-6.1.0.tar.xz 592036 BLAKE2B ea53949e8818ca9c83cabdc51018206b9908615ea830be326553745167d95a9df0ee1bccf3b30f7b7b87eeaf3b4bb901a3abe157414ca2c08d211025a1fcf6d8 SHA512 afeee8f47c202906d12a48153f325dc694e929d634ec785d6bf1db36c23dca913c3e0d4cd39947b1f4cf6aa62b5f3fa4e543590ec81b736e666335e62182dbd2 diff --git a/kde-frameworks/kfilemetadata/kfilemetadata-5.96.0.ebuild b/kde-frameworks/kfilemetadata/kfilemetadata-5.115.0.ebuild index 4137193881c6..dfbdf72e8425 100644 --- a/kde-frameworks/kfilemetadata/kfilemetadata-5.96.0.ebuild +++ b/kde-frameworks/kfilemetadata/kfilemetadata-5.115.0.ebuild @@ -1,38 +1,43 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{8..11} ) +PYTHON_COMPAT=( python3_{10..12} ) PVCUT=$(ver_cut 1-2) -QTMIN=5.15.4 +QTMIN=5.15.9 inherit ecm frameworks.kde.org optfeature python-any-r1 DESCRIPTION="Library for extracting file metadata" + LICENSE="LGPL-2+" KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" -IUSE="epub exif ffmpeg mobi office pdf taglib" +IUSE="epub exif ffmpeg mobi pdf taglib" RESTRICT="test" -BDEPEND=" - test? ( ${PYTHON_DEPS} ) -" RDEPEND=" + >=dev-qt/qtgui-${QTMIN}:5 >=dev-qt/qtxml-${QTMIN}:5 + =kde-frameworks/karchive-${PVCUT}*:5 =kde-frameworks/kcoreaddons-${PVCUT}*:5 =kde-frameworks/ki18n-${PVCUT}*:5 epub? ( app-text/ebook-tools ) exif? ( media-gfx/exiv2:= ) ffmpeg? ( media-video/ffmpeg:0= ) mobi? ( kde-apps/kdegraphics-mobipocket:5 ) - office? ( =kde-frameworks/karchive-${PVCUT}*:5 ) pdf? ( app-text/poppler[qt5] ) - taglib? ( media-libs/taglib ) + taglib? ( media-libs/taglib:= ) " DEPEND="${RDEPEND} kernel_linux? ( sys-apps/attr ) " +BDEPEND="test? ( ${PYTHON_DEPS} )" + +CMAKE_SKIP_TESTS=( + # FIXME: bug 644650, fails on tmpfs (but not for everyone) + usermetadatawritertest +) pkg_setup() { use test && python-any-r1_pkg_setup @@ -45,7 +50,6 @@ src_configure() { $(cmake_use_find_package exif LibExiv2) $(cmake_use_find_package ffmpeg FFmpeg) $(cmake_use_find_package mobi QMobipocket) - $(cmake_use_find_package office KF5Archive) $(cmake_use_find_package pdf Poppler) $(cmake_use_find_package taglib Taglib) ) @@ -53,12 +57,6 @@ src_configure() { ecm_src_configure } -src_test() { - # FIXME: bug 644650, fails on tmpfs (but not for everyone) - local myctestargs=( -E "(usermetadatawritertest)" ) - ecm_src_test -} - pkg_postinst() { if [[ -z "${REPLACING_VERSIONS}" ]]; then optfeature "Microsoft Word/Powerpoint file indexing" app-text/catdoc diff --git a/kde-frameworks/kfilemetadata/kfilemetadata-5.98.0.ebuild b/kde-frameworks/kfilemetadata/kfilemetadata-6.1.0.ebuild index 9181d233b99b..0135c867ceee 100644 --- a/kde-frameworks/kfilemetadata/kfilemetadata-5.98.0.ebuild +++ b/kde-frameworks/kfilemetadata/kfilemetadata-6.1.0.ebuild @@ -1,38 +1,43 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{8..11} ) +PYTHON_COMPAT=( python3_{10..12} ) PVCUT=$(ver_cut 1-2) -QTMIN=5.15.5 +QTMIN=6.6.2 inherit ecm frameworks.kde.org optfeature python-any-r1 DESCRIPTION="Library for extracting file metadata" + LICENSE="LGPL-2+" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" -IUSE="epub exif ffmpeg mobi office pdf taglib" +KEYWORDS="~amd64" +IUSE="epub exif ffmpeg mobi pdf taglib" RESTRICT="test" -BDEPEND=" - test? ( ${PYTHON_DEPS} ) -" RDEPEND=" - >=dev-qt/qtxml-${QTMIN}:5 - =kde-frameworks/kcoreaddons-${PVCUT}*:5 - =kde-frameworks/ki18n-${PVCUT}*:5 + >=dev-qt/qtbase-${QTMIN}:6[gui,xml] + =kde-frameworks/karchive-${PVCUT}*:6 + =kde-frameworks/kcodecs-${PVCUT}*:6 + =kde-frameworks/kcoreaddons-${PVCUT}*:6 + =kde-frameworks/ki18n-${PVCUT}*:6 epub? ( app-text/ebook-tools ) exif? ( media-gfx/exiv2:= ) ffmpeg? ( media-video/ffmpeg:0= ) - mobi? ( kde-apps/kdegraphics-mobipocket:5 ) - office? ( =kde-frameworks/karchive-${PVCUT}*:5 ) - pdf? ( app-text/poppler[qt5] ) - taglib? ( media-libs/taglib ) + mobi? ( kde-apps/kdegraphics-mobipocket:6 ) + pdf? ( app-text/poppler[qt6(-)] ) + taglib? ( media-libs/taglib:= ) " DEPEND="${RDEPEND} kernel_linux? ( sys-apps/attr ) " +BDEPEND="test? ( ${PYTHON_DEPS} )" + +CMAKE_SKIP_TESTS=( + # FIXME: bug 644650, fails on tmpfs (but not for everyone) + usermetadatawritertest +) pkg_setup() { use test && python-any-r1_pkg_setup @@ -45,7 +50,6 @@ src_configure() { $(cmake_use_find_package exif LibExiv2) $(cmake_use_find_package ffmpeg FFmpeg) $(cmake_use_find_package mobi QMobipocket) - $(cmake_use_find_package office KF5Archive) $(cmake_use_find_package pdf Poppler) $(cmake_use_find_package taglib Taglib) ) @@ -53,12 +57,6 @@ src_configure() { ecm_src_configure } -src_test() { - # FIXME: bug 644650, fails on tmpfs (but not for everyone) - local myctestargs=( -E "(usermetadatawritertest)" ) - ecm_src_test -} - pkg_postinst() { if [[ -z "${REPLACING_VERSIONS}" ]]; then optfeature "Microsoft Word/Powerpoint file indexing" app-text/catdoc diff --git a/kde-frameworks/kfilemetadata/metadata.xml b/kde-frameworks/kfilemetadata/metadata.xml index b2dffe740182..e82a63be4785 100644 --- a/kde-frameworks/kfilemetadata/metadata.xml +++ b/kde-frameworks/kfilemetadata/metadata.xml @@ -11,7 +11,6 @@ <use> <flag name="epub">Enable support for reading EPUB ebook metadata</flag> <flag name="mobi">Enable mobipocket support via <pkg>kde-apps/kdegraphics-mobipocket</pkg></flag> - <flag name="office">Enable support for reading ODF and OOXML metadata</flag> </use> <slots> <subslots> diff --git a/kde-frameworks/kglobalaccel/Manifest b/kde-frameworks/kglobalaccel/Manifest index f677ef001f05..ccf019ab70b9 100644 --- a/kde-frameworks/kglobalaccel/Manifest +++ b/kde-frameworks/kglobalaccel/Manifest @@ -1,2 +1,2 @@ -DIST kglobalaccel-5.96.0.tar.xz 96480 BLAKE2B 21a1033491838d9bd1d4828b9e71eb61b1fbac280864ef44a0fbcf4b1310bcc37bcecdd2a5c30d1062fa0daaa064bb34d70a50f47929fa42201c7d8b2502566b SHA512 8ca729c5b48da2e49a9f923182ec6621180025ab6a82a05a470afe2ed3feb2139fa874844ed85348f748ea8fb9931e2e89667b59a6ea92c4f7faf26de1b5a282 -DIST kglobalaccel-5.98.0.tar.xz 97144 BLAKE2B 7b95121cbbcb1b6e8941b2ec5701eef3a75aaedbeb83db2aee661319f419ac4820e3c934b131a83fe9529ef66b171795041982bfe7c13c538f45467c9f51443b SHA512 42cb0f678e7d9d334d72ff2c0daa559fa4f9157a063dfa2c6e28e580f0e111695c12499013480c5251ffcffc2bda69992b6b035abd5ff0c591641f25f56e5b6e +DIST kglobalaccel-5.115.0.tar.xz 2338984 BLAKE2B a7c3a5ab9037930bc0b031b1822fc2acf61d859924181b4a1cfad6479876f84c3cd3d13d03e62e8810c21c0c1ef60be0ea754e959b0ef2d2d60c367fd43a2311 SHA512 0cf7649637d6aac4fa2e0d99392663593e2781f2b5de2cdf501b5d9ce20fc93febf24e8a452fe3592a566d72af4d266545c386d04f785dc307e6027ee334b312 +DIST kglobalaccel-6.1.0.tar.xz 2303876 BLAKE2B ed387244e8ad3535e1458726798d04c06938d6ed7374a74f33562509d237b2816648c26cde79615c2bd964dcc7de3569eb8b96d0ef228d46ac3eafeba685735e SHA512 6ff600d6fa0431458b81d8023ec2fcc3366722f3194bc110133958d8565629c6c6689d4b8f535bc40f8871b15c2d404c32331a36d7132f5511be2271abfb4f74 diff --git a/kde-frameworks/kglobalaccel/kglobalaccel-5.96.0-r1.ebuild b/kde-frameworks/kglobalaccel/kglobalaccel-5.115.0.ebuild index 8775f98f2987..3f0aae37e5cf 100644 --- a/kde-frameworks/kglobalaccel/kglobalaccel-5.96.0-r1.ebuild +++ b/kde-frameworks/kglobalaccel/kglobalaccel-5.115.0.ebuild @@ -1,49 +1,48 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 PVCUT=$(ver_cut 1-2) -QTMIN=5.15.4 -VIRTUALX_REQUIRED="test" +QTMIN=5.15.9 inherit ecm frameworks.kde.org DESCRIPTION="Framework to handle global shortcuts" LICENSE="LGPL-2+" -KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" -IUSE="nls X" +KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86" +IUSE="kf6compat" -REQUIRED_USE="test? ( X )" RESTRICT="test" # requires installed instance -RDEPEND=" +COMMON_DEPEND=" >=dev-qt/qtdbus-${QTMIN}:5 >=dev-qt/qtgui-${QTMIN}:5 >=dev-qt/qtwidgets-${QTMIN}:5 >=dev-qt/qtx11extras-${QTMIN}:5 - X? ( - =kde-frameworks/kconfig-${PVCUT}*:5 - =kde-frameworks/kcoreaddons-${PVCUT}*:5 - =kde-frameworks/kcrash-${PVCUT}*:5 - =kde-frameworks/kdbusaddons-${PVCUT}*:5 - =kde-frameworks/kwindowsystem-${PVCUT}*:5[X] - x11-libs/libxcb - x11-libs/xcb-util-keysyms - ) + =kde-frameworks/kconfig-${PVCUT}*:5 + =kde-frameworks/kcoreaddons-${PVCUT}*:5 + =kde-frameworks/kcrash-${PVCUT}*:5 + =kde-frameworks/kdbusaddons-${PVCUT}*:5 + =kde-frameworks/kwindowsystem-${PVCUT}*:5[X] + x11-libs/libxcb + x11-libs/xcb-util-keysyms " -DEPEND="${RDEPEND} +DEPEND="${COMMON_DEPEND} test? ( >=dev-qt/qtdeclarative-${QTMIN}:5 >=dev-qt/qtquickcontrols2-${QTMIN}:5 =kde-frameworks/kdeclarative-${PVCUT}*:5 ) " -BDEPEND="nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )" +RDEPEND="${COMMON_DEPEND} + kf6compat? ( kde-plasma/kglobalacceld:6 ) +" +BDEPEND=">=dev-qt/linguist-tools-${QTMIN}:5" src_configure() { local mycmakeargs=( - -DBUILD_RUNTIME=$(usex X) + -DKF6_COMPAT_BUILD=$(usex kf6compat) ) ecm_src_configure } diff --git a/kde-frameworks/kglobalaccel/kglobalaccel-5.98.0.ebuild b/kde-frameworks/kglobalaccel/kglobalaccel-5.98.0.ebuild deleted file mode 100644 index 100fac252454..000000000000 --- a/kde-frameworks/kglobalaccel/kglobalaccel-5.98.0.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PVCUT=$(ver_cut 1-2) -QTMIN=5.15.5 -VIRTUALX_REQUIRED="test" -inherit ecm frameworks.kde.org - -DESCRIPTION="Framework to handle global shortcuts" - -LICENSE="LGPL-2+" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" -IUSE="nls X" - -REQUIRED_USE="test? ( X )" -RESTRICT="test" # requires installed instance - -RDEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=dev-qt/qtx11extras-${QTMIN}:5 - X? ( - =kde-frameworks/kconfig-${PVCUT}*:5 - =kde-frameworks/kcoreaddons-${PVCUT}*:5 - =kde-frameworks/kcrash-${PVCUT}*:5 - =kde-frameworks/kdbusaddons-${PVCUT}*:5 - =kde-frameworks/kwindowsystem-${PVCUT}*:5[X] - x11-libs/libxcb - x11-libs/xcb-util-keysyms - ) -" -DEPEND="${RDEPEND} - test? ( - >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtquickcontrols2-${QTMIN}:5 - =kde-frameworks/kdeclarative-${PVCUT}*:5 - ) -" -BDEPEND="nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )" - -src_configure() { - local mycmakeargs=( - -DBUILD_RUNTIME=$(usex X) - ) - ecm_src_configure -} - -src_test() { - XDG_CURRENT_DESKTOP="KDE" ecm_src_test # bug 789342 -} diff --git a/kde-frameworks/kglobalaccel/kglobalaccel-6.1.0.ebuild b/kde-frameworks/kglobalaccel/kglobalaccel-6.1.0.ebuild new file mode 100644 index 000000000000..3fbcff390fe6 --- /dev/null +++ b/kde-frameworks/kglobalaccel/kglobalaccel-6.1.0.ebuild @@ -0,0 +1,17 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +QTMIN=6.6.2 +inherit ecm frameworks.kde.org + +DESCRIPTION="Framework to handle global shortcuts" + +LICENSE="LGPL-2+" +KEYWORDS="~amd64" +IUSE="" + +RDEPEND=">=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]" +DEPEND="${RDEPEND}" +BDEPEND=">=dev-qt/qttools-${QTMIN}:6[linguist]" diff --git a/kde-frameworks/kglobalaccel/metadata.xml b/kde-frameworks/kglobalaccel/metadata.xml index 39e72e4520b0..72a6fda39c07 100644 --- a/kde-frameworks/kglobalaccel/metadata.xml +++ b/kde-frameworks/kglobalaccel/metadata.xml @@ -7,6 +7,7 @@ </maintainer> <upstream> <bugs-to>https://bugs.kde.org/</bugs-to> + <remote-id type="kde-invent">frameworks/kglobalaccel</remote-id> </upstream> <slots> <subslots> @@ -14,6 +15,6 @@ </subslots> </slots> <use> - <flag name="X">Build the kglobalacceld runtime needed for X</flag> + <flag name="kf6compat">Disable components colliding with KF6, depend on KF6 components instead</flag> </use> </pkgmetadata> diff --git a/kde-frameworks/kguiaddons/Manifest b/kde-frameworks/kguiaddons/Manifest index e3ac2d23469c..e61c9a99943b 100644 --- a/kde-frameworks/kguiaddons/Manifest +++ b/kde-frameworks/kguiaddons/Manifest @@ -1,2 +1,2 @@ -DIST kguiaddons-5.96.0.tar.xz 73428 BLAKE2B 10f51b731c95b23e2ccd51bc666401ec48f1090373154eb2faf8fd3db21b20c760cb1fd1992381787e0954eb9d777beb2c9e3be113b751404a3000cf6418cba0 SHA512 fccc8175de2e48405692ac4b34a703d9a0d0340b0b682f13ca26af8f44161e3e7f08821672271680f80cfdfd0d5d6c369e41548720d4a8b921f417945e698bf1 -DIST kguiaddons-5.98.0.tar.xz 73780 BLAKE2B 1dd852abba321f8113edeb1dcc3e9394fef82916c6f29ff075224ea32aa35b632df37a9fefcce068ae8ffc9777e4ae5800779f0d4a7d1fb6bdb57c33e318abe5 SHA512 ca3102f5dc4c146581172382a79824c90ce17e0496d4bc02569ae64b007747907b1696e3c2664d4bad5c719ebb2ac819cdf9744279767a788927873999421234 +DIST kguiaddons-5.115.0.tar.xz 78428 BLAKE2B 95b7867c2d81245bfa82da1707a7962b4a3ca60409d0bb2d3a7d7181c12f96d96cf59b7ff5459cf5584d01a0bb12a42d69699b14a39ed5c563afa9243d89bb5d SHA512 4416b0f9d2a9859fe2a8b24cb25405ea4eaa0670168348eaedf5a8e44ade59f582118f8ad7525e5829bac5dc6d4b56dd1e47b58e5df6bbe4226a8039a27ff5aa +DIST kguiaddons-6.1.0.tar.xz 82260 BLAKE2B 490a16ce270e344bc95870f8ebc8a9011ba3f70672687384acef91c6510a8aabb4d14d289fe2d54561c8a3d04c5172e3e45204675018a66bce48d835c1fb13a2 SHA512 e4413c692099cc946c260917777fd57e0ffac9bb3a251b70653f7557c64889558a3565896b4c79643504549b29a8b87b28b8cd98bf7762cb4c7056c5e563b869 diff --git a/kde-frameworks/kguiaddons/kguiaddons-5.98.0.ebuild b/kde-frameworks/kguiaddons/kguiaddons-5.115.0.ebuild index 8ec6713d0558..abea3ab05df7 100644 --- a/kde-frameworks/kguiaddons/kguiaddons-5.98.0.ebuild +++ b/kde-frameworks/kguiaddons/kguiaddons-5.115.0.ebuild @@ -1,21 +1,22 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 ECM_NONGUI="false" -QTMIN=5.15.5 -VIRTUALX_REQUIRED="test" +QTMIN=5.15.9 inherit ecm frameworks.kde.org DESCRIPTION="Framework providing assorted high-level user interface components" + LICENSE="LGPL-2+" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" -IUSE="wayland X" +KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86" +IUSE="dbus kf6compat wayland X" # slot op: includes qpa/qplatformnativeinterface.h -RDEPEND=" +COMMON_DEPEND=" >=dev-qt/qtgui-${QTMIN}:5 + dbus? ( >=dev-qt/qtdbus-${QTMIN}:5 ) wayland? ( dev-libs/wayland >=dev-qt/qtgui-${QTMIN}:5=[wayland] @@ -26,15 +27,20 @@ RDEPEND=" x11-libs/libX11 ) " -DEPEND="${RDEPEND} +DEPEND="${COMMON_DEPEND} x11-base/xorg-proto wayland? ( >=dev-libs/plasma-wayland-protocols-1.7.0 ) X? ( x11-libs/libxcb ) " +RDEPEND="${COMMON_DEPEND} + kf6compat? ( kde-frameworks/kguiaddons:6 ) +" BDEPEND="wayland? ( >=dev-qt/qtwaylandscanner-${QTMIN}:5 )" src_configure() { local mycmakeargs=( + -DBUILD_GEO_SCHEME_HANDLER=$(usex !kf6compat) + -DWITH_DBUS=$(usex dbus) -DWITH_WAYLAND=$(usex wayland) -DWITH_X11=$(usex X) ) diff --git a/kde-frameworks/kguiaddons/kguiaddons-5.96.0.ebuild b/kde-frameworks/kguiaddons/kguiaddons-5.96.0.ebuild deleted file mode 100644 index f1045abd06d6..000000000000 --- a/kde-frameworks/kguiaddons/kguiaddons-5.96.0.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_NONGUI="false" -QTMIN=5.15.4 -VIRTUALX_REQUIRED="test" -inherit ecm frameworks.kde.org - -DESCRIPTION="Framework providing assorted high-level user interface components" -LICENSE="LGPL-2+" -KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" -IUSE="wayland X" - -# slot op: includes qpa/qplatformnativeinterface.h -RDEPEND=" - >=dev-qt/qtgui-${QTMIN}:5 - wayland? ( - dev-libs/wayland - >=dev-qt/qtgui-${QTMIN}:5=[wayland] - >=dev-qt/qtwayland-${QTMIN}:5 - ) - X? ( - >=dev-qt/qtx11extras-${QTMIN}:5 - x11-libs/libX11 - ) -" -DEPEND="${RDEPEND} - x11-base/xorg-proto - wayland? ( >=dev-libs/plasma-wayland-protocols-1.7.0 ) - X? ( x11-libs/libxcb ) -" -BDEPEND="wayland? ( >=dev-qt/qtwaylandscanner-${QTMIN}:5 )" - -src_configure() { - local mycmakeargs=( - -DWITH_WAYLAND=$(usex wayland) - -DWITH_X11=$(usex X) - ) - ecm_src_configure -} diff --git a/kde-frameworks/kguiaddons/kguiaddons-6.1.0.ebuild b/kde-frameworks/kguiaddons/kguiaddons-6.1.0.ebuild new file mode 100644 index 000000000000..14139ab53c1c --- /dev/null +++ b/kde-frameworks/kguiaddons/kguiaddons-6.1.0.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_NONGUI="false" +QTMIN=6.6.2 +inherit ecm frameworks.kde.org + +DESCRIPTION="Framework providing assorted high-level user interface components" + +LICENSE="LGPL-2+" +KEYWORDS="~amd64" +IUSE="dbus wayland X" + +# slot op: includes qpa/qplatformnativeinterface.h +COMMON_DEPEND=" + >=dev-qt/qtbase-${QTMIN}:6[dbus?,gui] + wayland? ( + dev-libs/wayland + >=dev-qt/qtbase-${QTMIN}:6=[wayland] + >=dev-qt/qtwayland-${QTMIN}:6 + ) + X? ( x11-libs/libX11 ) +" +DEPEND="${COMMON_DEPEND} + x11-base/xorg-proto + wayland? ( >=dev-libs/plasma-wayland-protocols-1.11.1 ) + X? ( x11-libs/libxcb ) +" +RDEPEND="${COMMON_DEPEND} + !${CATEGORY}/${PN}:5[-kf6compat(-)] +" +BDEPEND="wayland? ( >=dev-qt/qtwayland-${QTMIN}:6 )" + +src_configure() { + local mycmakeargs=( + -DBUILD_GEO_SCHEME_HANDLER=ON + -DWITH_DBUS=$(usex dbus) + -DWITH_WAYLAND=$(usex wayland) + -DWITH_X11=$(usex X) + ) + ecm_src_configure +} diff --git a/kde-frameworks/kguiaddons/metadata.xml b/kde-frameworks/kguiaddons/metadata.xml index 506ecf605bc4..36ef35ac2598 100644 --- a/kde-frameworks/kguiaddons/metadata.xml +++ b/kde-frameworks/kguiaddons/metadata.xml @@ -8,6 +8,9 @@ <upstream> <bugs-to>https://bugs.kde.org/</bugs-to> </upstream> + <use> + <flag name="kf6compat">Disable components colliding with KF6, depend on KF6 components instead</flag> + </use> <slots> <subslots> Must only be used by packages that are known to use private parts of the Frameworks API. diff --git a/kde-frameworks/kholidays/Manifest b/kde-frameworks/kholidays/Manifest index 44487869f7cd..8822a46f156d 100644 --- a/kde-frameworks/kholidays/Manifest +++ b/kde-frameworks/kholidays/Manifest @@ -1,2 +1,2 @@ -DIST kholidays-5.96.0.tar.xz 239304 BLAKE2B ab93636e48f661a5925cbb5e1827a61066c64aa329ff6c64ed974ebce2ca8329a4a222f04db2327c2942f29676ccbbcc390e758ea810828d5c2f7fe69d7f5ab3 SHA512 e6a8a249c60a95a35e859569e3e67603918f4a93e6844e3e8e9e9e81b7420092a44057cb4f668082319fe90b41f35cec87f4ac147b3f55f48a99e8670135d496 -DIST kholidays-5.98.0.tar.xz 241596 BLAKE2B 284a1e71e9e00a5b2f6d90191194671d8bf54e9f816ef4cc5daeb1ac383180b4688c33236dfdd6d25f0823c2cd5fe89d850c2653038f103de3b9116d7125da20 SHA512 89859e70b06ff1989197de5fcf991be7e3b071b0783bda119c49a9268e4bdfcfcca54cb3c73820b7dcac36524d1f09b80ba3adaea9397d373fcb6d88f4d599d3 +DIST kholidays-5.115.0.tar.xz 255936 BLAKE2B 13c041432c1f773c1375d9ded0027e03c7bb85684172e540d72d12ded9650499b9a306452c777ed18480b96d9de3751cc28b3cce4181e7bfaafdc98db852e876 SHA512 db1c7d1575c1037e3de2ca96999d58b95e7c50c7d60483704723bec90fb738136d31895e04fa4256674b983831c812df87d7256582342c39af3213b209ca1378 +DIST kholidays-6.1.0.tar.xz 254140 BLAKE2B 1215bf6415d1eab42aa14b4fc15f7e3c27aa26cf9b9b030d2104765b2978021e7c2539fb8016955e5f7b50f0e8e8e5f70eae6eb36c800ed094687da6067ad94c SHA512 d2f3f5c3039f2ee55292edc427da863b0dfb364c57f74aeebcb6c8a85664c58aedbc810f1daec08e905decc3037d373607b0cc40929347030c2d2fef504663ff diff --git a/kde-frameworks/kholidays/kholidays-5.96.0.ebuild b/kde-frameworks/kholidays/kholidays-5.115.0.ebuild index d36b3583c31c..28cb7a379ef5 100644 --- a/kde-frameworks/kholidays/kholidays-5.96.0.ebuild +++ b/kde-frameworks/kholidays/kholidays-5.115.0.ebuild @@ -1,25 +1,22 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 ECM_QTHELP="false" ECM_TEST="true" -QTMIN=5.15.4 +QTMIN=5.15.9 inherit ecm frameworks.kde.org DESCRIPTION="Library to determine holidays and other special events for a geographical region" + LICENSE="LGPL-2.1+" KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" -IUSE="nls" +IUSE="" -BDEPEND=" - nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 ) -" -DEPEND=" - >=dev-qt/qtdeclarative-${QTMIN}:5 -" +DEPEND=">=dev-qt/qtdeclarative-${QTMIN}:5" RDEPEND="${DEPEND}" +BDEPEND=">=dev-qt/linguist-tools-${QTMIN}:5" src_test() { # bug 624214 diff --git a/kde-frameworks/kholidays/kholidays-5.98.0.ebuild b/kde-frameworks/kholidays/kholidays-5.98.0.ebuild deleted file mode 100644 index 6331b9327761..000000000000 --- a/kde-frameworks/kholidays/kholidays-5.98.0.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_QTHELP="false" -ECM_TEST="true" -QTMIN=5.15.5 -inherit ecm frameworks.kde.org - -DESCRIPTION="Library to determine holidays and other special events for a geographical region" -LICENSE="LGPL-2.1+" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" -IUSE="nls" - -BDEPEND=" - nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 ) -" -DEPEND=" - >=dev-qt/qtdeclarative-${QTMIN}:5 -" -RDEPEND="${DEPEND}" - -src_test() { - # bug 624214 - mkdir -p "${HOME}/.local/share/kf5/libkholidays" || die - cp -r "${S}/holidays/plan2" "${HOME}/.local/share/kf5/libkholidays/" || die - ecm_src_test -} diff --git a/kde-frameworks/kholidays/kholidays-6.1.0.ebuild b/kde-frameworks/kholidays/kholidays-6.1.0.ebuild new file mode 100644 index 000000000000..0c57cf515b63 --- /dev/null +++ b/kde-frameworks/kholidays/kholidays-6.1.0.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_QTHELP="false" +ECM_TEST="true" +QTMIN=6.6.2 +inherit ecm frameworks.kde.org + +DESCRIPTION="Library to determine holidays and other special events for a geographical region" + +LICENSE="LGPL-2.1+" +KEYWORDS="~amd64" +IUSE="" + +DEPEND=">=dev-qt/qtdeclarative-${QTMIN}:6" +RDEPEND="${DEPEND}" +BDEPEND=">=dev-qt/qttools-${QTMIN}:6[linguist]" + +src_test() { + # bug 624214 + mkdir -p "${HOME}/.local/share/kf6/libkholidays" || die + cp -r "${S}/holidays/plan2" "${HOME}/.local/share/kf6/libkholidays/" || die + ecm_src_test +} diff --git a/kde-frameworks/khtml/Manifest b/kde-frameworks/khtml/Manifest index 10e71ecb5632..5bf2bcc69881 100644 --- a/kde-frameworks/khtml/Manifest +++ b/kde-frameworks/khtml/Manifest @@ -1,2 +1 @@ -DIST khtml-5.96.0.tar.xz 1965056 BLAKE2B 857a338c9831a03989348ecd6d9c355d6538458311eb22ccc2ae1c631137a7dd411866c70632f941d2ae64bd54584283b90e9bb0cf6573f6504d6ceab0cb01f5 SHA512 7ccd0c8dbca62486b316f381c437568650696cc4fca0b2e382bf8d337435f9c7fc7fa4664e01bbe8db509bd293c23ebb4abaabc34719be38e91480ae0b1d4141 -DIST khtml-5.98.0.tar.xz 1964532 BLAKE2B c2973b3a7c132a63d53fff62dd0b7e6d03f31c44066b9688d98cdec55389569bbcbaaab0c468c2ccea335466220dc08ecb7243a0d2ea6f61adf0c2937a77f31e SHA512 f67128d9afde687d422a298dc169c59ba062bcc3e7fe45c5e6883d614e09295129fc0765fd1afd66e77b4409d36a305c4f4cf224488cd10627f3ca11ae35ee36 +DIST khtml-5.115.0.tar.xz 4012440 BLAKE2B 490005551036e3b14cd036af07fed97e2109fa4c6c2782f4086bdf612688652d1992b19b2d83c26efa70d4ea0025f96e6398df9fe0f803f6fee6ae03311379d5 SHA512 0141aca1b04a779522fb7a7c93e6ec1795b09cebe7f2b079698b076556b78aff807b90462199784e3fdfcddeb97da23a68910c52542994b39f327c5b4a4f1ddc diff --git a/kde-frameworks/khtml/files/khtml-5.96.0-with_x11.patch b/kde-frameworks/khtml/files/khtml-5.96.0-with_x11.patch deleted file mode 100644 index fb75eaa49cb3..000000000000 --- a/kde-frameworks/khtml/files/khtml-5.96.0-with_x11.patch +++ /dev/null @@ -1,100 +0,0 @@ -From 9712a641636bf9b794e1ce3b7ec00534de56faa1 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <asturm@gentoo.org> -Date: Sat, 6 Aug 2022 11:03:35 +0200 -Subject: [PATCH] Add CMake option to build WITH_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. - -HAVE_X11 already exists and is set automagically so far, but using --DCMAKE_DISABLE_FIND_PACKAGE_X11 will break if any dependencies list X11 -as required in their cmake config. This is a behavior change as previously -it was silently disabled if X11 was not found. - -Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> ---- - CMakeLists.txt | 14 +++++++------- - src/CMakeLists.txt | 5 ++--- - tests/CMakeLists.txt | 4 ++-- - 3 files changed, 11 insertions(+), 12 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index bca3622..700a0a7 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -60,9 +60,13 @@ set_package_properties(Perl PROPERTIES - PURPOSE "Required for generating JS bindings for elements" - ) - --if(NOT APPLE) -- find_package(X11) -- set(HAVE_X11 ${X11_FOUND}) -+if(NOT WIN32 AND NOT APPLE) -+ option(WITH_X11 "Build with X11 integration" ON) -+ if(WITH_X11) -+ find_package(X11 REQUIRED) -+ set(HAVE_X11 1) -+ find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED X11Extras) -+ endif() - endif() - - find_package(Phonon4Qt5 4.6.60) -@@ -94,10 +98,6 @@ set_package_properties(PNG PROPERTIES DESCRIPTION "PNG decoding library" - PURPOSE "Required for decoding and displaying PNG images" - ) - --if(NOT WIN32 AND NOT APPLE AND X11_FOUND) -- find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED X11Extras) --endif() -- - find_package(Gperf REQUIRED) - - # remove definitions set by KDEFrameworkCompilerSettings which we fail to meet -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 573fa88..14b2e73 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -592,7 +592,6 @@ target_link_libraries(KF5KHtml - ${JPEG_LIBRARIES} - ${GIF_LIBRARIES} - ${PNG_LIBRARIES} -- ${X11_LIBRARIES} - Qt5::PrintSupport - KF5::Archive - KF5::SonnetCore -@@ -604,8 +603,8 @@ target_link_libraries(KF5KHtml - KF5::Bookmarks - KF5::KIOWidgets # KUrlRequester - ) --if(NOT WIN32 AND NOT APPLE AND X11_FOUND) -- target_link_libraries(KF5KHtml PRIVATE Qt5::X11Extras) -+if(NOT WIN32 AND NOT APPLE AND HAVE_X11) -+ target_link_libraries(KF5KHtml PRIVATE ${X11_LIBRARIES} Qt5::X11Extras) - endif() - - if (KJS_DEBUGGER) -diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt -index ae079ae..b6347d7 100644 ---- a/tests/CMakeLists.txt -+++ b/tests/CMakeLists.txt -@@ -1,6 +1,6 @@ - include(ECMMarkAsTest) - --if(NOT WIN32 AND NOT APPLE AND X11_FOUND) -+if(NOT WIN32 AND NOT APPLE AND HAVE_X11) - find_package(Qt5X11Extras "${REQUIRED_QT_VERSION}" CONFIG REQUIRED) - set_package_properties(Qt5X11Extras PROPERTIES PURPOSE "Required for tests") - endif() -@@ -79,7 +79,7 @@ endif() - - # Note that testregression can't be compiled by default, it needs private Qt headers. - # See also BUILDING-TESTREGRESSION --if (KHTML_BUILD_TESTREGRESSION) -+if (KHTML_BUILD_TESTREGRESSION AND HAVE_X11) - - set(testregression_SRCS - test_regression.cpp --- -GitLab - diff --git a/kde-frameworks/khtml/khtml-5.96.0-r1.ebuild b/kde-frameworks/khtml/khtml-5.115.0.ebuild index fe5e4869c9eb..82be319b7559 100644 --- a/kde-frameworks/khtml/khtml-5.96.0-r1.ebuild +++ b/kde-frameworks/khtml/khtml-5.115.0.ebuild @@ -1,15 +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_QTHELP="false" PVCUT=$(ver_cut 1-2) -QTMIN=5.15.4 -VIRTUALX_REQUIRED="test" -inherit ecm frameworks.kde.org +QTMIN=5.15.9 +inherit ecm flag-o-matic frameworks.kde.org DESCRIPTION="KHTML web rendering engine" + LICENSE="LGPL-2" KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" IUSE="X" @@ -46,7 +46,7 @@ RDEPEND=" media-libs/giflib:= media-libs/libjpeg-turbo:= media-libs/libpng:0= - >=media-libs/phonon-4.11.0 + >=media-libs/phonon-4.11.0[qt5(+)] sys-libs/zlib X? ( >=dev-qt/qtx11extras-${QTMIN}:5 @@ -62,9 +62,9 @@ BDEPEND=" dev-util/gperf " -PATCHES=( "${FILESDIR}/${P}-with_x11.patch" ) - src_configure() { + filter-lto # bug 921686 + local mycmakeargs=( -DWITH_X11=$(usex X) ) diff --git a/kde-frameworks/khtml/khtml-5.98.0.ebuild b/kde-frameworks/khtml/khtml-5.98.0.ebuild deleted file mode 100644 index 566a6b536448..000000000000 --- a/kde-frameworks/khtml/khtml-5.98.0.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_QTHELP="false" -PVCUT=$(ver_cut 1-2) -QTMIN=5.15.5 -VIRTUALX_REQUIRED="test" -inherit ecm frameworks.kde.org - -DESCRIPTION="KHTML web rendering engine" -LICENSE="LGPL-2" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" -IUSE="X" - -RDEPEND=" - dev-libs/openssl:0 - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtnetwork-${QTMIN}:5[ssl] - >=dev-qt/qtprintsupport-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=dev-qt/qtxml-${QTMIN}:5 - =kde-frameworks/karchive-${PVCUT}*:5 - =kde-frameworks/kcodecs-${PVCUT}*:5 - =kde-frameworks/kcompletion-${PVCUT}*:5 - =kde-frameworks/kconfig-${PVCUT}*:5 - =kde-frameworks/kconfigwidgets-${PVCUT}*:5 - =kde-frameworks/kcoreaddons-${PVCUT}*:5 - =kde-frameworks/kglobalaccel-${PVCUT}*:5 - =kde-frameworks/ki18n-${PVCUT}*:5 - =kde-frameworks/kiconthemes-${PVCUT}*:5 - =kde-frameworks/kio-${PVCUT}*:5 - =kde-frameworks/kjobwidgets-${PVCUT}*:5 - =kde-frameworks/kjs-${PVCUT}*:5 - =kde-frameworks/knotifications-${PVCUT}*:5 - =kde-frameworks/kparts-${PVCUT}*:5 - =kde-frameworks/kservice-${PVCUT}*:5 - =kde-frameworks/ktextwidgets-${PVCUT}*:5 - =kde-frameworks/kwallet-${PVCUT}*:5 - =kde-frameworks/kwidgetsaddons-${PVCUT}*:5 - =kde-frameworks/kwindowsystem-${PVCUT}*:5[X?] - =kde-frameworks/kxmlgui-${PVCUT}*:5 - =kde-frameworks/sonnet-${PVCUT}*:5 - media-libs/giflib:= - media-libs/libjpeg-turbo:= - media-libs/libpng:0= - >=media-libs/phonon-4.11.0 - sys-libs/zlib - X? ( - >=dev-qt/qtx11extras-${QTMIN}:5 - x11-libs/libX11 - ) -" -DEPEND="${RDEPEND} - test? ( >=dev-qt/qtx11extras-${QTMIN}:5 ) - X? ( x11-base/xorg-proto ) -" -BDEPEND=" - dev-lang/perl - dev-util/gperf -" - -src_configure() { - local mycmakeargs=( - -DWITH_X11=$(usex X) - ) - - ecm_src_configure -} diff --git a/kde-frameworks/ki18n/Manifest b/kde-frameworks/ki18n/Manifest index e5d68b28f710..180d067ac281 100644 --- a/kde-frameworks/ki18n/Manifest +++ b/kde-frameworks/ki18n/Manifest @@ -1,2 +1,2 @@ -DIST ki18n-5.96.0.tar.xz 956764 BLAKE2B 91f00093b8f28f64ffa3221c0717e8f203d5bf6c4f2d9ff1b267a4bfcfe136be251ab46ad987bb68b51c3ba85cc042ba247ec0c196375c99fdec3fbe6f4cdfbe SHA512 ab059bd98ce16e20a803f7597ae0e5e3698f6b5ccbcd846131a8c8b0d02201ca9a61ed67ecf93cb2931ac347d3e13d5515079643c2cbbec39b0fe8139de17216 -DIST ki18n-5.98.0.tar.xz 955640 BLAKE2B f3ef6a5bae7240c9dcc156ebdd1b97710c9ca03883902b7df4005830e066eba9f935a48e8e3d53b0e05eb3f0755aa691dd832d0efffb4ce86f20a4c3e56abf71 SHA512 33b0694b26735f312d84ee1d1797c850e826a7899486e80dbba00b26a7922e2adf88af5695a600fb95e56e307e9f9ad8cb433204c60ab8fa9c5d7076505b696a +DIST ki18n-5.115.1.tar.xz 3130088 BLAKE2B e6a256fd8ffc99dfd3e670b9a7cda089f8505748010a593b9151efe309e1beefb6692ce392bb8cec774e7022be4c42ed3f62649c893a540a7f7c137494c67035 SHA512 fb1b1cddc9fdf36bc0c1d9a1505265c7c7d72451d85d695d56aa24ff577ddeb7fafac0c911dfd2b173705ed810d613a180ffb1f293c0051c4051791dc164bd0a +DIST ki18n-6.1.0.tar.xz 3125964 BLAKE2B 230411527978f0ec35f81e85403be08a05e7102afffbfeb5d1dc918605d307be902b153434a210c4d8da313effde8eb95f1438de7dc4ec1b9f706626e072277f SHA512 2f748d813a5b185b0f14932b589be6926b456c693d80e6f6dac1b15b91f5160001f426df833bac67147b9796874b723bf224206960d228561ff6bfd0a9b04cac diff --git a/kde-frameworks/ki18n/files/ki18n-5.57.0-python.patch b/kde-frameworks/ki18n/files/ki18n-5.57.0-python.patch deleted file mode 100644 index 8b863e4e0fca..000000000000 --- a/kde-frameworks/ki18n/files/ki18n-5.57.0-python.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/cmake/KF5I18nMacros.cmake.in 2019-04-07 09:28:26.000000000 +0200 -+++ b/cmake/KF5I18nMacros.cmake.in 2019-04-20 20:56:41.628484762 +0200 -@@ -31,7 +31,7 @@ - # solution if it cannot be found in $PATH when building applications. - set(_KI18N_PYTHON_EXECUTABLE "@PYTHON_EXECUTABLE@") - --find_program(KI18N_PYTHON_EXECUTABLE NAMES python3 python2 python) -+find_program(KI18N_PYTHON_EXECUTABLE NAMES python) - if(NOT KI18N_PYTHON_EXECUTABLE) - set(KI18N_PYTHON_EXECUTABLE "${_KI18N_PYTHON_EXECUTABLE}") - endif() diff --git a/kde-frameworks/ki18n/ki18n-5.96.0.ebuild b/kde-frameworks/ki18n/ki18n-5.115.1.ebuild index 6cbaca8cd6cf..df8e2d76b599 100644 --- a/kde-frameworks/ki18n/ki18n-5.96.0.ebuild +++ b/kde-frameworks/ki18n/ki18n-5.115.1.ebuild @@ -1,15 +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 -PYTHON_COMPAT=( python3_{8..11} ) -QTMIN=5.15.4 +PYTHON_COMPAT=( python3_{10..12} ) +QTMIN=5.15.9 inherit ecm frameworks.kde.org python-single-r1 DESCRIPTION="Framework based on Gettext for internationalizing user interface text" LICENSE="LGPL-2+" -KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" +KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86" IUSE="" REQUIRED_USE="${PYTHON_REQUIRED_USE}" @@ -26,7 +26,13 @@ RDEPEND="${COMMON_DEPEND} app-text/iso-codes " -PATCHES=( "${FILESDIR}/${PN}-5.57.0-python.patch" ) +CMAKE_SKIP_TESTS=( + # bug 876496 + kcatalogtest + # requires LANG fr_CH. bugs 823816 + kcountrytest + kcountrysubdivisiontest +) pkg_setup() { ecm_pkg_setup @@ -39,9 +45,3 @@ src_configure() { ) ecm_src_configure } - -src_test() { - # requires LANG fr_CH. bug 823816 - local myctestargs=( -E "(kcountrytest|kcountrysubdivisiontest)" ) - ecm_src_test -} diff --git a/kde-frameworks/ki18n/ki18n-5.98.0.ebuild b/kde-frameworks/ki18n/ki18n-6.1.0.ebuild index 20e52f60a9e2..9e4f4670a6a8 100644 --- a/kde-frameworks/ki18n/ki18n-5.98.0.ebuild +++ b/kde-frameworks/ki18n/ki18n-6.1.0.ebuild @@ -1,32 +1,39 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{8..11} ) -QTMIN=5.15.5 +PYTHON_COMPAT=( python3_{10..12} ) +QTMIN=6.6.2 inherit ecm frameworks.kde.org python-single-r1 DESCRIPTION="Framework based on Gettext for internationalizing user interface text" + LICENSE="LGPL-2+" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" +KEYWORDS="~amd64" IUSE="" REQUIRED_USE="${PYTHON_REQUIRED_USE}" COMMON_DEPEND="${PYTHON_DEPS} - >=dev-qt/qtdeclarative-${QTMIN}:5 + >=dev-qt/qtdeclarative-${QTMIN}:6 sys-devel/gettext virtual/libintl " DEPEND="${COMMON_DEPEND} - test? ( >=dev-qt/qtconcurrent-${QTMIN}:5 ) + test? ( >=dev-qt/qtbase-${QTMIN}:6[concurrent] ) " RDEPEND="${COMMON_DEPEND} app-text/iso-codes " -PATCHES=( "${FILESDIR}/${PN}-5.57.0-python.patch" ) +CMAKE_SKIP_TESTS=( + # bug 876496 + kcatalogtest + # requires LANG fr_CH. bugs 823816 + kcountrytest + kcountrysubdivisiontest +) pkg_setup() { ecm_pkg_setup @@ -35,13 +42,7 @@ pkg_setup() { src_configure() { local mycmakeargs=( - -DPYTHON_EXECUTABLE="${PYTHON}" + -DPython3_EXECUTABLE="${PYTHON}" ) ecm_src_configure } - -src_test() { - # requires LANG fr_CH. bug 823816 - local myctestargs=( -E "(kcountrytest|kcountrysubdivisiontest)" ) - ecm_src_test -} diff --git a/kde-frameworks/kiconthemes/Manifest b/kde-frameworks/kiconthemes/Manifest index 82de09311d7a..8c1d075e31fa 100644 --- a/kde-frameworks/kiconthemes/Manifest +++ b/kde-frameworks/kiconthemes/Manifest @@ -1,2 +1,2 @@ -DIST kiconthemes-5.96.0.tar.xz 226752 BLAKE2B 58063e262e98a5bdc9e53ec450231463b1ac68b4ac907661494a45d01e7b9efb71effb8ca44a4eea8077ac6aeeb4b353e9e0b32ae72430cd849742f65a53b55a SHA512 2e392faa6859cd96395318852b96423fa3e132904af77070edaeeec30919c7ff0007787e0a8f3930f7226fd6ea02d129779b2607facf47c66927b8794ef81723 -DIST kiconthemes-5.98.0.tar.xz 228060 BLAKE2B d7c8882dd163b4c0124d36c624a4c969c2e142a9973539122a094dcbb3bfb1de63a25c5ed439a5242a7064c739ce1ab4142efca93549a2c27aea518461556686 SHA512 a798f62db7cf1b55db6202b2457ca9579fd43fdbdfa8561a9448771363e87af98dee27eddfdcaf9e2e5c2608823fb881d91a4ad094b497ffa0bd5f6caf697a5a +DIST kiconthemes-5.115.0.tar.xz 1312068 BLAKE2B 6e40e89610031f5ed9cffbd4c847c1475ee8229810cb917e82837003db714854f96ceabc1e997e7a6c6197de00d84c946fcb51c4527fd203d9a917058160a871 SHA512 7cbfe721f45a9edda811fffdb2599452011b679fd5ffdc9088da009de4e712700a6b31cadf0ce24025fe3c264d5169eaae505a9080da123613dd47a8ffb43b6f +DIST kiconthemes-6.1.0.tar.xz 1315904 BLAKE2B 8648cd1f7d921dd31d0509bbfd4f346041e64e119ad6e3b514c1decffcf20c7270b3544e780e1fdf1b10c799f0e6f4f6d66ebf228a731d5adc5da933993be0d0 SHA512 a0f0210be8e464518770762f99d072c688872d2b9f324fa12830bdee78c9cf9439514b83ce87a6e526815dd7fbeaa76b6027a0c5cff6119052ccbac8ec8635c2 diff --git a/kde-frameworks/kiconthemes/kiconthemes-5.98.0.ebuild b/kde-frameworks/kiconthemes/kiconthemes-5.115.0.ebuild index db81149ad54f..d7ee4712379b 100644 --- a/kde-frameworks/kiconthemes/kiconthemes-5.98.0.ebuild +++ b/kde-frameworks/kiconthemes/kiconthemes-5.115.0.ebuild @@ -1,17 +1,16 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 ECM_DESIGNERPLUGIN="true" PVCUT=$(ver_cut 1-2) -QTMIN=5.15.5 -VIRTUALX_REQUIRED="test" +QTMIN=5.15.9 inherit ecm frameworks.kde.org DESCRIPTION="Framework for icon theming and configuration" LICENSE="LGPL-2+" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86" IUSE="" RESTRICT="test" # bug 574770 diff --git a/kde-frameworks/kiconthemes/kiconthemes-5.96.0.ebuild b/kde-frameworks/kiconthemes/kiconthemes-5.96.0.ebuild deleted file mode 100644 index 78ef3082d6bb..000000000000 --- a/kde-frameworks/kiconthemes/kiconthemes-5.96.0.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_DESIGNERPLUGIN="true" -PVCUT=$(ver_cut 1-2) -QTMIN=5.15.4 -VIRTUALX_REQUIRED="test" -inherit ecm frameworks.kde.org - -DESCRIPTION="Framework for icon theming and configuration" -LICENSE="LGPL-2+" -KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" -IUSE="" - -RESTRICT="test" # bug 574770 - -DEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtsvg-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - =kde-frameworks/karchive-${PVCUT}*:5 - =kde-frameworks/kconfig-${PVCUT}*:5 - =kde-frameworks/kconfigwidgets-${PVCUT}*:5 - =kde-frameworks/kcoreaddons-${PVCUT}*:5 - =kde-frameworks/ki18n-${PVCUT}*:5 - =kde-frameworks/kitemviews-${PVCUT}*:5 - =kde-frameworks/kwidgetsaddons-${PVCUT}*:5 -" -RDEPEND="${DEPEND}" diff --git a/kde-frameworks/kiconthemes/kiconthemes-6.1.0.ebuild b/kde-frameworks/kiconthemes/kiconthemes-6.1.0.ebuild new file mode 100644 index 000000000000..ab3f30c4325c --- /dev/null +++ b/kde-frameworks/kiconthemes/kiconthemes-6.1.0.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_DESIGNERPLUGIN="true" +PVCUT=$(ver_cut 1-2) +QTMIN=6.6.2 +inherit ecm frameworks.kde.org + +DESCRIPTION="Framework for icon theming and configuration" + +LICENSE="LGPL-2+" +KEYWORDS="~amd64" +IUSE="" + +RESTRICT="test" # bug 574770 + +# slot op: Uses Qt6::GuiPrivate for qiconloader_p.h, qguiapplication_p.h +RDEPEND=" + >=dev-qt/qtbase-${QTMIN}:6=[dbus,gui,widgets] + >=dev-qt/qtdeclarative-${QTMIN}:6 + >=dev-qt/qtsvg-${QTMIN}:6 + =kde-frameworks/karchive-${PVCUT}*:6 + =kde-frameworks/kcolorscheme-${PVCUT}*:6 + =kde-frameworks/kconfig-${PVCUT}*:6 + =kde-frameworks/kconfigwidgets-${PVCUT}*:6 + =kde-frameworks/ki18n-${PVCUT}*:6 + =kde-frameworks/kwidgetsaddons-${PVCUT}*:6 +" +DEPEND="${RDEPEND}" diff --git a/kde-frameworks/kidletime/Manifest b/kde-frameworks/kidletime/Manifest index 55799e79be35..edd336766d21 100644 --- a/kde-frameworks/kidletime/Manifest +++ b/kde-frameworks/kidletime/Manifest @@ -1,2 +1,2 @@ -DIST kidletime-5.96.0.tar.xz 29108 BLAKE2B c8bda958d716da078101c075647306a31cdd6404aacf7a18cdceef47adbcaebc7831d85e2aab94816f7a4acd087bccd8888bb17ef73d82ab7a9a6e4e19701ac4 SHA512 e7f991195ed48264ef11cee07843f7bfb2b93e701bda8fc2dd450d00055b24246b349a4a76f75bb13d81dea03e8170083b28140fb4504769927f5cf68436b335 -DIST kidletime-5.98.0.tar.xz 29116 BLAKE2B 79cf456c95c36163d311ec1b79f052cf6d96d7c5426a4c00286a8dddc14040851ed3801a9795867f17fcdf576d161922c40609505a5de8c4049c6ef2b264db75 SHA512 15a5c68c1ca71c20f1284cd75c8bfdf3a3108c7b151eee65e6e41a05099584fe471c6dd17f3de4425bfc64d2b88b4006284d1ba33c4d71931b635aaaa3d79015 +DIST kidletime-5.115.0.tar.xz 30936 BLAKE2B 060cab0d4ca5ac4bd831015fc70829f4d5b2cc5f6c4404a08832f044f497fe50a9cee3f84926ac5ceba5b66043fd81b2e279a99d159a68bf412e759bf3114627 SHA512 63b7d62dbdb5b8eb8ff3337616984951ae233b859fe8724604058b3217de454957dcc17152d0ab8a4091c8360020962e3730b4ee7cec4532f86b8d0de79a1143 +DIST kidletime-6.1.0.tar.xz 30912 BLAKE2B 80f69554332cc74444497d2e3ac554400eed9c937aa066f16ae5331caf3f40a33836e583f42d759a161ef9b1348391dc1e6b5fd8f6cc5d7e6bdabb25f7712c50 SHA512 9a958ccfb6a0b4bb32b481279b9ca0f96ab84a9400ed68da7c3712fefec070983d9c00e29ed9f6a53409796f73db4e32c41ebe275dd51ece21b6b00044f94828 diff --git a/kde-frameworks/kidletime/kidletime-5.96.0.ebuild b/kde-frameworks/kidletime/kidletime-5.115.0.ebuild index a42ee3438031..b04194e6d91f 100644 --- a/kde-frameworks/kidletime/kidletime-5.96.0.ebuild +++ b/kde-frameworks/kidletime/kidletime-5.115.0.ebuild @@ -1,21 +1,27 @@ -# 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="false" -QTMIN=5.15.4 +QTMIN=5.15.9 inherit ecm frameworks.kde.org DESCRIPTION="Framework for detection and notification of device idle time" + LICENSE="LGPL-2+" KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" -IUSE="X xscreensaver" +IUSE="wayland X xscreensaver" REQUIRED_USE="xscreensaver? ( X )" -DEPEND=" +RDEPEND=" >=dev-qt/qtgui-${QTMIN}:5 + wayland? ( + dev-libs/wayland + >=dev-qt/qtgui-${QTMIN}:5=[wayland] + >=dev-qt/qtwayland-${QTMIN}:5 + ) X? ( >=dev-qt/qtx11extras-${QTMIN}:5 x11-libs/libX11 @@ -27,7 +33,13 @@ DEPEND=" x11-libs/libXScrnSaver ) " -RDEPEND="${DEPEND}" +DEPEND="${RDEPEND} + wayland? ( + >=dev-libs/plasma-wayland-protocols-1.7.0 + >=dev-libs/wayland-protocols-1.27:0 + ) +" +BDEPEND="wayland? ( >=dev-qt/qtwaylandscanner-${QTMIN}:5 )" src_prepare() { ecm_src_prepare @@ -38,6 +50,7 @@ src_prepare() { src_configure() { local mycmakeargs=( + $(cmake_use_find_package wayland Qt5WaylandClient) $(cmake_use_find_package X X11) $(cmake_use_find_package X XCB) ) diff --git a/kde-frameworks/kidletime/kidletime-5.98.0.ebuild b/kde-frameworks/kidletime/kidletime-6.1.0.ebuild index 585aaa36ce13..a4213e68004d 100644 --- a/kde-frameworks/kidletime/kidletime-5.98.0.ebuild +++ b/kde-frameworks/kidletime/kidletime-6.1.0.ebuild @@ -1,33 +1,44 @@ -# 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="false" -QTMIN=5.15.5 +QTMIN=6.6.2 inherit ecm frameworks.kde.org DESCRIPTION="Framework for detection and notification of device idle time" + LICENSE="LGPL-2+" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" -IUSE="X xscreensaver" +KEYWORDS="~amd64" +IUSE="wayland X xscreensaver" REQUIRED_USE="xscreensaver? ( X )" -DEPEND=" - >=dev-qt/qtgui-${QTMIN}:5 +RDEPEND=" + >=dev-qt/qtbase-${QTMIN}:6[gui] + wayland? ( + dev-libs/wayland + >=dev-qt/qtbase-${QTMIN}:6=[wayland] + >=dev-qt/qtwayland-${QTMIN}:6 + ) X? ( - >=dev-qt/qtx11extras-${QTMIN}:5 x11-libs/libX11 x11-libs/libxcb x11-libs/libXext ) xscreensaver? ( - >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtbase-${QTMIN}:6[dbus] x11-libs/libXScrnSaver ) " -RDEPEND="${DEPEND}" +DEPEND="${RDEPEND} + wayland? ( + >=dev-libs/plasma-wayland-protocols-1.11.1 + >=dev-libs/wayland-protocols-1.27:0 + ) +" +BDEPEND="wayland? ( >=dev-qt/qtwayland-${QTMIN}:6 )" src_prepare() { ecm_src_prepare @@ -38,8 +49,8 @@ src_prepare() { src_configure() { local mycmakeargs=( - $(cmake_use_find_package X X11) - $(cmake_use_find_package X XCB) + -DWITH_WAYLAND=$(usex wayland) + -DWITH_X11=$(usex X) ) ecm_src_configure diff --git a/kde-frameworks/kimageformats/Manifest b/kde-frameworks/kimageformats/Manifest index 0868ea8263d9..a75fefdc8390 100644 --- a/kde-frameworks/kimageformats/Manifest +++ b/kde-frameworks/kimageformats/Manifest @@ -1,2 +1,2 @@ -DIST kimageformats-5.96.0.tar.xz 3589112 BLAKE2B 2a9e5f72b09e27ebb561013f816b41e9ef8be9d874074ddd014f631a57f0da79cc2785d3d528f9ea9f76b940075f0f7649aca57c8ff20a376f5ffa3adea80eb1 SHA512 37e51279824df05391647d45125676127d5570d4ed0905d2378dd627c3542d61f6f43bdd4e6f28ef43268127d120c1d2829a5cba34dde1ba7427b9051d241c1c -DIST kimageformats-5.98.0.tar.xz 5312392 BLAKE2B 8dbdbce77298585f29f42cc6c14c45d3b4104d7abb9627df25ecac94ec0d878c12bfb0860fe03ee6eebf7ecb651e0ec53324191c7a8707957a273d8640c3fec0 SHA512 4c37067ff252daa596bff0eba324774bf1b214e47b629326f83ee61904f71b06d0e4376484bda62419c0e4eaae8afde1ea6ab1c7b5aac7aabd3d722ebece9274 +DIST kimageformats-5.115.0.tar.xz 15757728 BLAKE2B 911215f6271a367f61ba47531cd258ef3b8471d239550770d738ee3de28f1e5b7ca6a15f904c8080c8c11cb34b26627206d281fafc55b86daa5a3ea0096c1ab0 SHA512 826cd5670ff7064163aeda2097cc2cf95d1d997e67d6c7e9ac40e54f797246d0a527fe01b4d90a2d052e8de10d57ae5d2c1bf8f23a4444d030b242cfc481517f +DIST kimageformats-6.1.0.tar.xz 15921424 BLAKE2B 71e21c9b839673b2d50ee69368ac595f7a1b6f1ec558ad42f231b6c27c8d1157d801b4ae46e8eeb68297f40a9b8ed269493be7925c7739ec08215708f3dbdfcd SHA512 99bf723b4a250d5d0c45cc5f77d2149e900f75a65fb70b2b2cd3cf61b60ba62ab7b17251a9a9f9c033681261f7ef4a5a4d5298d15a83d7327395884849ced157 diff --git a/kde-frameworks/kimageformats/kimageformats-5.96.0.ebuild b/kde-frameworks/kimageformats/kimageformats-5.115.0.ebuild index 1ca3c07d756e..caba00cf9789 100644 --- a/kde-frameworks/kimageformats/kimageformats-5.96.0.ebuild +++ b/kde-frameworks/kimageformats/kimageformats-5.115.0.ebuild @@ -1,29 +1,35 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 ECM_QTHELP="false" PVCUT=$(ver_cut 1-2) -QTMIN=5.15.4 -VIRTUALX_REQUIRED="test" +QTMIN=5.15.9 inherit ecm frameworks.kde.org DESCRIPTION="Framework providing additional format plugins for Qt's image I/O system" + LICENSE="LGPL-2+" -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" -IUSE="avif eps heif jpegxl openexr" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" +IUSE="avif eps heif jpegxl openexr raw" -DEPEND=" +RDEPEND=" >=dev-qt/qtgui-${QTMIN}:5 =kde-frameworks/karchive-${PVCUT}*:5 avif? ( >=media-libs/libavif-0.8.2:= ) eps? ( >=dev-qt/qtprintsupport-${QTMIN}:5 ) heif? ( >=media-libs/libheif-1.10.0:= ) - jpegxl? ( media-libs/libjxl ) + jpegxl? ( media-libs/libjxl:= ) openexr? ( >=media-libs/openexr-3:= ) + raw? ( media-libs/libraw:= ) +" +DEPEND="${RDEPEND} + test? ( + >=dev-qt/qtimageformats-${QTMIN}:5 + heif? ( media-libs/libheif[x265] ) + ) " -RDEPEND="${DEPEND}" DOCS=( src/imageformats/AUTHORS ) @@ -34,7 +40,7 @@ src_configure() { $(cmake_use_find_package eps Qt5PrintSupport) -DKIMAGEFORMATS_HEIF=$(usex heif) $(cmake_use_find_package openexr OpenEXR) + $(cmake_use_find_package raw LibRaw) ) - ecm_src_configure } diff --git a/kde-frameworks/kimageformats/kimageformats-5.98.0.ebuild b/kde-frameworks/kimageformats/kimageformats-6.1.0.ebuild index cb5227ae84d5..3568b85e4894 100644 --- a/kde-frameworks/kimageformats/kimageformats-5.98.0.ebuild +++ b/kde-frameworks/kimageformats/kimageformats-6.1.0.ebuild @@ -1,29 +1,35 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 ECM_QTHELP="false" PVCUT=$(ver_cut 1-2) -QTMIN=5.15.5 -VIRTUALX_REQUIRED="test" +QTMIN=6.6.2 inherit ecm frameworks.kde.org DESCRIPTION="Framework providing additional format plugins for Qt's image I/O system" + LICENSE="LGPL-2+" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" -IUSE="avif eps heif jpegxl openexr" +KEYWORDS="~amd64" +IUSE="avif eps heif jpegxl openexr raw" -DEPEND=" - >=dev-qt/qtgui-${QTMIN}:5 - =kde-frameworks/karchive-${PVCUT}*:5 +RDEPEND=" + >=dev-qt/qtbase-${QTMIN}:6[gui] + =kde-frameworks/karchive-${PVCUT}*:6 avif? ( >=media-libs/libavif-0.8.2:= ) - eps? ( >=dev-qt/qtprintsupport-${QTMIN}:5 ) + eps? ( >=dev-qt/qtbase-${QTMIN}:6[widgets] ) heif? ( >=media-libs/libheif-1.10.0:= ) - jpegxl? ( media-libs/libjxl ) + jpegxl? ( >=media-libs/libjxl-0.7.0:= ) openexr? ( >=media-libs/openexr-3:= ) + raw? ( media-libs/libraw:= ) +" +DEPEND="${RDEPEND} + test? ( + >=dev-qt/qtimageformats-${QTMIN}:6 + heif? ( media-libs/libheif[x265] ) + ) " -RDEPEND="${DEPEND}" DOCS=( src/imageformats/AUTHORS ) @@ -31,10 +37,10 @@ src_configure() { local mycmakeargs=( -DKIMAGEFORMATS_JXL=$(usex jpegxl) $(cmake_use_find_package avif libavif) - $(cmake_use_find_package eps Qt5PrintSupport) + $(cmake_use_find_package eps Qt6PrintSupport) -DKIMAGEFORMATS_HEIF=$(usex heif) $(cmake_use_find_package openexr OpenEXR) + $(cmake_use_find_package raw LibRaw) ) - ecm_src_configure } diff --git a/kde-frameworks/kimageformats/metadata.xml b/kde-frameworks/kimageformats/metadata.xml index 32a938a852f0..bd72f24c838a 100644 --- a/kde-frameworks/kimageformats/metadata.xml +++ b/kde-frameworks/kimageformats/metadata.xml @@ -7,12 +7,10 @@ </maintainer> <upstream> <bugs-to>https://bugs.kde.org/</bugs-to> + <remote-id type="cpe">cpe:/a:kde:kimageformats</remote-id> </upstream> <use> - <flag name="avif">Support the AVIF image file format</flag> <flag name="eps">Support the EPS graphics file format</flag> - <flag name="heif">Support for HEIF/HEIC images</flag> - <flag name="jpegxl">Support for JPEG XL image format</flag> </use> <slots> <subslots> diff --git a/kde-frameworks/kinit/Manifest b/kde-frameworks/kinit/Manifest index 9b64c317abad..e1dbbc2f2fe5 100644 --- a/kde-frameworks/kinit/Manifest +++ b/kde-frameworks/kinit/Manifest @@ -1,2 +1 @@ -DIST kinit-5.96.0.tar.xz 119408 BLAKE2B 7372a85d89e1344e1205035fd1bd643b88619ccb487667cb7f41b64b59046253e8afcb053e51e5093c31a86a8ee7bb71c8c1b9b9fdca342612d0a9ba024c4fb6 SHA512 e3f2a8fc3a4487baa1ecc60ac86e6322b9b15a1cc0fdda288eba9cf9fce387fb299435a689abeaef8570e22c9f5fdd646021409a72aa37653e28e37c8a230e7d -DIST kinit-5.98.0.tar.xz 119492 BLAKE2B 24d1caa8aa758567498701968b1ae381776881209e1c6f8ee90783f0ac87eaf4514741673169353a5520e65dde0213381249f8d741c60f629a8246e931c7eb74 SHA512 f6d52b6d69e2069a78bd5af0061164b3b344f5d0bebcc3f2ce22e67aeba7e273dc1eab9246c51519e3f046baac8dfa31f8fad2283450f8fb13e29bf6109b5091 +DIST kinit-5.115.0.tar.xz 2405120 BLAKE2B 92bb1ec3437b926942e1fea6133c36f1d7f930d862209b5849736f9d8cc375f6dc527fda13b17f88ee0a5de92a66edc4a3d5297cf6f644e5dfc38b6cbd037919 SHA512 bb8026aee90a2be5314ad941c31554f5f9e59ed387fc4cf393486485ad530bdb8a6cb8f020f90472c5241190404730ed0a70025ea24b9536bba5ba5bc123ea7f diff --git a/kde-frameworks/kinit/files/kinit-5.96.0-with_x11.patch b/kde-frameworks/kinit/files/kinit-5.96.0-with_x11.patch deleted file mode 100644 index fd6efe2fae00..000000000000 --- a/kde-frameworks/kinit/files/kinit-5.96.0-with_x11.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 85ca4b6515ac2539fb31b74db6fe5ceae1590be1 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <asturm@gentoo.org> -Date: Tue, 2 Aug 2022 00:19:19 +0200 -Subject: [PATCH] Add CMake option to build WITH_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. - -HAVE_X11 already exists and is set automagically so far, but using --DCMAKE_DISABLE_FIND_PACKAGE_X11 will break if any dependencies list X11 -as required in their cmake config. This is a behavior change as previously -it was silently disabled if X11 was not found. - -Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> ---- - CMakeLists.txt | 15 +++++++++------ - src/kdeinit/CMakeLists.txt | 4 ++-- - 2 files changed, 11 insertions(+), 8 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 90baa57..e27c41f 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -30,13 +30,16 @@ ecm_setup_version(PROJECT VARIABLE_PREFIX KINIT - - #optional features - if (NOT APPLE) -- find_package(X11) -+ option(WITH_X11 "Build with X11 integration" ON) -+ if(WITH_X11) -+ find_package(X11 REQUIRED) -+ set(HAVE_X11 1) -+ -+ find_package(XCB MODULE COMPONENTS XCB) -+ set_package_properties(XCB PROPERTIES TYPE OPTIONAL) -+ set(HAVE_XCB ${XCB_XCB_FOUND}) -+ endif() - endif() --set(HAVE_X11 ${X11_FOUND}) -- --find_package(XCB MODULE COMPONENTS XCB) --set_package_properties(XCB PROPERTIES TYPE OPTIONAL) --set(HAVE_XCB ${XCB_XCB_FOUND}) - - # used by 4 executables in this module - if(HAVE_SOCKET_LIBRARY) -diff --git a/src/kdeinit/CMakeLists.txt b/src/kdeinit/CMakeLists.txt -index af84a14..3fcbd1c 100644 ---- a/src/kdeinit/CMakeLists.txt -+++ b/src/kdeinit/CMakeLists.txt -@@ -38,7 +38,7 @@ target_compile_definitions(kdeinit5 PRIVATE - KDE_INSTALL_FULL_LIBEXECDIR_KF5="${KDE_INSTALL_FULL_LIBEXECDIR_KF5}" - ) - --if (X11_FOUND) -+if (HAVE_X11) - target_link_libraries(kdeinit5 ${X11_X11_LIB}) - endif() - -@@ -63,7 +63,7 @@ if (NOT WIN32) - - target_link_libraries(kdeinit5_wrapper ${KINIT_SOCKET_LIBRARY} Qt5::Core KF5::DBusAddons) - -- if (NOT X11_FOUND) -+ if (NOT HAVE_X11) - target_compile_definitions(kdeinit5_wrapper PRIVATE -DNO_DISPLAY) - endif () - --- -GitLab - diff --git a/kde-frameworks/kinit/kinit-5.98.0.ebuild b/kde-frameworks/kinit/kinit-5.115.0.ebuild index 22f74df7cb4e..c8a289d57e65 100644 --- a/kde-frameworks/kinit/kinit-5.98.0.ebuild +++ b/kde-frameworks/kinit/kinit-5.115.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -6,13 +6,13 @@ EAPI=8 ECM_QTHELP="false" ECM_TEST="false" PVCUT=$(ver_cut 1-2) -QTMIN=5.15.5 +QTMIN=5.15.9 inherit ecm frameworks.kde.org DESCRIPTION="Helper library to speed up start of applications on KDE workspaces" LICENSE="LGPL-2+" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" IUSE="+caps +man X" RDEPEND=" diff --git a/kde-frameworks/kinit/kinit-5.96.0-r1.ebuild b/kde-frameworks/kinit/kinit-5.96.0-r1.ebuild deleted file mode 100644 index 60cf6e3ee5cd..000000000000 --- a/kde-frameworks/kinit/kinit-5.96.0-r1.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_QTHELP="false" -ECM_TEST="false" -PVCUT=$(ver_cut 1-2) -QTMIN=5.15.4 -inherit ecm frameworks.kde.org - -DESCRIPTION="Helper library to speed up start of applications on KDE workspaces" - -LICENSE="LGPL-2+" -KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" -IUSE="+caps +man X" - -RDEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - =kde-frameworks/kconfig-${PVCUT}*:5 - =kde-frameworks/kcoreaddons-${PVCUT}*:5 - =kde-frameworks/kcrash-${PVCUT}*:5 - =kde-frameworks/kdbusaddons-${PVCUT}*:5 - =kde-frameworks/ki18n-${PVCUT}*:5 - =kde-frameworks/kio-${PVCUT}*:5 - =kde-frameworks/kservice-${PVCUT}*:5 - =kde-frameworks/kwindowsystem-${PVCUT}*:5[X?] - caps? ( sys-libs/libcap ) - X? ( - x11-libs/libX11 - x11-libs/libxcb - ) -" -DEPEND="${RDEPEND} - X? ( x11-base/xorg-proto ) -" -BDEPEND="man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )" - -# Approved upstream: https://invent.kde.org/frameworks/kinit/-/merge_requests/13 -PATCHES=( "${FILESDIR}/${P}-with_x11.patch" ) - -src_configure() { - local mycmakeargs=( - $(cmake_use_find_package caps Libcap) - $(cmake_use_find_package man KF5DocTools) - -DWITH_X11=$(usex X) - ) - - ecm_src_configure -} diff --git a/kde-frameworks/kio/Manifest b/kde-frameworks/kio/Manifest index 1f4855b836d7..e66eeccc6fdd 100644 --- a/kde-frameworks/kio/Manifest +++ b/kde-frameworks/kio/Manifest @@ -1,2 +1,2 @@ -DIST kio-5.96.0.tar.xz 3349852 BLAKE2B 981f0568c30678173f1c38972641b0a53071cce4b03cecdd1f829de7ace7244e3b67f9d63269501866474bcd64d22edc8d98e012f2197cb83f8cafd301a93da0 SHA512 70e7291efbd4b97916023cee7c44a96f3226355773f764f92a2c58c9110b75b04896196ab663ff468b757d1c2a5911f6e9021246044e7754a2ac47723eff8bd3 -DIST kio-5.98.0.tar.xz 3402060 BLAKE2B 2b8f5af4b57df63783609c1543c9b53fffd26dc663631d1c700f8fc1638c34133294faf456e79d742a35c938b0eff7eb241b10aedbf23d5e906820cf5d2b04b2 SHA512 14eaa2b3a1ea2e4736c515accf1325bd49d9ed0de5321a889eaff2f0a829977cf8746c9b4e4d7cec7cfc0aa6d5a89704a3b6e7d1236b6b2a62225a3a2432d312 +DIST kio-5.115.0.tar.xz 3799964 BLAKE2B 020084259a4e41d102e786d34b899420e18d75f27a3f8391dfd05f57d86168676d5ae88b603d84176a8ad963aee7bc5883ef4952c25f6d8ea1b11cd6d04bb470 SHA512 014eab017a1a9ba65cf122a9f241764054b3591c5759d5121ccd82593ebfe301eec0ba1f9e08165ef75b0fdf057094ef81293a6ec020ee2100394a68ab80a8d7 +DIST kio-6.1.0.tar.xz 3358572 BLAKE2B 07ee9b8f64735989d51b463bd4eac26867ae12cb4df6153b158cad1eea4630d9904f3d3403b9d3d87de7db5010bccbd4f88141fdbdc76c0501d41acc96b9c2bc SHA512 dcdd0a13d7e44c75ddd19d6d03e6c57b90c2b47f1141b6dc23054dc029a11358bb9748b8bb2115129cc1ab3769034728b3dd35507772807542376b3ef7b47707 diff --git a/kde-frameworks/kio/files/kio-5.96.0-fix-RAW-file-image-preview.patch b/kde-frameworks/kio/files/kio-5.96.0-fix-RAW-file-image-preview.patch deleted file mode 100644 index 12d4a4c05f2d..000000000000 --- a/kde-frameworks/kio/files/kio-5.96.0-fix-RAW-file-image-preview.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 5002a07e71ff270a8717911b965a75c33993f883 Mon Sep 17 00:00:00 2001 -From: Alexander Lohnau <alexander.lohnau@gmx.de> -Date: Fri, 8 Jul 2022 11:00:42 +0200 -Subject: [PATCH] Fix thumbnailer result for parent mime types being - overwritten - -BUG: 453480 ---- - src/widgets/previewjob.cpp | 12 +++++++----- - 1 file changed, 7 insertions(+), 5 deletions(-) - -diff --git a/src/widgets/previewjob.cpp b/src/widgets/previewjob.cpp -index c53bcc88a..91be5575e 100644 ---- a/src/widgets/previewjob.cpp -+++ b/src/widgets/previewjob.cpp -@@ -384,11 +384,13 @@ void PreviewJobPrivate::startPreview() - } - } - -- // Check the wildcards last, see BUG 453480 -- QString groupMimeType = mimeType; -- static const QRegularExpression expr(QStringLiteral("/.*")); -- groupMimeType.replace(expr, QStringLiteral("/*")); -- pluginIt = mimeMap.constFind(groupMimeType); -+ if (pluginIt == mimeMap.constEnd()) { -+ // Check the wildcards last, see BUG 453480 -+ QString groupMimeType = mimeType; -+ static const QRegularExpression expr(QStringLiteral("/.*")); -+ groupMimeType.replace(expr, QStringLiteral("/*")); -+ pluginIt = mimeMap.constFind(groupMimeType); -+ } - } - - if (pluginIt != mimeMap.constEnd()) { --- -GitLab - diff --git a/kde-frameworks/kio/files/kio-5.96.0-fix-crash-in-dropjob.patch b/kde-frameworks/kio/files/kio-5.96.0-fix-crash-in-dropjob.patch deleted file mode 100644 index 638a03f6eb98..000000000000 --- a/kde-frameworks/kio/files/kio-5.96.0-fix-crash-in-dropjob.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 29bdf541aa83c78bc8e9d90487a7e1dd505ef013 Mon Sep 17 00:00:00 2001 -From: David Edmundson <kde@davidedmundson.co.uk> -Date: Fri, 8 Jul 2022 15:46:11 +0100 -Subject: [PATCH] Fix crash in DropJob - -QMimeData is owned by the backend and can be deleted during any event -processing. - -DropJob has a deferred start operation. One path in this is to call -PasteJob with mimedata. It could be dangling by this point. - -Pastejob follows a similar pattern in -1d668a9fe65c5bc178487fc32e6662ff815147f6 internally but we also need to -handle this usage before PasteJob. - -BUG: 454747 ---- - src/widgets/dropjob.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/widgets/dropjob.cpp b/src/widgets/dropjob.cpp -index fa2bf4ccc..5af578d28 100644 ---- a/src/widgets/dropjob.cpp -+++ b/src/widgets/dropjob.cpp -@@ -139,7 +139,7 @@ public: - void addPluginActions(KIO::DropMenu *popup, const KFileItemListProperties &itemProps); - void doCopyToDirectory(); - -- const QMimeData *m_mimeData; -+ QPointer<const QMimeData> m_mimeData; - const QList<QUrl> m_urls; - QMap<QString, QString> m_metaData; - Qt::DropAction m_dropAction; -@@ -271,7 +271,7 @@ void DropJobPrivate::slotStart() - q->emitResult(); - } - } -- } else { -+ } else if (m_mimeData) { - // Dropping raw data - KIO::PasteJob *job = KIO::PasteJobPrivate::newJob(m_mimeData, m_destUrl, KIO::HideProgressInfo, false /*not clipboard*/); - QObject::connect(job, &KIO::PasteJob::itemCreated, q, &KIO::DropJob::itemCreated); --- -GitLab - diff --git a/kde-frameworks/kio/files/kio-5.96.0-with_x11.patch b/kde-frameworks/kio/files/kio-5.96.0-with_x11.patch deleted file mode 100644 index 9f87ec989af1..000000000000 --- a/kde-frameworks/kio/files/kio-5.96.0-with_x11.patch +++ /dev/null @@ -1,72 +0,0 @@ -From c7a277e6810b74b7f664b029573beab592932421 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <asturm@gentoo.org> -Date: Mon, 1 Aug 2022 22:10:02 +0200 -Subject: [PATCH] Drop obsolete X11 dependency, introduce WITH_X11 option - instead - -This will only determine whether to search for Qt5X11Extras and then -set HAVE_X11 accordingly. This is a behavior change as previously it was -silently disabled if X11 was not found. - -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. - -HAVE_X11 already exists and is set automagically so far, but using --DCMAKE_DISABLE_FIND_PACKAGE_X11 will break if any dependencies list X11 -as required in their cmake config. - -Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> ---- - CMakeLists.txt | 19 +++++++++---------- - src/ioslaves/http/CMakeLists.txt | 3 --- - 2 files changed, 9 insertions(+), 13 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 95b5db299..c3372f7ea 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -117,17 +117,16 @@ set_package_properties(GSSAPI PROPERTIES DESCRIPTION "Allows KIO to make use of - PURPOSE "A MIT or HEIMDAL flavor of GSSAPI can be used" - ) - --if (NOT APPLE AND NOT WIN32) -- find_package(X11) --endif() -- --set(HAVE_X11 ${X11_FOUND}) --if (HAVE_X11) -- if (QT_MAJOR_VERSION STREQUAL "5") -- find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED X11Extras) -- else() -- # qtx11extras_p.h is in Qt6Gui, which is implied by the find_package(QtWidgets) above -+if (NOT APPLE AND NOT WIN32 AND NOT ANDROID) -+ option(WITH_X11 "Build with X11 integration" ON) -+ if(WITH_X11) -+ if (QT_MAJOR_VERSION STREQUAL "5") -+ find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED X11Extras) -+ else() -+ # qtx11extras_p.h is in Qt6Gui, which is implied by the find_package(QtWidgets) above -+ endif() - endif() -+ set(HAVE_X11 ${WITH_X11}) - endif() - - find_package(ACL) -diff --git a/src/ioslaves/http/CMakeLists.txt b/src/ioslaves/http/CMakeLists.txt -index 4fbddb4a3..689f63dd8 100644 ---- a/src/ioslaves/http/CMakeLists.txt -+++ b/src/ioslaves/http/CMakeLists.txt -@@ -3,9 +3,6 @@ include(ECMMarkNonGuiExecutable) - include(ConfigureChecks.cmake) - configure_file(config-kioslave-http.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kioslave-http.h ) - --find_package(X11) --set(HAVE_X11 ${X11_FOUND}) -- - if(GSSAPI_FOUND) - set(HAVE_LIBGSSAPI 1) - if(GSSAPI_FLAVOR STREQUAL "MIT") --- -GitLab - diff --git a/kde-frameworks/kio/kio-5.98.0.ebuild b/kde-frameworks/kio/kio-5.115.0.ebuild index a9be2323c33b..d3dab7d256f8 100644 --- a/kde-frameworks/kio/kio-5.98.0.ebuild +++ b/kde-frameworks/kio/kio-5.115.0.ebuild @@ -1,27 +1,26 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 ECM_DESIGNERPLUGIN="true" +ECM_HANDBOOK="optional" +ECM_HANDBOOK_DIR="docs" ECM_TEST="forceoptional" PVCUT=$(ver_cut 1-2) -QTMIN=5.15.5 -VIRTUALX_REQUIRED="test" +QTMIN=5.15.9 inherit ecm frameworks.kde.org xdg-utils DESCRIPTION="Framework providing transparent file and data management" LICENSE="LGPL-2+" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" -IUSE="acl +handbook kerberos +kwallet X" +KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86" +IUSE="acl kerberos kf6compat +kwallet X" # tests hang RESTRICT="test" RDEPEND=" - dev-libs/libxml2 - dev-libs/libxslt >=dev-qt/qtdbus-${QTMIN}:5 >=dev-qt/qtdeclarative-${QTMIN}:5 >=dev-qt/qtgui-${QTMIN}:5 @@ -50,12 +49,18 @@ RDEPEND=" =kde-frameworks/kwindowsystem-${PVCUT}*:5[X?] =kde-frameworks/kxmlgui-${PVCUT}*:5 =kde-frameworks/solid-${PVCUT}*:5 + sys-power/switcheroo-control acl? ( sys-apps/attr virtual/acl ) - handbook? ( =kde-frameworks/kdoctools-${PVCUT}*:5 ) + handbook? ( + dev-libs/libxml2 + dev-libs/libxslt + =kde-frameworks/kdoctools-${PVCUT}*:5 + ) kerberos? ( virtual/krb5 ) + kf6compat? ( kde-apps/kio-extras:6 ) kwallet? ( =kde-frameworks/kwallet-${PVCUT}*:5 ) X? ( >=dev-qt/qtx11extras-${QTMIN}:5 ) " @@ -69,9 +74,9 @@ src_configure() { local mycmakeargs=( -DKIO_NO_PUBLIC_QTCONCURRENT=ON $(cmake_use_find_package acl ACL) - $(cmake_use_find_package handbook KF5DocTools) $(cmake_use_find_package kerberos GSSAPI) $(cmake_use_find_package kwallet KF5Wallet) + -DKF6_COMPAT_BUILD=$(usex kf6compat) -DWITH_X11=$(usex X) ) diff --git a/kde-frameworks/kio/kio-5.96.0-r3.ebuild b/kde-frameworks/kio/kio-5.96.0-r3.ebuild deleted file mode 100644 index ba5dd490e22e..000000000000 --- a/kde-frameworks/kio/kio-5.96.0-r3.ebuild +++ /dev/null @@ -1,96 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_DESIGNERPLUGIN="true" -ECM_TEST="forceoptional" -PVCUT=$(ver_cut 1-2) -QTMIN=5.15.4 -VIRTUALX_REQUIRED="test" -inherit ecm frameworks.kde.org xdg-utils - -DESCRIPTION="Framework providing transparent file and data management" - -LICENSE="LGPL-2+" -KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" -IUSE="acl +handbook kerberos +kwallet X" - -# tests hang -RESTRICT="test" - -RDEPEND=" - dev-libs/libxml2 - dev-libs/libxslt - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtnetwork-${QTMIN}:5[ssl] - >=dev-qt/qtwidgets-${QTMIN}:5 - >=dev-qt/qtxml-${QTMIN}:5 - =kde-frameworks/kauth-${PVCUT}*:5 - =kde-frameworks/karchive-${PVCUT}*:5 - =kde-frameworks/kbookmarks-${PVCUT}*:5 - =kde-frameworks/kcodecs-${PVCUT}*:5 - =kde-frameworks/kcompletion-${PVCUT}*:5 - =kde-frameworks/kconfig-${PVCUT}*:5 - =kde-frameworks/kconfigwidgets-${PVCUT}*:5 - =kde-frameworks/kcoreaddons-${PVCUT}*:5 - =kde-frameworks/kcrash-${PVCUT}*:5 - =kde-frameworks/kdbusaddons-${PVCUT}*:5 - =kde-frameworks/kguiaddons-${PVCUT}*:5 - =kde-frameworks/ki18n-${PVCUT}*:5 - =kde-frameworks/kiconthemes-${PVCUT}*:5 - =kde-frameworks/kitemviews-${PVCUT}*:5 - =kde-frameworks/kjobwidgets-${PVCUT}*:5 - =kde-frameworks/knotifications-${PVCUT}*:5 - =kde-frameworks/kservice-${PVCUT}*:5 - =kde-frameworks/ktextwidgets-${PVCUT}*:5 - =kde-frameworks/kwidgetsaddons-${PVCUT}*:5 - =kde-frameworks/kwindowsystem-${PVCUT}*:5[X?] - =kde-frameworks/kxmlgui-${PVCUT}*:5 - =kde-frameworks/solid-${PVCUT}*:5 - acl? ( - sys-apps/attr - virtual/acl - ) - handbook? ( =kde-frameworks/kdoctools-${PVCUT}*:5 ) - kerberos? ( virtual/krb5 ) - kwallet? ( =kde-frameworks/kwallet-${PVCUT}*:5 ) - X? ( >=dev-qt/qtx11extras-${QTMIN}:5 ) -" -DEPEND="${RDEPEND} - >=dev-qt/qtconcurrent-${QTMIN}:5 - test? ( sys-libs/zlib ) -" -PDEPEND=">=kde-frameworks/kded-${PVCUT}:5" - -PATCHES=( - "${FILESDIR}/${P}-fix-crash-in-dropjob.patch" # KDE-bug 454747 - "${FILESDIR}/${P}-fix-RAW-file-image-preview.patch" # KDE-bug 453480 - # Approved upstream: https://invent.kde.org/frameworks/kio/-/merge_requests/943 - "${FILESDIR}/${P}-with_x11.patch" -) - -src_configure() { - local mycmakeargs=( - -DKIO_NO_PUBLIC_QTCONCURRENT=ON - $(cmake_use_find_package acl ACL) - $(cmake_use_find_package handbook KF5DocTools) - $(cmake_use_find_package kerberos GSSAPI) - $(cmake_use_find_package kwallet KF5Wallet) - -DWITH_X11=$(usex X) - ) - - ecm_src_configure -} - -pkg_postinst() { - ecm_pkg_postinst - xdg_desktop_database_update -} - -pkg_postrm() { - ecm_pkg_postrm - xdg_desktop_database_update -} diff --git a/kde-frameworks/kio/kio-6.1.0.ebuild b/kde-frameworks/kio/kio-6.1.0.ebuild new file mode 100644 index 000000000000..1cc239e93018 --- /dev/null +++ b/kde-frameworks/kio/kio-6.1.0.ebuild @@ -0,0 +1,92 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_DESIGNERPLUGIN="true" +ECM_HANDBOOK="optional" +ECM_HANDBOOK_DIR="docs" +ECM_TEST="forceoptional" +PVCUT=$(ver_cut 1-2) +QTMIN=6.6.2 +inherit ecm frameworks.kde.org xdg-utils + +DESCRIPTION="Framework providing transparent file and data management" + +LICENSE="LGPL-2+" +KEYWORDS="~amd64" +IUSE="acl +kwallet wayland X" + +# tests hang +RESTRICT="test" + +# slot op: Uses Qt6::GuiPrivate for qtx11extras_p.h +COMMON_DEPEND=" + >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,ssl,widgets] + >=dev-qt/qt5compat-${QTMIN}:6 + >=dev-qt/qtdeclarative-${QTMIN}:6 + =kde-frameworks/kauth-${PVCUT}*:6 + =kde-frameworks/kbookmarks-${PVCUT}*:6 + =kde-frameworks/kcodecs-${PVCUT}*:6 + =kde-frameworks/kcolorscheme-${PVCUT}*:6 + =kde-frameworks/kcompletion-${PVCUT}*:6 + =kde-frameworks/kconfig-${PVCUT}*:6 + =kde-frameworks/kconfigwidgets-${PVCUT}*:6 + =kde-frameworks/kcoreaddons-${PVCUT}*:6 + =kde-frameworks/kcrash-${PVCUT}*:6 + =kde-frameworks/kdbusaddons-${PVCUT}*:6 + =kde-frameworks/kguiaddons-${PVCUT}*:6 + =kde-frameworks/ki18n-${PVCUT}*:6 + =kde-frameworks/kiconthemes-${PVCUT}*:6 + =kde-frameworks/kitemviews-${PVCUT}*:6 + =kde-frameworks/kjobwidgets-${PVCUT}*:6 + =kde-frameworks/knotifications-${PVCUT}*:6 + =kde-frameworks/kservice-${PVCUT}*:6 + =kde-frameworks/ktextwidgets-${PVCUT}*:6 + =kde-frameworks/kwidgetsaddons-${PVCUT}*:6 + =kde-frameworks/kwindowsystem-${PVCUT}*:6[wayland?,X?] + =kde-frameworks/kxmlgui-${PVCUT}*:6 + =kde-frameworks/solid-${PVCUT}*:6 + sys-power/switcheroo-control + acl? ( + sys-apps/attr + virtual/acl + ) + handbook? ( + dev-libs/libxml2 + dev-libs/libxslt + =kde-frameworks/karchive-${PVCUT}*:6 + =kde-frameworks/kdoctools-${PVCUT}*:6 + ) + kwallet? ( =kde-frameworks/kwallet-${PVCUT}*:6 ) + X? ( >=dev-qt/qtbase-${QTMIN}:6=[gui] ) +" +DEPEND="${COMMON_DEPEND} + >=dev-qt/qtbase-${QTMIN}:6[concurrent] +" +RDEPEND="${COMMON_DEPEND} + >=dev-qt/qtbase-${QTMIN}:6[libproxy] + sys-power/switcheroo-control +" +PDEPEND=">=kde-frameworks/kded-${PVCUT}:6" + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package acl ACL) + $(cmake_use_find_package kwallet KF6Wallet) + -DWITH_WAYLAND=$(usex wayland) + -DWITH_X11=$(usex X) + ) + + ecm_src_configure +} + +pkg_postinst() { + ecm_pkg_postinst + xdg_desktop_database_update +} + +pkg_postrm() { + ecm_pkg_postrm + xdg_desktop_database_update +} diff --git a/kde-frameworks/kio/metadata.xml b/kde-frameworks/kio/metadata.xml index ef4d43059c0d..01d1befe3457 100644 --- a/kde-frameworks/kio/metadata.xml +++ b/kde-frameworks/kio/metadata.xml @@ -10,6 +10,7 @@ </upstream> <use> <flag name="designer">Build plugins for <pkg>dev-qt/designer</pkg></flag> + <flag name="kf6compat">Disable components colliding with KF6, depend on KF6 components instead</flag> <flag name="kwallet">Enable permanent storage of passwords for kpasswdserver with <pkg>kde-frameworks/kwallet</pkg></flag> </use> <slots> diff --git a/kde-frameworks/kirigami/Manifest b/kde-frameworks/kirigami/Manifest index a4d416690301..d31ff44fc0c2 100644 --- a/kde-frameworks/kirigami/Manifest +++ b/kde-frameworks/kirigami/Manifest @@ -1,3 +1,2 @@ -DIST kirigami-5.96.0-fix-ScrollBar-binding-loop-freeze.patch.xz 8864 BLAKE2B f0222c16436c2fbe72198acdf6e00427d6b2ced08a3d7294ddeb11f39b10a744eabc11dc8cf3cf2353dc985405141b25e77f548f79de064b207bcea5ca7b0857 SHA512 10669cfc2e835d0d1904f2ecaef79a5c89807839a85c175006921336942b8b5f2b05e5e4d2cad249ec57d6937ff38e044ba15bc6f2d7c61eadab060851267da2 -DIST kirigami2-5.96.0.tar.xz 359936 BLAKE2B cadba252c1065d7c1c7a539b9d28489dc61683a3b688bdeb4c7d43528494d62d9f4fa3515d29a554d0c47c0bcc81169ab8d3f83952911147ef4fb06658560e50 SHA512 c96e7d53d263f3c5f0c3f3f98c6523555fd67fa5e12dbb0aecb81bc9f8a46f641d2176d377e9c7d901ca235151e004ff1163ac07521aabfb53e0e6517b4df546 -DIST kirigami2-5.98.0.tar.xz 360516 BLAKE2B 241e89b90343526e7cf1e85d2b8c020ab3794e4f4c0395ca5b3c648b3b929a2a374728909915247cb8f98ae711b06902df1fa3c79661daab2b20df5889a02de4 SHA512 cd5af943d847873ce9da18e8cb5ebb2af805b035ac9526bfba296ce0e9f7ec42724205d354d380bc250657de292f363e63e8b384b90ffc9d65943b1b7d8455ed +DIST kirigami-6.1.0.tar.xz 472340 BLAKE2B 1e4ddbdd4dc74d03c5afa982e4769b1b0e104d3bd947018031f3c115afb8e06d7e6133cbadc0f41238524de9c1d4615422a923b4859cf3af61c2f5087864d62d SHA512 2a75af0bc010120913f092f14760817c197298da4f6fc4780f5ab222de8e385864f4c88b9907acf4b03fea53759f1e2a39a2b62bcd78b8c2c1bc52129c04d207 +DIST kirigami2-5.115.0.tar.xz 383944 BLAKE2B ce95794319ebbda40d384896da4e94dcf5137d176b0c3cab53bf5223ed48e0c95486002010c74008b42857ce7d27d4840c2af0395e957d0eade18bc2f5796f87 SHA512 b99d9829f864ae59b0ae4064e0b0b24a0f33ce2c35c60b4609fd9746bb322cab26d3f9afe6ba0893b486d4c546ead98c5ba42dc33271d2fdf47e34caef35ea90 diff --git a/kde-frameworks/kirigami/kirigami-5.96.0-r1.ebuild b/kde-frameworks/kirigami/kirigami-5.115.0.ebuild index c1080614b209..730b8a18bb13 100644 --- a/kde-frameworks/kirigami/kirigami-5.96.0-r1.ebuild +++ b/kde-frameworks/kirigami/kirigami-5.115.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -6,18 +6,16 @@ EAPI=8 ECM_EXAMPLES="true" ECM_QTHELP="false" ECM_TEST="true" -KDE_ORG_NAME="${PN}2" -QTMIN=5.15.4 -inherit ecm frameworks.kde.org +KDE_ORG_TAR_PN="${PN}2" +QTMIN=5.15.9 +inherit ecm frameworks.kde.org toolchain-funcs DESCRIPTION="Lightweight user interface framework for mobile and convergent applications" HOMEPAGE="https://techbase.kde.org/Kirigami" -EGIT_REPO_URI="${EGIT_REPO_URI/${PN}2/${PN}}" -SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${P}-fix-ScrollBar-binding-loop-freeze.patch.xz" LICENSE="LGPL-2+" KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" -IUSE="" +IUSE="openmp" # requires package to already be installed RESTRICT="test" @@ -36,11 +34,18 @@ RDEPEND="${DEPEND} " BDEPEND=">=dev-qt/linguist-tools-${QTMIN}:5" -PATCHES=( "${WORKDIR}/${P}-fix-ScrollBar-binding-loop-freeze.patch" ) # KDE-bug 448784 +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} src_configure() { local mycmakeargs=( -DBUILD_EXAMPLES=$(usex examples) + $(cmake_use_find_package openmp OpenMP) ) ecm_src_configure diff --git a/kde-frameworks/kirigami/kirigami-5.98.0.ebuild b/kde-frameworks/kirigami/kirigami-5.98.0.ebuild deleted file mode 100644 index 0b17391a0c34..000000000000 --- a/kde-frameworks/kirigami/kirigami-5.98.0.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_EXAMPLES="true" -ECM_QTHELP="false" -ECM_TEST="true" -KDE_ORG_NAME="${PN}2" -QTMIN=5.15.5 -inherit ecm frameworks.kde.org - -DESCRIPTION="Lightweight user interface framework for mobile and convergent applications" -HOMEPAGE="https://techbase.kde.org/Kirigami" -EGIT_REPO_URI="${EGIT_REPO_URI/${PN}2/${PN}}" - -LICENSE="LGPL-2+" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" -IUSE="" - -# requires package to already be installed -RESTRICT="test" - -BDEPEND=" - >=dev-qt/linguist-tools-${QTMIN}:5 -" -DEPEND=" - >=dev-qt/qtconcurrent-${QTMIN}:5 - >=dev-qt/qtdbus-${QTMIN}:5 - >=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 -" -RDEPEND="${DEPEND} - >=dev-qt/qtgraphicaleffects-${QTMIN}:5 -" - -src_configure() { - local mycmakeargs=( - -DBUILD_EXAMPLES=$(usex examples) - ) - - ecm_src_configure -} diff --git a/kde-frameworks/kirigami/kirigami-6.1.0.ebuild b/kde-frameworks/kirigami/kirigami-6.1.0.ebuild new file mode 100644 index 000000000000..c782a7f01808 --- /dev/null +++ b/kde-frameworks/kirigami/kirigami-6.1.0.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_EXAMPLES="true" +ECM_QTHELP="false" +ECM_TEST="true" +QTMIN=6.6.2 +inherit ecm frameworks.kde.org toolchain-funcs + +DESCRIPTION="Lightweight user interface framework for mobile and convergent applications" +HOMEPAGE="https://techbase.kde.org/Kirigami" + +LICENSE="LGPL-2+" +KEYWORDS="~amd64" +IUSE="openmp" + +# requires package to already be installed +RESTRICT="test" + +# slot op: Uses Qt6::GuiPrivate for qguiapplication_p.h +DEPEND=" + >=dev-qt/qtbase-${QTMIN}:6=[concurrent,dbus,gui,network] + >=dev-qt/qtdeclarative-${QTMIN}:6 + >=dev-qt/qtsvg-${QTMIN}:6 +" +RDEPEND="${DEPEND} + examples? ( !${CATEGORY}/${PN}:5[examples] ) + >=dev-qt/qt5compat-${QTMIN}:6[qml] +" +BDEPEND=">=dev-qt/qttools-${QTMIN}:6[linguist]" + +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +src_configure() { + local mycmakeargs=( + -DBUILD_EXAMPLES=$(usex examples) + $(cmake_use_find_package openmp OpenMP) + ) + + ecm_src_configure +} diff --git a/kde-frameworks/kitemmodels/Manifest b/kde-frameworks/kitemmodels/Manifest index 9775449d7005..a0ec6f52eda8 100644 --- a/kde-frameworks/kitemmodels/Manifest +++ b/kde-frameworks/kitemmodels/Manifest @@ -1,2 +1,2 @@ -DIST kitemmodels-5.96.0.tar.xz 407272 BLAKE2B 35563933a1371e8c89da764286e6b2270d74b7bf27091d08b9910510c4a66995cc89f1bc30191eaea50338685c3ae40f2488ad6c04d6091c6d3d6dfa5868d04d SHA512 46e4380788f49ff79c6e7a7d372c6e451a83ddf349e175be41fb9db5311399c342e5a1e3dbd268c05b089d49700157d87b683dbf894be25b6ce8842380ee6a70 -DIST kitemmodels-5.98.0.tar.xz 407312 BLAKE2B 1d51cc38283b877b4d64acde2775b26d2e46ca5e83ad01bc8fcf1ae1aa934bba9b4ab6778ee36069d20d9a7ddaeb10dd9133692516edafc52d5703adfb9447dd SHA512 b019bd09e5da476574ec748b27633c54728c534b4c350ce6f6be07c4e5f006d2d479655b37200c7e6dd93f1c1daa0e3777b99384b13a8237a50d4263298135e3 +DIST kitemmodels-5.115.0.tar.xz 407312 BLAKE2B 101c2dc57fe2616fa1918343840422885f8f3ca4cb924ef4331b618cdb081b1777164442a2b905e1c0b419ddb5909b2ccb9418cd087a6b1dec53f8939b9822b2 SHA512 fdd0c98e27dcacef57a6224c17bdb17f7074514414542653b3211ffe787c1cc84499773ec7b1ab3ee0d6ee1dfa598ef61b7c0f97bffc1555c060c487f884a3bb +DIST kitemmodels-6.1.0.tar.xz 398808 BLAKE2B bfe00c72dd40f63959a7c0ee8c4abeebb8b3cf378e7cbb150d4361663e7efd4041a93986664f5ba30f900b125a8ea05b282ec1e7c17b96ef74e7e215f44a67d1 SHA512 d256ed99a6d1e7780650f4720da0b25f46b0caa7c42600e9eb62e91b4ba03a5baaaf28cfe9aa0f76e33bc248567065ebd874d16b41f7a0930c6e0985b932225c diff --git a/kde-frameworks/kitemmodels/kitemmodels-5.96.0.ebuild b/kde-frameworks/kitemmodels/kitemmodels-5.115.0.ebuild index 59aa384425c3..b4ed5bc62fd8 100644 --- a/kde-frameworks/kitemmodels/kitemmodels-5.96.0.ebuild +++ b/kde-frameworks/kitemmodels/kitemmodels-5.115.0.ebuild @@ -1,10 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -QTMIN=5.15.4 -VIRTUALX_REQUIRED="test" +QTMIN=5.15.9 inherit ecm frameworks.kde.org DESCRIPTION="Framework providing data models to help with tasks such as sorting and filtering" diff --git a/kde-frameworks/kitemmodels/kitemmodels-5.98.0.ebuild b/kde-frameworks/kitemmodels/kitemmodels-5.98.0.ebuild deleted file mode 100644 index 7b7db08aa818..000000000000 --- a/kde-frameworks/kitemmodels/kitemmodels-5.98.0.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -QTMIN=5.15.5 -VIRTUALX_REQUIRED="test" -inherit ecm frameworks.kde.org - -DESCRIPTION="Framework providing data models to help with tasks such as sorting and filtering" - -LICENSE="LGPL-2+" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" -IUSE="qml" - -RDEPEND=" - qml? ( >=dev-qt/qtdeclarative-${QTMIN}:5 ) -" -DEPEND="${RDEPEND} - test? ( >=dev-qt/qtwidgets-${QTMIN}:5 ) -" - -src_configure() { - local mycmakeargs=( - $(cmake_use_find_package qml Qt5Qml) - ) - ecm_src_configure -} - -src_test() { - LC_NUMERIC="C" ecm_src_test # bug 708820 -} diff --git a/kde-frameworks/kitemmodels/kitemmodels-6.1.0.ebuild b/kde-frameworks/kitemmodels/kitemmodels-6.1.0.ebuild new file mode 100644 index 000000000000..dd2bea8de8db --- /dev/null +++ b/kde-frameworks/kitemmodels/kitemmodels-6.1.0.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +QTMIN=6.6.2 +inherit ecm frameworks.kde.org + +DESCRIPTION="Framework providing data models to help with tasks such as sorting and filtering" + +LICENSE="LGPL-2+" +KEYWORDS="~amd64" + +RDEPEND=" + >=dev-qt/qtdeclarative-${QTMIN}:6 +" +DEPEND="${RDEPEND} + test? ( >=dev-qt/qtbase-${QTMIN}:6[widgets] ) +" + +src_test() { + LC_NUMERIC="C" ecm_src_test # bug 708820 +} diff --git a/kde-frameworks/kitemviews/Manifest b/kde-frameworks/kitemviews/Manifest index 0cb7594a6b49..2cf436ff5201 100644 --- a/kde-frameworks/kitemviews/Manifest +++ b/kde-frameworks/kitemviews/Manifest @@ -1,2 +1,2 @@ -DIST kitemviews-5.96.0.tar.xz 77440 BLAKE2B c1b8baa6d2ce0a47dafcc1ddb54b91fb27e3537711b1961566bf1fde19e301f4666fab4e22a283b1a55f61edc6bbb147377113b3de2110ba5513c71b2d75e18e SHA512 b1ba1a7c959436f88ba176cbba1a91eaf4453ca91b9dc3bc7ffea026a83371d6377475fc9a6a8999edd3d330a8bb57d266f1738e2be879bbcc651cac1ebbfeaa -DIST kitemviews-5.98.0.tar.xz 77300 BLAKE2B 6a2f4c7fff5951bbc7035cc1bbd97806e711c189dd92cba4549301fc88b6e14dd3b4066452f639e42df31e2f78c7863455e50241ddd3e39756f3497cf8bda243 SHA512 520b066ed4a354836f32e28546ede6492f63dccde3bf7089e291ba06db78f1f5a289d0d9ab5868864664099209f63159636fbf0444b08d50189f79d84eb3b204 +DIST kitemviews-5.115.0.tar.xz 2264972 BLAKE2B d9d60db19815471a269ee7d1ade03794c5b7877cecb917836cce53056787ab81e2caa7fab3b3cbab85f5908df297242fed6c31cfe0ce1ce7dad364a15c465046 SHA512 47150f92d74e709b7fc6aa98efd929af1753bd31f605aef16a52f5922235085d0e76676334fda3af3b764d770c3f2482ea8ca4b3eb416ad0cb35770784fb413e +DIST kitemviews-6.1.0.tar.xz 2262100 BLAKE2B c83711e641584e31d99e90cf3cdf9a0d7947d3ae291d8d179fd34b51915b05919252f13ed18f5b7601fb180b808f86f27a936f3b04b241aa331dac7319c3ca51 SHA512 f663f3bb11d062ce1847ce74d05934278dfd380eeed98fb890d7b9563894dffd4f11c8a1a80ed8e03cd7ecf19014d88b79cb436c8409c376e7f039d1e3f20d17 diff --git a/kde-frameworks/kitemviews/kitemviews-5.96.0.ebuild b/kde-frameworks/kitemviews/kitemviews-5.115.0.ebuild index 8dc324473f03..21ddd2aa8461 100644 --- a/kde-frameworks/kitemviews/kitemviews-5.96.0.ebuild +++ b/kde-frameworks/kitemviews/kitemviews-5.115.0.ebuild @@ -1,22 +1,21 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 ECM_DESIGNERPLUGIN="true" -QTMIN=5.15.4 -VIRTUALX_REQUIRED="test" +QTMIN=5.15.9 inherit ecm frameworks.kde.org DESCRIPTION="Framework providing additional widgets for item models" LICENSE="LGPL-2+" -KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" -IUSE="nls" +KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86" +IUSE="" DEPEND=" >=dev-qt/qtgui-${QTMIN}:5 >=dev-qt/qtwidgets-${QTMIN}:5 " RDEPEND="${DEPEND}" -BDEPEND="nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )" +BDEPEND=">=dev-qt/linguist-tools-${QTMIN}:5" diff --git a/kde-frameworks/kitemviews/kitemviews-5.98.0.ebuild b/kde-frameworks/kitemviews/kitemviews-5.98.0.ebuild deleted file mode 100644 index 8d978f4db47f..000000000000 --- a/kde-frameworks/kitemviews/kitemviews-5.98.0.ebuild +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_DESIGNERPLUGIN="true" -QTMIN=5.15.5 -VIRTUALX_REQUIRED="test" -inherit ecm frameworks.kde.org - -DESCRIPTION="Framework providing additional widgets for item models" - -LICENSE="LGPL-2+" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" -IUSE="nls" - -DEPEND=" - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 -" -RDEPEND="${DEPEND}" -BDEPEND="nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )" diff --git a/kde-frameworks/kitemviews/kitemviews-6.1.0.ebuild b/kde-frameworks/kitemviews/kitemviews-6.1.0.ebuild new file mode 100644 index 000000000000..e97c12e1ab8c --- /dev/null +++ b/kde-frameworks/kitemviews/kitemviews-6.1.0.ebuild @@ -0,0 +1,18 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_DESIGNERPLUGIN="true" +QTMIN=6.6.2 +inherit ecm frameworks.kde.org + +DESCRIPTION="Framework providing additional widgets for item models" + +LICENSE="LGPL-2+" +KEYWORDS="~amd64" +IUSE="" + +DEPEND=">=dev-qt/qtbase-${QTMIN}:6[gui,widgets]" +RDEPEND="${DEPEND}" +BDEPEND=">=dev-qt/qttools-${QTMIN}:6[linguist]" diff --git a/kde-frameworks/kjobwidgets/Manifest b/kde-frameworks/kjobwidgets/Manifest index f6ed989080bd..d8577dc07120 100644 --- a/kde-frameworks/kjobwidgets/Manifest +++ b/kde-frameworks/kjobwidgets/Manifest @@ -1,2 +1,2 @@ -DIST kjobwidgets-5.96.0.tar.xz 101704 BLAKE2B 98f647b2bc7266364c05f5e57ddefbb60b8a16260f83abac4b33d7819987b2083029c14d78e49f6cd1fd5e087a343b11893e30d45c496e345fe98d67465055b5 SHA512 17fb818efa4f241a3e8248b81ba16c3a879b0580eb3a33efc19983faa5b39959e0cb1032b9044e953accd13ad93c028bfc619c49b26076416f707e6ea9480510 -DIST kjobwidgets-5.98.0.tar.xz 101784 BLAKE2B 9474e28eb9c8779695f75d571bbc4339c50d4e0c57dddbccb17b0dc2bc851992c739930bfe79e91ed0d1a05bbe8ed785042fbb6ee6ef11545729a5fadd2c15be SHA512 6b0be68a86d62ad0e802dd6693f31e0dab99db7451cf763f81ef062e349fa6e4850c3e9d090a9e86313a8decc65c25e0553fb65bac6d6bb2198c5d7cdfc40812 +DIST kjobwidgets-5.115.0.tar.xz 2301320 BLAKE2B 52bbc7fc8cf26494a865400f4dd852e6779558e05c05cdbd589df983a7d431147ff65608b945f2786d6f81445df0b0e145d5f81bd0c9013f9e3dcb9e77a6387c SHA512 8364d7dc63fe7777dcf053aa627e8e8182cb56e4d93b4ed2e366f327cae60fbcfa93dac35ca37bc86a2352297a745a93d38c4123bccf73b57d19f987414f8fd0 +DIST kjobwidgets-6.1.0.tar.xz 2265188 BLAKE2B a853729ce73f8c1eb97b6f06329647a74dd13b3c89eaa6be13e089221cd66a75306e735772a1411f040767cebb0a838af4763518d44297508e18a7a42468cf67 SHA512 914be906818c54a4a4bd7932131f609f7eb4869c574908c39c212f11c793b978ec7dc7886a582d87e67bca154bc0efbd33f8af0b4922194374bf5050f0429f80 diff --git a/kde-frameworks/kjobwidgets/files/kjobwidgets-5.96.0-fix-ui-server-crash.patch b/kde-frameworks/kjobwidgets/files/kjobwidgets-5.96.0-fix-ui-server-crash.patch deleted file mode 100644 index 463daf84f573..000000000000 --- a/kde-frameworks/kjobwidgets/files/kjobwidgets-5.96.0-fix-ui-server-crash.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 5aeba3f01ef8cdf723813cacdd29945328288663 Mon Sep 17 00:00:00 2001 -From: Michael Pyne <mpyne@kde.org> -Date: Sat, 2 Jul 2022 17:57:10 -0400 -Subject: [PATCH] ui-server: Fix crash by only re-registering live KJobs. - -This addresses a frequently-reported crash in the job tracker for -KUiServerV2 that occurs when attempting to re-register new job views for -active KJobs after a new UI server comes online. - -Although I have not been able to reproduce the crash myself, (by -attempting to use both long-lived and short-lived file transfers from -Dolphin and restarting plasmashell), inspection of the code shows that -it is possible for there to be deleted KJobs pointing to JobView objects -during some portions of the job tracker's lifetime. - -The current code deals with this in situations including DBus calls to -create a U/I view for a KJob (the KJob may terminate before the DBus -reply is received) and even a short delay that can be optionally -introduced (the KJob may terminate before the delay elapses). A -QPointer<KJob> is used as a guard in these situations, but there is no -similar guard for the re-registration code. - -In this case we cannot use QPointer<KJob> to guard the job's lifetime -because the KJob must be alive when the QPointer<KJob> is created, and -this crash occurs when the KJob is terminated. However the KJob's -destruction should lead to the unregisterJob() function being called, -which handles removing the terminated KJob from the map of job views -with only one exception, where instead the job view for the KJob has its -"terminated" pending status set. - -So the fix here checks for the "terminated" state in the same way as -performed in requestView(), and if the KJob is terminated, handles -requesting the job view to terminate the U/I and finally removing the -terminated KJob from the map of job views. - -By doing this, we avoid passing a deleted KJob to the registerJob() -function, which will attempt to dereference it and crash the -application. - -See also merge request !22 - -BUG:450325 ---- - src/kuiserverv2jobtracker.cpp | 20 ++++++++++++++++---- - 1 file changed, 16 insertions(+), 4 deletions(-) - -diff --git a/src/kuiserverv2jobtracker.cpp b/src/kuiserverv2jobtracker.cpp -index 737c880..3592618 100644 ---- a/src/kuiserverv2jobtracker.cpp -+++ b/src/kuiserverv2jobtracker.cpp -@@ -209,12 +209,24 @@ void KUiServerV2JobTracker::registerJob(KJob *job) - - const auto oldState = view.currentState; - -- delete view.jobView; -- d->jobViews.remove(job); -+ // It is possible that the KJob has been deleted already so do not -+ // use or deference if marked as terminated -+ if (oldState.value(QStringLiteral("terminated")).toBool()) { -+ const uint errorCode = oldState.value(QStringLiteral("errorCode")).toUInt(); -+ const QString errorMessage = oldState.value(QStringLiteral("errorMessage")).toString(); - -- registerJob(job); -+ view.jobView->terminate(errorCode, errorMessage, QVariantMap() /*hints*/); - -- d->jobViews[job].currentState = oldState; -+ delete view.jobView; -+ d->jobViews.remove(job); -+ } else { -+ delete view.jobView; -+ d->jobViews.remove(job); // must happen before registerJob -+ -+ registerJob(job); -+ -+ d->jobViews[job].currentState = oldState; -+ } - } - }); - } --- -GitLab - diff --git a/kde-frameworks/kjobwidgets/kjobwidgets-5.98.0.ebuild b/kde-frameworks/kjobwidgets/kjobwidgets-5.115.0.ebuild index 66909f2ed71f..fe96e7b2fb44 100644 --- a/kde-frameworks/kjobwidgets/kjobwidgets-5.98.0.ebuild +++ b/kde-frameworks/kjobwidgets/kjobwidgets-5.115.0.ebuild @@ -1,20 +1,18 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 PVCUT=$(ver_cut 1-2) -QTMIN=5.15.5 +QTMIN=5.15.9 inherit ecm frameworks.kde.org DESCRIPTION="Framework providing assorted widgets for showing the progress of jobs" + LICENSE="LGPL-2+" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" -IUSE="nls X" +KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86" +IUSE="X" -BDEPEND=" - nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 ) -" RDEPEND=" >=dev-qt/qtdbus-${QTMIN}:5 >=dev-qt/qtgui-${QTMIN}:5 @@ -29,6 +27,7 @@ DEPEND="${RDEPEND} x11-libs/libX11 ) " +BDEPEND=">=dev-qt/linguist-tools-${QTMIN}:5" src_configure() { local mycmakeargs=( diff --git a/kde-frameworks/kjobwidgets/kjobwidgets-5.96.0-r1.ebuild b/kde-frameworks/kjobwidgets/kjobwidgets-5.96.0-r1.ebuild deleted file mode 100644 index dac768b0689e..000000000000 --- a/kde-frameworks/kjobwidgets/kjobwidgets-5.96.0-r1.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PVCUT=$(ver_cut 1-2) -QTMIN=5.15.4 -inherit ecm frameworks.kde.org - -DESCRIPTION="Framework providing assorted widgets for showing the progress of jobs" - -LICENSE="LGPL-2+" -KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" -IUSE="nls X" - -RDEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - =kde-frameworks/kcoreaddons-${PVCUT}*:5 - =kde-frameworks/kwidgetsaddons-${PVCUT}*:5 - X? ( >=dev-qt/qtx11extras-${QTMIN}:5 ) -" -DEPEND="${RDEPEND} - X? ( - x11-base/xorg-proto - x11-libs/libX11 - ) -" -BDEPEND=" - nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 ) -" - -PATCHES=( "${FILESDIR}/${P}-fix-ui-server-crash.patch" ) # KDE-bug 450325 - -src_configure() { - local mycmakeargs=( - $(cmake_use_find_package X X11) - ) - - ecm_src_configure -} diff --git a/kde-frameworks/kjobwidgets/kjobwidgets-6.1.0.ebuild b/kde-frameworks/kjobwidgets/kjobwidgets-6.1.0.ebuild new file mode 100644 index 000000000000..dd258bd6badd --- /dev/null +++ b/kde-frameworks/kjobwidgets/kjobwidgets-6.1.0.ebuild @@ -0,0 +1,25 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PVCUT=$(ver_cut 1-2) +QTMIN=6.6.2 +inherit ecm frameworks.kde.org + +DESCRIPTION="Framework providing assorted widgets for showing the progress of jobs" + +LICENSE="LGPL-2+" +KEYWORDS="~amd64" +IUSE="" + +# slot op: Uses Qt6::GuiPrivate for qtx11extras_p.h +# ...by automagic: #if __has_include(<private/qtx11extras_p.h>) +RDEPEND=" + >=dev-qt/qtbase-${QTMIN}:6=[dbus,gui,widgets] + =kde-frameworks/kcoreaddons-${PVCUT}*:6 + =kde-frameworks/knotifications-${PVCUT}*:6 + =kde-frameworks/kwidgetsaddons-${PVCUT}*:6 +" +DEPEND="${RDEPEND}" +BDEPEND=">=dev-qt/qttools-${QTMIN}:6[linguist]" diff --git a/kde-frameworks/kjs/Manifest b/kde-frameworks/kjs/Manifest index 53f71a73c0ea..5e3916a209aa 100644 --- a/kde-frameworks/kjs/Manifest +++ b/kde-frameworks/kjs/Manifest @@ -1,2 +1 @@ -DIST kjs-5.96.0.tar.xz 339216 BLAKE2B c229de410e94d453f42c901f457b886d20249344a79d8686e5054ce0542cdc1b5c0cadba255801bda5b58413588ce86dca153515f8458eb7e072697ebd96c459 SHA512 38f393c60f51a049e46fedc816b3c2c748b93592e12f4f8c56e333b4bffe610074ef64fad5c0122d54489b5d43902c5be390f38998e9ee538d62fcce81ecedb0 -DIST kjs-5.98.0.tar.xz 339244 BLAKE2B 6f6782bae96931ac1ea92a4ea42a8ff5893af0249779741d25f196f7b62fcd16eb143e3af79e8660c0298f6c4a49e31f7f76774b226bc96f521c1d4a4128aea2 SHA512 56af0fe2387479533aea2db779ecf80c3f977afc241be4222f459c5e7a4b7f3cc51f70c9b59bba6574ed524c6d5104212e589e89263204f0f3acd3d51d229da7 +DIST kjs-5.115.0.tar.xz 339808 BLAKE2B f6a33af1d334e985d05bf9440d04d270149da2fa155eed4b9de404cc0f55afe65ded9f106d933d6a238cf22921e5f90890887e9a76877abf862a80042f706899 SHA512 0b95025edf0b3aa3a9f550aeaffe8a43a8a8a265f556aeea80ee9becb50a93aef7c99def609e82db4802771a63474610eabd65b5cbd0965d59a5dd4d30a716fd diff --git a/kde-frameworks/kjs/kjs-5.96.0.ebuild b/kde-frameworks/kjs/kjs-5.115.0.ebuild index 1cd55ce6bc48..a85e824459dd 100644 --- a/kde-frameworks/kjs/kjs-5.96.0.ebuild +++ b/kde-frameworks/kjs/kjs-5.115.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 diff --git a/kde-frameworks/kjs/kjs-5.98.0.ebuild b/kde-frameworks/kjs/kjs-5.98.0.ebuild deleted file mode 100644 index a6a839aa1dac..000000000000 --- a/kde-frameworks/kjs/kjs-5.98.0.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_HANDBOOK="optional" -ECM_QTHELP="false" -inherit ecm frameworks.kde.org - -DESCRIPTION="ECMAScipt compatible parser and engine" -LICENSE="BSD-2 LGPL-2+" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" -IUSE="" - -BDEPEND=" - dev-lang/perl -" -DEPEND=" - dev-libs/libpcre -" -RDEPEND="${DEPEND}" - -DOCS=( src/README ) diff --git a/kde-frameworks/knewstuff/Manifest b/kde-frameworks/knewstuff/Manifest index 34a2235f1232..04054ca8c19e 100644 --- a/kde-frameworks/knewstuff/Manifest +++ b/kde-frameworks/knewstuff/Manifest @@ -1,2 +1,2 @@ -DIST knewstuff-5.96.0.tar.xz 1159824 BLAKE2B 391226a61f8b7c23eb7b942a3181a1887d42d83bdfbc8d8fd45f593d8eb15e9fe4f98b8067d81430d84b1a0bc178a0d549a3f73b926bfe5358254100fa4502f6 SHA512 5fffe90a25adbe5d0f9d69694beba5f9fe0418656d190bdb99c1495b7338cec5c0374e8f38d4fe3801cbea18a7596494d0e651fdb628c9d4e13932627fe60a26 -DIST knewstuff-5.98.0.tar.xz 1162564 BLAKE2B 6e89f594edb55ce9ad1ca4190f3b37c08fe6443ef251aa38d52ab5d2c6ae2fdc6581c750e381b9219c68e1246abdf2cdaa52913a8415a3cfde1d29cacaa68d68 SHA512 202b9f166d23aa6365bf0dcef7d190feb9b8dac45ccd79e9ff8a6e251c9b0a97ee95766db78145f11ecae9a5e921e19c723281fde9885db52c8094690c9bdef1 +DIST knewstuff-5.115.0.tar.xz 3389164 BLAKE2B 663e8695f6f5b2f470926737d36fd2117d19661bfcd4e46e2b7a9ea22a2da1b9ddeb7e15d323d13dd1fe2e37ca8bc81f57782d0c9f8fafe4c145752cf34e7182 SHA512 32b9d833d20932b7d6b20cc77812db1a3b01db4e581600c145dafc24becf27b7b72efb4c5f20a1b83b598346696198378095bc28efbfaa24f9944a62d5be29e4 +DIST knewstuff-6.1.0.tar.xz 3102052 BLAKE2B c2f4936dc91bf91d5cfc48eb769e44b37745b05984ccc673369c6e3f1c078b3ee7f9afc193d522cd53c79a5a8fb6a0c890dbfebeb62828c3b8587ca7831fdd8c SHA512 1ec44c82f156da74b9db64840908b472a81a9bdaac1f47d4fb76e3749306f21668791582e6a8c9190af6f621f3e3fa2e461c0d3321e3dde10960c891d6c8709b diff --git a/kde-frameworks/knewstuff/knewstuff-5.96.0.ebuild b/kde-frameworks/knewstuff/knewstuff-5.115.0.ebuild index aa62b01aed1d..bcac74b88590 100644 --- a/kde-frameworks/knewstuff/knewstuff-5.96.0.ebuild +++ b/kde-frameworks/knewstuff/knewstuff-5.115.0.ebuild @@ -1,11 +1,12 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 +ECM_DESIGNERPLUGIN="true" ECM_TEST="false" PVCUT=$(ver_cut 1-2) -QTMIN=5.15.4 +QTMIN=5.15.9 inherit ecm frameworks.kde.org DESCRIPTION="Framework for downloading and sharing additional application data" @@ -31,7 +32,6 @@ DEPEND=" =kde-frameworks/kitemviews-${PVCUT}*:5 =kde-frameworks/kpackage-${PVCUT}*:5 =kde-frameworks/kservice-${PVCUT}*:5 - =kde-frameworks/ktextwidgets-${PVCUT}*:5 =kde-frameworks/kwidgetsaddons-${PVCUT}*:5 =kde-frameworks/kxmlgui-${PVCUT}*:5 opds? ( =kde-frameworks/syndication-${PVCUT}*:5 ) diff --git a/kde-frameworks/knewstuff/knewstuff-5.98.0.ebuild b/kde-frameworks/knewstuff/knewstuff-5.98.0.ebuild deleted file mode 100644 index c5ac2abf03c7..000000000000 --- a/kde-frameworks/knewstuff/knewstuff-5.98.0.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_TEST="false" -PVCUT=$(ver_cut 1-2) -QTMIN=5.15.5 -inherit ecm frameworks.kde.org - -DESCRIPTION="Framework for downloading and sharing additional application data" - -LICENSE="LGPL-2+" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" -IUSE="opds" - -DEPEND=" - >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtnetwork-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=dev-qt/qtxml-${QTMIN}:5 - =kde-frameworks/attica-${PVCUT}*:5 - =kde-frameworks/karchive-${PVCUT}*:5 - =kde-frameworks/kcompletion-${PVCUT}*:5 - =kde-frameworks/kconfig-${PVCUT}*:5 - =kde-frameworks/kcoreaddons-${PVCUT}*:5 - =kde-frameworks/ki18n-${PVCUT}*:5 - =kde-frameworks/kiconthemes-${PVCUT}*:5 - =kde-frameworks/kio-${PVCUT}*:5 - =kde-frameworks/kitemviews-${PVCUT}*:5 - =kde-frameworks/kpackage-${PVCUT}*:5 - =kde-frameworks/kservice-${PVCUT}*:5 - =kde-frameworks/ktextwidgets-${PVCUT}*:5 - =kde-frameworks/kwidgetsaddons-${PVCUT}*:5 - =kde-frameworks/kxmlgui-${PVCUT}*:5 - opds? ( =kde-frameworks/syndication-${PVCUT}*:5 ) -" -RDEPEND="${DEPEND} - >=kde-frameworks/kirigami-${PVCUT}:5 -" - -src_configure() { - local mycmakeargs=( - $(cmake_use_find_package opds KF5Syndication) - ) - - ecm_src_configure -} diff --git a/kde-frameworks/knewstuff/knewstuff-6.1.0.ebuild b/kde-frameworks/knewstuff/knewstuff-6.1.0.ebuild new file mode 100644 index 000000000000..8c48819cbbc5 --- /dev/null +++ b/kde-frameworks/knewstuff/knewstuff-6.1.0.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_DESIGNERPLUGIN="true" +ECM_TEST="false" +PVCUT=$(ver_cut 1-2) +QTMIN=6.6.2 +inherit ecm frameworks.kde.org + +DESCRIPTION="Framework for downloading and sharing additional application data" + +LICENSE="LGPL-2+" +KEYWORDS="~amd64" +IUSE="opds" + +DEPEND=" + >=dev-qt/qtbase-${QTMIN}:6[gui,network,widgets,xml] + >=dev-qt/qtdeclarative-${QTMIN}:6[widgets] + =kde-frameworks/attica-${PVCUT}*:6 + =kde-frameworks/karchive-${PVCUT}*:6 + =kde-frameworks/kconfig-${PVCUT}*:6 + =kde-frameworks/kcoreaddons-${PVCUT}*:6 + =kde-frameworks/ki18n-${PVCUT}*:6 + =kde-frameworks/kpackage-${PVCUT}*:6 + =kde-frameworks/kwidgetsaddons-${PVCUT}*:6 + opds? ( =kde-frameworks/syndication-${PVCUT}*:6 ) +" +RDEPEND="${DEPEND} + >=kde-frameworks/kirigami-${PVCUT}:6 +" + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package opds KF6Syndication) + ) + + ecm_src_configure +} diff --git a/kde-frameworks/knewstuff/metadata.xml b/kde-frameworks/knewstuff/metadata.xml index dd12fc4e1a24..b0a054a1a103 100644 --- a/kde-frameworks/knewstuff/metadata.xml +++ b/kde-frameworks/knewstuff/metadata.xml @@ -9,6 +9,7 @@ <bugs-to>https://bugs.kde.org/</bugs-to> </upstream> <use> + <flag name="designer">Build plugins for <pkg>dev-qt/designer</pkg></flag> <flag name="opds">Enable support for the Open Publication Distribution System via <pkg>kde-frameworks/syndication</pkg></flag> </use> <slots> diff --git a/kde-frameworks/knotifications/Manifest b/kde-frameworks/knotifications/Manifest index 260fa5ee8728..9fd2a831e2cf 100644 --- a/kde-frameworks/knotifications/Manifest +++ b/kde-frameworks/knotifications/Manifest @@ -1,2 +1,2 @@ -DIST knotifications-5.96.0.tar.xz 132380 BLAKE2B 6f0ec16faabfbeac68e70257501bf9faf980cb57ebb20a4324c3de7846062fe3cc862a289aff273e5b5cf9557bcafac3cb283d763f684940abfc026bb94a53ef SHA512 a38af9f7fb2d472589846e0b62ee56865f229662167bfc09b7e85ae18619fe67a71f06c4ddfc8da81093736810ba5db82ac91b5fd40bbb88357ff647d91746e9 -DIST knotifications-5.98.0.tar.xz 132164 BLAKE2B b015ae257d76d13fae7670bc6b0cc7f87f3b5fb145b45afbf2417e0d0a409dc8a5f4ab95c5921820e8b51053c16999724c45de01463e12b714ca04d7a57baf69 SHA512 05ed1d4bdb6cfa5d4fec3fbd3fb729bab487965a7ad79a5ba271613bad5ab69cd1e43808e75e504ff46f0d1af3e6c5e489324662529588f37a94ccda5b834efa +DIST knotifications-5.115.0.tar.xz 2372832 BLAKE2B e5a58830214dc6cf812ca13d217d954da2386e4ef3deb95d8727b1ef39b973656a338cc89b7ebe9e9e095ee8169c25eb0c57064a21ca2cd36373d0b6533c79ea SHA512 5254cf3064fa2ee03332b37651d5fef1aded852c0f8474365bfe20f225d7f59e39c11952793a3a8aefb75206ae09080396e5fc5f2ace528eee5d8df1bda983d3 +DIST knotifications-6.1.0.tar.xz 2343596 BLAKE2B ab012336d4cebba6b4f7b77d0ad5a79ad11ca2a02677d649ab4909cefc55695b5f16c963f21e034b2f4157169684f29b94cf8121a9dca6439a7cf16807675b23 SHA512 158706e38320b620153f048cf1075063fb46692e165663222631ca05fbb99953f679bb4a888d06d61ce2671134605b88a767c875eee9c85a042b46a7820b3df1 diff --git a/kde-frameworks/knotifications/files/knotifications-5.98.0-without_x11.patch b/kde-frameworks/knotifications/files/knotifications-5.98.0-without_x11.patch deleted file mode 100644 index 358b873bb5e2..000000000000 --- a/kde-frameworks/knotifications/files/knotifications-5.98.0-without_x11.patch +++ /dev/null @@ -1,81 +0,0 @@ -From 0450e434116acdc640b0c8256228feec8b363e47 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <asturm@gentoo.org> -Date: Tue, 2 Aug 2022 10:14:51 +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. - -HAVE_X11 already exists and is set automagically so far, but 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 or adding unwanted features if the -option is enabled. - -Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> ---- - CMakeLists.txt | 15 +++++++++------ - KF5NotificationsConfig.cmake.in | 2 +- - src/CMakeLists.txt | 2 +- - 3 files changed, 11 insertions(+), 8 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index a59f704..8e6763f 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -75,14 +75,17 @@ if (QT_MAJOR_VERSION STREQUAL "5") - endif() - - if (NOT APPLE AND NOT WIN32) -- find_package(X11) -+ option(WITHOUT_X11 "Build without X11 support (skips finding X11)." OFF) -+ if(NOT WITHOUT_X11) -+ find_package(X11) -+ set(HAVE_X11 ${X11_FOUND}) -+ set(HAVE_XTEST ${X11_XTest_FOUND}) -+ if(X11_FOUND AND QT_MAJOR_VERSION STREQUAL "5") -+ find_package(Qt5X11Extras ${REQUIRED_QT_VERSION} NO_MODULE REQUIRED) -+ endif() -+ endif() - endif() - --set(HAVE_X11 ${X11_FOUND}) --set(HAVE_XTEST ${X11_XTest_FOUND}) --if(X11_FOUND AND QT_MAJOR_VERSION STREQUAL "5") -- find_package(Qt5X11Extras ${REQUIRED_QT_VERSION} NO_MODULE REQUIRED) --endif() - if(APPLE) - find_package(Qt5MacExtras ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE) - endif() -diff --git a/KF5NotificationsConfig.cmake.in b/KF5NotificationsConfig.cmake.in -index b0dbea8..dc97209 100644 ---- a/KF5NotificationsConfig.cmake.in -+++ b/KF5NotificationsConfig.cmake.in -@@ -36,7 +36,7 @@ if (NOT @BUILD_SHARED_LIBS@) - find_dependency(Qt5TextToSpeech @REQUIRED_QT_VERSION@) - endif() - -- if(@X11_FOUND@) -+ if(@HAVE_X11@) - if (NOT TARGET Qt6::Gui) - find_dependency(Qt5X11Extras @REQUIRED_QT_VERSION@) - endif() -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 7f47f54..8f63201 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -143,7 +143,7 @@ if (Qt5TextToSpeech_FOUND) - target_link_libraries(KF5Notifications PRIVATE Qt5::TextToSpeech) - endif() - --if(X11_FOUND) -+if(HAVE_X11) - target_link_libraries(KF5Notifications PRIVATE ${X11_X11_LIB}) - if (TARGET Qt5::X11Extras) - target_link_libraries(KF5Notifications PRIVATE Qt5::X11Extras) --- -GitLab - diff --git a/kde-frameworks/knotifications/knotifications-5.98.0-r1.ebuild b/kde-frameworks/knotifications/knotifications-5.115.0.ebuild index bae13cc8e50c..8c2223511933 100644 --- a/kde-frameworks/knotifications/knotifications-5.98.0-r1.ebuild +++ b/kde-frameworks/knotifications/knotifications-5.115.0.ebuild @@ -1,18 +1,18 @@ -# 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="false" PVCUT=$(ver_cut 1-2) -QTMIN=5.15.5 +QTMIN=5.15.9 inherit ecm frameworks.kde.org DESCRIPTION="Framework for notifying the user of an event" LICENSE="LGPL-2.1+" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" -IUSE="dbus nls phonon qml speech X" +KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86" +IUSE="dbus phonon qml speech X" RDEPEND=" >=dev-qt/qtdbus-${QTMIN}:5 @@ -23,7 +23,7 @@ RDEPEND=" =kde-frameworks/kwindowsystem-${PVCUT}*:5[X?] dbus? ( dev-libs/libdbusmenu-qt[qt5(+)] ) !phonon? ( media-libs/libcanberra ) - phonon? ( >=media-libs/phonon-4.11.0 ) + phonon? ( >=media-libs/phonon-4.11.0[qt5(+)] ) qml? ( >=dev-qt/qtdeclarative-${QTMIN}:5 ) speech? ( >=dev-qt/qtspeech-${QTMIN}:5 ) X? ( @@ -35,9 +35,7 @@ RDEPEND=" DEPEND="${RDEPEND} X? ( x11-base/xorg-proto ) " -BDEPEND="nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )" - -PATCHES=( "${FILESDIR}/${P}-without_x11.patch" ) +BDEPEND=">=dev-qt/linguist-tools-${QTMIN}:5" src_configure() { local mycmakeargs=( diff --git a/kde-frameworks/knotifications/knotifications-5.96.0.ebuild b/kde-frameworks/knotifications/knotifications-5.96.0.ebuild deleted file mode 100644 index fd6db07c10fd..000000000000 --- a/kde-frameworks/knotifications/knotifications-5.96.0.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_TEST="false" -PVCUT=$(ver_cut 1-2) -QTMIN=5.15.4 -inherit ecm frameworks.kde.org - -DESCRIPTION="Framework for notifying the user of an event" -LICENSE="LGPL-2.1+" -KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" -IUSE="dbus nls phonon qml speech X" - -RDEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - =kde-frameworks/kconfig-${PVCUT}*:5 - =kde-frameworks/kcoreaddons-${PVCUT}*:5 - =kde-frameworks/kwindowsystem-${PVCUT}*:5[X=] - dbus? ( dev-libs/libdbusmenu-qt[qt5(+)] ) - !phonon? ( media-libs/libcanberra ) - phonon? ( >=media-libs/phonon-4.11.0 ) - qml? ( >=dev-qt/qtdeclarative-${QTMIN}:5 ) - speech? ( >=dev-qt/qtspeech-${QTMIN}:5 ) - X? ( - >=dev-qt/qtx11extras-${QTMIN}:5 - x11-libs/libX11 - x11-libs/libXtst - ) -" -DEPEND="${RDEPEND} - X? ( x11-base/xorg-proto ) -" -BDEPEND=" - nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 ) -" - -src_configure() { - local mycmakeargs=( - $(cmake_use_find_package dbus dbusmenu-qt5) - $(cmake_use_find_package !phonon Canberra) - $(cmake_use_find_package qml Qt5Qml) - $(cmake_use_find_package speech Qt5TextToSpeech) - $(cmake_use_find_package X X11) - ) - - ecm_src_configure -} diff --git a/kde-frameworks/knotifications/knotifications-6.1.0.ebuild b/kde-frameworks/knotifications/knotifications-6.1.0.ebuild new file mode 100644 index 000000000000..0711aa0a9817 --- /dev/null +++ b/kde-frameworks/knotifications/knotifications-6.1.0.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_TEST="false" +PVCUT=$(ver_cut 1-2) +QTMIN=6.6.2 +inherit ecm frameworks.kde.org + +DESCRIPTION="Framework for notifying the user of an event" + +LICENSE="LGPL-2.1+" +KEYWORDS="~amd64" + +RDEPEND=" + >=dev-qt/qtbase-${QTMIN}:6[dbus,gui] + >=dev-qt/qtdeclarative-${QTMIN}:6 + =kde-frameworks/kconfig-${PVCUT}*:6 + media-libs/libcanberra +" +DEPEND="${RDEPEND}" +BDEPEND=">=dev-qt/qttools-${QTMIN}:6[linguist]" diff --git a/kde-frameworks/knotifyconfig/Manifest b/kde-frameworks/knotifyconfig/Manifest index 48ed19cc6082..480b9703bcab 100644 --- a/kde-frameworks/knotifyconfig/Manifest +++ b/kde-frameworks/knotifyconfig/Manifest @@ -1,2 +1,2 @@ -DIST knotifyconfig-5.96.0.tar.xz 87484 BLAKE2B 38358c908c3bd590b04a9802fa9b2694c7db5f92348138f8c81e5a56a014391c56cba0fe8e476fcc8c59d980e31a7b64ccecf564c63bc0f46b0b2ae6c8783303 SHA512 b0f6d8b6d01b4196943c2527e6562c24515ee66da05ad94f1be8178db6a2be42338e68ba15ca2e76dc71014432f7054aff3a969d9ede67938dc67ee6ba5919df -DIST knotifyconfig-5.98.0.tar.xz 87436 BLAKE2B 73f253dc0aa12e3117ae110d37539c7d0f367f4232627be3c448824c90c374ceaa5aa8f77d64acf6e380ae690435f57989d58c5637db4c6f9e207dbf41c1f674 SHA512 748700134399db759d87620cad783346b93e3549c230a9bb36b44c87bb8c8dc818b95839fb54243e814ce32f5561cad0aa43607e685ccbc432778e9f6518bc81 +DIST knotifyconfig-5.115.0.tar.xz 2401888 BLAKE2B 7f3ed295a93216f0cb8f7b915a915ee9052c6cbc0c20207898f6d53c39a1951b56d0da94c9a758535f0967297a4f3f6e8359e91aa9f9edf9814255265ad4b38c SHA512 75ca1341a1ec17f28d5e0651d14ca4b17c42d3bc7593d4976920ce8df96c1e9eddc9fd2eeb7564bf5094551729ac29e73c4d0712fc74a09695790c6d206f8500 +DIST knotifyconfig-6.1.0.tar.xz 2396612 BLAKE2B fa3dd95aed89ce7f6663da8a2cba598836d5d63e21574eb63890fa77a853c6b9773920e1c232a327f6226056699b9f5c2b3dac3c01a4c056bd533ab7ee44f3a9 SHA512 4ea2164ae7da248a8f50a43b6593227286a52ed3b20937d3b911ddd1b6f72cbda85a638635fcd0e33b80a729ea5a29b02d031aa5e1047f638bf48197ec23c44e diff --git a/kde-frameworks/knotifyconfig/knotifyconfig-5.96.0.ebuild b/kde-frameworks/knotifyconfig/knotifyconfig-5.115.0.ebuild index a6f9a68152fb..ae3baf83a807 100644 --- a/kde-frameworks/knotifyconfig/knotifyconfig-5.96.0.ebuild +++ b/kde-frameworks/knotifyconfig/knotifyconfig-5.115.0.ebuild @@ -1,11 +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_TEST="false" PVCUT=$(ver_cut 1-2) -QTMIN=5.15.4 +QTMIN=5.15.9 inherit ecm frameworks.kde.org DESCRIPTION="Framework for configuring desktop notifications" @@ -22,7 +22,7 @@ DEPEND=" =kde-frameworks/ki18n-${PVCUT}*:5 =kde-frameworks/kio-${PVCUT}*:5 !phonon? ( media-libs/libcanberra ) - phonon? ( >=media-libs/phonon-4.11.0 ) + phonon? ( >=media-libs/phonon-4.11.0[qt5(+)] ) " RDEPEND="${DEPEND}" diff --git a/kde-frameworks/knotifyconfig/knotifyconfig-5.98.0.ebuild b/kde-frameworks/knotifyconfig/knotifyconfig-6.1.0.ebuild index a1f0b20c7345..3cf100a4ed9e 100644 --- a/kde-frameworks/knotifyconfig/knotifyconfig-5.98.0.ebuild +++ b/kde-frameworks/knotifyconfig/knotifyconfig-6.1.0.ebuild @@ -1,28 +1,27 @@ -# 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="false" PVCUT=$(ver_cut 1-2) -QTMIN=5.15.5 +QTMIN=6.6.2 inherit ecm frameworks.kde.org DESCRIPTION="Framework for configuring desktop notifications" + LICENSE="LGPL-2+" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" +KEYWORDS="~amd64" IUSE="phonon" DEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - =kde-frameworks/kcompletion-${PVCUT}*:5 - =kde-frameworks/kconfig-${PVCUT}*:5 - =kde-frameworks/ki18n-${PVCUT}*:5 - =kde-frameworks/kio-${PVCUT}*:5 + >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets] + =kde-frameworks/kcompletion-${PVCUT}*:6 + =kde-frameworks/kconfig-${PVCUT}*:6 + =kde-frameworks/ki18n-${PVCUT}*:6 + =kde-frameworks/kio-${PVCUT}*:6 !phonon? ( media-libs/libcanberra ) - phonon? ( >=media-libs/phonon-4.11.0 ) + phonon? ( >=media-libs/phonon-4.12.0[qt6] ) " RDEPEND="${DEPEND}" diff --git a/kde-frameworks/kpackage/Manifest b/kde-frameworks/kpackage/Manifest index 9a282fae26ad..02b1c941d5b4 100644 --- a/kde-frameworks/kpackage/Manifest +++ b/kde-frameworks/kpackage/Manifest @@ -1,2 +1,2 @@ -DIST kpackage-5.96.0.tar.xz 141384 BLAKE2B 2feabaf3cfdc9322296d9cd6880c830f3aea1b69132c53dd1d93e4eb606af7163a9767c9c49c05192ff1b128e8b6e2cd45b47cf3c520dcc58b2af13e9e57178b SHA512 97133351bd5597a29ae4927656cd8cafd552f8e6203d8419292169f6c19fa4e5f227446393d8ed3fc4a4aac2dc3a8d9fab436dfd499774abc1bee0addb531947 -DIST kpackage-5.98.0.tar.xz 140944 BLAKE2B 15d2c76b8529746dbe218e3454ba80b0cf87705cb64e95ae3664d8663b8b9a1aa85ebe224ca183b9db91b8c83bc7ef68b1d431a0abd118865b0cb5a29bd483a0 SHA512 7cd6b8a22521d6c2c39b869962cdc0cb27238721bc039a9f6809258153501fa2d3f5a4250420554bfaf5ae95210cf51ca0640086fb47e2eaeb4294412857f015 +DIST kpackage-5.115.0.tar.xz 188928 BLAKE2B fe9674e02c9e65f934d2d3080da015476a8a76e77c0bee7eab2785724b59a4e396f246acc099da495fad50b1909d24cdee129657ddcdff3ec372648ace50a3a0 SHA512 f393863bde9a3ed6d21a980b3e53e5be37826ae8d520334dc5239f88a6ab2bfc26ea2c1345d362e5e499e1d786e83a705b520436277eaf6f65d9192a5ea9a241 +DIST kpackage-6.1.0.tar.xz 179348 BLAKE2B 68ffc34cdd7e3d4639620630169aabec0b1a7993535730b3422c4e4d5d254dc18ad5b6766a9ca57e99469d6f958795fbf0612b5acb6e640b22fe5a9d1b4b343d SHA512 b000774c559f9fa961687fdde59c74e8b8a2c357ad1710c75018e03d33ee91fae582f17e7090712d2aba4c61aa968dedbb52b502a1aa67da745df4913bde591b diff --git a/kde-frameworks/kpackage/kpackage-5.96.0.ebuild b/kde-frameworks/kpackage/kpackage-5.115.0.ebuild index fc9825903610..2ecc5e42ca6b 100644 --- a/kde-frameworks/kpackage/kpackage-5.96.0.ebuild +++ b/kde-frameworks/kpackage/kpackage-5.115.0.ebuild @@ -1,16 +1,16 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 PVCUT=$(ver_cut 1-2) -QTMIN=5.15.4 +QTMIN=5.15.9 inherit ecm frameworks.kde.org DESCRIPTION="Framework to install and load packages of non binary content" LICENSE="LGPL-2+" -KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" +KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86" IUSE="man" BDEPEND=" @@ -24,6 +24,13 @@ DEPEND=" " RDEPEND="${DEPEND}" +CMAKE_SKIP_TESTS=( + # bug 650214 + plasma-plasmoidpackagetest + # requires network access + testpackage-appstream +) + src_configure() { local mycmakeargs=( $(cmake_use_find_package man KF5DocTools) @@ -31,10 +38,3 @@ src_configure() { ecm_src_configure } - -src_test() { - # plasma-plasmoidpackagetest bug 650214 - # testpackage-appstream requires network access - local myctestargs=( -E "(plasma-plasmoidpackagetest|testpackage-appstream)" ) - ecm_src_test -} diff --git a/kde-frameworks/kpackage/kpackage-5.98.0.ebuild b/kde-frameworks/kpackage/kpackage-5.98.0.ebuild deleted file mode 100644 index 3b80fbeb599f..000000000000 --- a/kde-frameworks/kpackage/kpackage-5.98.0.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PVCUT=$(ver_cut 1-2) -QTMIN=5.15.5 -inherit ecm frameworks.kde.org - -DESCRIPTION="Framework to install and load packages of non binary content" - -LICENSE="LGPL-2+" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" -IUSE="man" - -BDEPEND=" - man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 ) -" -DEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - =kde-frameworks/karchive-${PVCUT}*:5 - =kde-frameworks/kcoreaddons-${PVCUT}*:5 - =kde-frameworks/ki18n-${PVCUT}*:5 -" -RDEPEND="${DEPEND}" - -src_configure() { - local mycmakeargs=( - $(cmake_use_find_package man KF5DocTools) - ) - - ecm_src_configure -} - -src_test() { - # plasma-plasmoidpackagetest bug 650214 - # testpackage-appstream requires network access - local myctestargs=( -E "(plasma-plasmoidpackagetest|testpackage-appstream)" ) - ecm_src_test -} diff --git a/kde-frameworks/kpackage/kpackage-6.1.0.ebuild b/kde-frameworks/kpackage/kpackage-6.1.0.ebuild new file mode 100644 index 000000000000..5997d40d92f6 --- /dev/null +++ b/kde-frameworks/kpackage/kpackage-6.1.0.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PVCUT=$(ver_cut 1-2) +QTMIN=6.6.2 +inherit ecm frameworks.kde.org + +DESCRIPTION="Framework to install and load packages of non binary content" + +LICENSE="LGPL-2+" +KEYWORDS="~amd64" +IUSE="man" + +DEPEND=" + >=dev-qt/qtbase-${QTMIN}:6[dbus] + =kde-frameworks/karchive-${PVCUT}*:6 + =kde-frameworks/kcoreaddons-${PVCUT}*:6 + =kde-frameworks/ki18n-${PVCUT}*:6 +" +RDEPEND="${DEPEND}" +BDEPEND="man? ( >=kde-frameworks/kdoctools-${PVCUT}:6 )" + +CMAKE_SKIP_TESTS=( + # bug 650214 + plasma-plasmoidpackagetest + # requires network access + testpackage-appstream +) + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package man KF6DocTools) + ) + + ecm_src_configure +} diff --git a/kde-frameworks/kparts/Manifest b/kde-frameworks/kparts/Manifest index dbaa31e4aad7..a6b328fd0e11 100644 --- a/kde-frameworks/kparts/Manifest +++ b/kde-frameworks/kparts/Manifest @@ -1,2 +1,2 @@ -DIST kparts-5.96.0.tar.xz 197024 BLAKE2B 7f8061af347001ee55a83f33650c650c42fc850cbc520d078582e3aa7cec2b6c40cf314ae9f9d692e57143f70ae4e97f362ad99a1bd81ff14eacb1dc61f118d9 SHA512 d1086f428a19abc3d880775a0c54d78fad7014b5f2f2212e4299c701f12ddcc61c64c09cb1db1512714fe54bdb5b7a6bfed491009eb44535454189b658af3602 -DIST kparts-5.98.0.tar.xz 196852 BLAKE2B 72246fd4037a3baef55dd0cee33f674e0c852c076ad7a36a133b0e52d8923b55927e3a98d33b3e851f872e64d6ce7564ac3dcf78b1b0cbf8f13a4741044788ed SHA512 99c5fcf3a08a015a25542da36f34abce4b0f9b92354a688e8340a69ae28ddf874f111c568c388f9edbd3b9598eeffbb949e469a8c7d4e67f97df25b19af65c3a +DIST kparts-5.115.0.tar.xz 2473780 BLAKE2B cca29730261ce176958a7aab432df61579ab4ae54d1cb49e7e18cb41b4e60771fce7c6840a89f71939958af3a530260a2615692ed24e60745c5806faabf724b4 SHA512 3afdc39d75e8f4f6bd43e40c3d23178f1be2cae3606d797bcd544e43e3f105038b587c6c1b0898fc40728c7742ba11f92592c9ce1531225d02dbabfc27e10aad +DIST kparts-6.1.0.tar.xz 2433364 BLAKE2B ada97949c1829213e40796889487c009fc52ea8128c4d390494620b91a10927dd4069c2f1bab8929c907dc476388e09f5fa0bd31f10ffb1ed30454a240afe37e SHA512 178f919af09d1e8219eefcd1ab6583e788fb6b09f4ef022721d4856b84c772571ebb0b66b45d3a8191b30ba781040e49a97740035b0441dcba5a7af895b87106 diff --git a/kde-frameworks/kparts/kparts-5.96.0.ebuild b/kde-frameworks/kparts/kparts-5.115.0.ebuild index aa7d673293e1..2afee89d7614 100644 --- a/kde-frameworks/kparts/kparts-5.96.0.ebuild +++ b/kde-frameworks/kparts/kparts-5.115.0.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 PVCUT=$(ver_cut 1-2) -QTMIN=5.15.4 -VIRTUALX_REQUIRED="test" +QTMIN=5.15.9 inherit ecm frameworks.kde.org DESCRIPTION="Framework providing elaborate user-interface components" diff --git a/kde-frameworks/kparts/kparts-5.98.0.ebuild b/kde-frameworks/kparts/kparts-5.98.0.ebuild deleted file mode 100644 index 208323fd634a..000000000000 --- a/kde-frameworks/kparts/kparts-5.98.0.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PVCUT=$(ver_cut 1-2) -QTMIN=5.15.5 -VIRTUALX_REQUIRED="test" -inherit ecm frameworks.kde.org - -DESCRIPTION="Framework providing elaborate user-interface components" - -LICENSE="LGPL-2+" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" -IUSE="" - -RDEPEND=" - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=dev-qt/qtxml-${QTMIN}:5 - =kde-frameworks/kconfig-${PVCUT}*:5 - =kde-frameworks/kcoreaddons-${PVCUT}*:5 - =kde-frameworks/ki18n-${PVCUT}*:5 - =kde-frameworks/kiconthemes-${PVCUT}*:5 - =kde-frameworks/kio-${PVCUT}*:5 - =kde-frameworks/kjobwidgets-${PVCUT}*:5 - =kde-frameworks/kservice-${PVCUT}*:5 - =kde-frameworks/kwidgetsaddons-${PVCUT}*:5 - =kde-frameworks/kxmlgui-${PVCUT}*:5 -" -DEPEND="${RDEPEND} - >=kde-frameworks/ktextwidgets-${PVCUT}:5 -" diff --git a/kde-frameworks/kparts/kparts-6.1.0.ebuild b/kde-frameworks/kparts/kparts-6.1.0.ebuild new file mode 100644 index 000000000000..ec9fac34769c --- /dev/null +++ b/kde-frameworks/kparts/kparts-6.1.0.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PVCUT=$(ver_cut 1-2) +QTMIN=6.6.2 +inherit ecm frameworks.kde.org + +DESCRIPTION="Framework providing elaborate user-interface components" + +LICENSE="LGPL-2+" +KEYWORDS="~amd64" +IUSE="" + +RDEPEND=" + >=dev-qt/qtbase-${QTMIN}:6[gui,widgets,xml] + =kde-frameworks/kconfig-${PVCUT}*:6 + =kde-frameworks/kcoreaddons-${PVCUT}*:6 + =kde-frameworks/ki18n-${PVCUT}*:6 + =kde-frameworks/kiconthemes-${PVCUT}*:6 + =kde-frameworks/kio-${PVCUT}*:6 + =kde-frameworks/kjobwidgets-${PVCUT}*:6 + =kde-frameworks/kservice-${PVCUT}*:6 + =kde-frameworks/kwidgetsaddons-${PVCUT}*:6 + =kde-frameworks/kxmlgui-${PVCUT}*:6 +" +DEPEND="${RDEPEND}" diff --git a/kde-frameworks/kpeople/Manifest b/kde-frameworks/kpeople/Manifest index 4e8bdfde394c..eb5e05bb85ec 100644 --- a/kde-frameworks/kpeople/Manifest +++ b/kde-frameworks/kpeople/Manifest @@ -1,2 +1,2 @@ -DIST kpeople-5.96.0.tar.xz 60456 BLAKE2B aee419e7d63fc87e22aab89ef50e88cb80aa9c72407855e9ff88b7741a3ba945e03f8bca6823749ddf53a639f7e118048f62df200a9d6178ebfa8612b6ec01e7 SHA512 22f6e38b06b6eb80fda535ce39d5481bf45b21bfb2ecb33a093b1d86dd8ccfe578e6b85e9f4001cf6f01131317b2074eb9f6dd474e6332c4f0fbe0f7e7a7e498 -DIST kpeople-5.98.0.tar.xz 60168 BLAKE2B 0b2f2dfb265f9d0e064ee61329b73d60ca3546caf0e387b3c80c05bb614d9a8cf71f7814b438d43edec9e1562dfe1c7a5270cb6a4697f4c59dab1f3a59e3d16b SHA512 02e54cdd442c40a04d809956dfb35b6ac517230798d08666352401c84655cb49b0995b53815e922f5be81c75d3bc31fceb46c8ecec8688eb840c06dddb43ad4b +DIST kpeople-5.115.0.tar.xz 63352 BLAKE2B eb82340c51331c7033d2310980921bd8d6289c696b5ccc0fc5c00b641ce34940ff1424cb563fc8f85e83a23a4dcb291a19031948e02328e9592a1aa8cc387dfb SHA512 cc1a8c40e83c0fc2a2185cd515023413c67f21c7adf9ca2870840ac1fddde22ee0ffe6b64819a9b451901ef91748ef7e7df9312a0dc7274b579b8daba286455d +DIST kpeople-6.1.0.tar.xz 66936 BLAKE2B 346695f4f27a15936188d97fd533b98f9025b63ae9a55b3aca5ef19cae787a58369984d35318b148de7aa5221394c85599dc382ba8f73cc98f59e543de10e3fb SHA512 de745c3d9dcd80dfdb16eeb12dacdad5d77252f3de2ae7957c0635bd39359c39b17d12bb69812a152cfa4ec9e801c0199b1b81cef5ffc3a2586953adf9f56028 diff --git a/kde-frameworks/kpeople/kpeople-5.96.0.ebuild b/kde-frameworks/kpeople/kpeople-5.115.0.ebuild index 13ffe86019b1..629343001822 100644 --- a/kde-frameworks/kpeople/kpeople-5.96.0.ebuild +++ b/kde-frameworks/kpeople/kpeople-5.115.0.ebuild @@ -1,11 +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 PVCUT=$(ver_cut 1-2) -QTMIN=5.15.4 -VIRTUALX_REQUIRED="test" +QTMIN=5.15.9 +VIRTUALX_REQUIRED="test" # bug 816588 (test fails) inherit ecm frameworks.kde.org DESCRIPTION="KDE contact person abstraction library" @@ -30,11 +30,10 @@ DEPEND=" RDEPEND="${DEPEND}" src_test() { - # personsmodeltest segfaults, bug 668192 - local myctestargs=( - -j1 - -E "(persondatatest)" + local CMAKE_SKIP_TESTS=( + # bug 668192, segfaults + persondatatest ) - ecm_src_test + ecm_src_test -j1 } diff --git a/kde-frameworks/kpeople/kpeople-5.98.0.ebuild b/kde-frameworks/kpeople/kpeople-5.98.0.ebuild deleted file mode 100644 index a674e988f0fa..000000000000 --- a/kde-frameworks/kpeople/kpeople-5.98.0.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PVCUT=$(ver_cut 1-2) -QTMIN=5.15.5 -VIRTUALX_REQUIRED="test" -inherit ecm frameworks.kde.org - -DESCRIPTION="KDE contact person abstraction library" -HOMEPAGE="https://invent.kde.org/frameworks/kpeople" - -LICENSE="LGPL-2.1" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" -IUSE="" - -DEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtsql-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - =kde-frameworks/kconfig-${PVCUT}*:5 - =kde-frameworks/kcoreaddons-${PVCUT}*:5 - =kde-frameworks/ki18n-${PVCUT}*:5 - =kde-frameworks/kitemviews-${PVCUT}*:5 - =kde-frameworks/kwidgetsaddons-${PVCUT}*:5 -" -RDEPEND="${DEPEND}" - -src_test() { - # personsmodeltest segfaults, bug 668192 - local myctestargs=( - -j1 - -E "(persondatatest)" - ) - - ecm_src_test -} diff --git a/kde-frameworks/kpeople/kpeople-6.1.0.ebuild b/kde-frameworks/kpeople/kpeople-6.1.0.ebuild new file mode 100644 index 000000000000..1b5609fd93f3 --- /dev/null +++ b/kde-frameworks/kpeople/kpeople-6.1.0.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PVCUT=$(ver_cut 1-2) +QTMIN=6.6.2 +VIRTUALX_REQUIRED="test" # bug 816588 (test fails) +inherit ecm frameworks.kde.org + +DESCRIPTION="KDE contact person abstraction library" +HOMEPAGE="https://invent.kde.org/frameworks/kpeople" + +LICENSE="LGPL-2.1" +KEYWORDS="~amd64" +IUSE="" + +DEPEND=" + >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,sql,widgets] + >=dev-qt/qtdeclarative-${QTMIN}:6 + =kde-frameworks/kconfig-${PVCUT}*:6 + =kde-frameworks/kcontacts-${PVCUT}*:6 + =kde-frameworks/kcoreaddons-${PVCUT}*:6 + =kde-frameworks/ki18n-${PVCUT}*:6 + =kde-frameworks/kitemviews-${PVCUT}*:6 + =kde-frameworks/kwidgetsaddons-${PVCUT}*:6 +" +RDEPEND="${DEPEND}" + +src_test() { + local CMAKE_SKIP_TESTS=( + # bug 668192, segfaults + persondatatest + ) + + ecm_src_test -j1 +} diff --git a/kde-frameworks/kpeople/metadata.xml b/kde-frameworks/kpeople/metadata.xml index 506ecf605bc4..37046107d1bf 100644 --- a/kde-frameworks/kpeople/metadata.xml +++ b/kde-frameworks/kpeople/metadata.xml @@ -7,6 +7,7 @@ </maintainer> <upstream> <bugs-to>https://bugs.kde.org/</bugs-to> + <remote-id type="kde-invent">frameworks/kpeople</remote-id> </upstream> <slots> <subslots> diff --git a/kde-frameworks/kplotting/Manifest b/kde-frameworks/kplotting/Manifest index cddf932b1508..df7fc0d6eada 100644 --- a/kde-frameworks/kplotting/Manifest +++ b/kde-frameworks/kplotting/Manifest @@ -1,2 +1,2 @@ -DIST kplotting-5.96.0.tar.xz 33704 BLAKE2B 6b305522410c60cc60d2b31d528617222fc4b460afa285d817e54202450209afd99a7336b4987c66c003265bbce2637fecb1a59a5c8b2b0ee71b603e4cd3457c SHA512 cc6062806b757e4594e74aa134432b8621f7d118c5a749e782b1dfb67989ccdfd45694ecaa3351c9641b399cba4a4260788cff8673f5a7acc44341d9be85ca10 -DIST kplotting-5.98.0.tar.xz 33728 BLAKE2B 0140314b70eb2b009e0601d7d7624c54c248e514c967186d5bda327f835cc85c17cb7d283393b48ca6b6574faf06350da97ee063c53cdc99a5cd43597537ce70 SHA512 cefb2466e0bb96193f6367753ee7ff71f1e7e804ee3d93ef70d447ea06d5b4bd2c6ffece07738709b02dbccd79a9f963a2203eedea49c5f12bd87bbfabf650f2 +DIST kplotting-5.115.0.tar.xz 33740 BLAKE2B c1e3543ef61bf764d35ad9025a5d7d19d99d9c13fa95e0ab1084c94f0d0fa527294d87afbc16a46d4ebeac82d4e001b2c7a7f285435e77d3c03e606a5fc5756d SHA512 cbe3ec13f9282024ddecedd4de03b877fedecdcf71d49a023cd7aded999017f6c373ebc4b4edbb80bbf4f4d6df891b03542241b706a61c97419358e91916cf1c +DIST kplotting-6.1.0.tar.xz 33792 BLAKE2B 09c83d601364c86d06c281b9343eeed1a618d1f8de4d76679f1c2d037db85881b171cc45165086029611ed35fe0da3820b98456d75da301eb466a31305b37926 SHA512 10af7aa2397185fcdc7a4f7c6eb2c2a8925f3da15fa6878501d1f3100c3e30849fd227e6412eb419f7382add97dad59115ca72e00f69d8cdc2fc00d76bece00d diff --git a/kde-frameworks/kplotting/kplotting-5.96.0.ebuild b/kde-frameworks/kplotting/kplotting-5.115.0.ebuild index dc59e69f53f7..8179967b3931 100644 --- a/kde-frameworks/kplotting/kplotting-5.96.0.ebuild +++ b/kde-frameworks/kplotting/kplotting-5.115.0.ebuild @@ -1,17 +1,16 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 ECM_DESIGNERPLUGIN="true" PVCUT=$(ver_cut 1-2) -QTMIN=5.15.4 -VIRTUALX_REQUIRED="test" +QTMIN=5.15.9 inherit ecm frameworks.kde.org DESCRIPTION="Framework providing easy data-plotting functions" LICENSE="LGPL-2+" -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" IUSE="" DEPEND=" diff --git a/kde-frameworks/kplotting/kplotting-5.98.0.ebuild b/kde-frameworks/kplotting/kplotting-6.1.0.ebuild index 340ac2bdb641..5b5b563b1940 100644 --- a/kde-frameworks/kplotting/kplotting-5.98.0.ebuild +++ b/kde-frameworks/kplotting/kplotting-6.1.0.ebuild @@ -1,21 +1,17 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 ECM_DESIGNERPLUGIN="true" -PVCUT=$(ver_cut 1-2) -QTMIN=5.15.5 -VIRTUALX_REQUIRED="test" +QTMIN=6.6.2 inherit ecm frameworks.kde.org DESCRIPTION="Framework providing easy data-plotting functions" + LICENSE="LGPL-2+" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" +KEYWORDS="~amd64" IUSE="" -DEPEND=" - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 -" +DEPEND=">=dev-qt/qtbase-${QTMIN}:6[gui,widgets]" RDEPEND="${DEPEND}" diff --git a/kde-frameworks/kpty/Manifest b/kde-frameworks/kpty/Manifest index f6c87970cefc..483ef7083d35 100644 --- a/kde-frameworks/kpty/Manifest +++ b/kde-frameworks/kpty/Manifest @@ -1,2 +1,2 @@ -DIST kpty-5.96.0.tar.xz 59400 BLAKE2B dba22a68250127a793938dc5c8f22e93b05e271af7ad1179a2bc7adaeae1fdb078a62795f4d5f23efe4fb2e3849666757bd591a485f60e1889190282c3b075fd SHA512 4801582c18632aec29b116dacfe63785ba534499d0d16036b1ebbcf9cf91495bc65a53c2cc7a70b56d1aef9a360ac1b803f8f4c0fbc117609a8f728c8beebac6 -DIST kpty-5.98.0.tar.xz 59480 BLAKE2B f03c725870338277cc61c83f80c38e4272c09708814344a99ef3694f5600936f56a7d10f7af8fa7a2719113b994e3e77576f4dfb3f75d69e05ba921c49010540 SHA512 54f4baa3fb1d3c83300e613a40fa0d80688bd86e968cb683ed358c3d91c285da0fcfbd638af9d55999444489ae0564a4e91125f3695298ed859bc17084bdc548 +DIST kpty-5.115.0.tar.xz 2416644 BLAKE2B a92e2bcec10f475c886da7db9dc7ef6e4026486e76d2c891e45564fa1ef70ba4d81c1460b6b71bbb5a0c090c3dbf1dcb01bab8b3ebcbc386b943bf4fb47bf308 SHA512 79d3d593397d357f3ec71f357e5fceb1c0678d9bb60b927df237d52a122f32a2945008faa43a356c1f4f65c4d14d71ebbfd2dd90c287247fd3b3ab68d43d2f6d +DIST kpty-6.1.0.tar.xz 2417868 BLAKE2B d111691bcdebcb0e51a569db6406711f8f5c9d0a6c22a79ab5e379f6f481bcced3e2f0b1f587192f5cb225988c4251278007583c8549337170c7f81c866de890 SHA512 bf369464be4d7d4391a48d5880752a36bf74f885678557d435f29749a7135c1bf47a5e97390436da4d44d78a65632be6cd34f50ce0c8c6c6a9cc68c8be02f958 diff --git a/kde-frameworks/kpty/kpty-5.96.0.ebuild b/kde-frameworks/kpty/kpty-5.115.0.ebuild index 8da56b40664f..ce82340bab26 100644 --- a/kde-frameworks/kpty/kpty-5.96.0.ebuild +++ b/kde-frameworks/kpty/kpty-5.115.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 diff --git a/kde-frameworks/kpty/kpty-5.98.0.ebuild b/kde-frameworks/kpty/kpty-6.1.0.ebuild index 75e9f7b83ccf..74489deaadab 100644 --- a/kde-frameworks/kpty/kpty-5.98.0.ebuild +++ b/kde-frameworks/kpty/kpty-6.1.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -7,13 +7,14 @@ PVCUT=$(ver_cut 1-2) inherit ecm frameworks.kde.org DESCRIPTION="Framework for pseudo terminal devices and running child processes" + LICENSE="LGPL-2+" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" +KEYWORDS="~amd64" IUSE="" DEPEND=" - =kde-frameworks/kcoreaddons-${PVCUT}*:5 - =kde-frameworks/ki18n-${PVCUT}*:5 + =kde-frameworks/kcoreaddons-${PVCUT}*:6 + =kde-frameworks/ki18n-${PVCUT}*:6 sys-libs/libutempter " RDEPEND="${DEPEND}" diff --git a/kde-frameworks/kquickcharts/Manifest b/kde-frameworks/kquickcharts/Manifest index 13bb7ffecc47..a0a7b5284030 100644 --- a/kde-frameworks/kquickcharts/Manifest +++ b/kde-frameworks/kquickcharts/Manifest @@ -1,2 +1,2 @@ -DIST kquickcharts-5.96.0.tar.xz 108884 BLAKE2B 3e0408144290b620092ca81b85b2122951e6a1a5a90cf88e4c00f0df35f620d2d5e1c2fc01cc717342e6d49d5ba2439026113b990840ae2097c7ca5fcdbcfb7b SHA512 306b4794eb44b7480a2cd85274d99b070184948d6bdc4a1f32c74360bdb5a48a25ffa913c743589ac58d10602f35708fb50e9111f7fac6de74b3986f9e410c7d -DIST kquickcharts-5.98.0.tar.xz 108876 BLAKE2B 5d36705d44dbd659bf08b849c1458d79fd0ad3cd12d7b6780723ec0f3cdbaadee97031ec0b960ccd251190c07272f2b02a6a14e08cd345c6d80512bf9839d2c5 SHA512 6cee0c6a1d3185b35cc351334693acf3fc6d2297169b484d65466259ff1f87e973e7403204dce714b27855b7195ea7d62f670ad07ddc94d8392ffa53972b1cf6 +DIST kquickcharts-5.115.0.tar.xz 113372 BLAKE2B a4e7ff48ec578f3c0dab414d8971fe83ffc20521778e10ee9cd154adb1a845be59be53689790dccab3edf546b060d2331997f1e5d27860207c106db0bf0713ca SHA512 570527d88b668050bfca24796a2b4f2deff3fe022a268aee051ed8d44a28b8eade0f19ba4eeeb8458f9840a516bd7ebff12b68b4dab4da4a94fd34cc47afb74d +DIST kquickcharts-6.1.0.tar.xz 109892 BLAKE2B 4b5ab5adaf0e69b87f6b8d65027c9e865ad1265b33537c2a3832ee43b86fd1ee1f82868cc8923280e7e19fc5685a0db4ae71a74de3eb296c48212c82c3e92827 SHA512 a3f25ff4ad0324b04d5bd2496e3bb3dc6cfcebdab52ccb1dcf52d0e36ae2d699c6c19651d2f399bac54236cceb696c0b64cca4f697582a75e7cc3b572c02df48 diff --git a/kde-frameworks/kquickcharts/kquickcharts-5.96.0.ebuild b/kde-frameworks/kquickcharts/kquickcharts-5.115.0.ebuild index 3b5537be0cfe..248d9a26c981 100644 --- a/kde-frameworks/kquickcharts/kquickcharts-5.96.0.ebuild +++ b/kde-frameworks/kquickcharts/kquickcharts-5.115.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -7,8 +7,8 @@ ECM_EXAMPLES="true" ECM_QTHELP="false" ECM_TEST="true" PVCUT=$(ver_cut 1-2) -QTMIN=5.15.4 -VIRTUALX_REQUIRED="test" +QTMIN=5.15.9 +VIRTUALX_REQUIRED="test" # bug 910062 (tests fail) inherit ecm frameworks.kde.org DESCRIPTION="QtQuick plugin providing high-performance charts" diff --git a/kde-frameworks/kquickcharts/kquickcharts-5.98.0.ebuild b/kde-frameworks/kquickcharts/kquickcharts-6.1.0.ebuild index 7eb768a4da3f..b0ff5d9ede1f 100644 --- a/kde-frameworks/kquickcharts/kquickcharts-5.98.0.ebuild +++ b/kde-frameworks/kquickcharts/kquickcharts-6.1.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -6,27 +6,25 @@ EAPI=8 ECM_EXAMPLES="true" ECM_QTHELP="false" ECM_TEST="true" -PVCUT=$(ver_cut 1-2) -QTMIN=5.15.5 -VIRTUALX_REQUIRED="test" +QTMIN=6.6.2 inherit ecm frameworks.kde.org DESCRIPTION="QtQuick plugin providing high-performance charts" HOMEPAGE="https://invent.kde.org/frameworks/kquickcharts" LICENSE="LGPL-2+" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" +KEYWORDS="~amd64" IUSE="" +# PVCUT=$(ver_cut 1-2) +# examples? ( +# >=dev-qt/qtwidgets-${QTMIN}:6 +# =kde-frameworks/kdeclarative-${PVCUT}*:5 +# =kde-frameworks/kirigami-${PVCUT}*:5 +# ) DEPEND=" - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtquickcontrols2-${QTMIN}:5 - examples? ( - >=dev-qt/qtwidgets-${QTMIN}:5 - =kde-frameworks/kdeclarative-${PVCUT}*:5 - =kde-frameworks/kirigami-${PVCUT}*:5 - ) + >=dev-qt/qtbase-${QTMIN}:6[gui] + >=dev-qt/qtdeclarative-${QTMIN}:6 " RDEPEND="${DEPEND}" diff --git a/kde-frameworks/kquickcharts/metadata.xml b/kde-frameworks/kquickcharts/metadata.xml index 506ecf605bc4..d75c4e131bff 100644 --- a/kde-frameworks/kquickcharts/metadata.xml +++ b/kde-frameworks/kquickcharts/metadata.xml @@ -7,6 +7,7 @@ </maintainer> <upstream> <bugs-to>https://bugs.kde.org/</bugs-to> + <remote-id type="kde-invent">frameworks/kquickcharts</remote-id> </upstream> <slots> <subslots> diff --git a/kde-frameworks/kross/Manifest b/kde-frameworks/kross/Manifest index a5c396debe62..d91238a04b60 100644 --- a/kde-frameworks/kross/Manifest +++ b/kde-frameworks/kross/Manifest @@ -1,2 +1 @@ -DIST kross-5.96.0.tar.xz 129452 BLAKE2B c18d629bc8b4234caa0df184b463c310da391f61a6363f902e53e1fe2f79b236409332aee541b4176720bfef9a85ee0a04621f39a6b1a4b81dc064a6d080f8af SHA512 dba8d86d1c4cbbeecfe407643cce9b545171a3123d7ce5f73aee74941ce256f6901af85796e8fff04d4e6e3a3622862f615d189885ec06d9d0e7dadebc31e732 -DIST kross-5.98.0.tar.xz 129392 BLAKE2B d7d5ac8d4f82c9e91dfdaa51932b36c342e6176d8c31d5c01467a8c0a985fc0c6304138d8c7027260e2b1af4df8d6f418252a908fe5b94f4bbc33ecf097dd500 SHA512 815e5e647c22b4da72eb27999f5970a156f6a695ac55612cfb5ecded55e76a899bf49895d2e51273edd5bebee97dbf9e85cc58d270abaa889dbd6daab0f6c023 +DIST kross-5.115.0.tar.xz 2440248 BLAKE2B b115cc50eb57f4d418b344360f4547ee0cb692bcac9222f420db4a0a9f0162d44be446e5c34026b4334d763b0bf7d78029ca05f5ded33b39aee80f9a7e4e7ccb SHA512 19c1cbd94cec88df149ddec45ba2c436dae5debce5a126c19f3292a3f1a7724ef04bede63a907e387606d163ae3c2ec7a880df851f5d9db976902303045322bb diff --git a/kde-frameworks/kross/kross-5.96.0.ebuild b/kde-frameworks/kross/kross-5.115.0.ebuild index 734a6cf4e490..95be2cf4ba6d 100644 --- a/kde-frameworks/kross/kross-5.96.0.ebuild +++ b/kde-frameworks/kross/kross-5.115.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -6,8 +6,7 @@ EAPI=8 ECM_HANDBOOK="forceoptional" ECM_QTHELP="false" PVCUT=$(ver_cut 1-2) -QTMIN=5.15.4 -VIRTUALX_REQUIRED="test" +QTMIN=5.15.9 inherit ecm frameworks.kde.org DESCRIPTION="Framework for embedding scripting into applications" diff --git a/kde-frameworks/kross/kross-5.98.0.ebuild b/kde-frameworks/kross/kross-5.98.0.ebuild deleted file mode 100644 index 21bf05979158..000000000000 --- a/kde-frameworks/kross/kross-5.98.0.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_HANDBOOK="forceoptional" -ECM_QTHELP="false" -PVCUT=$(ver_cut 1-2) -QTMIN=5.15.5 -VIRTUALX_REQUIRED="test" -inherit ecm frameworks.kde.org - -DESCRIPTION="Framework for embedding scripting into applications" -LICENSE="LGPL-2+" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" -IUSE="" - -RDEPEND=" - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtscript-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=dev-qt/qtxml-${QTMIN}:5 - =kde-frameworks/kcompletion-${PVCUT}*:5 - =kde-frameworks/kcoreaddons-${PVCUT}*:5 - =kde-frameworks/ki18n-${PVCUT}*:5 - =kde-frameworks/kiconthemes-${PVCUT}*:5 - =kde-frameworks/kio-${PVCUT}*:5 - =kde-frameworks/kparts-${PVCUT}*:5 - =kde-frameworks/kwidgetsaddons-${PVCUT}*:5 - =kde-frameworks/kxmlgui-${PVCUT}*:5 -" -DEPEND="${RDEPEND} - >=dev-qt/designer-${QTMIN}:5 -" diff --git a/kde-frameworks/krunner/Manifest b/kde-frameworks/krunner/Manifest index 93003f2ab297..feffa596c607 100644 --- a/kde-frameworks/krunner/Manifest +++ b/kde-frameworks/krunner/Manifest @@ -1,2 +1,2 @@ -DIST krunner-5.96.0.tar.xz 87452 BLAKE2B f9a81bb88fc0d02d8458b01fde2e55cc6c9042e9d33d29603f3f3a38165bcd0a6e7e590614a4d92f59f0d741f4995614cdce726a7f72521445f9cb88aa865678 SHA512 fb25fdd554d56ee5b3b5b31a2feae1df8f37e1c434101eda957548b954b99e13cf25be46e03a43b73771ed7935750228b2957d654e06cd5e810353ccd264ed48 -DIST krunner-5.98.0.tar.xz 87764 BLAKE2B e5f17afe84f305fdc602fe2c8bbba106b8b75ad7e4a0f66f84efc0d8c1e38113e027e5bb5a9d74bdca3fd99e09599f2f4a40dc0abf936898911e541f9dad328e SHA512 e10264332a93c16171f0d05a0d510f2d8c28a7e5f4210a7400c98e7b2e44a6f9e5f6a7e3a1d07ef291180d379fcc84008e0e12a6c7a5b1e5b2845d21a39eecf5 +DIST krunner-5.115.0.tar.xz 88964 BLAKE2B bc50f60c87ea4b583702f76f7ab38065ffae34da454b999ccac82f197dd047e00bd7973bea7991b5f02740f0c88aa272fa111382448114ed03aff23e5a413bbb SHA512 b0eeed6d7145585a55c29a60618a2be73fc3c9cb3e2167ccf064528994270f628a6d8bc5ef3147e332bff398005ee70d8c3870b076dc90a71d6368c0f9a7c676 +DIST krunner-6.1.0.tar.xz 130964 BLAKE2B 7c750f9249e9b41d6fb7461491383652358bd4401f3e0a8e86c3c9020abf8654b5a7222a742f0620be6918559819b9a332973e9fc0efcba83a00b8943ed7a4b8 SHA512 f9009333f860dd00fa5b67ab0f2bd6411828177ba6e8fd537eda6d21ee540dc0b6c3e15b543f260011e21c5f6092a84e2fe9349f3a0d6e88901abe18714e0fb5 diff --git a/kde-frameworks/krunner/krunner-5.96.0.ebuild b/kde-frameworks/krunner/krunner-5.115.0.ebuild index 3f0e5827d864..a0bd7ef3c133 100644 --- a/kde-frameworks/krunner/krunner-5.96.0.ebuild +++ b/kde-frameworks/krunner/krunner-5.115.0.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 PVCUT=$(ver_cut 1-2) -QTMIN=5.15.4 -VIRTUALX_REQUIRED="test" +QTMIN=5.15.9 inherit ecm frameworks.kde.org DESCRIPTION="Framework for providing different actions given a string query" @@ -24,24 +23,24 @@ DEPEND=" =kde-frameworks/ki18n-${PVCUT}*:5 =kde-frameworks/kio-${PVCUT}*:5 =kde-frameworks/kservice-${PVCUT}*:5 - =kde-frameworks/plasma-${PVCUT}*:5 - =kde-frameworks/solid-${PVCUT}*:5 =kde-frameworks/threadweaver-${PVCUT}*:5 - activities? ( =kde-frameworks/kactivities-${PVCUT}*:5 ) + =kde-plasma/libplasma-${PVCUT}*:5 + activities? ( =kde-plasma/plasma-activities-${PVCUT}*:5 ) " RDEPEND="${DEPEND}" +CMAKE_SKIP_TESTS=( + # requires virtual dbus, otherwise hangs; bugs #630672 + dbusrunnertest + # bug 789351 + runnermanagersinglerunnermodetest + # bug 838502 + runnermanagertest +) + src_configure() { local mycmakeargs=( $(cmake_use_find_package activities KF5Activities) ) ecm_src_configure } - -src_test() { - # requires virtual dbus, otherwise hangs; bugs #630672, #789351, #838502 - local myctestargs=( - -E "(dbusrunnertest|runnermanagersinglerunnermodetest|runnermanagertest)" - ) - ecm_src_test -} diff --git a/kde-frameworks/krunner/krunner-5.98.0.ebuild b/kde-frameworks/krunner/krunner-5.98.0.ebuild deleted file mode 100644 index 02f8941612fe..000000000000 --- a/kde-frameworks/krunner/krunner-5.98.0.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PVCUT=$(ver_cut 1-2) -QTMIN=5.15.5 -VIRTUALX_REQUIRED="test" -inherit ecm frameworks.kde.org - -DESCRIPTION="Framework for providing different actions given a string query" - -LICENSE="LGPL-2+" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" -IUSE="activities" - -DEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - =kde-frameworks/kconfig-${PVCUT}*:5 - =kde-frameworks/kcoreaddons-${PVCUT}*:5 - =kde-frameworks/ki18n-${PVCUT}*:5 - =kde-frameworks/kio-${PVCUT}*:5 - =kde-frameworks/kservice-${PVCUT}*:5 - =kde-frameworks/plasma-${PVCUT}*:5 - =kde-frameworks/solid-${PVCUT}*:5 - =kde-frameworks/threadweaver-${PVCUT}*:5 - activities? ( =kde-frameworks/kactivities-${PVCUT}*:5 ) -" -RDEPEND="${DEPEND}" - -src_configure() { - local mycmakeargs=( - $(cmake_use_find_package activities KF5Activities) - ) - ecm_src_configure -} - -src_test() { - # requires virtual dbus, otherwise hangs; bugs #630672, #789351, #838502 - local myctestargs=( - -E "(dbusrunnertest|runnermanagersinglerunnermodetest|runnermanagertest)" - ) - ecm_src_test -} diff --git a/kde-frameworks/krunner/krunner-6.1.0.ebuild b/kde-frameworks/krunner/krunner-6.1.0.ebuild new file mode 100644 index 000000000000..f1ba957a1150 --- /dev/null +++ b/kde-frameworks/krunner/krunner-6.1.0.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PVCUT=$(ver_cut 1-2) +QTMIN=6.6.2 +inherit ecm frameworks.kde.org + +DESCRIPTION="Framework for providing different actions given a string query" + +LICENSE="LGPL-2+" +KEYWORDS="~amd64" +IUSE="" + +DEPEND=" + >=dev-qt/qtbase-${QTMIN}:6[dbus,gui] + =kde-frameworks/kconfig-${PVCUT}*:6 + =kde-frameworks/kcoreaddons-${PVCUT}*:6 + =kde-frameworks/ki18n-${PVCUT}*:6 + =kde-frameworks/kitemmodels-${PVCUT}*:6 +" +RDEPEND="${DEPEND}" + +CMAKE_SKIP_TESTS=( + # requires virtual dbus, otherwise hangs; bugs #630672 + dbusrunnertest + # bug 789351 + runnermanagersinglerunnermodetest + # bug 838502 + runnermanagertest +) diff --git a/kde-frameworks/kservice/Manifest b/kde-frameworks/kservice/Manifest index cae94964e756..428e673e204f 100644 --- a/kde-frameworks/kservice/Manifest +++ b/kde-frameworks/kservice/Manifest @@ -1,2 +1,2 @@ -DIST kservice-5.96.0.tar.xz 268480 BLAKE2B cb0816857bffa7be18f7136959272015324c6990b5eab94e8f2f9eccd451ffb98d5d17dd8ece00488c45f0895007c4ffb8b77b0695a46498136a0417c373d719 SHA512 ff8f0932574de555626944954a1b7d3bc6fd23fbce03ec8749d6f0242f5e75406c16687c3b6bb9d1cb747dd17aa4c3560164e8dec78de5c6075f532e6ad2e609 -DIST kservice-5.98.0.tar.xz 268912 BLAKE2B 4b53f2976556d6201d4c2ca4f47831e922cb6de32a56480c205760b2ebc0c2c57d01744cf8a442552fb50ec95bb660d32e11033bc2962667e7ab6c37693c1fde SHA512 abbeb270c2c4170ea8c75bfbadabea85f2409322f754d571cab84cc438baace7ab13db1a0a2fc4a013680a1f9149d05aac940592a3d891b5b08b3a71342a5e17 +DIST kservice-5.115.0.tar.xz 2539084 BLAKE2B d37ff649ad8d8f4b675922be74e8e037dbf1fb0bc1194705e6787905e382c4f7d4026014be8a5c821b100179ef633e59757047b3d1bb68312eefb23088e5a256 SHA512 c7a88ee7e36b4f8d8c19259c72402ac573ab3d3e7e536d039d6501c255aa501bc756143f6aee07bfe792c908b802d35c76eae032d95a20e5272770dba64d55d1 +DIST kservice-6.1.0.tar.xz 2449116 BLAKE2B 0dbb529a5cdd8471ae7d56db000ac71534c44347f455145668954d8c61bb8640f860c19a4cf5ccfd15675cdb133340695322a47c3a6ea04f31b19ac12d243acb SHA512 cba417080332f7eb5c5b1cc69ef0414a9885624085d7313f2b703d7c7cee992ceea80fe107a0903f5674763565e5ed6eb7a2007edb84e1180670d438251e0115 diff --git a/kde-frameworks/kservice/kservice-5.98.0.ebuild b/kde-frameworks/kservice/kservice-5.115.0.ebuild index bea581b14dd5..fd7c9c58b1fb 100644 --- a/kde-frameworks/kservice/kservice-5.98.0.ebuild +++ b/kde-frameworks/kservice/kservice-5.115.0.ebuild @@ -1,26 +1,21 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 PVCUT=$(ver_cut 1-2) -QTMIN=5.15.5 +QTMIN=5.15.9 inherit ecm frameworks.kde.org DESCRIPTION="Advanced plugin and service introspection" LICENSE="LGPL-2 LGPL-2.1+" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86" IUSE="+man" # requires running kde environment RESTRICT="test" -BDEPEND=" - sys-devel/bison - sys-devel/flex - man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 ) -" RDEPEND=" >=dev-qt/qtdbus-${QTMIN}:5 >=dev-qt/qtxml-${QTMIN}:5 @@ -32,6 +27,11 @@ RDEPEND=" DEPEND="${RDEPEND} test? ( >=dev-qt/qtconcurrent-${QTMIN}:5 ) " +BDEPEND=" + app-alternatives/lex + app-alternatives/yacc + man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 ) +" src_configure() { local mycmakeargs=( diff --git a/kde-frameworks/kservice/kservice-5.96.0.ebuild b/kde-frameworks/kservice/kservice-5.96.0.ebuild deleted file mode 100644 index 8ee2200460d8..000000000000 --- a/kde-frameworks/kservice/kservice-5.96.0.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PVCUT=$(ver_cut 1-2) -QTMIN=5.15.4 -inherit ecm frameworks.kde.org - -DESCRIPTION="Advanced plugin and service introspection" - -LICENSE="LGPL-2 LGPL-2.1+" -KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" -IUSE="+man" - -# requires running kde environment -RESTRICT="test" - -BDEPEND=" - sys-devel/bison - sys-devel/flex - man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 ) -" -RDEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtxml-${QTMIN}:5 - =kde-frameworks/kconfig-${PVCUT}*:5 - =kde-frameworks/kcoreaddons-${PVCUT}*:5 - =kde-frameworks/kdbusaddons-${PVCUT}*:5 - =kde-frameworks/ki18n-${PVCUT}*:5 -" -DEPEND="${RDEPEND} - test? ( >=dev-qt/qtconcurrent-${QTMIN}:5 ) -" - -src_configure() { - local mycmakeargs=( - -DAPPLICATIONS_MENU_NAME=kf5-applications.menu - $(cmake_use_find_package man KF5DocTools) - ) - - ecm_src_configure -} - -src_install() { - ecm_src_install - - # bug 596316 - dosym kf5-applications.menu /etc/xdg/menus/applications.menu -} diff --git a/kde-frameworks/kservice/kservice-6.1.0.ebuild b/kde-frameworks/kservice/kservice-6.1.0.ebuild new file mode 100644 index 000000000000..a7d69b9f24b7 --- /dev/null +++ b/kde-frameworks/kservice/kservice-6.1.0.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PVCUT=$(ver_cut 1-2) +QTMIN=6.6.2 +inherit ecm frameworks.kde.org + +DESCRIPTION="Advanced plugin and service introspection" + +LICENSE="LGPL-2 LGPL-2.1+" +KEYWORDS="~amd64" +IUSE="+man" + +# requires running kde environment +RESTRICT="test" + +RDEPEND=" + >=dev-qt/qtbase-${QTMIN}:6[dbus,xml] + =kde-frameworks/kconfig-${PVCUT}*:6 + =kde-frameworks/kcoreaddons-${PVCUT}*:6 + =kde-frameworks/kdbusaddons-${PVCUT}*:6 + =kde-frameworks/ki18n-${PVCUT}*:6 +" +DEPEND="${RDEPEND} + test? ( >=dev-qt/qtbase-${QTMIN}:6[concurrent] ) +" +BDEPEND="man? ( >=kde-frameworks/kdoctools-${PVCUT}:6 )" + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package man KF6DocTools) + ) + + ecm_src_configure +} diff --git a/kde-frameworks/kstatusnotifieritem/Manifest b/kde-frameworks/kstatusnotifieritem/Manifest new file mode 100644 index 000000000000..90961ea2e1b8 --- /dev/null +++ b/kde-frameworks/kstatusnotifieritem/Manifest @@ -0,0 +1 @@ +DIST kstatusnotifieritem-6.1.0.tar.xz 47916 BLAKE2B d0bdc1fb0643b984cdf26f228c7857eef344c1914b0c4a267eb7daf1b996980f92f59d449b6ad6ccd18bfc1d860f4873e5c2e19d46aaf5271cb5c439422adc7c SHA512 453933b9a62dcb6150567162c3afb4a5384d827179c8a0b65e8cfceba309a699ade35c28d910251edfa913a230a3e70415f4a4838f1021da206c25e00f19891a diff --git a/kde-frameworks/kstatusnotifieritem/kstatusnotifieritem-6.1.0.ebuild b/kde-frameworks/kstatusnotifieritem/kstatusnotifieritem-6.1.0.ebuild new file mode 100644 index 000000000000..1784438f2858 --- /dev/null +++ b/kde-frameworks/kstatusnotifieritem/kstatusnotifieritem-6.1.0.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PVCUT=$(ver_cut 1-2) +QTMIN=6.6.2 +inherit ecm frameworks.kde.org + +DESCRIPTION="Implementation of Status Notifier Items" + +LICENSE="LGPL-2+" +KEYWORDS="~amd64" +IUSE="X" + +# slot op: Qt6::WidgetsPrivate use +RDEPEND=" + >=dev-qt/qtbase-${QTMIN}:6=[dbus,gui,widgets] + =kde-frameworks/kwindowsystem-${PVCUT}*:6[X?] +" +DEPEND="${RDEPEND}" +BDEPEND=">=dev-qt/qttools-${QTMIN}:6[linguist]" + +src_configure() { + local mycmakeargs=( + -DWITHOUT_X11=$(usex !X) + ) + + ecm_src_configure +} diff --git a/kde-frameworks/kwayland/metadata.xml b/kde-frameworks/kstatusnotifieritem/metadata.xml index 506ecf605bc4..cc6cdbccaeb4 100644 --- a/kde-frameworks/kwayland/metadata.xml +++ b/kde-frameworks/kstatusnotifieritem/metadata.xml @@ -7,6 +7,7 @@ </maintainer> <upstream> <bugs-to>https://bugs.kde.org/</bugs-to> + <remote-id type="kde-invent">frameworks/kstatusnotifieritem</remote-id> </upstream> <slots> <subslots> diff --git a/kde-frameworks/ksvg/Manifest b/kde-frameworks/ksvg/Manifest new file mode 100644 index 000000000000..738a72615ccf --- /dev/null +++ b/kde-frameworks/ksvg/Manifest @@ -0,0 +1 @@ +DIST ksvg-6.1.0.tar.xz 89204 BLAKE2B eaf5deef2322ed8d174f8e10d2d09dfae3b1be50c6f32b04a8b21b41949a9dabe8a5257d13d962df7dfb895b63c9b87750adc0f7b7602a49d6c6c0f5cbcf75ba SHA512 7000c407875682df8d847222ce0fc0ef87425562e844da98f0954829db53547f1a84382c5119446bf973aa71c841f58a40b478236413f5c3a04b45841563d05f diff --git a/kde-frameworks/ksvg/ksvg-6.1.0.ebuild b/kde-frameworks/ksvg/ksvg-6.1.0.ebuild new file mode 100644 index 000000000000..51c5021b4d0c --- /dev/null +++ b/kde-frameworks/ksvg/ksvg-6.1.0.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PVCUT=$(ver_cut 1-2) +QTMIN=6.6.2 +inherit ecm frameworks.kde.org + +DESCRIPTION="Components for handling SVGs" + +LICENSE="LGPL-2+" +KEYWORDS="~amd64" +IUSE="" + +DEPEND=" + >=dev-qt/qtbase-${QTMIN}:6[gui] + >=dev-qt/qtdeclarative-${QTMIN}:6 + >=dev-qt/qtsvg-${QTMIN}:6 + =kde-frameworks/karchive-${PVCUT}*:6 + =kde-frameworks/kcolorscheme-${PVCUT}*:6 + =kde-frameworks/kconfig-${PVCUT}*:6 + =kde-frameworks/kcoreaddons-${PVCUT}*:6 + =kde-frameworks/kguiaddons-${PVCUT}*:6 + =kde-frameworks/kirigami-${PVCUT}*:6 +" +RDEPEND="${DEPEND}" diff --git a/kde-frameworks/kactivities/metadata.xml b/kde-frameworks/ksvg/metadata.xml index 506ecf605bc4..8034b408892e 100644 --- a/kde-frameworks/kactivities/metadata.xml +++ b/kde-frameworks/ksvg/metadata.xml @@ -7,6 +7,7 @@ </maintainer> <upstream> <bugs-to>https://bugs.kde.org/</bugs-to> + <remote-id type="kde-invent">plasma/ksvg</remote-id> </upstream> <slots> <subslots> diff --git a/kde-frameworks/ktexteditor/Manifest b/kde-frameworks/ktexteditor/Manifest index fe285a0dbd31..81075bdf55e2 100644 --- a/kde-frameworks/ktexteditor/Manifest +++ b/kde-frameworks/ktexteditor/Manifest @@ -1,2 +1,2 @@ -DIST ktexteditor-5.96.0.tar.xz 2404504 BLAKE2B 3d35559a25a111b3a21ea48f8512b237f343fe31e4cce5031a60b6efd3eb1f832255ed327ec63c6d5e81bc2be2f7eac3eb524ef7b354516273f070a5057effa1 SHA512 83528972d06bdebbd5f00ff17b40bf6f413b29590127ab7ef2d842bf7bf248e18dfb9dfef4ad3501b2689fe14d6b0444ee654a06c4f58a0dc23bdebae2f7ea04 -DIST ktexteditor-5.98.0.tar.xz 2422756 BLAKE2B aebd1f753ae6df9e40e4e5033afcbe4d4a9a031a2d44ead751819b0117e442535970feb03cdb34767952618c55a897b9c1f909c576e7225993fb1adfa0814ad1 SHA512 9505d4b791809f4a262d11d6a4553e29f0897a5447b7609e6df6bc89f86e839691a6e33d325a0168e0eba8ae433d6f5ca740bed115c80a59e1ed68a54e9c8e2f +DIST ktexteditor-5.115.0.tar.xz 2791160 BLAKE2B 8f529cec46d32985cdfe4243390a78ffb7bccc2ac4eb9466fef307160794fce08a53c7c137248c36d4a2e35d7afe092b61b073af88afb8d64dc0fffbd31a73f7 SHA512 ce30c8e43d453e02c8f2f36087d145bf29e6f7740340868ce6740670856bb3c5dc10e310934facfcdbeef447a54d11faa96f1ff08b0173283c25f604760607a8 +DIST ktexteditor-6.1.0.tar.xz 2816964 BLAKE2B 5e3aac164569d0bb435b0a48c047f0405b97570664602f17793b30df8b5dda37a73e62fd7af16c646ea3812ae67830c7d13376076d8cd928dfa2c42ac90bca99 SHA512 c178822fdbce8738c41853b3ee2b5ee961c29efbc486ee4f3f9f073110c1c77abf9fd0310c4d68461f09e9b3d0ca47662b4e950be8d358e0be7d2141836fafd2 diff --git a/kde-frameworks/ktexteditor/files/ktexteditor-5.96.0-unused-dep.patch b/kde-frameworks/ktexteditor/files/ktexteditor-5.96.0-unused-dep.patch deleted file mode 100644 index 8107b3cbc12f..000000000000 --- a/kde-frameworks/ktexteditor/files/ktexteditor-5.96.0-unused-dep.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 509ca8a46ff46ef3e06407b90a8b48af9655fcce Mon Sep 17 00:00:00 2001 -From: Christoph Cullmann <cullmann@kde.org> -Date: Sat, 2 Jul 2022 22:34:15 +0200 -Subject: [PATCH] remove unused library - ---- - CMakeLists.txt | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 2e9d77e8..c6d9a327 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -69,7 +69,6 @@ find_package(KF5KIO ${KF_DEP_VERSION} REQUIRED) - find_package(KF5Parts ${KF_DEP_VERSION} REQUIRED) - find_package(KF5Sonnet ${KF_DEP_VERSION} REQUIRED) - find_package(KF5SyntaxHighlighting ${KF_DEP_VERSION} REQUIRED) --find_package(KF5TextWidgets ${KF_DEP_VERSION} REQUIRED) - - if (ENABLE_KAUTH) - find_package(KF5Auth ${KF_DEP_VERSION} REQUIRED) --- -GitLab - diff --git a/kde-frameworks/ktexteditor/ktexteditor-5.96.0-r1.ebuild b/kde-frameworks/ktexteditor/ktexteditor-5.115.0.ebuild index 851a891a7b6a..7eaae20a84a1 100644 --- a/kde-frameworks/ktexteditor/ktexteditor-5.96.0-r1.ebuild +++ b/kde-frameworks/ktexteditor/ktexteditor-5.115.0.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 PVCUT=$(ver_cut 1-2) -QTMIN=5.15.4 -VIRTUALX_REQUIRED="test" +QTMIN=5.15.9 inherit ecm frameworks.kde.org DESCRIPTION="Framework providing a full text editor component" @@ -37,6 +36,7 @@ DEPEND=" =kde-frameworks/kjobwidgets-${PVCUT}*:5 =kde-frameworks/kparts-${PVCUT}*:5 =kde-frameworks/kwidgetsaddons-${PVCUT}*:5 + =kde-frameworks/kwindowsystem-${PVCUT}*:5 =kde-frameworks/kxmlgui-${PVCUT}*:5 =kde-frameworks/sonnet-${PVCUT}*:5 =kde-frameworks/syntax-highlighting-${PVCUT}*:5 @@ -45,8 +45,6 @@ DEPEND=" RDEPEND="${DEPEND}" BDEPEND="test? ( >=kde-frameworks/kservice-${PVCUT}:5 )" -PATCHES=( "${FILESDIR}/${P}-unused-dep.patch" ) - src_configure() { local mycmakeargs=( $(cmake_use_find_package editorconfig EditorConfig) diff --git a/kde-frameworks/ktexteditor/ktexteditor-5.98.0.ebuild b/kde-frameworks/ktexteditor/ktexteditor-5.98.0.ebuild deleted file mode 100644 index 0808a11bf733..000000000000 --- a/kde-frameworks/ktexteditor/ktexteditor-5.98.0.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PVCUT=$(ver_cut 1-2) -QTMIN=5.15.5 -VIRTUALX_REQUIRED="test" -inherit ecm frameworks.kde.org - -DESCRIPTION="Framework providing a full text editor component" - -LICENSE="LGPL-2+" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" -IUSE="+editorconfig" - -RESTRICT="test" - -DEPEND=" - >=dev-qt/qtdeclarative-${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-${PVCUT}*:5 - =kde-frameworks/kauth-${PVCUT}*:5 - =kde-frameworks/kcodecs-${PVCUT}*:5 - =kde-frameworks/kcompletion-${PVCUT}*:5 - =kde-frameworks/kconfig-${PVCUT}*:5 - =kde-frameworks/kconfigwidgets-${PVCUT}*:5 - =kde-frameworks/kcoreaddons-${PVCUT}*:5 - =kde-frameworks/kguiaddons-${PVCUT}*:5 - =kde-frameworks/ki18n-${PVCUT}*:5 - =kde-frameworks/kiconthemes-${PVCUT}*:5 - =kde-frameworks/kio-${PVCUT}*:5 - =kde-frameworks/kitemviews-${PVCUT}*:5 - =kde-frameworks/kjobwidgets-${PVCUT}*:5 - =kde-frameworks/kparts-${PVCUT}*:5 - =kde-frameworks/kwidgetsaddons-${PVCUT}*:5 - =kde-frameworks/kxmlgui-${PVCUT}*:5 - =kde-frameworks/sonnet-${PVCUT}*:5 - =kde-frameworks/syntax-highlighting-${PVCUT}*:5 - editorconfig? ( app-text/editorconfig-core-c ) -" -RDEPEND="${DEPEND}" -BDEPEND="test? ( >=kde-frameworks/kservice-${PVCUT}:5 )" - -src_configure() { - local mycmakeargs=( - $(cmake_use_find_package editorconfig EditorConfig) - ) - - ecm_src_configure -} diff --git a/kde-frameworks/ktexteditor/ktexteditor-6.1.0.ebuild b/kde-frameworks/ktexteditor/ktexteditor-6.1.0.ebuild new file mode 100644 index 000000000000..4c382ee16261 --- /dev/null +++ b/kde-frameworks/ktexteditor/ktexteditor-6.1.0.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PVCUT=$(ver_cut 1-2) +QTMIN=6.6.2 +inherit ecm frameworks.kde.org + +DESCRIPTION="Framework providing a full text editor component" + +LICENSE="LGPL-2+" +KEYWORDS="~amd64" +IUSE="+editorconfig" + +RESTRICT="test" + +DEPEND=" + >=dev-qt/qtbase-${QTMIN}:6[gui,widgets] + >=dev-qt/qtdeclarative-${QTMIN}:6 + >=dev-qt/qtspeech-${QTMIN}:6 + =kde-frameworks/karchive-${PVCUT}*:6 + =kde-frameworks/kauth-${PVCUT}*:6 + =kde-frameworks/kcodecs-${PVCUT}*:6 + =kde-frameworks/kcompletion-${PVCUT}*:6 + =kde-frameworks/kconfig-${PVCUT}*:6 + =kde-frameworks/kconfigwidgets-${PVCUT}*:6 + =kde-frameworks/kcoreaddons-${PVCUT}*:6 + =kde-frameworks/kguiaddons-${PVCUT}*:6 + =kde-frameworks/ki18n-${PVCUT}*:6 + =kde-frameworks/kiconthemes-${PVCUT}*:6 + =kde-frameworks/kio-${PVCUT}*:6 + =kde-frameworks/kitemviews-${PVCUT}*:6 + =kde-frameworks/kjobwidgets-${PVCUT}*:6 + =kde-frameworks/kparts-${PVCUT}*:6 + =kde-frameworks/ktextwidgets-${PVCUT}*:6 + =kde-frameworks/kwidgetsaddons-${PVCUT}*:6 + =kde-frameworks/kwindowsystem-${PVCUT}*:6 + =kde-frameworks/kxmlgui-${PVCUT}*:6 + =kde-frameworks/sonnet-${PVCUT}*:6 + =kde-frameworks/syntax-highlighting-${PVCUT}*:6 + editorconfig? ( app-text/editorconfig-core-c ) +" +RDEPEND="${DEPEND}" +BDEPEND="test? ( >=kde-frameworks/kservice-${PVCUT}:6 )" + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package editorconfig EditorConfig) + ) + + ecm_src_configure +} diff --git a/kde-frameworks/ktexteditor/metadata.xml b/kde-frameworks/ktexteditor/metadata.xml index 6f38a24b2888..45f4b96ce4ea 100644 --- a/kde-frameworks/ktexteditor/metadata.xml +++ b/kde-frameworks/ktexteditor/metadata.xml @@ -7,6 +7,7 @@ </maintainer> <upstream> <bugs-to>https://bugs.kde.org/</bugs-to> + <remote-id type="cpe">cpe:/a:kde:ktexteditor</remote-id> </upstream> <use> <flag name="editorconfig">Enable support for EditorConfig configuration files</flag> diff --git a/kde-frameworks/ktexttemplate/Manifest b/kde-frameworks/ktexttemplate/Manifest new file mode 100644 index 000000000000..9973b26cedd4 --- /dev/null +++ b/kde-frameworks/ktexttemplate/Manifest @@ -0,0 +1 @@ +DIST ktexttemplate-6.1.0.tar.xz 847272 BLAKE2B 26859dd9dce8d6a39ae06af5006e36d218b9f8ac081323862241d8f75e0d8a13e54e1b9d15651f9aabc31845d0aede9b125d70780d17df1d804b98e9e4f81491 SHA512 6d0ffd3437f2f427a23719fca752687e7ab781cfac935ed7957d553883485a33ebeedc067ba874f713f475482e83dae2927c88554fec3a5ed9e3d1650782dd5f diff --git a/kde-frameworks/ktexttemplate/ktexttemplate-6.1.0.ebuild b/kde-frameworks/ktexttemplate/ktexttemplate-6.1.0.ebuild new file mode 100644 index 000000000000..d43eb717c085 --- /dev/null +++ b/kde-frameworks/ktexttemplate/ktexttemplate-6.1.0.ebuild @@ -0,0 +1,22 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_TEST="true" +PVCUT=$(ver_cut 1-2) +QTMIN=6.6.2 +inherit ecm frameworks.kde.org + +DESCRIPTION="Library to allow separating the structure of documents from data they contain" + +LICENSE="LGPL-2.1+" +KEYWORDS="~amd64" +IUSE="" + +RDEPEND=" + >=dev-qt/qtbase-${QTMIN}:6[gui] + dev-qt/qtdeclarative:6 +" +DEPEND="${RDEPEND}" +BDEPEND="test? ( dev-qt/qttools:6[linguist] )" diff --git a/kde-frameworks/ktexttemplate/metadata.xml b/kde-frameworks/ktexttemplate/metadata.xml new file mode 100644 index 000000000000..11bde0988c06 --- /dev/null +++ b/kde-frameworks/ktexttemplate/metadata.xml @@ -0,0 +1,11 @@ +<?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">steveire/grantlee</remote-id> + </upstream> +</pkgmetadata> diff --git a/kde-frameworks/ktextwidgets/Manifest b/kde-frameworks/ktextwidgets/Manifest index 7096e8cd59aa..5322362553da 100644 --- a/kde-frameworks/ktextwidgets/Manifest +++ b/kde-frameworks/ktextwidgets/Manifest @@ -1,2 +1,2 @@ -DIST ktextwidgets-5.96.0.tar.xz 329332 BLAKE2B 1689f7f9ef471ae0525b3b5c454a724e545a76a903aa41f8d0ed4b49c042e1f790bbe790b2c9cbd8c1829a8f0aae801a94a6cf0f49927a3790e4c20ce9a9796c SHA512 34cc2a4f2cb56449a8dc8ce439252e96a2c4248025ad5a4a279a3efbdb95460c49ef8f2bf871dd0cf3f1a6547f5d2d1f1bcf64696bfbb56e86a296cc22b1befe -DIST ktextwidgets-5.98.0.tar.xz 328292 BLAKE2B 784dd6b1ed084f5f0b5ec17d7ae614ffdb070717e24c959538470261a47450de475da9129a743979cf70d053f9f95939569728d9c2047f1d6bb8d20e3d220d8a SHA512 a56a465665e841c1aaada4bd75cba93926aa3083a2723dc9e6b1cbfb400ddefc3cbdf5f05e9455b417d87e5bc5c71e1dc33259fca44d32bad084cf325522cc2d +DIST ktextwidgets-5.115.0.tar.xz 2552660 BLAKE2B 197cad28792c09ad98244c7dd48abf1017b57cebd0ce2763065bced78676a34bf57b8bb2ddb58c95b6114ab50960677de833cfeff192d6522d78c2ded65e5dcd SHA512 ed6091a72b1e2e242652a9dc47a17651a02be642faa96155fe4d602e6b1ed6ea3cb48a5922eece146bb38a570e20fafd550ba4dab161b5eec60f57e980027977 +DIST ktextwidgets-6.1.0.tar.xz 2549212 BLAKE2B 0620b8e8271bd674f3d0014b3116bf68c4d9d0f92665ec2d56000a3e63d3e505d99c65e7e8c152eb72dda2c7a690c203f1c15f8d1147c0d742fb0fec16aea0dc SHA512 9c032a6f1f186381594c1843414d02fba8eb69df417aae49e3abb6e005a7504664419531f1e7ac41dfd04f4c64429dba11eeca96d5b9370453575609b2d20489 diff --git a/kde-frameworks/ktextwidgets/ktextwidgets-5.96.0.ebuild b/kde-frameworks/ktextwidgets/ktextwidgets-5.115.0.ebuild index 065e7d7ccac7..4b8c211eedd4 100644 --- a/kde-frameworks/ktextwidgets/ktextwidgets-5.96.0.ebuild +++ b/kde-frameworks/ktextwidgets/ktextwidgets-5.115.0.ebuild @@ -1,17 +1,16 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 ECM_DESIGNERPLUGIN="true" PVCUT=$(ver_cut 1-2) -QTMIN=5.15.4 -VIRTUALX_REQUIRED="test" +QTMIN=5.15.9 inherit ecm frameworks.kde.org DESCRIPTION="Framework providing an assortment of widgets for displaying and editing text" LICENSE="LGPL-2+ LGPL-2.1+" -KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" +KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86" IUSE="speech" DEPEND=" diff --git a/kde-frameworks/ktextwidgets/ktextwidgets-5.98.0.ebuild b/kde-frameworks/ktextwidgets/ktextwidgets-5.98.0.ebuild deleted file mode 100644 index 1b2be3120628..000000000000 --- a/kde-frameworks/ktextwidgets/ktextwidgets-5.98.0.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_DESIGNERPLUGIN="true" -PVCUT=$(ver_cut 1-2) -QTMIN=5.15.5 -VIRTUALX_REQUIRED="test" -inherit ecm frameworks.kde.org - -DESCRIPTION="Framework providing an assortment of widgets for displaying and editing text" -LICENSE="LGPL-2+ LGPL-2.1+" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" -IUSE="speech" - -DEPEND=" - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - =kde-frameworks/kcompletion-${PVCUT}*:5 - =kde-frameworks/kconfig-${PVCUT}*:5 - =kde-frameworks/kconfigwidgets-${PVCUT}*:5 - =kde-frameworks/kcoreaddons-${PVCUT}*:5 - =kde-frameworks/ki18n-${PVCUT}*:5 - =kde-frameworks/kservice-${PVCUT}*:5 - =kde-frameworks/kwidgetsaddons-${PVCUT}*:5 - =kde-frameworks/sonnet-${PVCUT}*:5 - speech? ( >=dev-qt/qtspeech-${QTMIN}:5 ) -" -RDEPEND="${DEPEND}" - -src_configure() { - local mycmakeargs=( - $(cmake_use_find_package speech Qt5TextToSpeech) - ) - - ecm_src_configure -} diff --git a/kde-frameworks/ktextwidgets/ktextwidgets-6.1.0.ebuild b/kde-frameworks/ktextwidgets/ktextwidgets-6.1.0.ebuild new file mode 100644 index 000000000000..8ff7cfd797dc --- /dev/null +++ b/kde-frameworks/ktextwidgets/ktextwidgets-6.1.0.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_DESIGNERPLUGIN="true" +PVCUT=$(ver_cut 1-2) +QTMIN=6.6.2 +inherit ecm frameworks.kde.org + +DESCRIPTION="Framework providing an assortment of widgets for displaying and editing text" + +LICENSE="LGPL-2+ LGPL-2.1+" +KEYWORDS="~amd64" +IUSE="speech" + +DEPEND=" + >=dev-qt/qtbase-${QTMIN}:6[gui,widgets] + =kde-frameworks/kcompletion-${PVCUT}*:6 + =kde-frameworks/kconfig-${PVCUT}*:6 + =kde-frameworks/kconfigwidgets-${PVCUT}*:6 + =kde-frameworks/kcoreaddons-${PVCUT}*:6 + =kde-frameworks/ki18n-${PVCUT}*:6 + =kde-frameworks/kservice-${PVCUT}*:6 + =kde-frameworks/kwidgetsaddons-${PVCUT}*:6 + =kde-frameworks/sonnet-${PVCUT}*:6 + speech? ( >=dev-qt/qtspeech-${QTMIN}:6 ) +" +RDEPEND="${DEPEND}" + +src_configure() { + local mycmakeargs=( + -DWITH_TEXT_TO_SPEECH=$(usex speech) + ) + + ecm_src_configure +} diff --git a/kde-frameworks/ktextwidgets/metadata.xml b/kde-frameworks/ktextwidgets/metadata.xml index 9561225faa7f..3ace511214fd 100644 --- a/kde-frameworks/ktextwidgets/metadata.xml +++ b/kde-frameworks/ktextwidgets/metadata.xml @@ -10,7 +10,6 @@ </upstream> <use> <flag name="designer">Build plugins for <pkg>dev-qt/designer</pkg></flag> - <flag name="speech">Enable text-to-speech support</flag> </use> <slots> <subslots> diff --git a/kde-frameworks/kunitconversion/Manifest b/kde-frameworks/kunitconversion/Manifest index c3fecf148668..94fbcfdff140 100644 --- a/kde-frameworks/kunitconversion/Manifest +++ b/kde-frameworks/kunitconversion/Manifest @@ -1,2 +1,2 @@ -DIST kunitconversion-5.96.0.tar.xz 899456 BLAKE2B 750bd4c70c7ecf29f9da9ce1a30c45c84d7b5a780661bb79079c15123cff6fe1b8a63f3f850037aa267163b50edd5db45a178ae212201c2985dbbb6873e03bbf SHA512 c3c61aee8edf12e17cc650dd903e3e2ff721c1f060ec621a55b3fa7bddb7494fb122bd430e899c26f2d49a5af83aa05512e17dabbabd077732666540a2f7d7fa -DIST kunitconversion-5.98.0.tar.xz 899204 BLAKE2B aaac0022baed04c9b5fb65513d3b90c72e4abb36623c154c81a60529e357829314cf0a72b9fceafbec703588ed6e910dee8b13838b9ca62744c4416423fb9440 SHA512 1ea9524208165b57346508b36a59bd57f1293e399cb549cf9d5eba072f6a6ffca653319f9c1b35d38508f89fb1add09c2e25eeae239ecf055a6b554600d9bef7 +DIST kunitconversion-5.115.0.tar.xz 931704 BLAKE2B 176170fa12437502686eccde6cabbc13638980d12d762e71c57af5e5270ceab55c42596e1edcfa76dbc1ddfa6c51c65cc56511a5c7184bce3bbea87bca4a58d4 SHA512 6ad5f3995ef6953f36e092643b47eed6145fda811a6463030b88c342a843f1893af1775193e7c37810e371ccf135cd2840d50c8b4f582921e23cb963e4e1fa95 +DIST kunitconversion-6.1.0.tar.xz 909724 BLAKE2B 3189becb1e0857333c3079f3dd5a3223543d8593fe9e76f2173bad11f6dabd73e1daac4fdc37da26b2d4d5ba847b9905ae815c6c873737e21778efa3746c33a6 SHA512 160904d00ebe4db5f672fe425f356c2589cf1da2b141a750c3d1c576a71b0bce0d414f72fa7559e13bc159d20ed4f4dc050552f88eba61df10f5ecaa9da2ff59 diff --git a/kde-frameworks/kunitconversion/kunitconversion-5.96.0.ebuild b/kde-frameworks/kunitconversion/kunitconversion-5.115.0.ebuild index 42860c279f35..492176ca988a 100644 --- a/kde-frameworks/kunitconversion/kunitconversion-5.96.0.ebuild +++ b/kde-frameworks/kunitconversion/kunitconversion-5.115.0.ebuild @@ -1,13 +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 PVCUT=$(ver_cut 1-2) -QTMIN=5.15.4 +QTMIN=5.15.9 inherit ecm frameworks.kde.org DESCRIPTION="Framework for converting units" + LICENSE="LGPL-2+" KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" IUSE="" @@ -19,11 +20,13 @@ DEPEND=" RDEPEND="${DEPEND}" src_test() { - local myctestargs=( - # convertertest: bug 623938 - needs internet connection - # categorytest: bug 808216 - needs internet connection - # currencytableinittest: bug 808216 - unknown, reported upstream - -E "(convertertest|categorytest|currencytableinittest)" + local CMAKE_SKIP_TESTS=( + # bug 623938 - needs internet connection + convertertest + # bug 808216 - needs internet connection + categorytest + # bug 808216 - unknown, reported upstream + currencytableinittest ) LC_NUMERIC="C" ecm_src_test # bug 694804 diff --git a/kde-frameworks/kunitconversion/kunitconversion-5.98.0.ebuild b/kde-frameworks/kunitconversion/kunitconversion-5.98.0.ebuild deleted file mode 100644 index 09d78f89083b..000000000000 --- a/kde-frameworks/kunitconversion/kunitconversion-5.98.0.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 - -PVCUT=$(ver_cut 1-2) -QTMIN=5.15.5 -inherit ecm frameworks.kde.org - -DESCRIPTION="Framework for converting units" -LICENSE="LGPL-2+" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" -IUSE="" - -DEPEND=" - >=dev-qt/qtnetwork-${QTMIN}:5 - =kde-frameworks/ki18n-${PVCUT}*:5 -" -RDEPEND="${DEPEND}" - -src_test() { - local myctestargs=( - # convertertest: bug 623938 - needs internet connection - # categorytest: bug 808216 - needs internet connection - # currencytableinittest: bug 808216 - unknown, reported upstream - -E "(convertertest|categorytest|currencytableinittest)" - ) - - LC_NUMERIC="C" ecm_src_test # bug 694804 -} diff --git a/kde-frameworks/kunitconversion/kunitconversion-6.1.0.ebuild b/kde-frameworks/kunitconversion/kunitconversion-6.1.0.ebuild new file mode 100644 index 000000000000..1d13f31138eb --- /dev/null +++ b/kde-frameworks/kunitconversion/kunitconversion-6.1.0.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PVCUT=$(ver_cut 1-2) +QTMIN=6.6.2 +inherit ecm frameworks.kde.org + +DESCRIPTION="Framework for converting units" + +LICENSE="LGPL-2+" +KEYWORDS="~amd64" +IUSE="" + +DEPEND=" + >=dev-qt/qtbase-${QTMIN}:6[network] + =kde-frameworks/ki18n-${PVCUT}*:6 +" +RDEPEND="${DEPEND}" + +src_test() { + local CMAKE_SKIP_TESTS=( + # bug 623938 - needs internet connection + convertertest + # bug 808216 - needs internet connection + categorytest + # bug 808216 - unknown, reported upstream + currencytableinittest + ) + + LC_NUMERIC="C" ecm_src_test # bug 694804 +} diff --git a/kde-frameworks/kuserfeedback/Manifest b/kde-frameworks/kuserfeedback/Manifest new file mode 100644 index 000000000000..201b8c08b9bb --- /dev/null +++ b/kde-frameworks/kuserfeedback/Manifest @@ -0,0 +1,2 @@ +DIST kuserfeedback-1.3.0.tar.xz 230644 BLAKE2B b7305be09a5e62c980273766ec16f624eab4312ababbb8ebb3e24983ffad7ac19445bb848088331c0b4b02da37ee646c9cf91b8965455d018f9b45084c62d17c SHA512 16fc7fa850e7ac1dc772ab25f81f75fe28454680ce9ddf68da0f14c6d5e9b8201f69d168b1ee32bdf9f0ee517b0cac34eb09fd3dbfa697c0a8d3b23c6ac790cb +DIST kuserfeedback-6.1.0.tar.xz 254136 BLAKE2B 94b0484cc5283c6329d728a16ed366d4fcb94bf8c5f81ec18ba578011c864b2bdb32e2ffc69a8eada96ad40e703bad01f88e90f9a471161f42f4c0775075ee88 SHA512 144b1576dccb9334405c6b92c58f0748f67f36b967aacdee9a15d0b758789133fe0dfccb2b4686b234ff167408ca68bc7961fa37fd8ca9cde6a59db95e00d5a0 diff --git a/kde-frameworks/kuserfeedback/files/kuserfeedback-1.3.0-missing-include.patch b/kde-frameworks/kuserfeedback/files/kuserfeedback-1.3.0-missing-include.patch new file mode 100644 index 000000000000..141e022169e0 --- /dev/null +++ b/kde-frameworks/kuserfeedback/files/kuserfeedback-1.3.0-missing-include.patch @@ -0,0 +1,27 @@ +From 9a23019d49513acba5128c5173e622ae2f53ced6 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Tue, 19 Dec 2023 20:57:04 +0100 +Subject: [PATCH] Add missing QDebug include + +Downstream report: https://bugs.gentoo.org/920311 + +Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> +--- + src/console/jobs/securityscanjob.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/console/jobs/securityscanjob.cpp b/src/console/jobs/securityscanjob.cpp +index 698db22..fcb8bbf 100644 +--- a/src/console/jobs/securityscanjob.cpp ++++ b/src/console/jobs/securityscanjob.cpp +@@ -10,6 +10,7 @@ + + #include <rest/restclient.h> + ++#include <QDebug> + #include <QNetworkAccessManager> + #include <QNetworkReply> + #include <QNetworkRequest> +-- +GitLab + diff --git a/kde-frameworks/kuserfeedback/kuserfeedback-1.3.0-r3.ebuild b/kde-frameworks/kuserfeedback/kuserfeedback-1.3.0-r3.ebuild new file mode 100644 index 000000000000..3b0e5e460f08 --- /dev/null +++ b/kde-frameworks/kuserfeedback/kuserfeedback-1.3.0-r3.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_QTHELP="false" +ECM_TEST="forceoptional" +KFMIN=5.106.0 +QTMIN=5.15.9 +inherit ecm kde.org + +DESCRIPTION="Framework to collect user feedback for applications via telemetry and surveys" +SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz" + +LICENSE="MIT" +SLOT="5" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" +IUSE="doc kf6compat" + +DEPEND=" + >=dev-qt/qtdeclarative-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtnetwork-${QTMIN}:5 + >=dev-qt/qtsvg-${QTMIN}:5 + !kf6compat? ( + >=dev-qt/qtcharts-${QTMIN}:5 + >=dev-qt/qtprintsupport-${QTMIN}:5 + >=dev-qt/qtwidgets-${QTMIN}:5 + ) +" +RDEPEND="${DEPEND} + kf6compat? ( kde-frameworks/kuserfeedback:6 ) +" +BDEPEND=" + app-alternatives/yacc + app-alternatives/lex + >=dev-qt/linguist-tools-${QTMIN}:5 + doc? ( + >=dev-qt/qdoc-${QTMIN}:5 + >=dev-qt/qthelp-${QTMIN}:5 + ) +" + +PATCHES=( "${FILESDIR}/${P}-missing-include.patch" ) + +src_configure() { + local mycmakeargs=( + # disable server application + -DENABLE_PHP=NO + -DENABLE_PHP_UNIT=NO + -DENABLE_SURVEY_TARGET_EXPRESSIONS=YES + -DENABLE_DOCS=$(usex doc) + -DENABLE_CLI=$(usex !kf6compat) + -DENABLE_CONSOLE=$(usex !kf6compat) + ) + + ecm_src_configure +} diff --git a/kde-frameworks/kuserfeedback/kuserfeedback-6.1.0.ebuild b/kde-frameworks/kuserfeedback/kuserfeedback-6.1.0.ebuild new file mode 100644 index 000000000000..83bea7219b96 --- /dev/null +++ b/kde-frameworks/kuserfeedback/kuserfeedback-6.1.0.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_QTHELP="false" +ECM_TEST="forceoptional" +PVCUT=$(ver_cut 1-2) +QTMIN=6.6.2 +inherit ecm frameworks.kde.org + +DESCRIPTION="Framework to collect user feedback for applications via telemetry and surveys" + +LICENSE="MIT" +KEYWORDS="~amd64" +IUSE="doc" + +# FIXME: Qt_6_PRIVATE_API matches UserFeedbackConsole, but where is it coming from? +DEPEND=" + >=dev-qt/qtbase-${QTMIN}:6[gui,network,widgets] + >=dev-qt/qtcharts-${QTMIN}:6 + >=dev-qt/qtdeclarative-${QTMIN}:6 + >=dev-qt/qtsvg-${QTMIN}:6 +" +RDEPEND="${DEPEND} + !${CATEGORY}/${PN}:5[-kf6compat(-)] +" +BDEPEND=" + app-alternatives/lex + app-alternatives/yacc + doc? ( >=dev-qt/qttools-${QTMIN}:6[assistant,qdoc,linguist] ) +" + +src_configure() { + local mycmakeargs=( + # disable server application + -DENABLE_PHP=NO + -DENABLE_PHP_UNIT=NO + -DENABLE_SURVEY_TARGET_EXPRESSIONS=YES + -DENABLE_DOCS=$(usex doc) + ) + + ecm_src_configure +} diff --git a/kde-frameworks/plasma/metadata.xml b/kde-frameworks/kuserfeedback/metadata.xml index 506ecf605bc4..6e6a28916521 100644 --- a/kde-frameworks/plasma/metadata.xml +++ b/kde-frameworks/kuserfeedback/metadata.xml @@ -7,10 +7,9 @@ </maintainer> <upstream> <bugs-to>https://bugs.kde.org/</bugs-to> + <remote-id type="kde-invent">frameworks/kuserfeedback</remote-id> </upstream> - <slots> - <subslots> - Must only be used by packages that are known to use private parts of the Frameworks API. - </subslots> - </slots> + <use> + <flag name="kf6compat">Disable components colliding with KF6, depend on KF6 components instead</flag> + </use> </pkgmetadata> diff --git a/kde-frameworks/kwallet/Manifest b/kde-frameworks/kwallet/Manifest index 27d959c19d2b..b7c2b7049d94 100644 --- a/kde-frameworks/kwallet/Manifest +++ b/kde-frameworks/kwallet/Manifest @@ -1,2 +1,2 @@ -DIST kwallet-5.96.0.tar.xz 309604 BLAKE2B 59a2c5d77e0a7aafe27c76568b149b05a1abc34a0591bdce09d14d1f6a43e19edf453a6a140a07664c0ff42cb8df73bc732853094222bc290e15ccff84d63686 SHA512 ce84bcf07e6e053075960132d27cc1e709327433d61ff25cef34b886ec6ed885fd5a0d1c5cf3b74694698006b8d3ce231f7c132ecd12acd2c9f05e81e5d488f7 -DIST kwallet-5.98.0.tar.xz 332948 BLAKE2B 9e43ec290311a212d75a621ca2f44f714e287c84fc0c84b958afa424219529f19dfcccb2ca67c1d2a88a3f326fe167342acbef1ea3f28f33e7334cee1b6ed3b4 SHA512 72c09201e549ffb240dbdb5a09f0aead3bd2e32e31e2fc49f2a8a7895d381e1bf5cec2bddd076bd46cf4665d44cf12564742439baec6dbd7a4cb9710deb8d925 +DIST kwallet-5.115.0.tar.xz 353124 BLAKE2B 18f9d51c52e60e20d44c3bbbb385cdd4d2b696d1a2b3a36700f44577d04d3ea652f848a6c680db4626d9516ff0848181a098efcaa0b6e4bbf282f9831c576096 SHA512 8870af27ab6dfe5a7f9c60a8199b917e3f0ad81e48524c5ea383c39d6e3ca6a2fbe7bbce9b645a190c33a58bc7e63347e1737b6f55783fefa2a46bf7bab598fe +DIST kwallet-6.1.0.tar.xz 351404 BLAKE2B 62e6fb78d4fb5772a0a03a87d60c0a9a3c2d2ab5fceafb1ab0a7def3a53039e1e95a2081819b24c51a533dfe26dceaddfdd416881595c823cc642bf28d6a8071 SHA512 fb0428a76788d556ffc6c18a649f5e4de96b57234931e2e878ea660c612384c9778367db26089d73f0499b0d5d5cffcc9b193ca97a03aa3504180b483170c88b diff --git a/kde-frameworks/kwallet/kwallet-5.98.0.ebuild b/kde-frameworks/kwallet/kwallet-5.115.0.ebuild index ccd08f53d1b9..02dd26354ef1 100644 --- a/kde-frameworks/kwallet/kwallet-5.98.0.ebuild +++ b/kde-frameworks/kwallet/kwallet-5.115.0.ebuild @@ -1,20 +1,20 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 PVCUT=$(ver_cut 1-2) -QTMIN=5.15.5 +QTMIN=5.15.9 inherit ecm frameworks.kde.org optfeature DESCRIPTION="Framework providing desktop-wide storage for passwords" LICENSE="LGPL-2+" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" -IUSE="gpg +man" +KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86" +IUSE="gpg kf6compat +man" DEPEND=" - >=app-crypt/qca-2.3.1 + >=app-crypt/qca-2.3.1:2[qt5(+)] dev-libs/libgcrypt:0= >=dev-qt/qtdbus-${QTMIN}:5 >=dev-qt/qtgui-${QTMIN}:5 @@ -27,25 +27,33 @@ DEPEND=" =kde-frameworks/knotifications-${PVCUT}*:5 =kde-frameworks/kservice-${PVCUT}*:5 =kde-frameworks/kwidgetsaddons-${PVCUT}*:5 - =kde-frameworks/kwindowsystem-${PVCUT}*:5 - gpg? ( >=app-crypt/gpgme-1.7.1:=[cxx,qt5] ) + =kde-frameworks/kwindowsystem-${PVCUT}*:5[X] + !kf6compat? ( gpg? ( >=app-crypt/gpgme-1.7.1:=[cxx,qt5] ) ) +" +RDEPEND="${DEPEND} + kf6compat? ( kde-frameworks/kwallet:6 ) " -RDEPEND="${DEPEND}" BDEPEND="man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )" src_configure() { local mycmakeargs=( - $(cmake_use_find_package gpg Gpgmepp) + -DBUILD_KWALLETD=$(usex !kf6compat) + -DBUILD_KWALLET_QUERY=$(usex !kf6compat) $(cmake_use_find_package man KF5DocTools) ) + if ! use kf6compat; then + mycmakeargs+=( + $(cmake_use_find_package gpg Gpgmepp) + ) + fi ecm_src_configure } pkg_postinst() { if [[ -z "${REPLACING_VERSIONS}" ]]; then - optfeature "Auto-unlocking after account login" kde-plasma/kwallet-pam - optfeature "KWallet management" kde-apps/kwalletmanager:5 + optfeature "Auto-unlocking after account login" "kde-plasma/kwallet-pam:5" + optfeature "KWallet management" "kde-apps/kwalletmanager:5" elog "For more information, read https://wiki.gentoo.org/wiki/KDE#KWallet" fi ecm_pkg_postinst diff --git a/kde-frameworks/kwallet/kwallet-5.96.0.ebuild b/kde-frameworks/kwallet/kwallet-5.96.0.ebuild deleted file mode 100644 index 46a5091e6ecb..000000000000 --- a/kde-frameworks/kwallet/kwallet-5.96.0.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PVCUT=$(ver_cut 1-2) -QTMIN=5.15.4 -inherit ecm frameworks.kde.org optfeature - -DESCRIPTION="Framework providing desktop-wide storage for passwords" - -LICENSE="LGPL-2+" -KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" -IUSE="gpg +man" - -DEPEND=" - dev-libs/libgcrypt:0= - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - =kde-frameworks/kconfig-${PVCUT}*:5 - =kde-frameworks/kconfigwidgets-${PVCUT}*:5 - =kde-frameworks/kcoreaddons-${PVCUT}*:5 - =kde-frameworks/kdbusaddons-${PVCUT}*:5 - =kde-frameworks/ki18n-${PVCUT}*:5 - =kde-frameworks/knotifications-${PVCUT}*:5 - =kde-frameworks/kservice-${PVCUT}*:5 - =kde-frameworks/kwidgetsaddons-${PVCUT}*:5 - =kde-frameworks/kwindowsystem-${PVCUT}*:5 - gpg? ( >=app-crypt/gpgme-1.7.1:=[cxx,qt5] ) -" -RDEPEND="${DEPEND}" -BDEPEND="man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )" - -src_configure() { - local mycmakeargs=( - $(cmake_use_find_package gpg Gpgmepp) - $(cmake_use_find_package man KF5DocTools) - ) - - ecm_src_configure -} - -pkg_postinst() { - if [[ -z "${REPLACING_VERSIONS}" ]]; then - optfeature "Auto-unlocking after account login" kde-plasma/kwallet-pam - optfeature "KWallet management" kde-apps/kwalletmanager:5 - elog "For more information, read https://wiki.gentoo.org/wiki/KDE#KWallet" - fi - ecm_pkg_postinst -} diff --git a/kde-frameworks/kwallet/kwallet-6.1.0.ebuild b/kde-frameworks/kwallet/kwallet-6.1.0.ebuild new file mode 100644 index 000000000000..e323d4c64db2 --- /dev/null +++ b/kde-frameworks/kwallet/kwallet-6.1.0.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PVCUT=$(ver_cut 1-2) +QTMIN=6.6.2 +inherit ecm frameworks.kde.org optfeature + +DESCRIPTION="Framework providing desktop-wide storage for passwords" + +LICENSE="LGPL-2+" +KEYWORDS="~amd64" +IUSE="gpg +man" + +DEPEND=" + >=app-crypt/qca-2.3.1:2[qt6(-)] + dev-libs/libgcrypt:0= + >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets] + =kde-frameworks/kcolorscheme-${PVCUT}*:6 + =kde-frameworks/kconfig-${PVCUT}*:6 + =kde-frameworks/kcoreaddons-${PVCUT}*:6 + =kde-frameworks/kdbusaddons-${PVCUT}*:6 + =kde-frameworks/ki18n-${PVCUT}*:6 + =kde-frameworks/knotifications-${PVCUT}*:6 + =kde-frameworks/kservice-${PVCUT}*:6 + =kde-frameworks/kwidgetsaddons-${PVCUT}*:6 + =kde-frameworks/kwindowsystem-${PVCUT}*:6[X] + gpg? ( app-crypt/gpgme:=[qt6(-)] ) +" +RDEPEND="${DEPEND} + !${CATEGORY}/${PN}:5[-kf6compat(-)] +" +BDEPEND="man? ( >=kde-frameworks/kdoctools-${PVCUT}:6 )" + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package gpg Gpgmepp) + $(cmake_use_find_package man KF6DocTools) + ) + + ecm_src_configure +} + +pkg_postinst() { + if [[ -z "${REPLACING_VERSIONS}" ]]; then + optfeature "Auto-unlocking after account login" "kde-plasma/kwallet-pam:6" + optfeature "KWallet management" "kde-apps/kwalletmanager:6" + elog "For more information, read https://wiki.gentoo.org/wiki/KDE#KWallet" + fi + ecm_pkg_postinst +} diff --git a/kde-frameworks/kwallet/metadata.xml b/kde-frameworks/kwallet/metadata.xml index ad10d0384d41..c3a09b264fe1 100644 --- a/kde-frameworks/kwallet/metadata.xml +++ b/kde-frameworks/kwallet/metadata.xml @@ -10,6 +10,7 @@ </upstream> <use> <flag name="gpg">Support wallets with GnuPG encryption in addition to the default blowfish-encrypted file</flag> + <flag name="kf6compat">Disable components colliding with KF6, depend on KF6 components instead</flag> </use> <slots> <subslots> diff --git a/kde-frameworks/kwayland/Manifest b/kde-frameworks/kwayland/Manifest deleted file mode 100644 index 218d7148b912..000000000000 --- a/kde-frameworks/kwayland/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST kwayland-5.96.0.tar.xz 335724 BLAKE2B 5bf792ebf1c97651cd9d578ca9e2be7b54cfa85d211447bc1055c8c0731a1ee1d4f1deeb93e693d6630b58777ac8da57725fd60ccdc53551d4fecad0d9e27060 SHA512 f81ff1cb141039c0148949860f0d9bd57c9afdf938b838dfc91aa92d67f2aa5da6b4c19875637eaa050174b94008f56f593c18b23422e97856b301e9d515c670 -DIST kwayland-5.98.0.tar.xz 336144 BLAKE2B 1dbe235138933f49502da42ee46a192e0f0a4c469ed31a51921d05454c892b7e87e7861d38db67dfd70097ea93f9e3feeda5e95fa8e77fe0e1a860ffd0c63538 SHA512 e714e4a23cda911819d56cf949c0d1f3e83dcac3f59abad01d25424fa615620e381390a2716a9a318ed205e2cc8f83ba0e4fa9322bcbb4522703534384c3b8e9 diff --git a/kde-frameworks/kwayland/files/kwayland-5.98.0-plasmashell-fallback-for-applet-popups.patch b/kde-frameworks/kwayland/files/kwayland-5.98.0-plasmashell-fallback-for-applet-popups.patch deleted file mode 100644 index 7cc45ad8e2e6..000000000000 --- a/kde-frameworks/kwayland/files/kwayland-5.98.0-plasmashell-fallback-for-applet-popups.patch +++ /dev/null @@ -1,37 +0,0 @@ -From d02188ad1f6222215adcf842f4c9806ba9e62ccb Mon Sep 17 00:00:00 2001 -From: Xaver Hugl <xaver.hugl@gmail.com> -Date: Sat, 17 Sep 2022 01:18:28 +0200 -Subject: [PATCH] client/plasmashell: add fallback for applet popups - -When the compositor doesn't support applet popups, the current code sends an -invalid surface role. This causes KWin to fall back to the "normal" surface role -and do normal window placement on it. - -CCBUG: 459188 ---- - src/client/plasmashell.cpp | 9 ++++++++- - 1 file changed, 8 insertions(+), 1 deletion(-) - -diff --git a/src/client/plasmashell.cpp b/src/client/plasmashell.cpp -index dc613cb..93bc31c 100644 ---- a/src/client/plasmashell.cpp -+++ b/src/client/plasmashell.cpp -@@ -276,7 +276,14 @@ void PlasmaShellSurface::setRole(PlasmaShellSurface::Role role) - } - break; - case Role::AppletPopup: -- wlRole = ORG_KDE_PLASMA_SURFACE_ROLE_APPLETPOPUP; -+ // ORG_KDE_PLASMA_SURFACE_ROLE_APPLETPOPUP_SINCE_VERSION is not used for this check -+ // because it wrongly is 7 with old plasma wayland protocols -+ if (wl_proxy_get_version(d->surface) < 8) { -+ // dock is what applet popups were before -+ wlRole = ORG_KDE_PLASMA_SURFACE_ROLE_PANEL; -+ } else { -+ wlRole = ORG_KDE_PLASMA_SURFACE_ROLE_APPLETPOPUP; -+ } - break; - default: - Q_UNREACHABLE(); --- -GitLab - diff --git a/kde-frameworks/kwayland/kwayland-5.96.0.ebuild b/kde-frameworks/kwayland/kwayland-5.96.0.ebuild deleted file mode 100644 index d29aa4251a8a..000000000000 --- a/kde-frameworks/kwayland/kwayland-5.96.0.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_TEST="true" -PVCUT=$(ver_cut 1-2) -QTMIN=5.15.4 -inherit ecm frameworks.kde.org - -DESCRIPTION="Qt-style client and server library wrapper for Wayland libraries" -HOMEPAGE="https://invent.kde.org/frameworks/kwayland" - -LICENSE="LGPL-2.1" -KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" -IUSE="" - -# All failing, I guess we need a virtual wayland server -RESTRICT="test" - -# slot op: includes qpa/qplatformnativeinterface.h -RDEPEND=" - >=dev-libs/wayland-1.15.0 - >=dev-qt/qtconcurrent-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5=[egl] - >=dev-qt/qtwayland-${QTMIN}:5 - media-libs/libglvnd -" -DEPEND="${RDEPEND} - >=dev-libs/plasma-wayland-protocols-1.7.0 - >=dev-libs/wayland-protocols-1.15 - sys-kernel/linux-headers -" -BDEPEND=" - >=dev-qt/qtwaylandscanner-${QTMIN}:5 - >=dev-util/wayland-scanner-1.19.0 -" diff --git a/kde-frameworks/kwayland/kwayland-5.98.0-r1.ebuild b/kde-frameworks/kwayland/kwayland-5.98.0-r1.ebuild deleted file mode 100644 index 59884e1adf75..000000000000 --- a/kde-frameworks/kwayland/kwayland-5.98.0-r1.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_TEST="true" -PVCUT=$(ver_cut 1-2) -QTMIN=5.15.5 -inherit ecm frameworks.kde.org - -DESCRIPTION="Qt-style client and server library wrapper for Wayland libraries" -HOMEPAGE="https://invent.kde.org/frameworks/kwayland" - -LICENSE="LGPL-2.1" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" -IUSE="" - -# All failing, I guess we need a virtual wayland server -RESTRICT="test" - -# slot ops: includes qpa/qplatformnativeinterface.h, surface_p.h -RDEPEND=" - >=dev-libs/wayland-1.15.0 - >=dev-qt/qtconcurrent-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5=[egl] - >=dev-qt/qtwayland-${QTMIN}:5= - media-libs/libglvnd -" -DEPEND="${RDEPEND} - >=dev-libs/plasma-wayland-protocols-1.7.0 - >=dev-libs/wayland-protocols-1.15 - sys-kernel/linux-headers -" -BDEPEND=" - >=dev-qt/qtwaylandscanner-${QTMIN}:5 - >=dev-util/wayland-scanner-1.19.0 -" - -PATCHES=( - "${FILESDIR}/${P}-plasmashell-fallback-for-applet-popups.patch" -) diff --git a/kde-frameworks/kwidgetsaddons/Manifest b/kde-frameworks/kwidgetsaddons/Manifest index 47cdc03b59bc..99a61c1445a9 100644 --- a/kde-frameworks/kwidgetsaddons/Manifest +++ b/kde-frameworks/kwidgetsaddons/Manifest @@ -1,2 +1,2 @@ -DIST kwidgetsaddons-5.96.0.tar.xz 2307896 BLAKE2B 428881315aeba33cb29b2835c24d9951f93e2314215f6d0015390f31b52e0544b6904002c0d97e07fba76f92a4bed927aeeaa565809f325ea8d0f6d62c2a9cf5 SHA512 4e725cb00ba84a862f607da81c4e0d18f8d7af51d302f5cac88d0301e590ea052942f16bd8fe2b34aab76cd03e2467da72c56c3a6a30b75d811a6c28d2edd308 -DIST kwidgetsaddons-5.98.0.tar.xz 2312552 BLAKE2B b79c65284145620a72377fa4bd939519f4a62cfa72aad62a851adeb86026ff15aa730fad1f410de3a8a3ca1117db5153ad71d74c8c459f582b70ca1e373a44ee SHA512 71db2157c51f27a1e14c02b29ac3181158241f9ee2c9f04f26f17dd9cf2c8e64c445f99c151720f6822011e0cc5d452d164f1633a700f5a8950001789ad28130 +DIST kwidgetsaddons-5.115.0.tar.xz 4270052 BLAKE2B 210a7b266b8158807db9fda8a4a018f41b62b4d9ba784032c6bb67ec71e69b3a9d1922ce3a26d8922fad6ba001e0301a7fa0ee8148958cba5a387173275e65e5 SHA512 fba4e669f6747f5823d45e80e5afa9f5057366bd964156cc2505a4ffcbd4a834144bb2a3fa717f3e7b9805991649d6108bd0cfbea2ea4e77d924bbe8b8dfee9c +DIST kwidgetsaddons-6.1.0.tar.xz 4264584 BLAKE2B 71f730b0da4f61e9ed39e70fefc78f039c8625bcdf611b88141caaffe0f411d514323fcb287731d568c7615724269e935a8852af2ca417250d758c9433397d76 SHA512 60281acbd06c6652ac8e35784f5e372335f91b991449550a35756ca736cfbcad0abf1d69139e242ffe03c93b901b0b7be801ce606ff3584a2dc8fed472b0db1a diff --git a/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.115.0.ebuild b/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.115.0.ebuild new file mode 100644 index 000000000000..5e2640cfb203 --- /dev/null +++ b/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.115.0.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_DESIGNERPLUGIN="true" +QTMIN=5.15.9 +inherit ecm frameworks.kde.org + +DESCRIPTION="An assortment of high-level widgets for common tasks" + +LICENSE="LGPL-2.1+" +KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86" +IUSE="" + +DEPEND=" + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtwidgets-${QTMIN}:5 +" +RDEPEND="${DEPEND}" +BDEPEND=">=dev-qt/linguist-tools-${QTMIN}:5" + +CMAKE_SKIP_TESTS=( + # bug 650216 + kdatecomboboxtest + # bug 697866 + ksqueezedtextlabelautotest + # bug 808216 + ktwofingertaptest + ktwofingerswipetest +) diff --git a/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.96.0.ebuild b/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.96.0.ebuild deleted file mode 100644 index c18c333f588d..000000000000 --- a/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.96.0.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_DESIGNERPLUGIN="true" -QTMIN=5.15.4 -VIRTUALX_REQUIRED="test" -inherit ecm frameworks.kde.org - -DESCRIPTION="An assortment of high-level widgets for common tasks" - -LICENSE="LGPL-2.1+" -KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" -IUSE="nls" - -DEPEND=" - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 -" -RDEPEND="${DEPEND}" -BDEPEND="nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )" - -src_test() { - # bug 650216, 653186, 697866, 808216 - local myctestargs=( -E "(kdatecomboboxtest|ksqueezedtextlabelautotest|ktwofingertaptest|ktwofingerswipetest)" ) - ecm_src_test -} diff --git a/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.98.0.ebuild b/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.98.0.ebuild deleted file mode 100644 index 1bd174a17186..000000000000 --- a/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.98.0.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_DESIGNERPLUGIN="true" -QTMIN=5.15.5 -VIRTUALX_REQUIRED="test" -inherit ecm frameworks.kde.org - -DESCRIPTION="An assortment of high-level widgets for common tasks" - -LICENSE="LGPL-2.1+" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" -IUSE="nls" - -DEPEND=" - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 -" -RDEPEND="${DEPEND}" -BDEPEND="nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )" - -src_test() { - # bug 650216, 653186, 697866, 808216 - local myctestargs=( -E "(kdatecomboboxtest|ksqueezedtextlabelautotest|ktwofingertaptest|ktwofingerswipetest)" ) - ecm_src_test -} diff --git a/kde-frameworks/kwidgetsaddons/kwidgetsaddons-6.1.0.ebuild b/kde-frameworks/kwidgetsaddons/kwidgetsaddons-6.1.0.ebuild new file mode 100644 index 000000000000..df9dda032f07 --- /dev/null +++ b/kde-frameworks/kwidgetsaddons/kwidgetsaddons-6.1.0.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_DESIGNERPLUGIN="true" +QTMIN=6.6.2 +inherit ecm frameworks.kde.org + +DESCRIPTION="An assortment of high-level widgets for common tasks" + +LICENSE="LGPL-2.1+" +KEYWORDS="~amd64" +IUSE="" + +DEPEND=">=dev-qt/qtbase-${QTMIN}:6[gui,widgets]" +RDEPEND="${DEPEND}" +BDEPEND=">=dev-qt/qttools-${QTMIN}:6[linguist]" + +CMAKE_SKIP_TESTS=( + # bug 650216 + kdatecomboboxtest + # bug 697866 + ksqueezedtextlabelautotest + # bug 808216 + ktwofingertaptest + ktwofingerswipetest +) diff --git a/kde-frameworks/kwindowsystem/Manifest b/kde-frameworks/kwindowsystem/Manifest index 8d33b8fa3f80..89f3b53a6b30 100644 --- a/kde-frameworks/kwindowsystem/Manifest +++ b/kde-frameworks/kwindowsystem/Manifest @@ -1,2 +1,2 @@ -DIST kwindowsystem-5.96.0.tar.xz 182568 BLAKE2B 320382003f4d840b39e54e8f1a36f4fb26150510e3a11c4af4c3bbc70bb8a9b57f2ecfdad53e8ea22347eae2a4035d68a7409354c360be0b9c8494359024257d SHA512 8d6bc7f03c8f4a63775b3457cbd3a792e285d3b180ed0098abd5dcef602f2dc9b51f906b39ca2c958f347efdfbe9b1fdc82e5ef498f0d522ca65782db7152613 -DIST kwindowsystem-5.98.0.tar.xz 182484 BLAKE2B 01ca97abf73ef3f3495b64c78fec910bba844929da832eb9f373645a44199653e3c2b77cfe5015cfea0f8b9de03f686ae1bd617e6674e9ad16cec078d971f958 SHA512 3567b5fe32a6b8c4d8c344d5a095297cae1f1e500a2d2e65cd8d4b0d709455f164b9cca9e8ebec494a85e60764990e86a96b599d854b9bda1087e4872c8a6c48 +DIST kwindowsystem-5.115.0.tar.xz 2406616 BLAKE2B 1ce5be2069b592664875f0714213dfa3aaa28f0309f04800d55a35c815ff1b4481859bf92305092ea46f48981650cdd9da5aecd7c9cd77924164581ed10ca32f SHA512 37380c8a523220cece2b9867e9801b79b848c55b0808fa472834050bbbd23ecd18db48d3ef3a17fcf8cf9ee6dbf8a5988a5c562c29c876065a3fda96913f78c7 +DIST kwindowsystem-6.1.0.tar.xz 2392976 BLAKE2B 67daa5b0788e7163bac4fa94a1f20cbe8d3ca8f2767ea6472256bcf116f272bf45b58a9ec17b18869f754d738350cc1bebb03ab5427143f60ed83707af25b9ba SHA512 b538c39c14a5bc11b599e9297cf553830f7eec832cb42c77ab2008f3a9f02fc7ccc18ea0d5d0de9f31d38d900367e1518f2dbc8fc85957458cddee6c9c191071 diff --git a/kde-frameworks/kwindowsystem/kwindowsystem-5.96.0.ebuild b/kde-frameworks/kwindowsystem/kwindowsystem-5.115.0.ebuild index a62798405f5e..1e5b646c6991 100644 --- a/kde-frameworks/kwindowsystem/kwindowsystem-5.96.0.ebuild +++ b/kde-frameworks/kwindowsystem/kwindowsystem-5.115.0.ebuild @@ -1,16 +1,16 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -QTMIN=5.15.4 -VIRTUALX_REQUIRED="test" +QTMIN=5.15.9 inherit ecm frameworks.kde.org DESCRIPTION="Framework providing access to properties and features of the window manager" + LICENSE="|| ( LGPL-2.1 LGPL-3 ) MIT" -KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" -IUSE="nls X" +KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86" +IUSE="wayland X" RESTRICT="test" @@ -28,9 +28,8 @@ DEPEND="${RDEPEND} X? ( x11-base/xorg-proto ) test? ( >=dev-qt/qtwidgets-${QTMIN}:5 ) " -BDEPEND=" - nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 ) -" +BDEPEND=">=dev-qt/linguist-tools-${QTMIN}:5" +PDEPEND="wayland? ( >=kde-plasma/kwayland-integration-5.25.5-r1:5 )" DOCS=( docs/README.kstartupinfo ) diff --git a/kde-frameworks/kwindowsystem/kwindowsystem-5.98.0.ebuild b/kde-frameworks/kwindowsystem/kwindowsystem-5.98.0.ebuild deleted file mode 100644 index a7bb3c2bf822..000000000000 --- a/kde-frameworks/kwindowsystem/kwindowsystem-5.98.0.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -QTMIN=5.15.5 -VIRTUALX_REQUIRED="test" -inherit ecm frameworks.kde.org - -DESCRIPTION="Framework providing access to properties and features of the window manager" -LICENSE="|| ( LGPL-2.1 LGPL-3 ) MIT" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" -IUSE="nls X" - -RESTRICT="test" - -RDEPEND=" - >=dev-qt/qtgui-${QTMIN}:5 - X? ( - >=dev-qt/qtx11extras-${QTMIN}:5 - x11-libs/libX11 - x11-libs/libXfixes - x11-libs/libxcb - x11-libs/xcb-util-keysyms - ) -" -DEPEND="${RDEPEND} - X? ( x11-base/xorg-proto ) - test? ( >=dev-qt/qtwidgets-${QTMIN}:5 ) -" -BDEPEND=" - nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 ) -" - -DOCS=( docs/README.kstartupinfo ) - -src_configure() { - local mycmakeargs=( - -DKWINDOWSYSTEM_NO_WIDGETS=ON - $(cmake_use_find_package X X11) - ) - - ecm_src_configure -} diff --git a/kde-frameworks/kwindowsystem/kwindowsystem-6.1.0.ebuild b/kde-frameworks/kwindowsystem/kwindowsystem-6.1.0.ebuild new file mode 100644 index 000000000000..28c792b12620 --- /dev/null +++ b/kde-frameworks/kwindowsystem/kwindowsystem-6.1.0.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +QTMIN=6.6.2 +inherit ecm frameworks.kde.org + +DESCRIPTION="Framework providing access to properties and features of the window manager" + +LICENSE="|| ( LGPL-2.1 LGPL-3 ) MIT" +KEYWORDS="~amd64" +IUSE="wayland X" + +RESTRICT="test" + +# slot op: Uses Qt6::GuiPrivate for qtx11extras_p.h +# slot op: Uses private/qwayland*_p.h headers +RDEPEND=" + >=dev-qt/qtbase-${QTMIN}:6[gui] + >=dev-qt/qtdeclarative-${QTMIN}:6 + wayland? ( >=dev-qt/qtwayland-${QTMIN}:6= ) + X? ( + >=dev-qt/qtbase-${QTMIN}:6=[gui] + x11-libs/libX11 + x11-libs/libXfixes + x11-libs/libxcb + x11-libs/xcb-util-keysyms + ) +" +DEPEND="${RDEPEND} + X? ( x11-base/xorg-proto ) + test? ( >=dev-qt/qtbase-${QTMIN}:6[widgets] ) + wayland? ( + dev-libs/plasma-wayland-protocols + >=dev-libs/wayland-protocols-1.21 + ) +" +BDEPEND=">=dev-qt/qttools-${QTMIN}:6[linguist]" + +DOCS=( docs/README.kstartupinfo ) + +src_configure() { + local mycmakeargs=( + -DKWINDOWSYSTEM_WAYLAND=$(usex wayland) + -DKWINDOWSYSTEM_X11=$(usex X) + ) + + ecm_src_configure +} diff --git a/kde-frameworks/kxmlgui/Manifest b/kde-frameworks/kxmlgui/Manifest index a750e4badd32..3e1b6736ad61 100644 --- a/kde-frameworks/kxmlgui/Manifest +++ b/kde-frameworks/kxmlgui/Manifest @@ -1,2 +1,2 @@ -DIST kxmlgui-5.96.0.tar.xz 899276 BLAKE2B 7aa619362c28c45c00bb725f5819443b8ecea806a468847b6259a053c48aa4fd9a3ce74094b65813e06d5fc426bbbb7b23450349298e1e552dc36c1a04e887a6 SHA512 44ffb6bfe8eaeb1fe1aad27d6794f1a536e030177547576b38021e87bd3c6ab57cd3fc1c41a70cf79cff8b8698a8d424d739875d9260115b5b6430cdad327912 -DIST kxmlgui-5.98.0.tar.xz 903408 BLAKE2B e0a04cc15b95a00c448d06f163d0eefdf3d74a97c05829ef7edea14bb5df0877832e9aa4cdc7543dd69beff8d334982cb056ead9a8dbe5c15160ecef164403fa SHA512 f2085e8a77bf1783666d24d36a7f71487d87eadc8bf4ec853a5eeed4463993338da642f57fdd5cff97be70182a2fdecaa03d5498fcd4784f36ee65f4860d09c3 +DIST kxmlgui-5.115.0.tar.xz 2953252 BLAKE2B 9ed52b405714abe5e78530d4b71a582ce92151bcbbfd563c92d44cfede58d379f99e387d25c41deb4a70eceead904503af3fca55fbbd7634518f0edc689dbaeb SHA512 4e06d72f509701d969eb77e608bd5a703a80fcd18d4d42a70d26b01b6889ca41b573b8be0a06b98b799e2dc62ff5d0111577e76f363c6f4c3d24828339274236 +DIST kxmlgui-6.1.0.tar.xz 2934480 BLAKE2B e617fec7678033a40d158dff740e5649d9725d38db8b75c1f7c7e11e3c750986f05aba6a8b9a13cd0878f9aa73d6f9f95c2c1541afe302aead2bd676f80e20ec SHA512 a646db1858d39596a9171c9976972a02f31f02cf656806534436960c4771a082a80ea9d47422e313a0f4e93ed53756f441af3c092ebdc5f8f84004329332a0fc diff --git a/kde-frameworks/kxmlgui/kxmlgui-5.96.0.ebuild b/kde-frameworks/kxmlgui/kxmlgui-5.115.0.ebuild index b261cc428052..2955a04263a1 100644 --- a/kde-frameworks/kxmlgui/kxmlgui-5.96.0.ebuild +++ b/kde-frameworks/kxmlgui/kxmlgui-5.115.0.ebuild @@ -1,17 +1,16 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 ECM_DESIGNERPLUGIN="true" PVCUT=$(ver_cut 1-2) -QTMIN=5.15.4 -VIRTUALX_REQUIRED="test" +QTMIN=5.15.9 inherit ecm frameworks.kde.org DESCRIPTION="Framework for managing menu and toolbar actions in an abstract way" -KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" +KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86" LICENSE="LGPL-2+" IUSE="" @@ -36,11 +35,11 @@ DEPEND=" " RDEPEND="${DEPEND}" -src_test() { - # Files are missing; whatever. Bugs 650290, 668198, 808216 - local myctestargs=( - -E "(ktoolbar_unittest|kxmlgui_unittest|ktooltiphelper_unittest)" - ) - - ecm_src_test -} +CMAKE_SKIP_TESTS=( + # bug 668198: files are missing; whatever. + ktoolbar_unittest + # bug 650290 + kxmlgui_unittest + # bug 808216 + ktooltiphelper_unittest +) diff --git a/kde-frameworks/kxmlgui/kxmlgui-5.98.0.ebuild b/kde-frameworks/kxmlgui/kxmlgui-5.98.0.ebuild deleted file mode 100644 index 4e2c1e89ac27..000000000000 --- a/kde-frameworks/kxmlgui/kxmlgui-5.98.0.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_DESIGNERPLUGIN="true" -PVCUT=$(ver_cut 1-2) -QTMIN=5.15.5 -VIRTUALX_REQUIRED="test" -inherit ecm frameworks.kde.org - -DESCRIPTION="Framework for managing menu and toolbar actions in an abstract way" - -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" -LICENSE="LGPL-2+" -IUSE="" - -# slot op: includes QtCore/private/qlocale_p.h -DEPEND=" - >=dev-qt/qtcore-${QTMIN}:5= - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtnetwork-${QTMIN}:5[ssl] - >=dev-qt/qtprintsupport-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=dev-qt/qtxml-${QTMIN}:5 - =kde-frameworks/kconfig-${PVCUT}*:5 - =kde-frameworks/kconfigwidgets-${PVCUT}*:5 - =kde-frameworks/kcoreaddons-${PVCUT}*:5 - =kde-frameworks/kglobalaccel-${PVCUT}*:5 - =kde-frameworks/kguiaddons-${PVCUT}*:5 - =kde-frameworks/ki18n-${PVCUT}*:5 - =kde-frameworks/kiconthemes-${PVCUT}*:5 - =kde-frameworks/kitemviews-${PVCUT}*:5 - =kde-frameworks/kwidgetsaddons-${PVCUT}*:5 -" -RDEPEND="${DEPEND}" - -src_test() { - # Files are missing; whatever. Bugs 650290, 668198, 808216 - local myctestargs=( - -E "(ktoolbar_unittest|kxmlgui_unittest|ktooltiphelper_unittest)" - ) - - ecm_src_test -} diff --git a/kde-frameworks/kxmlgui/kxmlgui-6.1.0.ebuild b/kde-frameworks/kxmlgui/kxmlgui-6.1.0.ebuild new file mode 100644 index 000000000000..aec2d0cf1a69 --- /dev/null +++ b/kde-frameworks/kxmlgui/kxmlgui-6.1.0.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_DESIGNERPLUGIN="true" +PVCUT=$(ver_cut 1-2) +QTMIN=6.6.2 +inherit ecm frameworks.kde.org + +DESCRIPTION="Framework for managing menu and toolbar actions in an abstract way" + +LICENSE="LGPL-2+" +KEYWORDS="~amd64" +IUSE="" + +# slot op: includes QtCore/private/qlocale_p.h +DEPEND=" + >=dev-qt/qtbase-${QTMIN}:6=[dbus,gui,network,ssl,widgets,xml] + =kde-frameworks/kconfig-${PVCUT}*:6 + =kde-frameworks/kconfigwidgets-${PVCUT}*:6 + =kde-frameworks/kcoreaddons-${PVCUT}*:6 + =kde-frameworks/kglobalaccel-${PVCUT}*:6 + =kde-frameworks/kguiaddons-${PVCUT}*:6 + =kde-frameworks/ki18n-${PVCUT}*:6 + =kde-frameworks/kiconthemes-${PVCUT}*:6 + =kde-frameworks/kitemviews-${PVCUT}*:6 + =kde-frameworks/kwidgetsaddons-${PVCUT}*:6 +" +RDEPEND="${DEPEND}" + +CMAKE_SKIP_TESTS=( + # bug 668198: files are missing; whatever. + ktoolbar_unittest + # bug 650290 + kxmlgui_unittest + # bug 808216 + ktooltiphelper_unittest +) diff --git a/kde-frameworks/metadata.xml b/kde-frameworks/metadata.xml index 5979bd74c917..1fe782f45924 100644 --- a/kde-frameworks/metadata.xml +++ b/kde-frameworks/metadata.xml @@ -2,8 +2,11 @@ <!DOCTYPE catmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <catmetadata> <longdescription lang="en"> - The kde-frameworks category contains KDE Frameworks - - the next generation of KDE libraries modularized for - easy integration in Qt applications. + The kde-frameworks category contains KDE Frameworks – + add-on libraries for programming with Qt. + </longdescription> + <longdescription lang="de"> + Die Kategorie kde-frameworks enthält die KDE Frameworks – + Erweiterungen für Qt. </longdescription> </catmetadata> diff --git a/kde-frameworks/modemmanager-qt/Manifest b/kde-frameworks/modemmanager-qt/Manifest index bd51e44630fa..0f20d8a9415c 100644 --- a/kde-frameworks/modemmanager-qt/Manifest +++ b/kde-frameworks/modemmanager-qt/Manifest @@ -1,2 +1,2 @@ -DIST modemmanager-qt-5.96.0.tar.xz 121052 BLAKE2B 1d8117ff16aa45939bc61adb5007be50e9bed77878124f14b723aae51507e906b7efbd4ce14ed9c00d881e67ffbd8fd67ee51a3ef6e0ffd3abb30c00d90edb6c SHA512 3c959b57e08342d0e8959d1f4768ba87703ac364eb0d4e2462b008567aeca6f8fe398fa13ee28585cf93a21278a22736e400e8877f5d63339ec36800599e13be -DIST modemmanager-qt-5.98.0.tar.xz 121084 BLAKE2B de1842a8c2db1ae91869a1b4f5c0c8ddd36576b0fa7d8147496bb27d50c752cad4dd47f62242ed04347984bcd3c329ab84b109517e660bb7c49f39446cf948bc SHA512 780d9eecbacebaebdd4bfc5416391c37cfe7ab1adb89c665b8775e847b0856550d99930f9902165e0c60573d6e0658c7c51846715c55fea9ba47559b13ade129 +DIST modemmanager-qt-5.115.0.tar.xz 121292 BLAKE2B c7a22c7dd2761e3b330896204ad0f828dadab8baf4572ca58cd3f3f85be8cea0a8f2063d8a2f31b16191b977f7fc9ad390a78161d63f2d575f6bc7278bea18c4 SHA512 0726dbda809e94fea966f54d5adfa8d03e51e5fed5a4b5471516c39e23dd0fd652d5ce9822aa3ddd8e9197b842067040e87e5d369c8cfeccdc8d5965df935f64 +DIST modemmanager-qt-6.1.0.tar.xz 123140 BLAKE2B 2ff4741b2aa2848c02ca47eba99e94829dac46d8482f7aa3230cdca923acc09472cad838db2d4b835a86e9719ca19e42d1ded98043a1c0b7c55389917839d979 SHA512 d31d97802ad2f9068509e15430113c8e98803592ce801360222377b39a808055929292eaf76773253e5894813851fe0957fdd5c35743d481fc7caea1acd59648 diff --git a/kde-frameworks/modemmanager-qt/modemmanager-qt-5.96.0.ebuild b/kde-frameworks/modemmanager-qt/modemmanager-qt-5.115.0.ebuild index 9951196ceba6..27a43aa63777 100644 --- a/kde-frameworks/modemmanager-qt/modemmanager-qt-5.96.0.ebuild +++ b/kde-frameworks/modemmanager-qt/modemmanager-qt-5.115.0.ebuild @@ -1,15 +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 PVCUT=$(ver_cut 1-2) -QTMIN=5.15.4 +QTMIN=5.15.9 inherit ecm frameworks.kde.org DESCRIPTION="ModemManager bindings for Qt" LICENSE="LGPL-2" -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" IUSE="" # requires running environment diff --git a/kde-frameworks/modemmanager-qt/modemmanager-qt-5.98.0.ebuild b/kde-frameworks/modemmanager-qt/modemmanager-qt-6.1.0.ebuild index 7048bdaaaa76..4b797a0c02b3 100644 --- a/kde-frameworks/modemmanager-qt/modemmanager-qt-5.98.0.ebuild +++ b/kde-frameworks/modemmanager-qt/modemmanager-qt-6.1.0.ebuild @@ -1,26 +1,24 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 PVCUT=$(ver_cut 1-2) -QTMIN=5.15.5 +QTMIN=6.6.2 inherit ecm frameworks.kde.org DESCRIPTION="ModemManager bindings for Qt" + LICENSE="LGPL-2" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" +KEYWORDS="~amd64" IUSE="" # requires running environment RESTRICT="test" -BDEPEND=" - virtual/pkgconfig -" DEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtxml-${QTMIN}:5 + >=dev-qt/qtbase-${QTMIN}:6[dbus,xml] net-misc/modemmanager " RDEPEND="${DEPEND}" +BDEPEND="virtual/pkgconfig" diff --git a/kde-frameworks/networkmanager-qt/Manifest b/kde-frameworks/networkmanager-qt/Manifest index 082ff89bcb8d..2aa9b1fb1a1b 100644 --- a/kde-frameworks/networkmanager-qt/Manifest +++ b/kde-frameworks/networkmanager-qt/Manifest @@ -1,2 +1,2 @@ -DIST networkmanager-qt-5.96.0.tar.xz 197644 BLAKE2B 191ea1360476fa85d663323b8482e37b2e281588a52303b4fbfd3e7943b974af971010097916a9915957b6810b031b69dbe9649a616298429082d2c2a6e35a7b SHA512 35f8080932c5a66a708c97826a8308c73ba5ae760abc72e8ef458ae971cf5d2f837fa9ad32ccbc3cc028065389d404adb04f30410bc637679bec88c9dffaf823 -DIST networkmanager-qt-5.98.0.tar.xz 197732 BLAKE2B 707d65991cf50b5a8c79dd4caa9138678728abf266009803afdb9d40bc3c1825d4d078a961d6365cf436df8207d07a47d5f1de756eec287138f569ceaaf4f043 SHA512 536382b35fae375b139761750fba2bed7c434a9925fe39721a560c375e0b8b3f7cf406254114285707b06a3d0591aaa861c8c2c6811017b8ad7d913616a6283a +DIST networkmanager-qt-5.115.0.tar.xz 198888 BLAKE2B 41f4bff229f0c1cb3c327a54f428889a6fe5f413c76ca45def2eff33311a6ab5633b3c1aac2cb57e97443f7fe2303a88c3b93075eb0872bc763798815e901743 SHA512 a21522f447dabd98cae2535c41f6a08748f96c2b76ac63264615f2610b74527522edc4539598c30d1166bac8b4f1cc40729afcca36057968a781b6ce07f25e8f +DIST networkmanager-qt-6.1.0.tar.xz 200516 BLAKE2B 2a39fd2f9a5368a2cce09263067c59c2de610b5d3499792203d492c3dbbb726fbf75667049169b29dc3a047fb11b040e60422cc1f3c4300d925584d6cbfc4e0a SHA512 a07f0c301ba1f4a21aa82b3ae91c6f49252346512d75a60a71710452bada24d082de57666d8164f42a92ca3944eeb3a7800379162bb260ecb922f0720b7128d2 diff --git a/kde-frameworks/networkmanager-qt/networkmanager-qt-5.96.0.ebuild b/kde-frameworks/networkmanager-qt/networkmanager-qt-5.115.0.ebuild index a1d19435bc42..6dc7083a09f6 100644 --- a/kde-frameworks/networkmanager-qt/networkmanager-qt-5.96.0.ebuild +++ b/kde-frameworks/networkmanager-qt/networkmanager-qt-5.115.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -QTMIN=5.15.4 +QTMIN=5.15.9 inherit ecm frameworks.kde.org DESCRIPTION="NetworkManager bindings for Qt" @@ -24,13 +24,11 @@ RDEPEND="${DEPEND} >=net-misc/networkmanager-1.4.0-r1[systemd] ) " -BDEPEND=" - virtual/pkgconfig -" +BDEPEND="virtual/pkgconfig" -src_test() { +CMAKE_SKIP_TESTS=( # bug: 625276 - local myctestargs=( -E "(managertest|settingstest|activeconnectiontest)" ) - - ecm_src_test -} + managertest + settingstest + activeconnectiontest +) diff --git a/kde-frameworks/networkmanager-qt/networkmanager-qt-5.98.0.ebuild b/kde-frameworks/networkmanager-qt/networkmanager-qt-6.1.0.ebuild index b18a1fce20ce..3d59b2462fad 100644 --- a/kde-frameworks/networkmanager-qt/networkmanager-qt-5.98.0.ebuild +++ b/kde-frameworks/networkmanager-qt/networkmanager-qt-6.1.0.ebuild @@ -1,21 +1,20 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -QTMIN=5.15.5 +QTMIN=6.6.2 inherit ecm frameworks.kde.org DESCRIPTION="NetworkManager bindings for Qt" LICENSE="LGPL-2" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" +KEYWORDS="~amd64" IUSE="teamd" DEPEND=" dev-libs/glib:2 - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtnetwork-${QTMIN}:5 + >=dev-qt/qtbase-${QTMIN}:6[dbus,network] >=net-misc/networkmanager-1.4.0-r1[teamd=] " RDEPEND="${DEPEND} @@ -24,13 +23,11 @@ RDEPEND="${DEPEND} >=net-misc/networkmanager-1.4.0-r1[systemd] ) " -BDEPEND=" - virtual/pkgconfig -" +BDEPEND="virtual/pkgconfig" -src_test() { +CMAKE_SKIP_TESTS=( # bug: 625276 - local myctestargs=( -E "(managertest|settingstest|activeconnectiontest)" ) - - ecm_src_test -} + managertest + settingstest + activeconnectiontest +) diff --git a/kde-frameworks/oxygen-icons/Manifest b/kde-frameworks/oxygen-icons/Manifest index af4dbf6b7640..c6f30fe254ce 100644 --- a/kde-frameworks/oxygen-icons/Manifest +++ b/kde-frameworks/oxygen-icons/Manifest @@ -1,2 +1,2 @@ -DIST oxygen-icons5-5.96.0.tar.xz 238635128 BLAKE2B c42043a99f4e2ba314392daf6dcce5bf58600942c410dfa4e7a14782e8677060d18cad5671fada454e3c2c07c1bd17ea0d95a44638b1ed8e363f5043890dc805 SHA512 faa76c08a232530ad1e9cf2f1f46c217f55bd5880736df564725c61cc74b4e04d484d227f67d68b13257d8ab1ba0cacb761950a5c074b35dcde4f06c50a3d90f -DIST oxygen-icons5-5.98.0.tar.xz 238635476 BLAKE2B 14e62639d35830fbdf60ab4b7c6952e93f1b7e4b2714c0326ce30be25dd0cbca0c27f28c3e13d61dc247778aeec04da912bcfd7535ebe7dd309abf851f59dcc6 SHA512 15ec59dfc361a066c5217f05d0ba6a78da1980efe1617e408573069e23c879fa545e55a0920639cd9d2e201aa4d76822dec090b482e17cd3aabf8fc13483ec6c +DIST oxygen-icons-5.115.0.tar.xz 238640536 BLAKE2B 0b8e165da8ca8cd60e12d8eb7d0f63aa4553b77382d447f5b2b0a4810652819d2ba8504d352c1f5a1109b55ba6f353ec5eb3b153535d6748aeeee03d1512fce7 SHA512 2b830e9230c3ffed4d780e1d1768dfefcbbd94307be6d19339605cb31971497c0b0b896266ad53d8c687726eea07ead0d84a432bd54916052799bf2268e22804 +DIST oxygen-icons-6.0.0.tar.xz 242619736 BLAKE2B 4af5715bcf6e190e6c6f9bd1c0f6d68d58b0ceede1f6c2d59ebfb7261904a1f82f94b91c9f7d9b4d8dea911a7f29f650ebf8de9025cfd8412fe8eaf311e9afe0 SHA512 56a165a44612936b6d8e71100806eb29ab70e1fdc36b7d53173159e86f7c2957dfefd7e52b9c108117bc6cf558ec0416bc491ae977ec75bbc3e7d37eab36b378 diff --git a/kde-frameworks/oxygen-icons/oxygen-icons-5.96.0.ebuild b/kde-frameworks/oxygen-icons/oxygen-icons-5.115.0.ebuild index 01543b85dc32..e2882448cfd2 100644 --- a/kde-frameworks/oxygen-icons/oxygen-icons-5.96.0.ebuild +++ b/kde-frameworks/oxygen-icons/oxygen-icons-5.115.0.ebuild @@ -1,27 +1,30 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -KDE_ORG_NAME="oxygen-icons5" PVCUT=$(ver_cut 1-2) -QTMIN=5.15.4 +QTMIN=5.15.9 inherit cmake frameworks.kde.org xdg-utils DESCRIPTION="Oxygen SVG icon theme" LICENSE="LGPL-3" -KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ppc64 ~riscv x86" IUSE="test" RESTRICT="!test? ( test )" +DEPEND=" + test? ( + >=dev-qt/qtcore-${QTMIN}:5 + >=dev-qt/qttest-${QTMIN}:5 + ) +" BDEPEND=" - >=dev-qt/qtcore-${QTMIN}:5 - >=kde-frameworks/extra-cmake-modules-${PVCUT}:5 + >=kde-frameworks/extra-cmake-modules-${PVCUT}:0 test? ( app-misc/fdupes ) " -DEPEND="test? ( >=dev-qt/qttest-${QTMIN}:5 )" src_prepare() { cmake_src_prepare diff --git a/kde-frameworks/oxygen-icons/oxygen-icons-5.98.0.ebuild b/kde-frameworks/oxygen-icons/oxygen-icons-5.98.0.ebuild deleted file mode 100644 index ebf7dee98b83..000000000000 --- a/kde-frameworks/oxygen-icons/oxygen-icons-5.98.0.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -KDE_ORG_NAME="oxygen-icons5" -PVCUT=$(ver_cut 1-2) -QTMIN=5.15.5 -inherit cmake frameworks.kde.org xdg-utils - -DESCRIPTION="Oxygen SVG icon theme" - -LICENSE="LGPL-3" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" -IUSE="test" - -RESTRICT="!test? ( test )" - -BDEPEND=" - >=dev-qt/qtcore-${QTMIN}:5 - >=kde-frameworks/extra-cmake-modules-${PVCUT}:5 - test? ( app-misc/fdupes ) -" -DEPEND="test? ( >=dev-qt/qttest-${QTMIN}:5 )" - -src_prepare() { - cmake_src_prepare - use test || cmake_comment_add_subdirectory autotests -} - -pkg_postinst() { - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_icon_cache_update -} diff --git a/kde-frameworks/oxygen-icons/oxygen-icons-6.0.0.ebuild b/kde-frameworks/oxygen-icons/oxygen-icons-6.0.0.ebuild new file mode 100644 index 000000000000..5205a05feae7 --- /dev/null +++ b/kde-frameworks/oxygen-icons/oxygen-icons-6.0.0.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +KFMIN=6.0.0 +QTMIN=6.6.2 +inherit cmake kde.org xdg-utils + +DESCRIPTION="Oxygen SVG icon theme" +HOMEPAGE="https://develop.kde.org/frameworks/oxygen-icons/" + +if [[ ${KDE_BUILD_TYPE} != live ]]; then + SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz" + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" +fi + +LICENSE="LGPL-3" +SLOT="6" +IUSE="test" + +RESTRICT="!test? ( test )" + +RDEPEND="!kde-frameworks/${PN}:5" +DEPEND="test? ( >=dev-qt/qtbase-${QTMIN}:6 )" +BDEPEND=" + >=kde-frameworks/extra-cmake-modules-${KFMIN}:0 + test? ( app-misc/fdupes ) +" + +src_prepare() { + cmake_src_prepare + use test || cmake_comment_add_subdirectory autotests +} + +pkg_postinst() { + xdg_icon_cache_update +} + +pkg_postrm() { + xdg_icon_cache_update +} diff --git a/kde-frameworks/plasma/Manifest b/kde-frameworks/plasma/Manifest deleted file mode 100644 index 92755a1f9583..000000000000 --- a/kde-frameworks/plasma/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST plasma-framework-5.96.0.tar.xz 3145380 BLAKE2B a9190358fc454dfba03d8f5881b52e21e7e209f471823d4d4ead54818103436775f09df7f1dd42ade4d4b5b2df448f5cb1bb682ea77d32c57cdfe7c39ecab238 SHA512 9361948197c69ab8b2a1b943c1e9a2e44443588cd3bb4073eaa9ac6a4575bb4c1e6a257eb2fda6333df13eb568e09ed26a88d128fdafbe517bca705b8a8f2a5b -DIST plasma-framework-5.98.0.tar.xz 3148664 BLAKE2B e61b896ed80a6f8b70846b19e2b9d525490ebbe4abb95d35f5663e93afbbc3ec23453e2228b20346c5961f6d6313c38f738150eca98f71d399670af3e07e0a88 SHA512 a016b5376ed620d4650c7581b282601c99aea2e6b7948d87f7a99bb747a3913ae2cc96a168deb7d25797fb9f936f4c76d05682036693a8515e756b7f20dab46d diff --git a/kde-frameworks/plasma/files/plasma-5.96.0-fix-crash-in-WindowShadowTile.patch b/kde-frameworks/plasma/files/plasma-5.96.0-fix-crash-in-WindowShadowTile.patch deleted file mode 100644 index 8d37a508b359..000000000000 --- a/kde-frameworks/plasma/files/plasma-5.96.0-fix-crash-in-WindowShadowTile.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 50eaece7aef004b588a684c9fadff0f6787f2ef8 Mon Sep 17 00:00:00 2001 -From: David Edmundson <kde@davidedmundson.co.uk> -Date: Thu, 14 Jul 2022 22:45:14 +0100 -Subject: [PATCH] Scope DialogShadows lifetime to application - -- DialogShadows own KWayland::Client::buffer objects - - Buffer cleanup makes wayland calls - - wayland calls after QGuiApplication has stoped will fail - -Q_GLOBAL_STATIC mangaged objects can outlive the QGuiApplication. - -BUG:443706 ---- - src/plasmaquick/dialogshadows.cpp | 18 ++++++------------ - 1 file changed, 6 insertions(+), 12 deletions(-) - -diff --git a/src/plasmaquick/dialogshadows.cpp b/src/plasmaquick/dialogshadows.cpp -index 17c9a41e2..93b9bcc0f 100644 ---- a/src/plasmaquick/dialogshadows.cpp -+++ b/src/plasmaquick/dialogshadows.cpp -@@ -37,17 +37,6 @@ public: - QVector<KWindowShadowTile::Ptr> m_tiles; - }; - --class DialogShadowsSingleton --{ --public: -- DialogShadowsSingleton() -- { -- } -- -- DialogShadows self; --}; -- --Q_GLOBAL_STATIC(DialogShadowsSingleton, privateDialogShadowsSelf) - - DialogShadows::DialogShadows(QObject *parent, const QString &prefix) - : Plasma::Svg(parent) -@@ -64,7 +53,12 @@ DialogShadows::~DialogShadows() - - DialogShadows *DialogShadows::self() - { -- return &privateDialogShadowsSelf->self; -+ // KF6 port to Q_APPLICATION_STATIC -+ static DialogShadows *s_privateDialogShadowsSelf = nullptr; -+ if (!s_privateDialogShadowsSelf) { -+ s_privateDialogShadowsSelf = new DialogShadows(qApp); -+ } -+ return s_privateDialogShadowsSelf; - } - - void DialogShadows::addWindow(QWindow *window, Plasma::FrameSvg::EnabledBorders enabledBorders) --- -GitLab - diff --git a/kde-frameworks/plasma/files/plasma-5.98.0-without_x11.patch b/kde-frameworks/plasma/files/plasma-5.98.0-without_x11.patch deleted file mode 100644 index 62b393ba9b91..000000000000 --- a/kde-frameworks/plasma/files/plasma-5.98.0-without_x11.patch +++ /dev/null @@ -1,140 +0,0 @@ -From d674a99d19efcad866a773fe6c848a7626a61c0a Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <asturm@gentoo.org> -Date: Tue, 2 Aug 2022 10:52:59 +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. - -HAVE_X11 already exists and is set automagically so far, but 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 or adding unwanted features if the -option is enabled. - -Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> ---- - CMakeLists.txt | 51 ++++++++++--------- - .../core/config-x11.h.cmake | 1 + - src/plasmaquick/CMakeLists.txt | 8 +-- - src/plasmaquick/dialog.cpp | 1 + - 4 files changed, 31 insertions(+), 30 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 3b6405725..15698543f 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -88,28 +88,33 @@ set_package_properties(KF5DocTools PROPERTIES DESCRIPTION "Tools to generate doc - TYPE OPTIONAL - ) - --#optional features --find_package(X11 MODULE) --set_package_properties(X11 PROPERTIES DESCRIPTION "X11 libraries" -- URL "https://www.x.org/" -- TYPE OPTIONAL -- ) --find_package(XCB MODULE COMPONENTS XCB COMPOSITE DAMAGE SHAPE XFIXES RENDER) --set_package_properties(XCB PROPERTIES DESCRIPTION "X protocol C-language Binding" -- URL "https://xcb.freedesktop.org/" -- TYPE OPTIONAL -- ) --if(X11_FOUND AND XCB_XCB_FOUND) -- set(HAVE_X11 1) -- if (QT_MAJOR_VERSION STREQUAL "5") -- find_package(Qt5X11Extras ${REQUIRED_QT_VERSION} NO_MODULE) -- elseif (QT_MAJOR_VERSION STREQUAL "6") -- find_package(Qt${QT_MAJOR_VERSION} ${REQUIRED_QT_VERSION} CONFIG REQUIRED Gui) # qtx11extras_p.h -- endif() -- #X11_Xrender discovery is done by FindX11 -- #add_feature_info("X Rendering Extension (libXrender)" X11_Xrender_FOUND "Support for compositing, rendering operations, and alpha-blending. STRONGLY RECOMMENDED") --else() -- set(HAVE_X11 0) -+option(WITHOUT_X11 "Build without X11 support (skips finding X11)." OFF) -+if(NOT WITHOUT_X11) -+ #optional features -+ find_package(X11 MODULE) -+ set_package_properties(X11 PROPERTIES DESCRIPTION "X11 libraries" -+ URL "https://www.x.org/" -+ TYPE OPTIONAL -+ ) -+ find_package(XCB MODULE COMPONENTS XCB COMPOSITE DAMAGE SHAPE XFIXES RENDER) -+ set_package_properties(XCB PROPERTIES DESCRIPTION "X protocol C-language Binding" -+ URL "https://xcb.freedesktop.org/" -+ TYPE OPTIONAL -+ ) -+ if(X11_FOUND AND XCB_XCB_FOUND) -+ set(HAVE_X11 1) -+ if (QT_MAJOR_VERSION STREQUAL "5") -+ find_package(Qt5X11Extras ${REQUIRED_QT_VERSION} NO_MODULE) -+ elseif (QT_MAJOR_VERSION STREQUAL "6") -+ find_package(Qt${QT_MAJOR_VERSION} ${REQUIRED_QT_VERSION} CONFIG REQUIRED Gui) # qtx11extras_p.h -+ endif() -+ #X11_Xrender discovery is done by FindX11 -+ #add_feature_info("X Rendering Extension (libXrender)" X11_Xrender_FOUND "Support for compositing, rendering operations, and alpha-blending. STRONGLY RECOMMENDED") -+ set(HAVE_XCB_SHAPE ${XCB_SHAPE_FOUND}) -+ else() -+ set(HAVE_X11 0) -+ set(HAVE_XCB_SHAPE 0) -+ endif() - endif() - - find_package(OpenGL) -@@ -125,7 +130,7 @@ set_package_properties(EGL PROPERTIES - ) - - get_target_property(QtGui_Enabled_Features Qt${QT_MAJOR_VERSION}::Gui QT_ENABLED_PUBLIC_FEATURES) --if(OpenGL_GLX_FOUND AND X11_FOUND AND (QtGui_Enabled_Features MATCHES "opengl")) -+if(OpenGL_GLX_FOUND AND HAVE_X11 AND (QtGui_Enabled_Features MATCHES "opengl")) - add_feature_info(GLX OpenGL_GLX_FOUND "OpenGL GLX libraries.") - set(HAVE_GLX 1) - else() -diff --git a/src/declarativeimports/core/config-x11.h.cmake b/src/declarativeimports/core/config-x11.h.cmake -index 2f543d547..ad1b45099 100644 ---- a/src/declarativeimports/core/config-x11.h.cmake -+++ b/src/declarativeimports/core/config-x11.h.cmake -@@ -1,2 +1,3 @@ - #cmakedefine01 HAVE_X11 - #cmakedefine01 HAVE_XCB_COMPOSITE -+#cmakedefine01 HAVE_XCB_SHAPE -diff --git a/src/plasmaquick/CMakeLists.txt b/src/plasmaquick/CMakeLists.txt -index 37bbc5097..dd2442e70 100644 ---- a/src/plasmaquick/CMakeLists.txt -+++ b/src/plasmaquick/CMakeLists.txt -@@ -1,9 +1,3 @@ --if(HAVE_X11 AND XCB_XCB_FOUND AND XCB_SHAPE_FOUND) -- add_definitions(-DHAVE_XCB_SHAPE=1) --else() -- add_definitions(-DHAVE_XCB_SHAPE=0) --endif() -- - add_library(KF5PlasmaQuick SHARED) - add_library(KF5::PlasmaQuick ALIAS KF5PlasmaQuick) - -@@ -81,7 +75,7 @@ if(HAVE_X11) - target_link_libraries(KF5PlasmaQuick PRIVATE Qt6::GuiPrivate) - endif() - -- if(XCB_SHAPE_FOUND) -+ if(HAVE_XCB_SHAPE) - target_link_libraries(KF5PlasmaQuick PRIVATE XCB::SHAPE) - endif() - endif() -diff --git a/src/plasmaquick/dialog.cpp b/src/plasmaquick/dialog.cpp -index 452e36523..2eabd5fb7 100644 ---- a/src/plasmaquick/dialog.cpp -+++ b/src/plasmaquick/dialog.cpp -@@ -11,6 +11,7 @@ - #include "../declarativeimports/core/framesvgitem.h" - #include "appletquickitem.h" - #include "config-plasma.h" -+#include "../declarativeimports/core/config-x11.h" - #include "configview.h" - #include "dialogshadows_p.h" - #include "view.h" --- -GitLab - diff --git a/kde-frameworks/plasma/plasma-5.96.0-r1.ebuild b/kde-frameworks/plasma/plasma-5.96.0-r1.ebuild deleted file mode 100644 index cf6319f87d3b..000000000000 --- a/kde-frameworks/plasma/plasma-5.96.0-r1.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -KDE_ORG_NAME="${PN}-framework" -PVCUT=$(ver_cut 1-2) -QTMIN=5.15.4 -VIRTUALX_REQUIRED="test" -inherit ecm frameworks.kde.org - -DESCRIPTION="Plasma framework" - -LICENSE="LGPL-2+" -KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" -IUSE="gles2-only man wayland X" - -RESTRICT="test" - -RDEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5[gles2-only=,X=] - >=dev-qt/qtquickcontrols-${QTMIN}:5 - >=dev-qt/qtsql-${QTMIN}:5 - >=dev-qt/qtsvg-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - =kde-frameworks/kactivities-${PVCUT}*:5 - =kde-frameworks/karchive-${PVCUT}*:5 - =kde-frameworks/kconfig-${PVCUT}*:5[qml] - =kde-frameworks/kconfigwidgets-${PVCUT}*:5 - =kde-frameworks/kcoreaddons-${PVCUT}*:5 - =kde-frameworks/kdeclarative-${PVCUT}*:5 - =kde-frameworks/kglobalaccel-${PVCUT}*:5 - =kde-frameworks/kguiaddons-${PVCUT}*:5 - =kde-frameworks/ki18n-${PVCUT}*:5 - =kde-frameworks/kiconthemes-${PVCUT}*:5 - =kde-frameworks/kio-${PVCUT}*:5 - =kde-frameworks/kirigami-${PVCUT}*:5 - =kde-frameworks/knotifications-${PVCUT}*:5 - =kde-frameworks/kpackage-${PVCUT}*:5 - =kde-frameworks/kservice-${PVCUT}*:5 - =kde-frameworks/kwidgetsaddons-${PVCUT}*:5 - =kde-frameworks/kwindowsystem-${PVCUT}*:5 - =kde-frameworks/kxmlgui-${PVCUT}*:5 - !gles2-only? ( media-libs/libglvnd[X?] ) - wayland? ( - =kde-frameworks/kwayland-${PVCUT}*:5 - media-libs/libglvnd - ) - X? ( - >=dev-qt/qtx11extras-${QTMIN}:5 - x11-libs/libX11 - x11-libs/libxcb - ) -" -DEPEND="${RDEPEND} - X? ( x11-base/xorg-proto ) -" -BDEPEND="man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )" - -PATCHES=( "${FILESDIR}/${P}-fix-crash-in-WindowShadowTile.patch" ) # KDE-bug 443706 - -src_configure() { - local mycmakeargs=( - $(cmake_use_find_package !gles2-only OpenGL) - $(cmake_use_find_package man KF5DocTools) - $(cmake_use_find_package wayland EGL) - $(cmake_use_find_package wayland KF5Wayland) - $(cmake_use_find_package X X11) - $(cmake_use_find_package X XCB) - ) - - ecm_src_configure -} diff --git a/kde-frameworks/plasma/plasma-5.98.0-r1.ebuild b/kde-frameworks/plasma/plasma-5.98.0-r1.ebuild deleted file mode 100644 index 36811b06c0b8..000000000000 --- a/kde-frameworks/plasma/plasma-5.98.0-r1.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -KDE_ORG_NAME="${PN}-framework" -PVCUT=$(ver_cut 1-2) -QTMIN=5.15.5 -VIRTUALX_REQUIRED="test" -inherit ecm frameworks.kde.org - -DESCRIPTION="Plasma framework" - -LICENSE="LGPL-2+" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" -IUSE="gles2-only man wayland X" - -RESTRICT="test" - -RDEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5[gles2-only=,X=] - >=dev-qt/qtquickcontrols-${QTMIN}:5 - >=dev-qt/qtsql-${QTMIN}:5 - >=dev-qt/qtsvg-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - =kde-frameworks/kactivities-${PVCUT}*:5 - =kde-frameworks/karchive-${PVCUT}*:5 - =kde-frameworks/kconfig-${PVCUT}*:5[qml] - =kde-frameworks/kconfigwidgets-${PVCUT}*:5 - =kde-frameworks/kcoreaddons-${PVCUT}*:5 - =kde-frameworks/kdeclarative-${PVCUT}*:5 - =kde-frameworks/kglobalaccel-${PVCUT}*:5 - =kde-frameworks/kguiaddons-${PVCUT}*:5 - =kde-frameworks/ki18n-${PVCUT}*:5 - =kde-frameworks/kiconthemes-${PVCUT}*:5 - =kde-frameworks/kio-${PVCUT}*:5 - =kde-frameworks/kirigami-${PVCUT}*:5 - =kde-frameworks/knotifications-${PVCUT}*:5 - =kde-frameworks/kpackage-${PVCUT}*:5 - =kde-frameworks/kservice-${PVCUT}*:5 - =kde-frameworks/kwidgetsaddons-${PVCUT}*:5 - =kde-frameworks/kwindowsystem-${PVCUT}*:5[X?] - =kde-frameworks/kxmlgui-${PVCUT}*:5 - !gles2-only? ( media-libs/libglvnd[X?] ) - wayland? ( - =kde-frameworks/kwayland-${PVCUT}*:5 - media-libs/libglvnd - ) - X? ( - >=dev-qt/qtx11extras-${QTMIN}:5 - x11-libs/libX11 - x11-libs/libxcb - ) -" -DEPEND="${RDEPEND} - X? ( x11-base/xorg-proto ) -" -BDEPEND="man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )" - -PATCHES=( "${FILESDIR}/${P}-without_x11.patch" ) - -src_configure() { - local mycmakeargs=( - $(cmake_use_find_package !gles2-only OpenGL) - $(cmake_use_find_package man KF5DocTools) - $(cmake_use_find_package wayland EGL) - $(cmake_use_find_package wayland KF5Wayland) - -DWITHOUT_X11=$(usex !X) - ) - - ecm_src_configure -} diff --git a/kde-frameworks/prison/Manifest b/kde-frameworks/prison/Manifest index 144376ab87df..c00339e6522c 100644 --- a/kde-frameworks/prison/Manifest +++ b/kde-frameworks/prison/Manifest @@ -1,2 +1,2 @@ -DIST prison-5.96.0.tar.xz 55380 BLAKE2B f6fd3467283a1d7980d070f77031d72bec4d94da0da30f99e360ec6cc160c1041d0025227df41649a0c20c4c247e99269c28e146aacbe5dae293a2f13457e562 SHA512 1bb85d4e8e6cd349cae559d5a933e606896ced077b850b4cac1a50f374ac2b938d01095c83a8bdb76af31069c17dfb07102a3a9f3c62ae9832f5b3846335a078 -DIST prison-5.98.0.tar.xz 55752 BLAKE2B 0b7ca899b9148ea9fe57d5189a27af2569be36c8a6ad681a5e0a0885a0708ec4a6e0ca8722085180df674e82887887e63c708090c28cd574be38f8c2cc153137 SHA512 71c800693292a98888f8dad3317613464bd7c07c20ea882e871f1103270619a0a59021405207f30bad4360c81649ae2701d7237c9e9d5948a4d37b4d148b067b +DIST prison-5.115.0.tar.xz 55264 BLAKE2B 26987983a64538d73eb0cd951d1b2ea6b0c63f5fc2f433136a23dba06cc36bc7cd26d6ebea02e0fe90e9113479780f6b5d43f0762b05e35399a4d67eb684edd9 SHA512 48145ee4c1fd7eb177e58b3cd676eb7e50452897b335093eb1d65ac1f6cada83ab5e43d16d26387c1f4c5b992367a91a03d07ac26ae96b253f8f03660f7b226b +DIST prison-6.1.0.tar.xz 55444 BLAKE2B f677f51519b05958a752f2c41034eccd1a5bccddc872ebf0c69db77acb260274987ea8f54d9873194ec6b0ef3a6cad21a3bb97f3d6c9c51dce06ad7c5afd722a SHA512 4111b286b4d61b37c2a2127b2a78fea7c44a9282db17c4635c13f61217782485b919519fd50a82314f33c6a155897c6a238278bba09797fa03eb54da4e4c3887 diff --git a/kde-frameworks/prison/files/prison-5.96.0-zxing-cpp-1.4.0.patch b/kde-frameworks/prison/files/prison-5.96.0-zxing-cpp-1.4.0.patch deleted file mode 100644 index 8971bd919a08..000000000000 --- a/kde-frameworks/prison/files/prison-5.96.0-zxing-cpp-1.4.0.patch +++ /dev/null @@ -1,107 +0,0 @@ -From 74e34fa35a59098db7c4358b788ad3ac0a5745f7 Mon Sep 17 00:00:00 2001 -From: Volker Krause <vkrause@kde.org> -Date: Fri, 8 Jul 2022 16:18:47 +0200 -Subject: [PATCH] Support ZXing 1.4.0 - -The previous code doesn't build (and when made to build, crashes) with -ZXing 1.4.0. ---- - src/scanner/CMakeLists.txt | 2 ++ - src/scanner/config-prison-scanner.h.in | 14 ++++++++++++++ - src/scanner/videoscannerworker.cpp | 17 +++++++++++++++++ - 3 files changed, 33 insertions(+) - create mode 100644 src/scanner/config-prison-scanner.h.in - -diff --git a/src/scanner/CMakeLists.txt b/src/scanner/CMakeLists.txt -index d5b9cf5..ef690c5 100644 ---- a/src/scanner/CMakeLists.txt -+++ b/src/scanner/CMakeLists.txt -@@ -1,6 +1,8 @@ - # SPDX-FileCopyrightText: 2022 Volker Krause <vkrause@kde.org> - # SPDX-License-Identifier: BSD-3-Clause - -+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config-prison-scanner.h.in ${CMAKE_CURRENT_BINARY_DIR}/config-prison-scanner.h) -+ - add_library(KF5PrisonScanner) - add_library(KF5::PrisonScanner ALIAS KF5PrisonScanner) - -diff --git a/src/scanner/config-prison-scanner.h.in b/src/scanner/config-prison-scanner.h.in -new file mode 100644 -index 0000000..d80ceaf ---- /dev/null -+++ b/src/scanner/config-prison-scanner.h.in -@@ -0,0 +1,14 @@ -+/* -+ SPDX-FileCopyrightText: 2022 Volker Krause <vkrause@kde.org> -+ SPDX-License-Identifier: LGPL-2.0-or-later -+*/ -+ -+#ifndef CONFIG_PRISON_SCANNER_H -+#define CONFIG_PRISON_SCANNER_H -+ -+#define ZXING_VERSION_MAJOR @ZXing_VERSION_MAJOR@ -+#define ZXING_VERSION_MINOR @ZXing_VERSION_MINOR@ -+#define ZXING_VERSION_PATCH @ZXing_VERSION_PATCH@ -+#define ZXING_VERSION ((@ZXing_VERSION_MAJOR@<<16)|(@ZXing_VERSION_MINOR@<<8)|(@ZXing_VERSION_PATCH@)) -+ -+#endif // CONFIG_PRISON_SCANNER_H -diff --git a/src/scanner/videoscannerworker.cpp b/src/scanner/videoscannerworker.cpp -index 45792dc..947367c 100644 ---- a/src/scanner/videoscannerworker.cpp -+++ b/src/scanner/videoscannerworker.cpp -@@ -3,6 +3,7 @@ - SPDX-License-Identifier: MIT - */ - -+#include "config-prison-scanner.h" - #include "format_p.h" - #include "scanresult_p.h" - #include "videoscannerframe_p.h" -@@ -12,6 +13,7 @@ - #include <QImage> - #include <QTransform> - -+#define ZX_USE_UTF8 1 - #include <ZXing/ReadBarcode.h> - #include <ZXing/TextUtfEncoding.h> - -@@ -25,7 +27,11 @@ VideoScannerWorker::VideoScannerWorker(QObject *parent) - - void VideoScannerWorker::slotScanFrame(VideoScannerFrame frame) - { -+#if ZXING_VERSION < QT_VERSION_CHECK(1, 4, 0) - ZXing::Result zxRes(ZXing::DecodeStatus::FormatError); -+#else -+ ZXing::Result zxRes; -+#endif - ZXing::DecodeHints hints; - hints.setFormats(frame.formats() == Format::NoFormat ? ZXing::BarcodeFormats::all() : Format::toZXing(frame.formats())); - -@@ -173,6 +179,7 @@ void VideoScannerWorker::slotScanFrame(VideoScannerFrame frame) - if (zxRes.isValid()) { - auto res = ScanResultPrivate::get(scanResult); - -+#if ZXING_VERSION < QT_VERSION_CHECK(1, 4, 0) - // distinguish between binary and text content - const auto hasWideChars = std::any_of(zxRes.text().begin(), zxRes.text().end(), [](auto c) { - return c > 255; -@@ -188,6 +195,16 @@ void VideoScannerWorker::slotScanFrame(VideoScannerFrame frame) - std::copy(zxRes.text().begin(), zxRes.text().end(), b.begin()); - res->content = b; - } -+#else -+ if (zxRes.contentType() == ZXing::ContentType::Text) { -+ res->content = QString::fromStdString(zxRes.text()); -+ } else { -+ QByteArray b; -+ b.resize(zxRes.bytes().size()); -+ std::copy(zxRes.bytes().begin(), zxRes.bytes().end(), b.begin()); -+ res->content = b; -+ } -+#endif - - // determine the bounding rect - // the cooridinates we get from ZXing are a polygon, we need to determine the --- -GitLab - diff --git a/kde-frameworks/prison/metadata.xml b/kde-frameworks/prison/metadata.xml index 6709562d0d64..8035cf6f1b4c 100644 --- a/kde-frameworks/prison/metadata.xml +++ b/kde-frameworks/prison/metadata.xml @@ -7,6 +7,7 @@ </maintainer> <upstream> <bugs-to>https://bugs.kde.org/</bugs-to> + <remote-id type="kde-invent">frameworks/prison</remote-id> </upstream> <use> <flag name="qml">Enable QML/QtQuick support via <pkg>dev-qt/qtdeclarative</pkg></flag> diff --git a/kde-frameworks/prison/prison-5.96.0-r1.ebuild b/kde-frameworks/prison/prison-5.115.0.ebuild index 33b9a8f7bdba..dc6affb61e6b 100644 --- a/kde-frameworks/prison/prison-5.96.0-r1.ebuild +++ b/kde-frameworks/prison/prison-5.115.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -QTMIN=5.15.4 +QTMIN=5.15.9 inherit ecm frameworks.kde.org DESCRIPTION="QRCode and data matrix barcode library" @@ -25,8 +25,6 @@ DEPEND="${RDEPEND} test? ( >=dev-qt/qtwidgets-${QTMIN}:5 ) " -PATCHES=( "${FILESDIR}/${P}-zxing-cpp-1.4.0.patch" ) - src_configure() { local mycmakeargs=( $(cmake_use_find_package qml Qt5Quick) diff --git a/kde-frameworks/prison/prison-5.98.0.ebuild b/kde-frameworks/prison/prison-6.1.0.ebuild index 2972465702e6..e3d7a41cad3f 100644 --- a/kde-frameworks/prison/prison-5.98.0.ebuild +++ b/kde-frameworks/prison/prison-6.1.0.ebuild @@ -1,33 +1,33 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -QTMIN=5.15.5 +QTMIN=6.6.2 inherit ecm frameworks.kde.org DESCRIPTION="QRCode and data matrix barcode library" HOMEPAGE="https://invent.kde.org/frameworks/prison" LICENSE="GPL-2" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" +KEYWORDS="~amd64" IUSE="qml" RDEPEND=" - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtmultimedia-${QTMIN}:5 + >=dev-qt/qtbase-${QTMIN}:6[gui] + >=dev-qt/qtmultimedia-${QTMIN}:6 media-gfx/qrencode:= media-libs/libdmtx media-libs/zxing-cpp:= - qml? ( >=dev-qt/qtdeclarative-${QTMIN}:5 ) + qml? ( >=dev-qt/qtdeclarative-${QTMIN}:6 ) " DEPEND="${RDEPEND} - test? ( >=dev-qt/qtwidgets-${QTMIN}:5 ) + test? ( >=dev-qt/qtbase-${QTMIN}:6[widgets] ) " src_configure() { local mycmakeargs=( - $(cmake_use_find_package qml Qt5Quick) + $(cmake_use_find_package qml Qt6Quick) ) ecm_src_configure diff --git a/kde-frameworks/purpose/Manifest b/kde-frameworks/purpose/Manifest index 1efe0375fff5..0695c546af1b 100644 --- a/kde-frameworks/purpose/Manifest +++ b/kde-frameworks/purpose/Manifest @@ -1,2 +1,2 @@ -DIST purpose-5.96.0.tar.xz 172284 BLAKE2B 3a272ea568d862ed4c300a45dbf6c3d5eee6b9dd1a6b8bc1f9c08535375ae9bac1233514ca8b6bafc20febce4b42efd773fe8415dfd7156222cbe3302d33d7c2 SHA512 80ede3300842db1a1e2553525c47f0d8d5d8611c6fd5509b2e864f1832b468326c38f70fd1a9588260660c4aff6ac7264d8dade55a5c255a9b46cb4aff2445b7 -DIST purpose-5.98.0.tar.xz 174904 BLAKE2B a4cadd69aff680fbe41b6a93e18756b8a05a82fb43c8c2e55c2805ddbcc3829b7327d8f3a2e799a61220eb0caa29ec8998e507914ba75eabe36203f2f6ee9324 SHA512 3fff666a64a6ff82fec7e109a3118078179b971692f6b62dac72c7204b345b481766f2366b8d799674fb73633dc76c9aefe457d4f18ae733afb9e7a47fc18eb6 +DIST purpose-5.115.0.tar.xz 180012 BLAKE2B 2e5a2805b19384f5e8ce0fdb94fa5cc3a7dbfeaaac027e45d95cc16091ea94e2a626ebb8be34f67838ea48049496005588ee6055f745b332676a64a35450c30e SHA512 b17cd780ed7947582fbc71430de67ebeaf33432113bbb77fba3736bd608d05fb132d40f7783cba4fdfd7ab3eec60f00676d48be0ce9c601c37f8eccc04d4db31 +DIST purpose-6.1.0.tar.xz 175584 BLAKE2B 02cabc4ff679560bad0bc77d853f97ac5b4a27e2e20c5ac0ca86ce932aa2c8ed1d8e2d24d1ff5c39513903baefea772289fd99307bcbb13282d3499205712b24 SHA512 a52b365c3e33966e2557529d63a9cab8af66d1ea976a47e9aeee62755897bada371ad16f758abefb47201728e371f050c40fd88d29b9584445b4c816e954ff78 diff --git a/kde-frameworks/purpose/metadata.xml b/kde-frameworks/purpose/metadata.xml index 94150564ce73..6b0d501b777f 100644 --- a/kde-frameworks/purpose/metadata.xml +++ b/kde-frameworks/purpose/metadata.xml @@ -10,6 +10,7 @@ </upstream> <use> <flag name="kaccounts">Enable support for system-wide defined KAccounts</flag> + <flag name="kf6compat">Disable components colliding with KF6, depend on KF6 components instead</flag> </use> <slots> <subslots> diff --git a/kde-frameworks/purpose/purpose-5.96.0.ebuild b/kde-frameworks/purpose/purpose-5.115.0.ebuild index 433693cab7b4..608b515dc68e 100644 --- a/kde-frameworks/purpose/purpose-5.96.0.ebuild +++ b/kde-frameworks/purpose/purpose-5.115.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -6,40 +6,48 @@ EAPI=8 ECM_QTHELP="false" ECM_TEST="forceoptional" PVCUT=$(ver_cut 1-2) -QTMIN=5.15.4 +QTMIN=5.15.9 inherit ecm frameworks.kde.org optfeature xdg-utils DESCRIPTION="Library for providing abstractions to get the developer's purposes fulfilled" LICENSE="LGPL-2.1+" KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" -IUSE="bluetooth +kaccounts" +IUSE="bluetooth kaccounts kf6compat" # requires running environment RESTRICT="test" DEPEND=" + >=dev-qt/qtdbus-${QTMIN}:5 >=dev-qt/qtdeclarative-${QTMIN}:5 >=dev-qt/qtgui-${QTMIN}:5 >=dev-qt/qtnetwork-${QTMIN}:5 >=dev-qt/qtwidgets-${QTMIN}:5 + =kde-frameworks/kconfig-${PVCUT}*:5 =kde-frameworks/kcoreaddons-${PVCUT}*:5 =kde-frameworks/ki18n-${PVCUT}*:5 =kde-frameworks/kio-${PVCUT}*:5 =kde-frameworks/kirigami-${PVCUT}*:5 =kde-frameworks/knotifications-${PVCUT}*:5 + =kde-frameworks/kservice-${PVCUT}*:5 =kde-frameworks/prison-${PVCUT}*:5 kaccounts? ( - >=kde-apps/kaccounts-integration-19.04.3:5 - net-libs/accounts-qt + || ( + kde-apps/kaccounts-integration:6[qt5] + kde-apps/kaccounts-integration:5 + ) + net-libs/accounts-qt[qt5(+)] ) " RDEPEND="${DEPEND} + kf6compat? ( kde-frameworks/purpose:6[kaccounts?] ) >=dev-qt/qtquickcontrols-${QTMIN}:5 >=dev-qt/qtquickcontrols2-${QTMIN}:5 >=kde-frameworks/kdeclarative-${PVCUT}:5 bluetooth? ( =kde-frameworks/bluez-qt-${PVCUT}*:5 ) - kaccounts? ( net-libs/accounts-qml ) + kaccounts? ( net-libs/accounts-qml[qt5(+)] ) " +BDEPEND="kaccounts? ( dev-util/intltool )" src_prepare() { ecm_src_prepare @@ -56,6 +64,20 @@ src_configure() { ecm_src_configure } +src_install() { + ecm_src_install + + if use kf6compat; then + rm "${D}"/usr/share/icons/hicolor/128x128/apps/{reviewboard,phabricator}-purpose.png \ + "${D}"/usr/share/icons/hicolor/16x16/apps/{reviewboard,phabricator}-purpose.png \ + || die + if use kaccounts; then + rm "${D}"/usr/share/accounts/services/kde/{google-youtube,nextcloud-upload}.service \ + || die + fi + fi +} + pkg_postinst() { if [[ -z "${REPLACING_VERSIONS}" ]]; then optfeature "Send through KDE Connect" kde-misc/kdeconnect diff --git a/kde-frameworks/purpose/purpose-5.98.0.ebuild b/kde-frameworks/purpose/purpose-5.98.0.ebuild deleted file mode 100644 index 977f6624605a..000000000000 --- a/kde-frameworks/purpose/purpose-5.98.0.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_QTHELP="false" -ECM_TEST="forceoptional" -PVCUT=$(ver_cut 1-2) -QTMIN=5.15.5 -inherit ecm frameworks.kde.org optfeature xdg-utils - -DESCRIPTION="Library for providing abstractions to get the developer's purposes fulfilled" -LICENSE="LGPL-2.1+" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" -IUSE="bluetooth +kaccounts" - -# requires running environment -RESTRICT="test" - -DEPEND=" - >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtnetwork-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - =kde-frameworks/kcoreaddons-${PVCUT}*:5 - =kde-frameworks/ki18n-${PVCUT}*:5 - =kde-frameworks/kio-${PVCUT}*:5 - =kde-frameworks/kirigami-${PVCUT}*:5 - =kde-frameworks/knotifications-${PVCUT}*:5 - =kde-frameworks/prison-${PVCUT}*:5 - kaccounts? ( - >=kde-apps/kaccounts-integration-19.04.3:5 - net-libs/accounts-qt - ) -" -RDEPEND="${DEPEND} - >=dev-qt/qtquickcontrols-${QTMIN}:5 - >=dev-qt/qtquickcontrols2-${QTMIN}:5 - >=kde-frameworks/kdeclarative-${PVCUT}:5 - bluetooth? ( =kde-frameworks/bluez-qt-${PVCUT}*:5 ) - kaccounts? ( net-libs/accounts-qml ) -" - -src_prepare() { - ecm_src_prepare - - use bluetooth || - cmake_run_in src/plugins cmake_comment_add_subdirectory bluetooth -} - -src_configure() { - local mycmakeargs=( - $(cmake_use_find_package kaccounts KAccounts) - ) - - ecm_src_configure -} - -pkg_postinst() { - if [[ -z "${REPLACING_VERSIONS}" ]]; then - optfeature "Send through KDE Connect" kde-misc/kdeconnect - fi - ecm_pkg_postinst - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_icon_cache_update -} diff --git a/kde-frameworks/purpose/purpose-6.1.0.ebuild b/kde-frameworks/purpose/purpose-6.1.0.ebuild new file mode 100644 index 000000000000..644569f4d542 --- /dev/null +++ b/kde-frameworks/purpose/purpose-6.1.0.ebuild @@ -0,0 +1,70 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_QTHELP="false" +ECM_TEST="forceoptional" +PVCUT=$(ver_cut 1-2) +QTMIN=6.6.2 +inherit ecm frameworks.kde.org optfeature xdg-utils + +DESCRIPTION="Library for providing abstractions to get the developer's purposes fulfilled" + +LICENSE="LGPL-2.1+" +KEYWORDS="~amd64" +IUSE="bluetooth kaccounts" + +# requires running environment +RESTRICT="test" + +DEPEND=" + >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets] + >=dev-qt/qtdeclarative-${QTMIN}:6 + =kde-frameworks/kconfig-${PVCUT}*:6 + =kde-frameworks/kcoreaddons-${PVCUT}*:6 + =kde-frameworks/ki18n-${PVCUT}*:6 + =kde-frameworks/kio-${PVCUT}*:6 + =kde-frameworks/kirigami-${PVCUT}*:6 + =kde-frameworks/knotifications-${PVCUT}*:6 + =kde-frameworks/kservice-${PVCUT}*:6 + =kde-frameworks/prison-${PVCUT}*:6 + kaccounts? ( + kde-apps/kaccounts-integration:6 + >=net-libs/accounts-qt-1.16_p20220803[qt6] + ) +" +RDEPEND="${DEPEND} + !${CATEGORY}/${PN}:5[-kf6compat(-)] + >=kde-frameworks/kdeclarative-${PVCUT}:6 + bluetooth? ( =kde-frameworks/bluez-qt-${PVCUT}*:6 ) + kaccounts? ( >=net-libs/accounts-qml-0.7_p20231028[qt6] ) +" +BDEPEND="kaccounts? ( dev-util/intltool )" + +src_prepare() { + ecm_src_prepare + + use bluetooth || + cmake_run_in src/plugins cmake_comment_add_subdirectory bluetooth +} + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package kaccounts KAccounts6) + ) + + ecm_src_configure +} + +pkg_postinst() { + if [[ -z "${REPLACING_VERSIONS}" ]]; then + optfeature "Send through KDE Connect" kde-misc/kdeconnect + fi + ecm_pkg_postinst + xdg_icon_cache_update +} + +pkg_postrm() { + xdg_icon_cache_update +} diff --git a/kde-frameworks/qqc2-desktop-style/Manifest b/kde-frameworks/qqc2-desktop-style/Manifest index d9a6cf281b20..1e4c4a6af101 100644 --- a/kde-frameworks/qqc2-desktop-style/Manifest +++ b/kde-frameworks/qqc2-desktop-style/Manifest @@ -1,2 +1,2 @@ -DIST qqc2-desktop-style-5.96.0.tar.xz 64896 BLAKE2B f2bc4a599feb1aa0ed7d604cc0c81c20d5f07471845d9fd8c28a112c7c6ff0bb66223975a44a2e1ee771b540e1634e6d4be8eb8aa0761db63068fb8411515ce7 SHA512 ef9342933beecfd7ddc5c934c2d0f399f3d3eb8dd1f02b5e0f397e1d377ec06487363bcd7f6d1be3679b4db971fec80904e20acb391b57b2795f6be3a73e6db9 -DIST qqc2-desktop-style-5.98.0.tar.xz 66392 BLAKE2B 5a7e9c7bf67169c476e7baa12b2cab95f04a25c142fab9d351cdf9000239db1cc562f34c83e01f28c8722c2bc506dbbf934a11dffa3f6c0061b06a67252b3170 SHA512 a64a3b523854155270ec6ac8f45ffca421897f5a186fc0ad42de59f43996f39747fee219bf25832af1e58fa4ce3f5c9686332c093383262aad9e52c9b05424d0 +DIST qqc2-desktop-style-5.115.0.tar.xz 69448 BLAKE2B 1164f0a3a3868de02e82d94beaf65c13aab6b28a1945f5b8d539cd2bc7a2a692d96762f007bacb8e542275d7f049d38956a440a6fed1ad07040b19d9cd298a17 SHA512 79d3395e687f7e5117997639f05a5358a13dc9f343ce3a007b3d64d1a5a470caa03a8e3d0e11b66ec394d8e1cc1817aea1d337477d741295dac48fec83a9914b +DIST qqc2-desktop-style-6.1.0.tar.xz 84260 BLAKE2B 21a7757134fb20c5bc8eca84a3b368887bfc2746b408fe62ce189054bb6e75be28e353c642ea0525b6edbbeb0b558b1a30dd28e8c4716d7bd14c192c9f81ad40 SHA512 befb9c9ee024fcf73a04be9495800172d2049f9a0c14d21fe8e5c7d889a1411702de2297e1a27ca11154f7471b541ab1b02b182d38622a81eabd6b3a8aca1530 diff --git a/kde-frameworks/qqc2-desktop-style/files/qqc2-desktop-style-5.96.0-drop-layout-direction-hack.patch b/kde-frameworks/qqc2-desktop-style/files/qqc2-desktop-style-5.96.0-drop-layout-direction-hack.patch deleted file mode 100644 index 6f31670f5a52..000000000000 --- a/kde-frameworks/qqc2-desktop-style/files/qqc2-desktop-style-5.96.0-drop-layout-direction-hack.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 6a095ad15153479e22472628ddfe1bab1183d911 Mon Sep 17 00:00:00 2001 -From: ivan tkachenko <me@ratijas.tk> -Date: Sat, 4 Jun 2022 03:11:58 +0300 -Subject: [PATCH] ProgressBar: Drop layout direction hack - -It is not needed anymore: mirroring is now handled correctly in the -Breeze theme implementation. ---- - org.kde.desktop/ProgressBar.qml | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/org.kde.desktop/ProgressBar.qml b/org.kde.desktop/ProgressBar.qml -index 23c1df3..2d075c7 100644 ---- a/org.kde.desktop/ProgressBar.qml -+++ b/org.kde.desktop/ProgressBar.qml -@@ -26,7 +26,7 @@ T.ProgressBar { - control: controlRoot - maximum: indeterminate ? 0 : 10000 * controlRoot.to - minimum: indeterminate ? 0 : 10000 * controlRoot.from -- value: indeterminate ? 0 : 10000 * ((Qt.application.layoutDirection === Qt.LeftToRight ? controlRoot.visualPosition : 1 - controlRoot.visualPosition) * (controlRoot.to - controlRoot.from) + controlRoot.from) -+ value: indeterminate ? 0 : 10000 * controlRoot.value - horizontal: true - enabled: controlRoot.enabled - --- -GitLab - diff --git a/kde-frameworks/qqc2-desktop-style/files/qqc2-desktop-style-5.96.0-fix-menubar-theme.patch b/kde-frameworks/qqc2-desktop-style/files/qqc2-desktop-style-5.96.0-fix-menubar-theme.patch deleted file mode 100644 index 6cb908283ffc..000000000000 --- a/kde-frameworks/qqc2-desktop-style/files/qqc2-desktop-style-5.96.0-fix-menubar-theme.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 299748e9bdc01a30e90cb7413b0815564864dc3b Mon Sep 17 00:00:00 2001 -From: Kartikey Subramanium <kartikey@tutanota.com> -Date: Wed, 20 Jul 2022 14:33:55 +0000 -Subject: [PATCH] Fix QQC2 MenuBar theme. - -BUG: 456729 - -| Before | After | -| ------ | ------ | -|  |  | ---- - org.kde.desktop/MenuBar.qml | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/org.kde.desktop/MenuBar.qml b/org.kde.desktop/MenuBar.qml -index f10b01a..68b92af 100644 ---- a/org.kde.desktop/MenuBar.qml -+++ b/org.kde.desktop/MenuBar.qml -@@ -13,6 +13,9 @@ import org.kde.kirigami 2.4 as Kirigami - T.MenuBar { - id: controlRoot - -+ Kirigami.Theme.colorSet: Kirigami.Theme.Header -+ Kirigami.Theme.inherit: false -+ - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - contentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, --- -GitLab - diff --git a/kde-frameworks/qqc2-desktop-style/files/qqc2-desktop-style-5.96.0-fix-precision.patch b/kde-frameworks/qqc2-desktop-style/files/qqc2-desktop-style-5.96.0-fix-precision.patch deleted file mode 100644 index 36705ce0c8b6..000000000000 --- a/kde-frameworks/qqc2-desktop-style/files/qqc2-desktop-style-5.96.0-fix-precision.patch +++ /dev/null @@ -1,70 +0,0 @@ -From efb795efbe0579cb30cc042d61214c139c5fb110 Mon Sep 17 00:00:00 2001 -From: ivan tkachenko <me@ratijas.tk> -Date: Fri, 22 Jul 2022 20:31:48 +0300 -Subject: [PATCH] ProgressBar,Slider: Adapt great precision to the harsh - reality - -Test case: `to` values >= 214749 should work. - -BUG: 455339 ---- - org.kde.desktop/ProgressBar.qml | 10 +++++++--- - org.kde.desktop/Slider.qml | 12 ++++++++---- - 2 files changed, 15 insertions(+), 7 deletions(-) - -diff --git a/org.kde.desktop/ProgressBar.qml b/org.kde.desktop/ProgressBar.qml -index 18d879b..77beb1b 100644 ---- a/org.kde.desktop/ProgressBar.qml -+++ b/org.kde.desktop/ProgressBar.qml -@@ -22,11 +22,15 @@ T.ProgressBar { - contentItem: Item {} - - background: StylePrivate.StyleItem { -+ // Rescale for extra precision. Adapts to the range of `from` & `to` to avoid integer overflow. -+ property int factor: (Math.abs(controlRoot.from) < 100000 && Math.abs(controlRoot.to) < 100000) -+ ? 10000 : 1 -+ - elementType: "progressbar" - control: controlRoot -- maximum: indeterminate ? 0 : 10000 * controlRoot.to -- minimum: indeterminate ? 0 : 10000 * controlRoot.from -- value: indeterminate ? 0 : 10000 * controlRoot.value -+ maximum: indeterminate ? 0 : factor * controlRoot.to -+ minimum: indeterminate ? 0 : factor * controlRoot.from -+ value: indeterminate ? 0 : factor * controlRoot.value - horizontal: true - enabled: controlRoot.enabled - -diff --git a/org.kde.desktop/Slider.qml b/org.kde.desktop/Slider.qml -index 58bc99a..49b8ccb 100644 ---- a/org.kde.desktop/Slider.qml -+++ b/org.kde.desktop/Slider.qml -@@ -28,6 +28,10 @@ T.Slider { - snapMode: T.Slider.SnapOnRelease - - background: StylePrivate.StyleItem { -+ // Rescale for extra precision. Adapts to the range of `from` & `to` to avoid integer overflow. -+ property int factor: (Math.abs(controlRoot.from) < 100000 && Math.abs(controlRoot.to) < 100000) -+ ? 10000 : 1 -+ - control: controlRoot - elementType: "slider" - sunken: controlRoot.pressed -@@ -36,10 +40,10 @@ T.Slider { - contentHeight: horizontal ? (Kirigami.Settings.tabletMode ? 24 : 22) : controlRoot.implicitHeight - anchors.verticalCenter: controlRoot.verticalCenter - -- maximum: 10000 * controlRoot.to -- minimum: 10000 * controlRoot.from -- step: 10000 * controlRoot.stepSize -- value: 10000 * controlRoot.value -+ maximum: factor * controlRoot.to -+ minimum: factor * controlRoot.from -+ step: factor * controlRoot.stepSize -+ value: factor * controlRoot.value - horizontal: controlRoot.orientation === Qt.Horizontal - enabled: controlRoot.enabled - hasFocus: controlRoot.activeFocus --- -GitLab - diff --git a/kde-frameworks/qqc2-desktop-style/files/qqc2-desktop-style-5.96.0-strip-out-apersands.patch b/kde-frameworks/qqc2-desktop-style/files/qqc2-desktop-style-5.96.0-strip-out-apersands.patch deleted file mode 100644 index 59bb60c6c347..000000000000 --- a/kde-frameworks/qqc2-desktop-style/files/qqc2-desktop-style-5.96.0-strip-out-apersands.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 939273025ed92246b5e6d1e3a944a8c88bbc682b Mon Sep 17 00:00:00 2001 -From: ivan tkachenko <me@ratijas.tk> -Date: Fri, 22 Jul 2022 21:27:04 +0300 -Subject: [PATCH] ToolTip: Sync to PC3: Strip out ampersands -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Easily reproducible broken example: put a notes applet on a desktop, -hover over its "Configure…" button (it should be fine so far), then -right click it, press Escape (or otherwise close the context menu, and -hover again: now the tooltip spells "&Configure…" because for some -reason a mnemonic was added during this time. ---- - org.kde.desktop/ToolTip.qml | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) - -diff --git a/org.kde.desktop/ToolTip.qml b/org.kde.desktop/ToolTip.qml -index 40dfcbd..3a03cc5 100644 ---- a/org.kde.desktop/ToolTip.qml -+++ b/org.kde.desktop/ToolTip.qml -@@ -13,7 +13,7 @@ import QtQuick.Layouts 1.15 - import org.kde.kirigami 2.12 as Kirigami - - T.ToolTip { -- id: controlRoot -+ id: control - - Kirigami.Theme.colorSet: Kirigami.Theme.Tooltip - Kirigami.Theme.inherit: false -@@ -41,9 +41,11 @@ T.ToolTip { - closePolicy: T.Popup.CloseOnEscape | T.Popup.CloseOnPressOutsideParent | T.Popup.CloseOnReleaseOutsideParent - - contentItem: Controls.Label { -- text: controlRoot.text -+ // Strip out ampersands right before non-whitespace characters, i.e. -+ // those used to determine the alt key shortcut -+ text: control.text.replace(/&(?=\S)/g, "") - wrapMode: Text.WordWrap -- font: controlRoot.font -+ font: control.font - Kirigami.Theme.colorSet: Kirigami.Theme.Tooltip - color: Kirigami.Theme.textColor - } --- -GitLab - diff --git a/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.98.0.ebuild b/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.115.0.ebuild index cf0e8a2b6099..e6b354dbd922 100644 --- a/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.98.0.ebuild +++ b/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.115.0.ebuild @@ -1,23 +1,25 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 ECM_QTHELP="false" PVCUT=$(ver_cut 1-2) -QTMIN=5.15.5 +QTMIN=5.15.9 inherit ecm frameworks.kde.org DESCRIPTION="Style for QtQuickControls 2 that uses QWidget's QStyle for painting" LICENSE="|| ( GPL-2+ LGPL-3+ )" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" IUSE="" DEPEND=" + >=dev-qt/qtdbus-${QTMIN}:5 >=dev-qt/qtdeclarative-${QTMIN}:5= >=dev-qt/qtgui-${QTMIN}:5 >=dev-qt/qtwidgets-${QTMIN}:5 + =kde-frameworks/kconfig-${PVCUT}*:5 =kde-frameworks/kconfigwidgets-${PVCUT}*:5 =kde-frameworks/kiconthemes-${PVCUT}*:5 =kde-frameworks/kirigami-${PVCUT}*:5 diff --git a/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.96.0-r1.ebuild b/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.96.0-r1.ebuild deleted file mode 100644 index faec21e2b741..000000000000 --- a/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.96.0-r1.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_QTHELP="false" -PVCUT=$(ver_cut 1-2) -QTMIN=5.15.4 -inherit ecm frameworks.kde.org - -DESCRIPTION="Style for QtQuickControls 2 that uses QWidget's QStyle for painting" - -LICENSE="|| ( GPL-2+ LGPL-3+ )" -KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" -IUSE="" - -DEPEND=" - >=dev-qt/qtdeclarative-${QTMIN}:5= - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - =kde-frameworks/kconfigwidgets-${PVCUT}*:5 - =kde-frameworks/kiconthemes-${PVCUT}*:5 - =kde-frameworks/kirigami-${PVCUT}*:5 - =kde-frameworks/sonnet-${PVCUT}*:5[qml] -" -RDEPEND="${DEPEND} - >=dev-qt/qtgraphicaleffects-${QTMIN}:5 - >=dev-qt/qtquickcontrols2-${QTMIN}:5 -" - -PATCHES=( - "${FILESDIR}/${P}-fix-menubar-theme.patch" # KDE-bug #456729 - "${FILESDIR}/${P}-drop-layout-direction-hack.patch" # mirror fix in breeze 5.24.6-r1 - "${FILESDIR}/${P}-fix-precision.patch" # KDE-bug #455339 - "${FILESDIR}/${P}-strip-out-apersands.patch" # KDE-bug #457079 -) diff --git a/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-6.1.0.ebuild b/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-6.1.0.ebuild new file mode 100644 index 000000000000..f16eae109fb7 --- /dev/null +++ b/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-6.1.0.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_QTHELP="false" +PVCUT=$(ver_cut 1-2) +QTMIN=6.6.2 +inherit ecm frameworks.kde.org + +DESCRIPTION="Style for QtQuickControls 2 that uses QWidget's QStyle for painting" + +LICENSE="|| ( GPL-2+ LGPL-3+ )" +KEYWORDS="~amd64" +IUSE="" + +# Qt_6_PRIVATE_API matches org.kde.desktop.so, see also: +# https://invent.kde.org/frameworks/qqc2-desktop-style/-/merge_requests/379 +DEPEND=" + >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets] + >=dev-qt/qtdeclarative-${QTMIN}:6= + =kde-frameworks/kcolorscheme-${PVCUT}*:6 + =kde-frameworks/kconfig-${PVCUT}*:6 + =kde-frameworks/kiconthemes-${PVCUT}*:6 + =kde-frameworks/kirigami-${PVCUT}*:6 + =kde-frameworks/sonnet-${PVCUT}*:6[qml] +" +RDEPEND="${DEPEND} + >=dev-qt/qt5compat-${QTMIN}:6 +" +BDEPEND=">=dev-qt/qttools-${QTMIN}:6[linguist]" diff --git a/kde-frameworks/solid/Manifest b/kde-frameworks/solid/Manifest index e7dc9f36a4a7..67b5e9ebf2be 100644 --- a/kde-frameworks/solid/Manifest +++ b/kde-frameworks/solid/Manifest @@ -1,2 +1,2 @@ -DIST solid-5.96.0.tar.xz 259176 BLAKE2B b466c2c8bf5421bbb4779252c5030be954e8ed5b9e950317244a046ccd878b0e41bf548ee2bede2115191ee86ba5253f7cd131643029ec76c448bd7682536655 SHA512 5a13db666f99aedcf0c893d3fbe0488390fca66605d2aabb30ca07e2d3a0a7e9832c06e3cf7574a25e78bcd6a002d04ac9b8e4de29ad6c5e2e191555896316a3 -DIST solid-5.98.0.tar.xz 259180 BLAKE2B 15527cffc3735b99d9eee12391b603f096f698ca28df105d4717b2eab25ba5f827e7b67dd6d4cdead7f22d277e5765da0f6c79d13e24a6468c9cac02394be209 SHA512 0a291f771cc77ac7e4ed804d619cd2d4638cf505e6c813f2e7e7a4ca6ffc60726939e346fc87053666c1d71e855fa1907712c9f59d235ce8bb2cca3ee730afb6 +DIST solid-5.115.0.tar.xz 306312 BLAKE2B 866476310d2a2b477f01edb5ca2206cebd5c1d5ea7d1907b9c2915b3be2e86a38bab7405af0680d086611cd46fc292da7fc9b9b623bc6573f7a00fb1fc625b2f SHA512 727fe483124edcfbc56aad2f3988c1499b1d100173279a0da3477a12857e0381b845a9efa1d1827ad24a96557d3a2d0ce67b09e53571c37637dbb4aac4dff4d1 +DIST solid-6.1.1.tar.xz 305916 BLAKE2B 7e134f72ba879c1f7fac04a3f638a9ba19dc254da04b3e4ea8a3a73324fef927f2dffd1e393be08cf62417ed5ad42083b822e84190cb094c360ad059778e1bdb SHA512 d30e6426e418791f0cab72fb5ab54ed2d8ff98212959fee5a4e661db2165a0b920f3a1c36ebc518b4659b36640429e31925200946a45999d874424f4756158d5 diff --git a/kde-frameworks/solid/solid-5.96.0.ebuild b/kde-frameworks/solid/solid-5.115.0.ebuild index bd4b4a428e8e..f3d77112cc05 100644 --- a/kde-frameworks/solid/solid-5.96.0.ebuild +++ b/kde-frameworks/solid/solid-5.115.0.ebuild @@ -1,17 +1,16 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -QTMIN=5.15.4 -VIRTUALX_REQUIRED="test" +QTMIN=5.15.9 inherit ecm frameworks.kde.org optfeature DESCRIPTION="Provider for platform independent hardware discovery, abstraction and management" LICENSE="LGPL-2.1+" -KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" -IUSE="ios nls" +KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86" +IUSE="ios" RDEPEND=" >=dev-qt/qtdbus-${QTMIN}:5 @@ -30,9 +29,9 @@ DEPEND="${RDEPEND} test? ( >=dev-qt/qtconcurrent-${QTMIN}:5 ) " BDEPEND=" - sys-devel/bison - sys-devel/flex - nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 ) + app-alternatives/lex + app-alternatives/yacc + >=dev-qt/linguist-tools-${QTMIN}:5 " src_configure() { diff --git a/kde-frameworks/solid/solid-5.98.0.ebuild b/kde-frameworks/solid/solid-6.1.1.ebuild index 6a92d9c81505..deef27fe5a5c 100644 --- a/kde-frameworks/solid/solid-5.98.0.ebuild +++ b/kde-frameworks/solid/solid-6.1.1.ebuild @@ -1,23 +1,20 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -QTMIN=5.15.5 -VIRTUALX_REQUIRED="test" +QTMIN=6.6.2 inherit ecm frameworks.kde.org optfeature DESCRIPTION="Provider for platform independent hardware discovery, abstraction and management" LICENSE="LGPL-2.1+" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" -IUSE="ios nls" +KEYWORDS="~amd64" +IUSE="ios" RDEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtxml-${QTMIN}:5 + >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,xml] + >=dev-qt/qtdeclarative-${QTMIN}:6 sys-apps/util-linux sys-fs/udisks:2 virtual/libudev:= @@ -27,12 +24,12 @@ RDEPEND=" ) " DEPEND="${RDEPEND} - test? ( >=dev-qt/qtconcurrent-${QTMIN}:5 ) + test? ( >=dev-qt/qtbase-${QTMIN}:6[concurrent] ) " BDEPEND=" - sys-devel/bison - sys-devel/flex - nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 ) + app-alternatives/lex + app-alternatives/yacc + >=dev-qt/qttools-${QTMIN}:6[linguist] " src_configure() { diff --git a/kde-frameworks/sonnet/Manifest b/kde-frameworks/sonnet/Manifest index 69508b166c28..fb7a30dfca08 100644 --- a/kde-frameworks/sonnet/Manifest +++ b/kde-frameworks/sonnet/Manifest @@ -1,2 +1,2 @@ -DIST sonnet-5.96.0.tar.xz 308092 BLAKE2B 89c568becffb3a13f7583e6e34e6e2046715f1abf906c9cda60ad8c14723b4b0c0330c25172a233067deea09f4e687d5afb8f357ffd9536adb392275697c4173 SHA512 4625328b255112fd6d727db8e91d47b9fd45ab9b19a754dc6bee0de96a1002a9e812c7de0ddfdb4c146581192f8a36e1a274903d7525b6a0541e6bcf2641f6f9 -DIST sonnet-5.98.0.tar.xz 307848 BLAKE2B aa767ab37b075c8eb4cc78f97ca02b03e920e450a0c544d91726589611f54de6d36e5ac865a461dc8ef71aede17d0ef6d4362c5bbf92da4d3d7d86ff408e3a44 SHA512 165297c8376b812dcef612387b52a883dd0f6df3d3f381fe5b5bade26b3f0375ebd86a2568e2a90ca2b9c8fe632a3cf9d22f50bd61efeb04dcf15e3af3a87bc9 +DIST sonnet-5.115.0.tar.xz 2438396 BLAKE2B f0cd760a8b873502f517836d36904b83b5cde11383264827879048d7f02b2a2f26d9682f7f2b46b4c7c723cb1f35f1be4a221e5d56d87ae5a97f8c2b7489a727 SHA512 ee95bd4be8fb97eb284f9f7f6dedbf4b8eb9d105cc95f0a489c2acbc52b447e138ce70a4dc8aca4ebb8f90f328ab7c87dda4ce66b9026cf303479f1455b55c7c +DIST sonnet-6.1.0.tar.xz 2441692 BLAKE2B f352ddfa548ee4748bb378883ca71de0bf04dd6c562302c2d30a404d2438bb695d9ccdd769add50fd7f2599aab189ef8c343f8a41fe2f29c4a44d059cfbdde27 SHA512 af609e0f978d287073c5ca338ddb221fb8fc3c27a5165bda5f639a3f532f0d02672575287f71be368e0399beac99dc8bdb8f8977df69072e58d8c5f040458635 diff --git a/kde-frameworks/sonnet/sonnet-5.96.0.ebuild b/kde-frameworks/sonnet/sonnet-5.115.0.ebuild index 14436cce08e4..4ab9949af1dc 100644 --- a/kde-frameworks/sonnet/sonnet-5.96.0.ebuild +++ b/kde-frameworks/sonnet/sonnet-5.115.0.ebuild @@ -1,18 +1,17 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 ECM_DESIGNERPLUGIN="true" -QTMIN=5.15.4 -VIRTUALX_REQUIRED="test" +QTMIN=5.15.9 inherit ecm frameworks.kde.org DESCRIPTION="Framework for providing spell-checking through abstraction of popular backends" LICENSE="LGPL-2+ LGPL-2.1+" -KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv x86" -IUSE="aspell +hunspell nls qml" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ppc64 ~riscv x86" +IUSE="aspell +hunspell qml" DEPEND=" >=dev-qt/qtgui-${QTMIN}:5 @@ -22,9 +21,15 @@ DEPEND=" qml? ( >=dev-qt/qtdeclarative-${QTMIN}:5 ) " RDEPEND="${DEPEND}" -BDEPEND=" - nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 ) -" +BDEPEND=">=dev-qt/linguist-tools-${QTMIN}:5" + +CMAKE_SKIP_TESTS=( + # bug 779994 + sonnet-test_autodetect + # bug 680032 + sonnet-test_settings + sonnet-test_highlighter +) src_configure() { local mycmakeargs=( @@ -35,13 +40,3 @@ src_configure() { ecm_src_configure } - -src_test() { - # sonnet-test_settings: bug 680032 - # sonnet-test_autodetect: bug 779994 - local myctestargs=( - -E "(sonnet-test_autodetect|sonnet-test_settings|sonnet-test_highlighter)" - ) - - ecm_src_test -} diff --git a/kde-frameworks/sonnet/sonnet-5.98.0.ebuild b/kde-frameworks/sonnet/sonnet-6.1.0.ebuild index 6a624120445d..59dafac959a3 100644 --- a/kde-frameworks/sonnet/sonnet-5.98.0.ebuild +++ b/kde-frameworks/sonnet/sonnet-6.1.0.ebuild @@ -1,30 +1,34 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 ECM_DESIGNERPLUGIN="true" -QTMIN=5.15.5 -VIRTUALX_REQUIRED="test" +QTMIN=6.6.2 inherit ecm frameworks.kde.org DESCRIPTION="Framework for providing spell-checking through abstraction of popular backends" LICENSE="LGPL-2+ LGPL-2.1+" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" -IUSE="aspell +hunspell nls qml" +KEYWORDS="~amd64" +IUSE="aspell +hunspell qml" DEPEND=" - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 + >=dev-qt/qtbase-${QTMIN}:6[gui,widgets] aspell? ( app-text/aspell ) hunspell? ( app-text/hunspell:= ) - qml? ( >=dev-qt/qtdeclarative-${QTMIN}:5 ) + qml? ( >=dev-qt/qtdeclarative-${QTMIN}:6 ) " RDEPEND="${DEPEND}" -BDEPEND=" - nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 ) -" +BDEPEND=">=dev-qt/qttools-${QTMIN}:6[linguist]" + +CMAKE_SKIP_TESTS=( + # bug 779994 + sonnet-test_autodetect + # bug 680032 + sonnet-test_settings + sonnet-test_highlighter +) src_configure() { local mycmakeargs=( @@ -35,13 +39,3 @@ src_configure() { ecm_src_configure } - -src_test() { - # sonnet-test_settings: bug 680032 - # sonnet-test_autodetect: bug 779994 - local myctestargs=( - -E "(sonnet-test_autodetect|sonnet-test_settings|sonnet-test_highlighter)" - ) - - ecm_src_test -} diff --git a/kde-frameworks/syndication/Manifest b/kde-frameworks/syndication/Manifest index 25effc991cff..338f647e2e36 100644 --- a/kde-frameworks/syndication/Manifest +++ b/kde-frameworks/syndication/Manifest @@ -1,2 +1,2 @@ -DIST syndication-5.96.0.tar.xz 510504 BLAKE2B b59241247a7557a603081bd3685010a1fe724428e3b784517b67e0dfb9fd55bb852e4e4a8d9ef008d1270907a3177c7cd2be9a9481296dc41ad34de4a776aa6c SHA512 2069364750a1be9a3026b5846d37d2c0b75125d66f72c8a7efc76585445b699ac8e8fcbf24dce80fd32787041c513477bb5d7d77647d5254aadb880a2474d902 -DIST syndication-5.98.0.tar.xz 510440 BLAKE2B d883d2ee323c932e30980f434c37ce0d31bfe5ec3581721a6f52d07f1cba6a4b85561b97001456c1a637987376fda56de78ef2c8775aac4695cc9135478f764e SHA512 18a879bbfef722d1abd9ce51f46dc27867b36a6965c563be9c58331101f3aa5a605948587c819408fd62e7ff7fdf5dbd79653cb413cc9ea49206ea44ad6cc32c +DIST syndication-5.115.0.tar.xz 510504 BLAKE2B f8080c800710170fdbb8756502a33d8788f0d23a557be7cffe7ee7cb1b2c903fb8c69537ce5f99344487c72866e3d458890b89e9c8a58142d854d4a2038002fb SHA512 477d50ac097f63ecdfce009a2c52cae58d08213f06c1ae806956c0b6d6d6a4253d9cc77c4ed5e44f39a7d10ff539e24243cbe45f43db3a1720bd83479ff783cd +DIST syndication-6.1.0.tar.xz 569560 BLAKE2B fa29327e96feeeb6ddd46933fd213fcff64ff17a5c02c6f7748ccd56209dfce8f91c984629bdc6d817398a427f71b7eb5892e9f62fc2f9863c65f9574cb67c83 SHA512 40d5e8b40a53ce4e86a48cafc9c1f7a3e92872a366ab381412eb29331126e4e0e89ec76a15c8c4c0be9d2425dd5e1c78f8d9cc36077f169609f245b5b4168e53 diff --git a/kde-frameworks/syndication/syndication-5.98.0.ebuild b/kde-frameworks/syndication/syndication-5.115.0.ebuild index 156b1f11eb33..ca33c20c9b63 100644 --- a/kde-frameworks/syndication/syndication-5.98.0.ebuild +++ b/kde-frameworks/syndication/syndication-5.115.0.ebuild @@ -1,17 +1,17 @@ -# 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="true" PVCUT=$(ver_cut 1-2) -QTMIN=5.15.5 +QTMIN=5.15.9 inherit ecm frameworks.kde.org DESCRIPTION="Library for parsing RSS and Atom feeds" LICENSE="LGPL-2+" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" IUSE="" RDEPEND=" diff --git a/kde-frameworks/syndication/syndication-5.96.0.ebuild b/kde-frameworks/syndication/syndication-6.1.0.ebuild index d5374efbdbaf..eec507e0f8a0 100644 --- a/kde-frameworks/syndication/syndication-5.96.0.ebuild +++ b/kde-frameworks/syndication/syndication-6.1.0.ebuild @@ -1,23 +1,23 @@ -# 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="true" PVCUT=$(ver_cut 1-2) -QTMIN=5.15.4 +QTMIN=6.6.2 inherit ecm frameworks.kde.org DESCRIPTION="Library for parsing RSS and Atom feeds" LICENSE="LGPL-2+" -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" +KEYWORDS="~amd64" IUSE="" RDEPEND=" - >=dev-qt/qtxml-${QTMIN}:5 - =kde-frameworks/kcodecs-${PVCUT}*:5 + >=dev-qt/qtbase-${QTMIN}:6[xml] + =kde-frameworks/kcodecs-${PVCUT}*:6 " DEPEND="${RDEPEND} - test? ( >=dev-qt/qtnetwork-${QTMIN}:5 ) + test? ( >=dev-qt/qtbase-${QTMIN}:6[network] ) " diff --git a/kde-frameworks/syntax-highlighting/Manifest b/kde-frameworks/syntax-highlighting/Manifest index 4cdef1cfb6f3..5c07fb7c5b76 100644 --- a/kde-frameworks/syntax-highlighting/Manifest +++ b/kde-frameworks/syntax-highlighting/Manifest @@ -1,2 +1,2 @@ -DIST syntax-highlighting-5.96.0.tar.xz 2399612 BLAKE2B c9549fff056c582fb72461483ee90ff5e1f44cdeeb586a288aee5dabb3f60ebebbc64e33cf9557043fa42cf5f6afeec9c143560868517945b7d19532594fd729 SHA512 55412c64d151ad72264547822c478c9882d1e8f397b621d2d2f976df4a9703fdb99cbc1d2fe749cf87df456c0e4359e4c9a9e53f464d677ae1b28c683f2707ec -DIST syntax-highlighting-5.98.0.tar.xz 2443264 BLAKE2B d4e49a180d928b8929c1f1716f32deacd9b2769aa58643860ac468dd9c175ec2673dc917c1bb8efd07f51e4734401a8367de987cbbcbad1e13109e6b1220d37e SHA512 7e5ec4e184abedb69c6e31f68cd717ecce2ec0cd5f4b3974bb83426775161951ba346c711da15b15eb3bf2b1b0651954e02de12b8c27f21b7a15f7fae98cb06a +DIST syntax-highlighting-5.115.0.tar.xz 3432708 BLAKE2B 3ecfda27588509e5b791f3a78806c6fc3d898807157edef9e574c73f26069b1d92093d8c760da785cc9d769504a13f261c340fa4829857f37e158ade81a96dee SHA512 6a25a6c3be6258e956663065864ec177d05d91c817e79922ba599e45d4738813746a7c751c5043135d2c7255d341a60a6152e1d02ad90136e00a97ecb2ecd479 +DIST syntax-highlighting-6.1.0.tar.xz 3533272 BLAKE2B c88fdd05a966c6990ea752dfbd8200191b798145695d11ce223bc6ac36e5b5160844d7cd959ec886a4b9e8c383f18016d2dacc3d24dec33a85dcfcafb67bcfb2 SHA512 1aebf4507461aca80f5248cbce3311ca5a000b0d5e1f214ca877fd184a9380ac7646fab999901e230717a90047c90a66e8eedb35c224883474e20554b6931690 diff --git a/kde-frameworks/syntax-highlighting/files/syntax-highlighting-5.115.0-fix-tests.patch b/kde-frameworks/syntax-highlighting/files/syntax-highlighting-5.115.0-fix-tests.patch new file mode 100644 index 000000000000..8ab49e752f2a --- /dev/null +++ b/kde-frameworks/syntax-highlighting/files/syntax-highlighting-5.115.0-fix-tests.patch @@ -0,0 +1,85 @@ +From aaede4eff4f9aa160be767c7b1aee0cf27cbb0e8 Mon Sep 17 00:00:00 2001 +From: Christoph Cullmann <cullmann@kde.org> +Date: Sun, 3 Mar 2024 18:01:38 +0100 +Subject: [PATCH] use (?:sub){0,2} to work with all pcre versions + +--- + autotests/html/highlight.ly.dark.html | 2 +- + autotests/html/highlight.ly.html | 2 +- + autotests/reference/highlight.ly.ref | 2 +- + data/syntax/lilypond.xml | 6 +++--- + 4 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/autotests/html/highlight.ly.dark.html b/autotests/html/highlight.ly.dark.html +index 8a8466174..441a16839 100644 +--- a/autotests/html/highlight.ly.dark.html ++++ b/autotests/html/highlight.ly.dark.html +@@ -15,7 +15,7 @@ + <span style="color:#7a7c7d;">%}</span> + + <span style="font-weight:bold;">\header {</span> +- title = <span style="color:#f44f4f;">"Katepart Lilypond syntax highlighting test file"</span> ++ <span style="color:#2980b9;">title</span> = <span style="color:#f44f4f;">"Katepart Lilypond syntax highlighting test file"</span> + <span style="color:#2980b9;">composer</span> = <span style="color:#7a7c7d;">%{"Wilbert Berendsen"%}</span> <span style="color:#f44f4f;">"Anonymus"</span> + <span style="color:#2980b9;">poet</span> = <span style="color:#f44f4f;">"The KDE team"</span> + <span style="color:#2980b9;">opus</span> = <span style="color:#f44f4f;">"1"</span> +diff --git a/autotests/html/highlight.ly.html b/autotests/html/highlight.ly.html +index 8bc714646..1081ed38c 100644 +--- a/autotests/html/highlight.ly.html ++++ b/autotests/html/highlight.ly.html +@@ -15,7 +15,7 @@ + <span style="color:#898887;">%}</span> + + <span style="font-weight:bold;">\header {</span> +- title = <span style="color:#bf0303;">"Katepart Lilypond syntax highlighting test file"</span> ++ <span style="color:#0057ae;">title</span> = <span style="color:#bf0303;">"Katepart Lilypond syntax highlighting test file"</span> + <span style="color:#0057ae;">composer</span> = <span style="color:#898887;">%{"Wilbert Berendsen"%}</span> <span style="color:#bf0303;">"Anonymus"</span> + <span style="color:#0057ae;">poet</span> = <span style="color:#bf0303;">"The KDE team"</span> + <span style="color:#0057ae;">opus</span> = <span style="color:#bf0303;">"1"</span> +diff --git a/autotests/reference/highlight.ly.ref b/autotests/reference/highlight.ly.ref +index f11654d43..9b7afdb3c 100644 +--- a/autotests/reference/highlight.ly.ref ++++ b/autotests/reference/highlight.ly.ref +@@ -9,7 +9,7 @@ + <Comment>%}</Comment><br/> + <Normal Text></Normal Text><br/> + <Keyword>\header {</Keyword><br/> +-<Normal Text> title = </Normal Text><Quoted Text>"Katepart Lilypond syntax highlighting test file"</Quoted Text><br/> ++<Normal Text> </Normal Text><Variable>title</Variable><Normal Text> = </Normal Text><Quoted Text>"Katepart Lilypond syntax highlighting test file"</Quoted Text><br/> + <Normal Text> </Normal Text><Variable>composer</Variable><Normal Text> = </Normal Text><Comment>%{"Wilbert Berendsen"%}</Comment><Normal Text> </Normal Text><Quoted Text>"Anonymus"</Quoted Text><br/> + <Normal Text> </Normal Text><Variable>poet</Variable><Normal Text> = </Normal Text><Quoted Text>"The KDE team"</Quoted Text><br/> + <Normal Text> </Normal Text><Variable>opus</Variable><Normal Text> = </Normal Text><Quoted Text>"1"</Quoted Text><br/> +diff --git a/data/syntax/lilypond.xml b/data/syntax/lilypond.xml +index 58a4459db..1894d4063 100644 +--- a/data/syntax/lilypond.xml ++++ b/data/syntax/lilypond.xml +@@ -23,7 +23,7 @@ + <!ENTITY markupnotextargs "arrow-head|beam|char|(semi|sesqui|double)?(flat|sharp)|draw-(circle|line)|epsfile|eyeglasses|filled-box|fret-diagram(-terse|-verbose)?|fromproperty|harp-pedal|(justify|wordwrap)-(field|string)|left-brace|lookup|markalphabet|markletter|musicglyph|natural|note-by-number|note|null|path|right-brace|simple|(back)?slashed-digit|stencil|strut|tied-lyric|triangle|verbatim-file"> + <!ENTITY markupwithtextargs "markup|bold|(rounded-)?box|bracket|caps|(center|general|left|right)-align|circle|((center|dir|left|right)-)?column|combine|concat|dynamic|fill-line|finger|fontCaps|(abs-)?fontsize|fraction|halign|hbracket|hcenter-in|hcenter|hspace|huge|italic|justify|larger?|line|lower|magnify|medium|normal-size-(sub|super)|normal-text|normalsize|number|on-the-fly|override|pad-(around|markup|to-box|x)|page-ref|postscript|put-adjacent|raise|roman|rotate|sans|small(er)?|smallCaps|sub|super|teeny|text|tiny|translate(-scaled)?|transparent|typewriter|underline|upright|vcenter|whiteout|with-(color|dimensions|url)|wordwrap|(markup|column-|justified-|override-|wordwrap-)lines|wordwrap-(string-)?internal"> + <!ENTITY deprecatedmarkup "bigger|h?center"> +- <!ENTITY headervars "dedication|(sub){,2}title|poet|composer|meter|opus|arranger|instrument|piece|breakbefore|copyright|tagline|mutopia(title|composer|poet|opus|instrument)|date|enteredby|source|style|maintainer(Email|Web)?|moreInfo|lastupdated|texidoc|footer"> ++ <!ENTITY headervars "dedication|(?:sub){0,2}title|poet|composer|meter|opus|arranger|instrument|piece|breakbefore|copyright|tagline|mutopia(title|composer|poet|opus|instrument)|date|enteredby|source|style|maintainer(Email|Web)?|moreInfo|lastupdated|texidoc|footer"> + + <!-- The '-new' entities are for for LilyPond 2.13.4 and higher, and '-old' for LilyPond up to 2.12 --> + <!ENTITY paper-margin "(top|bottom|left|right)-margin|(foot|head)-separation|indent|short-indent|paper-(height|width)|horizontal-shift|line-width"> +@@ -56,7 +56,7 @@ + ]> + <language name="LilyPond" section="Other" + style="lilypond" indenter="lilypond" +- version="10" kateversion="5.0" ++ version="11" kateversion="5.0" + extensions="*.ly;*.LY;*.ily;*.ILY;*.lyi;*.LYI" + mimetype="text/x-lilypond" + author="Wilbert Berendsen (info@wilbertberendsen.nl)" license="LGPL"> +@@ -1076,7 +1076,7 @@ + <RegExpr String="("?)\b(?:&engravers00;|&engravers01;|&engravers02;|&engravers1;|&engravers2;)\b\1" attribute="Engraver"/> + <keyword String="layoutobjects" attribute="Layout Object"/> + <keyword String="properties" attribute="Property"/> +- <RegExpr String="\b(&headervars;|&papervars;|&layoutvars;)\b" attribute="Variable"/> ++ <RegExpr String="\b(?:&headervars;|&papervars;|&layoutvars;)\b" attribute="Variable"/> + <keyword String="deprecatedproperties" attribute="Deprecated Property"/> + <IncludeRules context="default"/> + </context> +-- +GitLab + diff --git a/kde-frameworks/syntax-highlighting/syntax-highlighting-5.96.0.ebuild b/kde-frameworks/syntax-highlighting/syntax-highlighting-5.115.0-r1.ebuild index e5bfdbe84d1b..93a2dfd1f115 100644 --- a/kde-frameworks/syntax-highlighting/syntax-highlighting-5.96.0.ebuild +++ b/kde-frameworks/syntax-highlighting/syntax-highlighting-5.115.0-r1.ebuild @@ -1,30 +1,28 @@ -# 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" -QTMIN=5.15.4 +QTMIN=5.15.9 inherit ecm frameworks.kde.org DESCRIPTION="Framework for syntax highlighting" + LICENSE="MIT" KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" -IUSE="nls" +IUSE="" -DEPEND=" +RDEPEND=" >=dev-qt/qtdeclarative-${QTMIN}:5 >=dev-qt/qtgui-${QTMIN}:5 >=dev-qt/qtnetwork-${QTMIN}:5 - >=dev-qt/qtxmlpatterns-${QTMIN}:5 " -RDEPEND="${DEPEND}" +DEPEND="${RDEPEND} + >=dev-qt/qtxmlpatterns-${QTMIN}:5" BDEPEND=" dev-lang/perl - nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 ) + >=dev-qt/linguist-tools-${QTMIN}:5 " -src_install() { - ecm_src_install - dobin "${BUILD_DIR}"/bin/katehighlightingindexer -} +PATCHES=( "${FILESDIR}/${P}-fix-tests.patch" ) # bug 924756 diff --git a/kde-frameworks/syntax-highlighting/syntax-highlighting-5.98.0.ebuild b/kde-frameworks/syntax-highlighting/syntax-highlighting-5.98.0.ebuild deleted file mode 100644 index 1cb111a4cf42..000000000000 --- a/kde-frameworks/syntax-highlighting/syntax-highlighting-5.98.0.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 - -ECM_TEST="forceoptional" -QTMIN=5.15.5 -inherit ecm frameworks.kde.org - -DESCRIPTION="Framework for syntax highlighting" -LICENSE="MIT" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" -IUSE="nls" - -DEPEND=" - >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtnetwork-${QTMIN}:5 - >=dev-qt/qtxmlpatterns-${QTMIN}:5 -" -RDEPEND="${DEPEND}" -BDEPEND=" - dev-lang/perl - nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 ) -" - -src_install() { - ecm_src_install - dobin "${BUILD_DIR}"/bin/katehighlightingindexer -} diff --git a/kde-frameworks/syntax-highlighting/syntax-highlighting-6.1.0.ebuild b/kde-frameworks/syntax-highlighting/syntax-highlighting-6.1.0.ebuild new file mode 100644 index 000000000000..059677d77655 --- /dev/null +++ b/kde-frameworks/syntax-highlighting/syntax-highlighting-6.1.0.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_TEST="forceoptional" +QTMIN=6.6.2 +inherit ecm frameworks.kde.org + +DESCRIPTION="Framework for syntax highlighting" + +LICENSE="MIT" +KEYWORDS="~amd64" +IUSE="" + +# examples: dev-qt/qtbase[printsupport,widgets] +RDEPEND=" + >=dev-qt/qtbase-${QTMIN}:6[gui,network] + >=dev-qt/qtdeclarative-${QTMIN}:6 +" +DEPEND="${RDEPEND} + dev-libs/xerces-c +" +BDEPEND=" + dev-lang/perl + >=dev-qt/qttools-${QTMIN}:6[linguist] +" diff --git a/kde-frameworks/threadweaver/Manifest b/kde-frameworks/threadweaver/Manifest index e60ffeb435d0..ab0612c3ca98 100644 --- a/kde-frameworks/threadweaver/Manifest +++ b/kde-frameworks/threadweaver/Manifest @@ -1,2 +1,2 @@ -DIST threadweaver-5.96.0.tar.xz 1413012 BLAKE2B 04637969c0a6b24211c98e62e5eef38273af4058c4da621494ec028efedb4c9f1d569eb7160360618d10745aeb340c254d85bf059e6b99f54f18700cdcfd6a15 SHA512 151169abff000a32b02028e0c5a96aa926875cf63023cf34d1b0253d456361b94e30284c5c3c7460c851a5e5bb59f34d91a7c154f089cc2721e0551fe87e7bdd -DIST threadweaver-5.98.0.tar.xz 1413012 BLAKE2B fb9b297394433a59e1259c2a7e294b732e93848868bdd6dbbe57a589614f6d43eefec2350263356665727a6df3446cc3ca15dba1c025566c2b18ab075e8f1289 SHA512 7ddef1bd50ba45b10f92ebe52a6206ad2c18de17d6eff83a9e5021395a64aa68c4e553c8f18e2737a2da25c1b6efd1736dd95b2a71c6d2ba0408a5bd25082123 +DIST threadweaver-5.115.0.tar.xz 1413108 BLAKE2B 39a26c4e7fcf1350afb3c773cbf9bda02179eb3eb79857d8783830c4903a2539a27923302d6f0d52143c70e2d5ea5a7d0286567e01747ad489654a9a9f38a06e SHA512 4c7fa0fe4d04269bfabebab0cab1636e237005046b6c88e27f7dcb0bf8dc6b96d62254748e97177ae9b9a7ec69756130429280e09c64db8cb7f851d997b55240 +DIST threadweaver-6.1.0.tar.xz 1414960 BLAKE2B c0233d9d51ce20509bdea187c77d3da00885f3404579898d9c62422af370df186fb140e69b38b29c7bdbf477276cd1c9d7d1c640441d49440ee1bac8020c41b1 SHA512 ebbc7c83caa9bbd369ca0c8a7c807291f60b78fa1a7b4bcd1aa2bc2e5f8d1714f73b564b5ca511e430d8b594675ae2fe71032b6ceb62426f18cac85e94380b60 diff --git a/kde-frameworks/threadweaver/threadweaver-5.96.0.ebuild b/kde-frameworks/threadweaver/threadweaver-5.115.0.ebuild index 1fae8b827a6b..babc8b629360 100644 --- a/kde-frameworks/threadweaver/threadweaver-5.96.0.ebuild +++ b/kde-frameworks/threadweaver/threadweaver-5.115.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 diff --git a/kde-frameworks/threadweaver/threadweaver-5.98.0.ebuild b/kde-frameworks/threadweaver/threadweaver-6.1.0.ebuild index 5a02e553b261..5339424c365c 100644 --- a/kde-frameworks/threadweaver/threadweaver-5.98.0.ebuild +++ b/kde-frameworks/threadweaver/threadweaver-6.1.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -6,8 +6,9 @@ EAPI=8 inherit ecm frameworks.kde.org DESCRIPTION="Framework for managing threads using job and queue-based interfaces" + LICENSE="LGPL-2+" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" +KEYWORDS="~amd64" IUSE="" src_prepare() { |