summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'kde-frameworks')
-rw-r--r--kde-frameworks/attica/Manifest4
-rw-r--r--kde-frameworks/attica/attica-5.92.0.ebuild (renamed from kde-frameworks/attica/attica-5.85.0.ebuild)2
-rw-r--r--kde-frameworks/attica/attica-5.94.0.ebuild (renamed from kde-frameworks/attica/attica-5.88.0.ebuild)4
-rw-r--r--kde-frameworks/baloo/Manifest4
-rw-r--r--kde-frameworks/baloo/baloo-5.92.0.ebuild (renamed from kde-frameworks/baloo/baloo-5.85.0.ebuild)2
-rw-r--r--kde-frameworks/baloo/baloo-5.94.0.ebuild (renamed from kde-frameworks/baloo/baloo-5.88.0.ebuild)4
-rw-r--r--kde-frameworks/bluez-qt/Manifest4
-rw-r--r--kde-frameworks/bluez-qt/bluez-qt-5.92.0.ebuild (renamed from kde-frameworks/bluez-qt/bluez-qt-5.85.0.ebuild)2
-rw-r--r--kde-frameworks/bluez-qt/bluez-qt-5.94.0.ebuild (renamed from kde-frameworks/bluez-qt/bluez-qt-5.88.0.ebuild)4
-rw-r--r--kde-frameworks/breeze-icons-rcc/Manifest4
-rw-r--r--kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.92.0.ebuild (renamed from kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.85.0.ebuild)4
-rw-r--r--kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.94.0.ebuild (renamed from kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.88.0.ebuild)4
-rw-r--r--kde-frameworks/breeze-icons/Manifest4
-rw-r--r--kde-frameworks/breeze-icons/breeze-icons-5.92.0.ebuild (renamed from kde-frameworks/breeze-icons/breeze-icons-5.85.0.ebuild)9
-rw-r--r--kde-frameworks/breeze-icons/breeze-icons-5.94.0.ebuild (renamed from kde-frameworks/breeze-icons/breeze-icons-5.88.0.ebuild)2
-rw-r--r--kde-frameworks/countryflags/Manifest2
-rw-r--r--kde-frameworks/countryflags/countryflags-5.92.0.ebuild22
-rw-r--r--kde-frameworks/countryflags/countryflags-5.94.0.ebuild22
-rw-r--r--kde-frameworks/countryflags/files/countryflags-5.90.0-standalone.patch31
-rw-r--r--kde-frameworks/countryflags/metadata.xml16
-rw-r--r--kde-frameworks/extra-cmake-modules/Manifest4
-rw-r--r--kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.92.0.ebuild (renamed from kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.85.0.ebuild)4
-rw-r--r--kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.94.0.ebuild (renamed from kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.88.0.ebuild)10
-rw-r--r--kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.91.0-disable-qmlplugindump.patch (renamed from kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.88.0-disable-qmlplugindump.patch)55
-rw-r--r--kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.93.0-disable-qmlplugindump.patch (renamed from kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.74.0-disable-qmlplugindump.patch)55
-rw-r--r--kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.93.0-skip-ecm_add_test-early.patch58
-rw-r--r--kde-frameworks/frameworkintegration/Manifest4
-rw-r--r--kde-frameworks/frameworkintegration/frameworkintegration-5.92.0.ebuild (renamed from kde-frameworks/frameworkintegration/frameworkintegration-5.85.0.ebuild)2
-rw-r--r--kde-frameworks/frameworkintegration/frameworkintegration-5.94.0.ebuild (renamed from kde-frameworks/frameworkintegration/frameworkintegration-5.88.0.ebuild)4
-rw-r--r--kde-frameworks/kactivities-stats/Manifest4
-rw-r--r--kde-frameworks/kactivities-stats/kactivities-stats-5.92.0.ebuild (renamed from kde-frameworks/kactivities-stats/kactivities-stats-5.85.0.ebuild)4
-rw-r--r--kde-frameworks/kactivities-stats/kactivities-stats-5.94.0.ebuild (renamed from kde-frameworks/kactivities-stats/kactivities-stats-5.88.0.ebuild)6
-rw-r--r--kde-frameworks/kactivities/Manifest4
-rw-r--r--kde-frameworks/kactivities/kactivities-5.92.0.ebuild (renamed from kde-frameworks/kactivities/kactivities-5.85.0.ebuild)2
-rw-r--r--kde-frameworks/kactivities/kactivities-5.94.0.ebuild (renamed from kde-frameworks/kactivities/kactivities-5.88.0.ebuild)4
-rw-r--r--kde-frameworks/kapidox/Manifest4
-rw-r--r--kde-frameworks/kapidox/kapidox-5.92.0.ebuild (renamed from kde-frameworks/kapidox/kapidox-5.85.0.ebuild)4
-rw-r--r--kde-frameworks/kapidox/kapidox-5.94.0.ebuild (renamed from kde-frameworks/kapidox/kapidox-5.88.0.ebuild)4
-rw-r--r--kde-frameworks/karchive/Manifest4
-rw-r--r--kde-frameworks/karchive/karchive-5.92.0.ebuild (renamed from kde-frameworks/karchive/karchive-5.85.0.ebuild)2
-rw-r--r--kde-frameworks/karchive/karchive-5.94.0.ebuild (renamed from kde-frameworks/karchive/karchive-5.88.0.ebuild)2
-rw-r--r--kde-frameworks/kauth/Manifest4
-rw-r--r--kde-frameworks/kauth/kauth-5.92.0.ebuild (renamed from kde-frameworks/kauth/kauth-5.85.0.ebuild)3
-rw-r--r--kde-frameworks/kauth/kauth-5.94.0.ebuild (renamed from kde-frameworks/kauth/kauth-5.88.0.ebuild)5
-rw-r--r--kde-frameworks/kbookmarks/Manifest4
-rw-r--r--kde-frameworks/kbookmarks/kbookmarks-5.92.0.ebuild (renamed from kde-frameworks/kbookmarks/kbookmarks-5.85.0.ebuild)2
-rw-r--r--kde-frameworks/kbookmarks/kbookmarks-5.94.0.ebuild (renamed from kde-frameworks/kbookmarks/kbookmarks-5.88.0.ebuild)4
-rw-r--r--kde-frameworks/kcalendarcore/Manifest4
-rw-r--r--kde-frameworks/kcalendarcore/kcalendarcore-5.92.0.ebuild (renamed from kde-frameworks/kcalendarcore/kcalendarcore-5.85.0.ebuild)10
-rw-r--r--kde-frameworks/kcalendarcore/kcalendarcore-5.94.0.ebuild (renamed from kde-frameworks/kcalendarcore/kcalendarcore-5.88.0.ebuild)12
-rw-r--r--kde-frameworks/kcmutils/Manifest4
-rw-r--r--kde-frameworks/kcmutils/files/kcmutils-5.92.0-KDEBUG-444378.patch52
-rw-r--r--kde-frameworks/kcmutils/kcmutils-5.92.0-r1.ebuild (renamed from kde-frameworks/kcmutils/kcmutils-5.85.0.ebuild)4
-rw-r--r--kde-frameworks/kcmutils/kcmutils-5.94.0.ebuild (renamed from kde-frameworks/kcmutils/kcmutils-5.88.0.ebuild)4
-rw-r--r--kde-frameworks/kcodecs/Manifest4
-rw-r--r--kde-frameworks/kcodecs/kcodecs-5.92.0.ebuild (renamed from kde-frameworks/kcodecs/kcodecs-5.85.0.ebuild)9
-rw-r--r--kde-frameworks/kcodecs/kcodecs-5.94.0.ebuild (renamed from kde-frameworks/kcodecs/kcodecs-5.88.0.ebuild)11
-rw-r--r--kde-frameworks/kcompletion/Manifest4
-rw-r--r--kde-frameworks/kcompletion/kcompletion-5.92.0.ebuild (renamed from kde-frameworks/kcompletion/kcompletion-5.85.0.ebuild)14
-rw-r--r--kde-frameworks/kcompletion/kcompletion-5.94.0.ebuild (renamed from kde-frameworks/kcompletion/kcompletion-5.88.0.ebuild)16
-rw-r--r--kde-frameworks/kconfig/Manifest4
-rw-r--r--kde-frameworks/kconfig/kconfig-5.92.0.ebuild (renamed from kde-frameworks/kconfig/kconfig-5.85.0.ebuild)14
-rw-r--r--kde-frameworks/kconfig/kconfig-5.94.0.ebuild (renamed from kde-frameworks/kconfig/kconfig-5.88.0.ebuild)16
-rw-r--r--kde-frameworks/kconfig/metadata.xml3
-rw-r--r--kde-frameworks/kconfigwidgets/Manifest4
-rw-r--r--kde-frameworks/kconfigwidgets/files/kconfigwidgets-5.88.0-KCommandBar-alignment.patch494
-rw-r--r--kde-frameworks/kconfigwidgets/files/kconfigwidgets-5.88.0-hamburger-menu-no-window-on-wayland.patch87
-rw-r--r--kde-frameworks/kconfigwidgets/files/kconfigwidgets-5.92.0-khamburgermenu-ensure-polished.patch32
-rw-r--r--kde-frameworks/kconfigwidgets/kconfigwidgets-5.92.0-r1.ebuild (renamed from kde-frameworks/kconfigwidgets/kconfigwidgets-5.85.0.ebuild)10
-rw-r--r--kde-frameworks/kconfigwidgets/kconfigwidgets-5.94.0.ebuild (renamed from kde-frameworks/kconfigwidgets/kconfigwidgets-5.88.0-r1.ebuild)15
-rw-r--r--kde-frameworks/kcontacts/Manifest4
-rw-r--r--kde-frameworks/kcontacts/kcontacts-5.92.0.ebuild (renamed from kde-frameworks/kcontacts/kcontacts-5.85.0.ebuild)13
-rw-r--r--kde-frameworks/kcontacts/kcontacts-5.94.0.ebuild (renamed from kde-frameworks/kcontacts/kcontacts-5.88.0.ebuild)14
-rw-r--r--kde-frameworks/kcoreaddons/Manifest4
-rw-r--r--kde-frameworks/kcoreaddons/kcoreaddons-5.92.0.ebuild (renamed from kde-frameworks/kcoreaddons/kcoreaddons-5.85.0.ebuild)14
-rw-r--r--kde-frameworks/kcoreaddons/kcoreaddons-5.94.0.ebuild (renamed from kde-frameworks/kcoreaddons/kcoreaddons-5.88.0.ebuild)16
-rw-r--r--kde-frameworks/kcrash/Manifest4
-rw-r--r--kde-frameworks/kcrash/kcrash-5.92.0.ebuild (renamed from kde-frameworks/kcrash/kcrash-5.85.0.ebuild)27
-rw-r--r--kde-frameworks/kcrash/kcrash-5.94.0.ebuild (renamed from kde-frameworks/kcrash/kcrash-5.88.0.ebuild)4
-rw-r--r--kde-frameworks/kdav/Manifest4
-rw-r--r--kde-frameworks/kdav/kdav-5.92.0.ebuild (renamed from kde-frameworks/kdav/kdav-5.85.0.ebuild)5
-rw-r--r--kde-frameworks/kdav/kdav-5.94.0.ebuild (renamed from kde-frameworks/kdav/kdav-5.88.0.ebuild)7
-rw-r--r--kde-frameworks/kdbusaddons/Manifest4
-rw-r--r--kde-frameworks/kdbusaddons/kdbusaddons-5.92.0.ebuild (renamed from kde-frameworks/kdbusaddons/kdbusaddons-5.85.0.ebuild)3
-rw-r--r--kde-frameworks/kdbusaddons/kdbusaddons-5.94.0.ebuild (renamed from kde-frameworks/kdbusaddons/kdbusaddons-5.88.0.ebuild)5
-rw-r--r--kde-frameworks/kdeclarative/Manifest4
-rw-r--r--kde-frameworks/kdeclarative/files/kdeclarative-5.88.0-KeySequenceItem-record-on-correct-window.patch36
-rw-r--r--kde-frameworks/kdeclarative/kdeclarative-5.92.0.ebuild (renamed from kde-frameworks/kdeclarative/kdeclarative-5.85.0.ebuild)2
-rw-r--r--kde-frameworks/kdeclarative/kdeclarative-5.94.0.ebuild (renamed from kde-frameworks/kdeclarative/kdeclarative-5.88.0-r1.ebuild)8
-rw-r--r--kde-frameworks/kded/Manifest4
-rw-r--r--kde-frameworks/kded/kded-5.92.0.ebuild (renamed from kde-frameworks/kded/kded-5.85.0.ebuild)2
-rw-r--r--kde-frameworks/kded/kded-5.94.0.ebuild (renamed from kde-frameworks/kded/kded-5.88.0.ebuild)4
-rw-r--r--kde-frameworks/kdelibs4support/Manifest4
-rw-r--r--kde-frameworks/kdelibs4support/files/kdelibs4support-5.82.0-unused-dep.patch51
-rw-r--r--kde-frameworks/kdelibs4support/kdelibs4support-5.92.0.ebuild (renamed from kde-frameworks/kdelibs4support/kdelibs4support-5.85.0.ebuild)22
-rw-r--r--kde-frameworks/kdelibs4support/kdelibs4support-5.94.0.ebuild (renamed from kde-frameworks/kdelibs4support/kdelibs4support-5.88.0.ebuild)8
-rw-r--r--kde-frameworks/kdesu/Manifest4
-rw-r--r--kde-frameworks/kdesu/kdesu-5.92.0.ebuild (renamed from kde-frameworks/kdesu/kdesu-5.85.0.ebuild)4
-rw-r--r--kde-frameworks/kdesu/kdesu-5.94.0.ebuild (renamed from kde-frameworks/kdesu/kdesu-5.88.0.ebuild)4
-rw-r--r--kde-frameworks/kdnssd/Manifest4
-rw-r--r--kde-frameworks/kdnssd/kdnssd-5.92.0.ebuild (renamed from kde-frameworks/kdnssd/kdnssd-5.85.0.ebuild)4
-rw-r--r--kde-frameworks/kdnssd/kdnssd-5.94.0.ebuild (renamed from kde-frameworks/kdnssd/kdnssd-5.88.0.ebuild)6
-rw-r--r--kde-frameworks/kdoctools/Manifest4
-rw-r--r--kde-frameworks/kdoctools/kdoctools-5.92.0.ebuild (renamed from kde-frameworks/kdoctools/kdoctools-5.85.0.ebuild)2
-rw-r--r--kde-frameworks/kdoctools/kdoctools-5.94.0.ebuild (renamed from kde-frameworks/kdoctools/kdoctools-5.88.0.ebuild)2
-rw-r--r--kde-frameworks/kemoticons/Manifest4
-rw-r--r--kde-frameworks/kemoticons/kemoticons-5.92.0.ebuild (renamed from kde-frameworks/kemoticons/kemoticons-5.85.0.ebuild)2
-rw-r--r--kde-frameworks/kemoticons/kemoticons-5.94.0.ebuild (renamed from kde-frameworks/kemoticons/kemoticons-5.88.0.ebuild)4
-rw-r--r--kde-frameworks/kfilemetadata/Manifest4
-rw-r--r--kde-frameworks/kfilemetadata/kfilemetadata-5.92.0.ebuild (renamed from kde-frameworks/kfilemetadata/kfilemetadata-5.85.0.ebuild)6
-rw-r--r--kde-frameworks/kfilemetadata/kfilemetadata-5.94.0.ebuild (renamed from kde-frameworks/kfilemetadata/kfilemetadata-5.88.0.ebuild)8
-rw-r--r--kde-frameworks/kfilemetadata/metadata.xml1
-rw-r--r--kde-frameworks/kglobalaccel/Manifest4
-rw-r--r--kde-frameworks/kglobalaccel/files/kglobalaccel-5.85.0-start-processes-w-kstart5-if-available.patch67
-rw-r--r--kde-frameworks/kglobalaccel/kglobalaccel-5.92.0.ebuild (renamed from kde-frameworks/kglobalaccel/kglobalaccel-5.85.0-r1.ebuild)9
-rw-r--r--kde-frameworks/kglobalaccel/kglobalaccel-5.94.0.ebuild (renamed from kde-frameworks/kglobalaccel/kglobalaccel-5.88.0.ebuild)17
-rw-r--r--kde-frameworks/kguiaddons/Manifest4
-rw-r--r--kde-frameworks/kguiaddons/kguiaddons-5.92.0.ebuild (renamed from kde-frameworks/kguiaddons/kguiaddons-5.88.0.ebuild)7
-rw-r--r--kde-frameworks/kguiaddons/kguiaddons-5.94.0.ebuild (renamed from kde-frameworks/kguiaddons/kguiaddons-5.85.0-r1.ebuild)21
-rw-r--r--kde-frameworks/kholidays/Manifest4
-rw-r--r--kde-frameworks/kholidays/kholidays-5.92.0.ebuild (renamed from kde-frameworks/kholidays/kholidays-5.85.0.ebuild)2
-rw-r--r--kde-frameworks/kholidays/kholidays-5.94.0.ebuild (renamed from kde-frameworks/kholidays/kholidays-5.88.0.ebuild)4
-rw-r--r--kde-frameworks/khtml/Manifest4
-rw-r--r--kde-frameworks/khtml/khtml-5.92.0.ebuild (renamed from kde-frameworks/khtml/khtml-5.85.0.ebuild)2
-rw-r--r--kde-frameworks/khtml/khtml-5.94.0.ebuild (renamed from kde-frameworks/khtml/khtml-5.88.0.ebuild)14
-rw-r--r--kde-frameworks/ki18n/Manifest4
-rw-r--r--kde-frameworks/ki18n/ki18n-5.92.0.ebuild (renamed from kde-frameworks/ki18n/ki18n-5.85.0.ebuild)16
-rw-r--r--kde-frameworks/ki18n/ki18n-5.94.0.ebuild (renamed from kde-frameworks/ki18n/ki18n-5.88.0.ebuild)5
-rw-r--r--kde-frameworks/kiconthemes/Manifest4
-rw-r--r--kde-frameworks/kiconthemes/kiconthemes-5.92.0.ebuild (renamed from kde-frameworks/kiconthemes/kiconthemes-5.85.0.ebuild)2
-rw-r--r--kde-frameworks/kiconthemes/kiconthemes-5.94.0.ebuild (renamed from kde-frameworks/kiconthemes/kiconthemes-5.88.0.ebuild)4
-rw-r--r--kde-frameworks/kidletime/Manifest4
-rw-r--r--kde-frameworks/kidletime/files/kidletime-5.92.0-crashfix.patch41
-rw-r--r--kde-frameworks/kidletime/kidletime-5.92.0-r1.ebuild (renamed from kde-frameworks/kidletime/kidletime-5.85.0.ebuild)4
-rw-r--r--kde-frameworks/kidletime/kidletime-5.94.0.ebuild (renamed from kde-frameworks/kidletime/kidletime-5.88.0.ebuild)4
-rw-r--r--kde-frameworks/kimageformats/Manifest4
-rw-r--r--kde-frameworks/kimageformats/kimageformats-5.92.0-r2.ebuild (renamed from kde-frameworks/kimageformats/kimageformats-5.85.0-r1.ebuild)13
-rw-r--r--kde-frameworks/kimageformats/kimageformats-5.94.0.ebuild (renamed from kde-frameworks/kimageformats/kimageformats-5.88.0.ebuild)13
-rw-r--r--kde-frameworks/kimageformats/metadata.xml1
-rw-r--r--kde-frameworks/kinit/Manifest4
-rw-r--r--kde-frameworks/kinit/kinit-5.92.0.ebuild (renamed from kde-frameworks/kinit/kinit-5.85.0.ebuild)2
-rw-r--r--kde-frameworks/kinit/kinit-5.94.0.ebuild (renamed from kde-frameworks/kinit/kinit-5.88.0.ebuild)4
-rw-r--r--kde-frameworks/kio/Manifest4
-rw-r--r--kde-frameworks/kio/files/kio-5.85.0-KDirOperator-exp-to-url-only-in-detail-treeview.patch54
-rw-r--r--kde-frameworks/kio/files/kio-5.85.0-allow-edit-icons-for-root-owned-desktop-files.patch32
-rw-r--r--kde-frameworks/kio/files/kio-5.85.0-revert-to-pre-libblkid-parsing.patch128
-rw-r--r--kde-frameworks/kio/files/kio-5.88.0-fix-copy-between-filesystems.patch28
-rw-r--r--kde-frameworks/kio/kio-5.85.0-r2.ebuild100
-rw-r--r--kde-frameworks/kio/kio-5.92.0.ebuild (renamed from kde-frameworks/kio/kio-5.85.0-r1.ebuild)8
-rw-r--r--kde-frameworks/kio/kio-5.94.0.ebuild (renamed from kde-frameworks/kio/kio-5.88.0-r1.ebuild)6
-rw-r--r--kde-frameworks/kirigami/Manifest4
-rw-r--r--kde-frameworks/kirigami/files/kirigami-5.88.0-PageRowGlobalToolBarUI-dont-animate-opacity.patch56
-rw-r--r--kde-frameworks/kirigami/files/kirigami-5.92.0-ListItemDragHandle-emit-moveRequest.patch28
-rw-r--r--kde-frameworks/kirigami/kirigami-5.92.0-r1.ebuild (renamed from kde-frameworks/kirigami/kirigami-5.88.0-r1.ebuild)6
-rw-r--r--kde-frameworks/kirigami/kirigami-5.94.0.ebuild (renamed from kde-frameworks/kirigami/kirigami-5.85.0.ebuild)6
-rw-r--r--kde-frameworks/kitemmodels/Manifest4
-rw-r--r--kde-frameworks/kitemmodels/kitemmodels-5.92.0.ebuild (renamed from kde-frameworks/kitemmodels/kitemmodels-5.85.0.ebuild)3
-rw-r--r--kde-frameworks/kitemmodels/kitemmodels-5.94.0.ebuild (renamed from kde-frameworks/kitemmodels/kitemmodels-5.88.0.ebuild)5
-rw-r--r--kde-frameworks/kitemviews/Manifest4
-rw-r--r--kde-frameworks/kitemviews/kitemviews-5.92.0.ebuild (renamed from kde-frameworks/kitemviews/kitemviews-5.85.0.ebuild)14
-rw-r--r--kde-frameworks/kitemviews/kitemviews-5.94.0.ebuild (renamed from kde-frameworks/kitemviews/kitemviews-5.88.0.ebuild)16
-rw-r--r--kde-frameworks/kjobwidgets/Manifest4
-rw-r--r--kde-frameworks/kjobwidgets/kjobwidgets-5.92.0.ebuild (renamed from kde-frameworks/kjobwidgets/kjobwidgets-5.85.0.ebuild)3
-rw-r--r--kde-frameworks/kjobwidgets/kjobwidgets-5.94.0.ebuild (renamed from kde-frameworks/kjobwidgets/kjobwidgets-5.88.0.ebuild)5
-rw-r--r--kde-frameworks/kjs/Manifest4
-rw-r--r--kde-frameworks/kjs/kjs-5.92.0.ebuild (renamed from kde-frameworks/kjs/kjs-5.85.0.ebuild)2
-rw-r--r--kde-frameworks/kjs/kjs-5.94.0.ebuild (renamed from kde-frameworks/kjs/kjs-5.88.0.ebuild)2
-rw-r--r--kde-frameworks/knewstuff/Manifest4
-rw-r--r--kde-frameworks/knewstuff/files/knewstuff-5.92.0-KDEBUG-451165.patch53
-rw-r--r--kde-frameworks/knewstuff/files/knewstuff-5.92.0-fix-valid-tar-recognition.patch27
-rw-r--r--kde-frameworks/knewstuff/knewstuff-5.92.0-r2.ebuild (renamed from kde-frameworks/knewstuff/knewstuff-5.85.0.ebuild)7
-rw-r--r--kde-frameworks/knewstuff/knewstuff-5.94.0.ebuild (renamed from kde-frameworks/knewstuff/knewstuff-5.88.0.ebuild)4
-rw-r--r--kde-frameworks/knotifications/Manifest4
-rw-r--r--kde-frameworks/knotifications/knotifications-5.92.0.ebuild (renamed from kde-frameworks/knotifications/knotifications-5.85.0.ebuild)14
-rw-r--r--kde-frameworks/knotifications/knotifications-5.94.0.ebuild (renamed from kde-frameworks/knotifications/knotifications-5.88.0.ebuild)4
-rw-r--r--kde-frameworks/knotifyconfig/Manifest4
-rw-r--r--kde-frameworks/knotifyconfig/knotifyconfig-5.92.0.ebuild (renamed from kde-frameworks/knotifyconfig/knotifyconfig-5.85.0.ebuild)2
-rw-r--r--kde-frameworks/knotifyconfig/knotifyconfig-5.94.0.ebuild (renamed from kde-frameworks/knotifyconfig/knotifyconfig-5.88.0.ebuild)4
-rw-r--r--kde-frameworks/kpackage/Manifest4
-rw-r--r--kde-frameworks/kpackage/kpackage-5.92.0.ebuild (renamed from kde-frameworks/kpackage/kpackage-5.85.0.ebuild)7
-rw-r--r--kde-frameworks/kpackage/kpackage-5.94.0.ebuild (renamed from kde-frameworks/kpackage/kpackage-5.88.0.ebuild)4
-rw-r--r--kde-frameworks/kparts/Manifest4
-rw-r--r--kde-frameworks/kparts/kparts-5.92.0.ebuild (renamed from kde-frameworks/kparts/kparts-5.85.0.ebuild)2
-rw-r--r--kde-frameworks/kparts/kparts-5.94.0.ebuild (renamed from kde-frameworks/kparts/kparts-5.88.0.ebuild)4
-rw-r--r--kde-frameworks/kpeople/Manifest4
-rw-r--r--kde-frameworks/kpeople/kpeople-5.92.0.ebuild (renamed from kde-frameworks/kpeople/kpeople-5.85.0.ebuild)2
-rw-r--r--kde-frameworks/kpeople/kpeople-5.94.0.ebuild (renamed from kde-frameworks/kpeople/kpeople-5.88.0.ebuild)4
-rw-r--r--kde-frameworks/kplotting/Manifest4
-rw-r--r--kde-frameworks/kplotting/kplotting-5.92.0.ebuild (renamed from kde-frameworks/kplotting/kplotting-5.85.0.ebuild)4
-rw-r--r--kde-frameworks/kplotting/kplotting-5.94.0.ebuild (renamed from kde-frameworks/kplotting/kplotting-5.88.0.ebuild)4
-rw-r--r--kde-frameworks/kpty/Manifest4
-rw-r--r--kde-frameworks/kpty/kpty-5.92.0.ebuild (renamed from kde-frameworks/kpty/kpty-5.85.0.ebuild)2
-rw-r--r--kde-frameworks/kpty/kpty-5.94.0.ebuild (renamed from kde-frameworks/kpty/kpty-5.88.0.ebuild)2
-rw-r--r--kde-frameworks/kquickcharts/Manifest4
-rw-r--r--kde-frameworks/kquickcharts/kquickcharts-5.92.0.ebuild (renamed from kde-frameworks/kquickcharts/kquickcharts-5.85.0.ebuild)2
-rw-r--r--kde-frameworks/kquickcharts/kquickcharts-5.94.0.ebuild (renamed from kde-frameworks/kquickcharts/kquickcharts-5.88.0.ebuild)4
-rw-r--r--kde-frameworks/kross/Manifest4
-rw-r--r--kde-frameworks/kross/kross-5.92.0.ebuild (renamed from kde-frameworks/kross/kross-5.85.0.ebuild)2
-rw-r--r--kde-frameworks/kross/kross-5.94.0.ebuild (renamed from kde-frameworks/kross/kross-5.88.0.ebuild)4
-rw-r--r--kde-frameworks/krunner/Manifest4
-rw-r--r--kde-frameworks/krunner/files/krunner-5.92.0-drop-runnermanagertest-timeouts.patch55
-rw-r--r--kde-frameworks/krunner/files/krunner-5.92.0-increase-runnermanagertest-timeout.patch26
-rw-r--r--kde-frameworks/krunner/krunner-5.92.0.ebuild (renamed from kde-frameworks/krunner/krunner-5.85.0.ebuild)11
-rw-r--r--kde-frameworks/krunner/krunner-5.94.0.ebuild (renamed from kde-frameworks/krunner/krunner-5.88.0.ebuild)4
-rw-r--r--kde-frameworks/kservice/Manifest4
-rw-r--r--kde-frameworks/kservice/kservice-5.92.0.ebuild (renamed from kde-frameworks/kservice/kservice-5.85.0.ebuild)3
-rw-r--r--kde-frameworks/kservice/kservice-5.94.0.ebuild (renamed from kde-frameworks/kservice/kservice-5.88.0.ebuild)4
-rw-r--r--kde-frameworks/ktexteditor/Manifest4
-rw-r--r--kde-frameworks/ktexteditor/files/ktexteditor-5.88.0-revert-invoke-always.patch36
-rw-r--r--kde-frameworks/ktexteditor/files/ktexteditor-5.92.0-fix-crash-w-stale-indexes.patch29
-rw-r--r--kde-frameworks/ktexteditor/files/ktexteditor-5.92.0-fix-toggle-comment.patch112
-rw-r--r--kde-frameworks/ktexteditor/ktexteditor-5.92.0-r1.ebuild (renamed from kde-frameworks/ktexteditor/ktexteditor-5.85.0.ebuild)15
-rw-r--r--kde-frameworks/ktexteditor/ktexteditor-5.94.0.ebuild (renamed from kde-frameworks/ktexteditor/ktexteditor-5.88.0-r1.ebuild)16
-rw-r--r--kde-frameworks/ktextwidgets/Manifest4
-rw-r--r--kde-frameworks/ktextwidgets/ktextwidgets-5.92.0.ebuild (renamed from kde-frameworks/ktextwidgets/ktextwidgets-5.85.0.ebuild)2
-rw-r--r--kde-frameworks/ktextwidgets/ktextwidgets-5.94.0.ebuild (renamed from kde-frameworks/ktextwidgets/ktextwidgets-5.88.0.ebuild)4
-rw-r--r--kde-frameworks/kunitconversion/Manifest4
-rw-r--r--kde-frameworks/kunitconversion/files/kunitconversion-5.85.0-fix-24h-currency-sync.patch91
-rw-r--r--kde-frameworks/kunitconversion/files/kunitconversion-5.85.0-fix-currency-values-init.patch235
-rw-r--r--kde-frameworks/kunitconversion/kunitconversion-5.92.0.ebuild (renamed from kde-frameworks/kunitconversion/kunitconversion-5.85.0-r1.ebuild)7
-rw-r--r--kde-frameworks/kunitconversion/kunitconversion-5.94.0.ebuild (renamed from kde-frameworks/kunitconversion/kunitconversion-5.88.0.ebuild)4
-rw-r--r--kde-frameworks/kwallet/Manifest4
-rw-r--r--kde-frameworks/kwallet/kwallet-5.92.0.ebuild (renamed from kde-frameworks/kwallet/kwallet-5.85.0.ebuild)4
-rw-r--r--kde-frameworks/kwallet/kwallet-5.94.0.ebuild (renamed from kde-frameworks/kwallet/kwallet-5.88.0.ebuild)6
-rw-r--r--kde-frameworks/kwayland/Manifest4
-rw-r--r--kde-frameworks/kwayland/kwayland-5.92.0.ebuild (renamed from kde-frameworks/kwayland/kwayland-5.85.0-r1.ebuild)6
-rw-r--r--kde-frameworks/kwayland/kwayland-5.94.0.ebuild (renamed from kde-frameworks/kwayland/kwayland-5.88.0.ebuild)8
-rw-r--r--kde-frameworks/kwidgetsaddons/Manifest4
-rw-r--r--kde-frameworks/kwidgetsaddons/files/kwidgetsaddons-5.88.0-kacceleratormanager-alt-x-shortcuts.patch149
-rw-r--r--kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.92.0.ebuild (renamed from kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.85.0.ebuild)14
-rw-r--r--kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.94.0.ebuild (renamed from kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.88.0-r1.ebuild)18
-rw-r--r--kde-frameworks/kwindowsystem/Manifest4
-rw-r--r--kde-frameworks/kwindowsystem/kwindowsystem-5.92.0.ebuild (renamed from kde-frameworks/kwindowsystem/kwindowsystem-5.85.0.ebuild)2
-rw-r--r--kde-frameworks/kwindowsystem/kwindowsystem-5.94.0.ebuild (renamed from kde-frameworks/kwindowsystem/kwindowsystem-5.88.0.ebuild)4
-rw-r--r--kde-frameworks/kxmlgui/Manifest4
-rw-r--r--kde-frameworks/kxmlgui/kxmlgui-5.92.0.ebuild (renamed from kde-frameworks/kxmlgui/kxmlgui-5.85.0.ebuild)2
-rw-r--r--kde-frameworks/kxmlgui/kxmlgui-5.94.0.ebuild (renamed from kde-frameworks/kxmlgui/kxmlgui-5.88.0.ebuild)4
-rw-r--r--kde-frameworks/modemmanager-qt/Manifest4
-rw-r--r--kde-frameworks/modemmanager-qt/modemmanager-qt-5.92.0.ebuild (renamed from kde-frameworks/modemmanager-qt/modemmanager-qt-5.85.0.ebuild)2
-rw-r--r--kde-frameworks/modemmanager-qt/modemmanager-qt-5.94.0.ebuild (renamed from kde-frameworks/modemmanager-qt/modemmanager-qt-5.88.0.ebuild)4
-rw-r--r--kde-frameworks/networkmanager-qt/Manifest4
-rw-r--r--kde-frameworks/networkmanager-qt/networkmanager-qt-5.92.0.ebuild (renamed from kde-frameworks/networkmanager-qt/networkmanager-qt-5.85.0.ebuild)10
-rw-r--r--kde-frameworks/networkmanager-qt/networkmanager-qt-5.94.0.ebuild (renamed from kde-frameworks/networkmanager-qt/networkmanager-qt-5.88.0.ebuild)4
-rw-r--r--kde-frameworks/oxygen-icons/Manifest4
-rw-r--r--kde-frameworks/oxygen-icons/oxygen-icons-5.92.0.ebuild (renamed from kde-frameworks/oxygen-icons/oxygen-icons-5.85.0.ebuild)2
-rw-r--r--kde-frameworks/oxygen-icons/oxygen-icons-5.94.0.ebuild (renamed from kde-frameworks/oxygen-icons/oxygen-icons-5.88.0.ebuild)4
-rw-r--r--kde-frameworks/plasma/Manifest4
-rw-r--r--kde-frameworks/plasma/files/plasma-5.85.0-fix-ExpandableListItem-overlapping.patch41
-rw-r--r--kde-frameworks/plasma/files/plasma-5.85.0-fix-cmake.patch48
-rw-r--r--kde-frameworks/plasma/files/plasma-5.85.0-fix-pinned-calendar-dots.patch37
-rw-r--r--kde-frameworks/plasma/files/plasma-5.85.0-fix-plasma-scaling-w-int-scale-factors.patch44
-rw-r--r--kde-frameworks/plasma/files/plasma-5.85.0-fix-svgicon-memleak.patch37
-rw-r--r--kde-frameworks/plasma/files/plasma-5.85.0-fix-theme-memleak.patch86
-rw-r--r--kde-frameworks/plasma/files/plasma-5.88.0-fix-centered-text.patch121
-rw-r--r--kde-frameworks/plasma/files/plasma-5.88.0-fix-misrenderings-with-transparency.patch34
-rw-r--r--kde-frameworks/plasma/files/plasma-5.88.0-make-OSD-an-actual-wayland-OSD.patch34
-rw-r--r--kde-frameworks/plasma/files/plasma-5.92.0-breeze-light-dark-visual-fix.patch40
-rw-r--r--kde-frameworks/plasma/files/plasma-5.92.0-fix-blurry-buttons.patch110
-rw-r--r--kde-frameworks/plasma/plasma-5.92.0-r2.ebuild (renamed from kde-frameworks/plasma/plasma-5.85.0-r3.ebuild)10
-rw-r--r--kde-frameworks/plasma/plasma-5.94.0.ebuild (renamed from kde-frameworks/plasma/plasma-5.88.0-r1.ebuild)10
-rw-r--r--kde-frameworks/prison/Manifest4
-rw-r--r--kde-frameworks/prison/prison-5.92.0.ebuild (renamed from kde-frameworks/prison/prison-5.85.0.ebuild)3
-rw-r--r--kde-frameworks/prison/prison-5.94.0.ebuild (renamed from kde-frameworks/prison/prison-5.88.0.ebuild)5
-rw-r--r--kde-frameworks/purpose/Manifest4
-rw-r--r--kde-frameworks/purpose/purpose-5.92.0.ebuild (renamed from kde-frameworks/purpose/purpose-5.85.0.ebuild)3
-rw-r--r--kde-frameworks/purpose/purpose-5.94.0.ebuild (renamed from kde-frameworks/purpose/purpose-5.88.0.ebuild)4
-rw-r--r--kde-frameworks/qqc2-desktop-style/Manifest4
-rw-r--r--kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.92.0.ebuild (renamed from kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.85.0.ebuild)3
-rw-r--r--kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.94.0.ebuild (renamed from kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.88.0.ebuild)4
-rw-r--r--kde-frameworks/solid/Manifest4
-rw-r--r--kde-frameworks/solid/solid-5.92.0.ebuild (renamed from kde-frameworks/solid/solid-5.85.0.ebuild)2
-rw-r--r--kde-frameworks/solid/solid-5.94.0.ebuild (renamed from kde-frameworks/solid/solid-5.88.0.ebuild)4
-rw-r--r--kde-frameworks/sonnet/Manifest4
-rw-r--r--kde-frameworks/sonnet/sonnet-5.92.0.ebuild (renamed from kde-frameworks/sonnet/sonnet-5.85.0.ebuild)13
-rw-r--r--kde-frameworks/sonnet/sonnet-5.94.0.ebuild (renamed from kde-frameworks/sonnet/sonnet-5.88.0.ebuild)4
-rw-r--r--kde-frameworks/syndication/Manifest4
-rw-r--r--kde-frameworks/syndication/syndication-5.92.0.ebuild (renamed from kde-frameworks/syndication/syndication-5.85.0.ebuild)2
-rw-r--r--kde-frameworks/syndication/syndication-5.94.0.ebuild (renamed from kde-frameworks/syndication/syndication-5.88.0.ebuild)4
-rw-r--r--kde-frameworks/syntax-highlighting/Manifest5
-rw-r--r--kde-frameworks/syntax-highlighting/files/syntax-highlighting-5.85.0-python-add-yield-from-keyword.patch170
-rw-r--r--kde-frameworks/syntax-highlighting/syntax-highlighting-5.92.0-r1.ebuild (renamed from kde-frameworks/syntax-highlighting/syntax-highlighting-5.85.0-r1.ebuild)17
-rw-r--r--kde-frameworks/syntax-highlighting/syntax-highlighting-5.94.0.ebuild (renamed from kde-frameworks/syntax-highlighting/syntax-highlighting-5.88.0.ebuild)4
-rw-r--r--kde-frameworks/threadweaver/Manifest4
-rw-r--r--kde-frameworks/threadweaver/threadweaver-5.92.0.ebuild (renamed from kde-frameworks/threadweaver/threadweaver-5.85.0.ebuild)2
-rw-r--r--kde-frameworks/threadweaver/threadweaver-5.94.0.ebuild (renamed from kde-frameworks/threadweaver/threadweaver-5.88.0.ebuild)2
285 files changed, 1465 insertions, 3010 deletions
diff --git a/kde-frameworks/attica/Manifest b/kde-frameworks/attica/Manifest
index 2297e36d9cf..35aa9524aac 100644
--- a/kde-frameworks/attica/Manifest
+++ b/kde-frameworks/attica/Manifest
@@ -1,2 +1,2 @@
-DIST attica-5.85.0.tar.xz 66672 BLAKE2B 61e3ca48058f615af27fd7ad226c2a3ad6a05ae6edb1e1e59ed4dded937ec24a5115780fe128011bb983d83d3d7e3603a1780a5b15dadbceb95165f05e2fd1e6 SHA512 a6f64c51bd0b6a8eb739db198b6db7f5c91f3276912a0bba8b20bbca526738b6e8baea24e6f4502cd0f96b1fc704f4a61445dde0acd645776052527d376215bc
-DIST attica-5.88.0.tar.xz 67204 BLAKE2B 1c7c56efb65beff635478b7284c8efe079713f66cd0950b6d2019e3f6b278ce43eddf8a9862aa03a9a82129962975ea55e9ac27412ec7e2faaf19fb706167849 SHA512 edc3b5dcb9399f6121c972fd432d526aae8b018323caf1be460ceef2e53b2820e3e4b0a04430027c9c2d2eb8fad723461b6b7a93fc2f6a8fa00fb590cca75b77
+DIST attica-5.92.0.tar.xz 69292 BLAKE2B 39ebb66e584b98d35c25b7086ade046bdc032c48978d91bdf5d60f28067c3fd3aeea307c8394aab937eb1be81e026baf4a08218e27d3ff07e14f1767d951dcda SHA512 cb82bbe7d2ba6bd093eb09c3b658af24462ba82380a93138eaec367caacbb6f89931dbcfd8a560a576c51d8f4f532a96dd3ec56fd404c92214d38705fd18fb9c
+DIST attica-5.94.0.tar.xz 69320 BLAKE2B 17824e3de7611a448f99c5562882e0e289dedda939b06a658da4e54d8278a340a74939a0f9a4405011c4153aa5c4040027d623bb67f2e69e695509d4e07bf9a1 SHA512 0c5dd2495f43b2cd4e7bd431619af249a767e5f7add913889dffcf64dc5ef8c4551e789a3a2b1850bb7c4a544144921d562e62580f0ff257b0291521dfdddf56
diff --git a/kde-frameworks/attica/attica-5.85.0.ebuild b/kde-frameworks/attica/attica-5.92.0.ebuild
index db74566f5a9..f6e3a07af36 100644
--- a/kde-frameworks/attica/attica-5.85.0.ebuild
+++ b/kde-frameworks/attica/attica-5.92.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
diff --git a/kde-frameworks/attica/attica-5.88.0.ebuild b/kde-frameworks/attica/attica-5.94.0.ebuild
index b126db32d6a..a0eed868ad4 100644
--- a/kde-frameworks/attica/attica-5.88.0.ebuild
+++ b/kde-frameworks/attica/attica-5.94.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-QTMIN=5.15.2
+QTMIN=5.15.3
inherit ecm kde.org
DESCRIPTION="Framework providing access to Open Collaboration Services"
diff --git a/kde-frameworks/baloo/Manifest b/kde-frameworks/baloo/Manifest
index 49eef976fc5..2fc5337ec61 100644
--- a/kde-frameworks/baloo/Manifest
+++ b/kde-frameworks/baloo/Manifest
@@ -1,2 +1,2 @@
-DIST baloo-5.85.0.tar.xz 281308 BLAKE2B e5d1812996674ce9542ba437ec6318ed81d8f00fa1acf2db3a5cf118d8c620ea2e9b3fb0f937390e21c69106a77bcad154a53226e88d3e2b44e87690a1b4b1e0 SHA512 63d483ae4688fb093cb8566366b7a821840ba7d1dbec916fead088d079771c803adb06a0d7252aa07058b9571ae8a84caab44d34c1d6ee1e37537113c1e92831
-DIST baloo-5.88.0.tar.xz 282128 BLAKE2B f227c3931e48ad66a9033287635a1fe789d6e76da3e8d3aceffaa23bb9422fc040ea34a3e8af710a35c9f7cc79eb7972e0c28808822b3ddff3dcf24a250cc7a2 SHA512 c1cabfe22608b75e2f39f9f0ae19c0e85216c1929b4672a103c61e47140cc2ff3c0f00f908855f39582176eb45a0242a21ed7f706383b5a7f29f7292df7a7714
+DIST baloo-5.92.0.tar.xz 287616 BLAKE2B 4120a298a4e4b30ac9ffd2e797e84c18252c3d69a8f5e82db1a73b6aecc4b3b1e0200eb35cece221296ff5aa2c65ea6cb385945c2b624b21b67e94da543f005b SHA512 0914420618d6c79ee370e308a2fdcb770fd276136aa8d73fa3afbc76d4a51aac7236ecc6f386ef4fb0cf9776daaf3f2056cffdadd0c948420b4fcb5c292b9d64
+DIST baloo-5.94.0.tar.xz 289452 BLAKE2B e53fd68e15d122e9fb1154c54674b4531f8ec310eca666cf492b74b5725c126dd75c00cf76c5aca9f8d884f771cf942f4839d7df4997f4e49d77ce5cce85181a SHA512 e79fa98d86daca96fd813e8778cfffa16488d0c5fc050eaa4b72b5bfc33243fcd777e8508425bf64ecd451e0f150c02dd18fb892d215fa6a05cb17e03bd349f7
diff --git a/kde-frameworks/baloo/baloo-5.85.0.ebuild b/kde-frameworks/baloo/baloo-5.92.0.ebuild
index 6666329c4a2..873f6ab1576 100644
--- a/kde-frameworks/baloo/baloo-5.85.0.ebuild
+++ b/kde-frameworks/baloo/baloo-5.92.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
diff --git a/kde-frameworks/baloo/baloo-5.88.0.ebuild b/kde-frameworks/baloo/baloo-5.94.0.ebuild
index 5f0003ad737..b07f4702bd3 100644
--- a/kde-frameworks/baloo/baloo-5.88.0.ebuild
+++ b/kde-frameworks/baloo/baloo-5.94.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# 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.2
+QTMIN=5.15.3
VIRTUALX_REQUIRED="test"
inherit ecm kde.org
diff --git a/kde-frameworks/bluez-qt/Manifest b/kde-frameworks/bluez-qt/Manifest
index fad1b5a9696..aaf119b141d 100644
--- a/kde-frameworks/bluez-qt/Manifest
+++ b/kde-frameworks/bluez-qt/Manifest
@@ -1,2 +1,2 @@
-DIST bluez-qt-5.85.0.tar.xz 101768 BLAKE2B 43dea08e7370f13247908c4545a6f755f259b3a76d6a3600b08889e7ac7a1b0cb71cac45435012ec6efde9765aeb5e315fd051463feb3d80401caf83e3fe837d SHA512 cc86562edc55ca0b7db2a475068bff8a0094f74780be07c5080000f14d0568f21bf9ebd239a886023ddcb664cec7b4fc393133c5fa8bd2c0cae8b9aec74aec77
-DIST bluez-qt-5.88.0.tar.xz 110744 BLAKE2B c2ef831e094b20439f2219db97e130d0955bec5a272d9c8d1da7bc9b180fcb9c33b81120ec08acc9e1b9de80acbf6051219f5e867bfb407ab70377dfddd6acec SHA512 64f28157aaf2c0fee78b89240d6f744b3c679f2449d84d520f7d9eded243b0c4414205aa00caf800d13a3d8051cd7155e97dc8d5afcb737f4350c63056d076b0
+DIST bluez-qt-5.92.0.tar.xz 113940 BLAKE2B b34dcd937f1f01c43935862df3dbddf09109aefb66c1e5f56790be43d2db4116ce1528177b0e9ffd8341b69867f1c09db7289de680b44575623f3ee6d77f7471 SHA512 fe258828731f6efc71b7fe83fff1613cf57fc41b27ea1c5a72063bb65df42e101cf68942aa668c39c3905ab4df9d03629d6d6b97c2cf98bea176069c11aa183b
+DIST bluez-qt-5.94.0.tar.xz 113992 BLAKE2B f9b02eab865dc83ea59ac5c4db4cb2a7e62d6874ed8a6c5c4665ccd64e5e0fa5dedb44dabd246e280e5d7ad4803c41314c874c31c4842ae38716011d73a29418 SHA512 9599376056de2711faba6e74f6259caa5d641f4c1dadd84967f184736d0437195d0789c322fd81dc3767bafc99232d0899e7728ba90a8c6bac7b8f482fad0ac9
diff --git a/kde-frameworks/bluez-qt/bluez-qt-5.85.0.ebuild b/kde-frameworks/bluez-qt/bluez-qt-5.92.0.ebuild
index 934bad6bac3..c486982aaf0 100644
--- a/kde-frameworks/bluez-qt/bluez-qt-5.85.0.ebuild
+++ b/kde-frameworks/bluez-qt/bluez-qt-5.92.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
diff --git a/kde-frameworks/bluez-qt/bluez-qt-5.88.0.ebuild b/kde-frameworks/bluez-qt/bluez-qt-5.94.0.ebuild
index 036f8176f68..bf8e1478150 100644
--- a/kde-frameworks/bluez-qt/bluez-qt-5.88.0.ebuild
+++ b/kde-frameworks/bluez-qt/bluez-qt-5.94.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-QTMIN=5.15.2
+QTMIN=5.15.3
VIRTUALX_REQUIRED="test"
inherit ecm kde.org udev
diff --git a/kde-frameworks/breeze-icons-rcc/Manifest b/kde-frameworks/breeze-icons-rcc/Manifest
index 3d3116eb11f..659a3dbc070 100644
--- a/kde-frameworks/breeze-icons-rcc/Manifest
+++ b/kde-frameworks/breeze-icons-rcc/Manifest
@@ -1,2 +1,2 @@
-DIST breeze-icons-5.85.0.tar.xz 2051056 BLAKE2B 443edc464db1248ffef50e64fe8d680e9e854ad6f389861cff242c1a174cd05ac7c77cf172ac96510fa55869d8d9657eb6a99db730b86cf7de1892dabae2f23d SHA512 78be4cdf9701d92a5e8f405bceb64334c84008cb63c08af861e7d7424e08970d07f9f8320df2e66ae3468860424792c55b26299c14cb4cf347cfd65f513ab363
-DIST breeze-icons-5.88.0.tar.xz 2128308 BLAKE2B e96b04d524d99227ee09935c63ed8362b0a75a88e89835afc8537d03e360c202957392eee329397c0c502a47140d975ac2bde79738b911fd0600c6d2a3a079ab SHA512 e66ee04a2e073fe954e97dfd377581715313a041d62740eda7c4b599fd6785ca241f58508afafcb2fb3a8803df72f5e451a213dff7329f6beca87197e8e1f00d
+DIST breeze-icons-5.92.0.tar.xz 2147592 BLAKE2B a4b8bb0d05c38c90d2c8170918b1ad9abe0100bf1323f8b5089d43e698d117e2959cce6d7cc39f634c8e008fdde5ae8a2acdb830356df4b07f601e9ec2ba4ebc SHA512 830309765695df290e249d6aff6685867e8a394e5a39e0df66b2566cb3d8bf5eb973a33fc61f69bf410b16ea5644f967da557a7c3d1cc349eb1fc429d997597b
+DIST breeze-icons-5.94.0.tar.xz 2151008 BLAKE2B 1aa8826c57d894d01545f344dc7e01b2db7ff0f87938ca2ed10962760912e73e5f3747457c32c2e7f17cd5739cffd84f6f9d8a5d7ac4f6ff1ce2f1b78993e541 SHA512 63f58c75864b3791c7b7ab87666c49328589cd2867f166e496553281497375d9c6054c3ddfea7c6101092d8636d35d4c263fdccd3a58b50d9dd2a14210facb5c
diff --git a/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.85.0.ebuild b/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.92.0.ebuild
index 3b92b0478e2..a11983e6812 100644
--- a/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.85.0.ebuild
+++ b/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.92.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -10,7 +10,7 @@ inherit cmake kde.org python-any-r1
DESCRIPTION="Breeze SVG icon theme binary resource"
LICENSE="LGPL-3"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.88.0.ebuild b/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.94.0.ebuild
index f18acabfef4..41c19ea3eb4 100644
--- a/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.88.0.ebuild
+++ b/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.94.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -10,7 +10,7 @@ inherit cmake kde.org python-any-r1
DESCRIPTION="Breeze SVG icon theme binary resource"
LICENSE="LGPL-3"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/kde-frameworks/breeze-icons/Manifest b/kde-frameworks/breeze-icons/Manifest
index 3d3116eb11f..659a3dbc070 100644
--- a/kde-frameworks/breeze-icons/Manifest
+++ b/kde-frameworks/breeze-icons/Manifest
@@ -1,2 +1,2 @@
-DIST breeze-icons-5.85.0.tar.xz 2051056 BLAKE2B 443edc464db1248ffef50e64fe8d680e9e854ad6f389861cff242c1a174cd05ac7c77cf172ac96510fa55869d8d9657eb6a99db730b86cf7de1892dabae2f23d SHA512 78be4cdf9701d92a5e8f405bceb64334c84008cb63c08af861e7d7424e08970d07f9f8320df2e66ae3468860424792c55b26299c14cb4cf347cfd65f513ab363
-DIST breeze-icons-5.88.0.tar.xz 2128308 BLAKE2B e96b04d524d99227ee09935c63ed8362b0a75a88e89835afc8537d03e360c202957392eee329397c0c502a47140d975ac2bde79738b911fd0600c6d2a3a079ab SHA512 e66ee04a2e073fe954e97dfd377581715313a041d62740eda7c4b599fd6785ca241f58508afafcb2fb3a8803df72f5e451a213dff7329f6beca87197e8e1f00d
+DIST breeze-icons-5.92.0.tar.xz 2147592 BLAKE2B a4b8bb0d05c38c90d2c8170918b1ad9abe0100bf1323f8b5089d43e698d117e2959cce6d7cc39f634c8e008fdde5ae8a2acdb830356df4b07f601e9ec2ba4ebc SHA512 830309765695df290e249d6aff6685867e8a394e5a39e0df66b2566cb3d8bf5eb973a33fc61f69bf410b16ea5644f967da557a7c3d1cc349eb1fc429d997597b
+DIST breeze-icons-5.94.0.tar.xz 2151008 BLAKE2B 1aa8826c57d894d01545f344dc7e01b2db7ff0f87938ca2ed10962760912e73e5f3747457c32c2e7f17cd5739cffd84f6f9d8a5d7ac4f6ff1ce2f1b78993e541 SHA512 63f58c75864b3791c7b7ab87666c49328589cd2867f166e496553281497375d9c6054c3ddfea7c6101092d8636d35d4c263fdccd3a58b50d9dd2a14210facb5c
diff --git a/kde-frameworks/breeze-icons/breeze-icons-5.85.0.ebuild b/kde-frameworks/breeze-icons/breeze-icons-5.92.0.ebuild
index 8fde4b4d4a2..22ffd3c00b7 100644
--- a/kde-frameworks/breeze-icons/breeze-icons-5.85.0.ebuild
+++ b/kde-frameworks/breeze-icons/breeze-icons-5.92.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -40,6 +40,13 @@ src_configure() {
cmake_src_configure
}
+src_install() {
+ cmake_src_install
+ # bug 770988
+ 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
}
diff --git a/kde-frameworks/breeze-icons/breeze-icons-5.88.0.ebuild b/kde-frameworks/breeze-icons/breeze-icons-5.94.0.ebuild
index ef153169884..152a388fe1e 100644
--- a/kde-frameworks/breeze-icons/breeze-icons-5.88.0.ebuild
+++ b/kde-frameworks/breeze-icons/breeze-icons-5.94.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
diff --git a/kde-frameworks/countryflags/Manifest b/kde-frameworks/countryflags/Manifest
new file mode 100644
index 00000000000..52e32d4daf1
--- /dev/null
+++ b/kde-frameworks/countryflags/Manifest
@@ -0,0 +1,2 @@
+DIST kdelibs4support-5.92.0.tar.xz 3649060 BLAKE2B c3989cb4a0d9365a46cd42519abf82b65238234010207e1eb00d214eae11eb27525642689c791e6140db6de481a622b07b11a5d16355388fb6182ad3d7f230d3 SHA512 ff42d5ad75c073c3f5c856b611b3235982f513c1bc1186a9c7b4ceecf2cb7561dc37485a8e5d53582546141493b6038177a72cc94ac76bd999913ea83d22297d
+DIST kdelibs4support-5.94.0.tar.xz 3651300 BLAKE2B e6ddd55693f1e233b03f80d65ebe07db54eb93456019c4a1bb18eb75281e93471e3638fd1e40da5b1c7e31e247823192d7ab748b5016f264b578a3b39de7b3ac SHA512 8b48b7d67201bc6e0fb67fa00b75dbaf8e35e21f7527b4bc79939c2b689c027bfa75eb60b13686bd8bce710a61682a27cac85481edd6e321063aefb186cdd2f2
diff --git a/kde-frameworks/countryflags/countryflags-5.92.0.ebuild b/kde-frameworks/countryflags/countryflags-5.92.0.ebuild
new file mode 100644
index 00000000000..3a924d95ea4
--- /dev/null
+++ b/kde-frameworks/countryflags/countryflags-5.92.0.ebuild
@@ -0,0 +1,22 @@
+# 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 kde.org
+
+DESCRIPTION="Icons of flags for various countries"
+
+LICENSE="LGPL-2+"
+KEYWORDS="amd64 ~arm arm64 ~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/countryflags/countryflags-5.94.0.ebuild b/kde-frameworks/countryflags/countryflags-5.94.0.ebuild
new file mode 100644
index 00000000000..f64b0a75fbf
--- /dev/null
+++ b/kde-frameworks/countryflags/countryflags-5.94.0.ebuild
@@ -0,0 +1,22 @@
+# 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 kde.org
+
+DESCRIPTION="Icons of flags for various countries"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~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/countryflags/files/countryflags-5.90.0-standalone.patch b/kde-frameworks/countryflags/files/countryflags-5.90.0-standalone.patch
new file mode 100644
index 00000000000..777fc622580
--- /dev/null
+++ b/kde-frameworks/countryflags/files/countryflags-5.90.0-standalone.patch
@@ -0,0 +1,31 @@
+From 4abd415bae7dd03cfb30f7db3597e0ab241f19e5 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Fri, 17 Dec 2021 16:09:12 +0100
+Subject: [PATCH] Standalone install of countryflags (src/l10n)
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ src/l10n/CMakeLists.txt | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/src/l10n/CMakeLists.txt b/src/l10n/CMakeLists.txt
+index babb57b8..915b6fe4 100644
+--- a/src/l10n/CMakeLists.txt
++++ b/src/l10n/CMakeLists.txt
+@@ -1,3 +1,13 @@
++cmake_minimum_required(VERSION 3.16)
++
++project(CountryFlags)
++
++include(FeatureSummary)
++find_package(ECM 5.89.0 NO_MODULE)
++set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
++
++include(KDEInstallDirs)
++
+ install( FILES northafrica.desktop westafrica.desktop southafrica.desktop centralafrica.desktop eastafrica.desktop caribbean.desktop oceania.desktop centralamerica.desktop northamerica.desktop southamerica.desktop easteurope.desktop westeurope.desktop centraleurope.desktop northeurope.desktop southeurope.desktop southasia.desktop southeastasia.desktop eastasia.desktop centralasia.desktop middleeast.desktop DESTINATION ${KDE_INSTALL_DATADIR_KF5}/locale/countries )
+
+ set(listLang C epo ad ae af ag ai al am an ao ar as at au aw ax az ba bb bd be bf bg bh bi bj bl bm bn bo br bs bt bw by bz ca cc cd cf cg ch ci ck cl cm cn co cr cu cv cx cy cz de dj dk dm do dz ec ee eg eh er es et fi fj fk fm fo fr ga gb gd ge gf gg gh gi gl gm gn gp gq gr gt gu gw gy hk hn hr ht hu id ie il im in iq ir is it je jm jo jp ke kg kh ki km kn kp kr kw ky kz la lb lc li lk lr ls lt lu lv ly ma mc md me mf mg mh mk ml mm mn mo mp mq mr ms mt mu mv mw mx my mz na nc ne nf ng ni nl no np nr nu nz om pa pe pf pg ph pk pl pm pn pr ps pt pw py qa re ro rs ru rw sa sb sc sd se sg sh si sk sl sm sn so sr ss st sv sy sz tc td tg th tj tk tl tm tn to tp tr tt tv tw tz ua ug us uy uz va vc ve vg vi vn vu wf ws ye yt za zm zw )
+--
+2.34.1
+
diff --git a/kde-frameworks/countryflags/metadata.xml b/kde-frameworks/countryflags/metadata.xml
new file mode 100644
index 00000000000..506ecf605bc
--- /dev/null
+++ b/kde-frameworks/countryflags/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+ </maintainer>
+ <upstream>
+ <bugs-to>https://bugs.kde.org/</bugs-to>
+ </upstream>
+ <slots>
+ <subslots>
+ Must only be used by packages that are known to use private parts of the Frameworks API.
+ </subslots>
+ </slots>
+</pkgmetadata>
diff --git a/kde-frameworks/extra-cmake-modules/Manifest b/kde-frameworks/extra-cmake-modules/Manifest
index 9bb590e8e2d..eaf09389342 100644
--- a/kde-frameworks/extra-cmake-modules/Manifest
+++ b/kde-frameworks/extra-cmake-modules/Manifest
@@ -1,2 +1,2 @@
-DIST extra-cmake-modules-5.85.0.tar.xz 318048 BLAKE2B b33d1e4d131349f706f7ef3cc75b59dc48299f03c62699fb1cdc6a9c496ebc527628bf07da41241ddd86128c5fa44b2b2c0a68509a0eefe742efa37d02386be0 SHA512 78ff26496c37d93106449663ab30ad35784a3ad668f4b1ec49d1ef51916e5de050e828fec8f6dc4ee5e2bed95cf22becb06ddd971dc46b65acc19934f5c1c5b3
-DIST extra-cmake-modules-5.88.0.tar.xz 319140 BLAKE2B 784483a6b66cb859bb0b8764928e4a42a1c265119196e5f79e074930a302d10698fa7b59f065dfddfd6462b9810d378b2129cee3822b897f187d9a5225de69d1 SHA512 e560aa84dbbc1f1673bb51b7c384a64899244f255c7a20e6f5c4046334a6bbfa4632d01ec75b219cb129f0ac37c328a10fe1ea5bbd05bc4c839d797fa965ce3b
+DIST extra-cmake-modules-5.92.0.tar.xz 329884 BLAKE2B e2d6bb7ff492f916f2e276faf452c2b02adfed8133096cff17c76992d11255f93a55cfc8140dc1b577facdb03cbbcddfefcbbe5242a006aa4c5786a0c64bf329 SHA512 c4adc98a5d3ff0844165fc5f51f9a1a4ff04ef8e8d8b87b87b094d0601577c239f87f05dd461270563d5160af7248ee064984275223a48e931b1761450dcaf20
+DIST extra-cmake-modules-5.94.0.tar.xz 331500 BLAKE2B b3dd13a9ae089fd1b102fec37155fbe173511d97367ba2bf347533a2ce019bc6327a747cef2fab46daa9ec0429df49729d9f15256cd466a62bb41f7cc5b2397e SHA512 c76e27ded4d5108d756b5891c64cbfbaad8a944e2cc5ce3a1b56ef395bad9688e493a1d8a6e91c2910e156ff5ff018ed054a4b3825b093c877e6c445eb74179e
diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.85.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.92.0.ebuild
index 706ddafde48..408c253bc7f 100644
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.85.0.ebuild
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.92.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -34,7 +34,7 @@ RDEPEND="
PATCHES=(
"${FILESDIR}/${PN}-5.49.0-no-fatal-warnings.patch"
"${FILESDIR}/${PN}-5.72.0-skip-ecm_add_test-early.patch"
- "${FILESDIR}/${PN}-5.74.0-disable-qmlplugindump.patch"
+ "${FILESDIR}/${PN}-5.91.0-disable-qmlplugindump.patch"
)
python_check_deps() {
diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.88.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.94.0.ebuild
index bfa6d7323bb..6dd4ecb8e60 100644
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.88.0.ebuild
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.94.0.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
PYTHON_COMPAT=( python3_{8..10} )
-QTMIN=5.15.2
+QTMIN=5.15.3
inherit cmake 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 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86"
IUSE="doc test"
RESTRICT="!test? ( test )"
@@ -33,8 +33,8 @@ RDEPEND="
PATCHES=(
"${FILESDIR}/${PN}-5.49.0-no-fatal-warnings.patch"
- "${FILESDIR}/${PN}-5.72.0-skip-ecm_add_test-early.patch"
- "${FILESDIR}/${PN}-5.88.0-disable-qmlplugindump.patch"
+ "${FILESDIR}/${PN}-5.93.0-skip-ecm_add_test-early.patch"
+ "${FILESDIR}/${PN}-5.93.0-disable-qmlplugindump.patch"
)
python_check_deps() {
diff --git a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.88.0-disable-qmlplugindump.patch b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.91.0-disable-qmlplugindump.patch
index f2c83688989..fbec9a441e3 100644
--- a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.88.0-disable-qmlplugindump.patch
+++ b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.91.0-disable-qmlplugindump.patch
@@ -1,33 +1,39 @@
-From 8bcda9bc1d12e2e8ea54dc8d957e415f9d5469a0 Mon Sep 17 00:00:00 2001
+From 76ee984d5094990c2bd79c71b84ba9f82b3bf3da 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
-Back-story: https://bugzilla.gnome.org/show_bug.cgi?id=744135
+See also: https://phabricator.kde.org/D25812
+
+Backstory: https://bugzilla.gnome.org/show_bug.cgi?id=744135
BUG: 387753
---
- modules/ECMFindQMLModule.cmake.in | 35 +++++++++++++++++++------------
- 1 file changed, 22 insertions(+), 13 deletions(-)
+ modules/ECMFindQmlModule.cmake.in | 45 ++++++++++++++++++-------------
+ 1 file changed, 27 insertions(+), 18 deletions(-)
-diff --git a/modules/ECMFindQMLModule.cmake.in b/modules/ECMFindQMLModule.cmake.in
-index 4234b702..d9817fe8 100644
---- a/modules/ECMFindQMLModule.cmake.in
-+++ b/modules/ECMFindQMLModule.cmake.in
-@@ -5,23 +5,32 @@
- #=============================================================================
-
+diff --git a/modules/ECMFindQmlModule.cmake.in b/modules/ECMFindQmlModule.cmake.in
+index 6c054bf0..1c17c981 100644
+--- a/modules/ECMFindQmlModule.cmake.in
++++ b/modules/ECMFindQmlModule.cmake.in
+@@ -7,27 +7,36 @@
include(FindPackageHandleStandardArgs)
--include("${ECM_MODULE_DIR}/ECMQueryQmake.cmake")
+ include("${ECM_MODULE_DIR}/QtVersionOption.cmake")
--query_qmake(qt_binaries_dir QT_HOST_BINS)
-+option (ECM_DISABLE_QMLPLUGINDUMP "Do not use qmlplugindump which may segfault in some sandboxed environments" OFF)
-
--find_program(QMLPLUGINDUMP_PROGRAM NAMES qmlplugindump HINTS ${qt_binaries_dir})
+-if (QT_MAJOR_VERSION EQUAL "5")
+- include("${ECM_MODULE_DIR}/ECMQueryQmake.cmake")
+- query_qmake(qt_binaries_dir QT_HOST_BINS)
+- find_program(QMLPLUGINDUMP_PROGRAM NAMES qmlplugindump HINTS ${qt_binaries_dir})
+-elseif (QT_MAJOR_VERSION EQUAL "6")
+- find_package(Qt6 COMPONENTS QmlTools REQUIRED)
+- get_target_property(QMLPLUGINDUMP_PROGRAM Qt6::qmlplugindump LOCATION)
+-endif()
+-
-if(NOT QMLPLUGINDUMP_PROGRAM)
- message(WARNING "Could not find qmlplugindump. It is necessary to look up qml module dependencies.")
-endif()
--
++option (ECM_DISABLE_QMLPLUGINDUMP "Do not use qmlplugindump which may segfault in some sandboxed environments" OFF)
+
-execute_process(COMMAND "${QMLPLUGINDUMP_PROGRAM}" "@MODULE_NAME@" "@VERSION@" ERROR_VARIABLE ERRORS_OUTPUT OUTPUT_VARIABLE DISREGARD_VARIABLE RESULT_VARIABLE ExitCode TIMEOUT 30)
-
-if(ExitCode EQUAL 0)
@@ -39,16 +45,21 @@ index 4234b702..d9817fe8 100644
else()
- message(STATUS "qmlplugindump failed for @MODULE_NAME@.")
- set(@GENMODULE@_FOUND FALSE)
-+ include("${ECM_MODULE_DIR}/ECMQueryQmake.cmake")
+
-+ query_qmake(qt_binaries_dir QT_HOST_BINS)
++ if (QT_MAJOR_VERSION EQUAL "5")
++ include("${ECM_MODULE_DIR}/ECMQueryQmake.cmake")
++ query_qmake(qt_binaries_dir QT_HOST_BINS)
++ find_program(QMLPLUGINDUMP_PROGRAM NAMES qmlplugindump HINTS ${qt_binaries_dir})
++ elseif (QT_MAJOR_VERSION EQUAL "6")
++ find_package(Qt6 COMPONENTS QmlTools REQUIRED)
++ get_target_property(QMLPLUGINDUMP_PROGRAM Qt6::qmlplugindump LOCATION)
++ endif()
+
-+ find_program(QMLPLUGINDUMP_PROGRAM NAMES qmlplugindump HINTS ${qt_binaries_dir})
+ if(NOT QMLPLUGINDUMP_PROGRAM)
+ message(WARNING "Could not find qmlplugindump. It is necessary to look up qml module dependencies.")
+ endif()
+
-+ execute_process(COMMAND "${QMLPLUGINDUMP_PROGRAM}" "@MODULE_NAME@" "@VERSION@" ERROR_VARIABLE ERRORS_OUTPUT OUTPUT_VARIABLE DISREGARD_VARIABLE RESULT_VARIABLE ExitCode)
++ execute_process(COMMAND "${QMLPLUGINDUMP_PROGRAM}" "@MODULE_NAME@" "@VERSION@" ERROR_VARIABLE ERRORS_OUTPUT OUTPUT_VARIABLE DISREGARD_VARIABLE RESULT_VARIABLE ExitCode TIMEOUT 30)
+
+ if(ExitCode EQUAL 0)
+ set(@GENMODULE@_FOUND TRUE)
@@ -61,5 +72,5 @@ index 4234b702..d9817fe8 100644
find_package_handle_standard_args(@GENMODULE@
--
-2.33.0
+2.34.1
diff --git a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.74.0-disable-qmlplugindump.patch b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.93.0-disable-qmlplugindump.patch
index 08fcf32338b..0683bd3effd 100644
--- a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.74.0-disable-qmlplugindump.patch
+++ b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.93.0-disable-qmlplugindump.patch
@@ -1,33 +1,39 @@
-From 8d30a7dd4517130bf1f6904b0969aaa78e44e16b Mon Sep 17 00:00:00 2001
+From 1c79ef2189dc156bbe0f182411bcc136f140a21d 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
-Back story: https://bugzilla.gnome.org/show_bug.cgi?id=744135
+See also: https://phabricator.kde.org/D25812
+
+Backstory: https://bugzilla.gnome.org/show_bug.cgi?id=744135
BUG: 387753
---
- modules/ECMFindQMLModule.cmake.in | 35 +++++++++++++++++++------------
- 1 file changed, 22 insertions(+), 13 deletions(-)
+ modules/ECMFindQmlModule.cmake.in | 45 ++++++++++++++++++-------------
+ 1 file changed, 27 insertions(+), 18 deletions(-)
-diff --git a/modules/ECMFindQMLModule.cmake.in b/modules/ECMFindQMLModule.cmake.in
-index 8109ab8..1edc01d 100644
---- a/modules/ECMFindQMLModule.cmake.in
-+++ b/modules/ECMFindQMLModule.cmake.in
-@@ -26,23 +26,32 @@
- #=============================================================================
-
+diff --git a/modules/ECMFindQmlModule.cmake.in b/modules/ECMFindQmlModule.cmake.in
+index 0ee5665e..d6e1f14c 100644
+--- a/modules/ECMFindQmlModule.cmake.in
++++ b/modules/ECMFindQmlModule.cmake.in
+@@ -7,27 +7,36 @@
include(FindPackageHandleStandardArgs)
--include("${ECM_MODULE_DIR}/ECMQueryQmake.cmake")
+ include("${ECM_MODULE_DIR}/QtVersionOption.cmake")
--query_qmake(qt_binaries_dir QT_INSTALL_BINS)
-+option (ECM_DISABLE_QMLPLUGINDUMP "Do not use qmlplugindump which may segfault in some sandboxed environments" OFF)
-
--find_program(QMLPLUGINDUMP_PROGRAM NAMES qmlplugindump HINTS ${qt_binaries_dir})
+-if (QT_MAJOR_VERSION EQUAL "5")
+- include("${ECM_MODULE_DIR}/ECMQueryQt.cmake")
+- ecm_query_qt(qt_binaries_dir QT_HOST_BINS)
+- find_program(QMLPLUGINDUMP_PROGRAM NAMES qmlplugindump HINTS ${qt_binaries_dir})
+-elseif (QT_MAJOR_VERSION EQUAL "6")
+- find_package(Qt6 COMPONENTS QmlTools REQUIRED)
+- get_target_property(QMLPLUGINDUMP_PROGRAM Qt6::qmlplugindump LOCATION)
+-endif()
+-
-if(NOT QMLPLUGINDUMP_PROGRAM)
- message(WARNING "Could not find qmlplugindump. It is necessary to look up qml module dependencies.")
-endif()
--
++option (ECM_DISABLE_QMLPLUGINDUMP "Do not use qmlplugindump which may segfault in some sandboxed environments" OFF)
+
-execute_process(COMMAND "${QMLPLUGINDUMP_PROGRAM}" "@MODULE_NAME@" "@VERSION@" ERROR_VARIABLE ERRORS_OUTPUT OUTPUT_VARIABLE DISREGARD_VARIABLE RESULT_VARIABLE ExitCode TIMEOUT 30)
-
-if(ExitCode EQUAL 0)
@@ -39,16 +45,21 @@ index 8109ab8..1edc01d 100644
else()
- message(STATUS "qmlplugindump failed for @MODULE_NAME@.")
- set(@GENMODULE@_FOUND FALSE)
-+ include("${ECM_MODULE_DIR}/ECMQueryQmake.cmake")
+
-+ query_qmake(qt_binaries_dir QT_INSTALL_BINS)
++ if (QT_MAJOR_VERSION EQUAL "5")
++ include("${ECM_MODULE_DIR}/ECMQueryQt.cmake")
++ ecm_query_qt(qt_binaries_dir QT_HOST_BINS)
++ find_program(QMLPLUGINDUMP_PROGRAM NAMES qmlplugindump HINTS ${qt_binaries_dir})
++ elseif (QT_MAJOR_VERSION EQUAL "6")
++ find_package(Qt6 COMPONENTS QmlTools REQUIRED)
++ get_target_property(QMLPLUGINDUMP_PROGRAM Qt6::qmlplugindump LOCATION)
++ endif()
+
-+ find_program(QMLPLUGINDUMP_PROGRAM NAMES qmlplugindump HINTS ${qt_binaries_dir})
+ if(NOT QMLPLUGINDUMP_PROGRAM)
+ message(WARNING "Could not find qmlplugindump. It is necessary to look up qml module dependencies.")
+ endif()
+
-+ execute_process(COMMAND "${QMLPLUGINDUMP_PROGRAM}" "@MODULE_NAME@" "@VERSION@" ERROR_VARIABLE ERRORS_OUTPUT OUTPUT_VARIABLE DISREGARD_VARIABLE RESULT_VARIABLE ExitCode)
++ execute_process(COMMAND "${QMLPLUGINDUMP_PROGRAM}" "@MODULE_NAME@" "@VERSION@" ERROR_VARIABLE ERRORS_OUTPUT OUTPUT_VARIABLE DISREGARD_VARIABLE RESULT_VARIABLE ExitCode TIMEOUT 30)
+
+ if(ExitCode EQUAL 0)
+ set(@GENMODULE@_FOUND TRUE)
@@ -61,5 +72,5 @@ index 8109ab8..1edc01d 100644
find_package_handle_standard_args(@GENMODULE@
--
-2.24.0
+2.35.1
diff --git a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.93.0-skip-ecm_add_test-early.patch b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.93.0-skip-ecm_add_test-early.patch
new file mode 100644
index 00000000000..84e192919c7
--- /dev/null
+++ b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.93.0-skip-ecm_add_test-early.patch
@@ -0,0 +1,58 @@
+From 36e435f059ee44da78e6900fded348709ea865df Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sat, 11 Jul 2020 23:04:16 +0200
+Subject: [PATCH] ECMAddTests.cmake: Skip ecm_add_test early if Qt::Test is not
+ available
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ modules/ECMAddTests.cmake | 9 +++++++++
+ tests/ECMAddTests/CMakeLists.txt | 5 +++++
+ 2 files changed, 14 insertions(+)
+
+diff --git a/modules/ECMAddTests.cmake b/modules/ECMAddTests.cmake
+index 58c78d05..994ed1e4 100644
+--- a/modules/ECMAddTests.cmake
++++ b/modules/ECMAddTests.cmake
+@@ -84,6 +84,10 @@ function(ecm_add_test)
+ message(FATAL_ERROR "ecm_add_test() called with multiple source files but without setting \"TEST_NAME\"")
+ endif()
+
++ if(NOT TARGET Qt::Test)
++ return()
++ endif()
++
+ set(_testname ${ARG_NAME_PREFIX}${_targetname})
+ set(gui_args)
+ if(ARG_GUI)
+@@ -127,6 +131,11 @@ function(ecm_add_tests)
+ endif()
+ set(test_names)
+ set(target_names)
++
++ if(NOT TARGET Qt::Test)
++ return()
++ endif()
++
+ foreach(_test_source ${ARG_UNPARSED_ARGUMENTS})
+ ecm_add_test(${_test_source}
+ NAME_PREFIX ${ARG_NAME_PREFIX}
+diff --git a/tests/ECMAddTests/CMakeLists.txt b/tests/ECMAddTests/CMakeLists.txt
+index aa7e73a1..f9fb10cb 100644
+--- a/tests/ECMAddTests/CMakeLists.txt
++++ b/tests/ECMAddTests/CMakeLists.txt
+@@ -4,6 +4,11 @@ else()
+ set(QT_VERSION_OPT "-DBUILD_WITH_QT6=OFF")
+ endif()
+
++if(NOT TARGET Qt::Test)
++ message(STATUS "WARNING: skipping tests that require Qt::Test")
++ return()
++endif()
++
+ macro(add_check NAME)
+ string(REPLACE "." "/" dir "${NAME}")
+ string(REGEX REPLACE "[^.]*\\." "" proj "${NAME}")
+--
+2.35.1
+
diff --git a/kde-frameworks/frameworkintegration/Manifest b/kde-frameworks/frameworkintegration/Manifest
index 2d10013aa0c..f3b15e72d1f 100644
--- a/kde-frameworks/frameworkintegration/Manifest
+++ b/kde-frameworks/frameworkintegration/Manifest
@@ -1,2 +1,2 @@
-DIST frameworkintegration-5.85.0.tar.xz 1755792 BLAKE2B 0a9b6b9a35d20fac0d07cbcf23f4ca1e0627a0175a7298a6b6391b1f4e1c38a46e029dc21ff22ea397ad3de053485097137e5a0de818300000f0c0e4f03c474e SHA512 d496c3b2ff49a3e4ee43e3c208b7dd3df68561fed0fe519f22a163c3389683f7d776270fc6472f4b52677cf85eb4a73c6bb7bdeea951600f8f5302411677a4f3
-DIST frameworkintegration-5.88.0.tar.xz 1756084 BLAKE2B 38b827ab48b5c3e5ca98f9fafc022e6ad33eb056a2ffe2f6e82490c0c155984f54cde4fdb2a91af5709341b78977e14222c94af86d9127ac1710a51f46502607 SHA512 50944c4eaf40213cbb25f19bd35fa1e410778791c8a993b75ffed922f8e07d984735a0a6362bb2598dca085be7739e4981d0469bd07783b2276d3bb564274e0d
+DIST frameworkintegration-5.92.0.tar.xz 1758268 BLAKE2B 7f72908f93158f42c2e90488aa037bb7dd9146e333b504a9034c8b5c6898fb5a6357a62fc81c237f8be9b854d05c97ce4352d28aa4f28ba1674d26b0098c7e41 SHA512 3445749f4ee10493a798433a7b5630dc22701c98c3f81c7e2236cffea9f9576ce8123006e5123698e5d648771ea77bff848453b188b1a6e791aab08184cebecc
+DIST frameworkintegration-5.94.0.tar.xz 1758292 BLAKE2B 00f4289667ff547e3064c3d18369a225825a08ec0569e5712a2c1b044d2ea1a4e9ff0a12a8e43d4c81900e5ae18f67ebbdc4b9589abb338fa2d8b6bdb2ed97ec SHA512 3900fe970d459707b634df90515e49593632e7fe1dc9ba2a54b45d5042a768997f11b0875fe5419912673d8c9166e244d27b943b83c2d4a8936b8d6e30e17eb1
diff --git a/kde-frameworks/frameworkintegration/frameworkintegration-5.85.0.ebuild b/kde-frameworks/frameworkintegration/frameworkintegration-5.92.0.ebuild
index 039e2fa0d10..f5f785f0956 100644
--- a/kde-frameworks/frameworkintegration/frameworkintegration-5.85.0.ebuild
+++ b/kde-frameworks/frameworkintegration/frameworkintegration-5.92.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
diff --git a/kde-frameworks/frameworkintegration/frameworkintegration-5.88.0.ebuild b/kde-frameworks/frameworkintegration/frameworkintegration-5.94.0.ebuild
index d52fad50135..1f7f33acb63 100644
--- a/kde-frameworks/frameworkintegration/frameworkintegration-5.88.0.ebuild
+++ b/kde-frameworks/frameworkintegration/frameworkintegration-5.94.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# 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.2
+QTMIN=5.15.3
VIRTUALX_REQUIRED="test"
inherit ecm kde.org
diff --git a/kde-frameworks/kactivities-stats/Manifest b/kde-frameworks/kactivities-stats/Manifest
index 4ead1227c16..affb2cb4cff 100644
--- a/kde-frameworks/kactivities-stats/Manifest
+++ b/kde-frameworks/kactivities-stats/Manifest
@@ -1,2 +1,2 @@
-DIST kactivities-stats-5.85.0.tar.xz 81924 BLAKE2B 2e00d96f01b3f3540405c0e4dcddc201eec8218e025e0c3086a9038ab24f4727acf7c11af7a8234d068d6808ce4bcd1384fcd14cc858c6dc33079749ac6e37f6 SHA512 4d58a6ca1f5d373a0c625bcc782e3f6e3bd68c960615c1a7f08ec3ca0e889b72dce300e80d080ae3e531bbcfa9cadeb50cea27a517e35f4cae3d426d487322ed
-DIST kactivities-stats-5.88.0.tar.xz 82232 BLAKE2B 6e2225133acb0e0cd0f687e01bf0c39b1b36d45f22a7911d83d89c1ad87857a26553e90d9a1458303c334c0300e55be43cb76ecbc37e84d8e66a35f011a8c14f SHA512 b6666d3004d9fa250ca9d1719abebab96d762f3ef70c9696d27e1ba7755c27cfc594126e93b65a10921b4c3e76a2cc032ba10be14dcb94ce1727f3ba33955411
+DIST kactivities-stats-5.92.0.tar.xz 84280 BLAKE2B 958d9bbe6a5fecbca7e31f8bf481a198790f80c307842e8c594613d9117a583b04ecf2f6104fd20a922c6c98342bd80d88d2934141448af288a86502cc70224d SHA512 5298f2390942ee71270ba71201229de7b4e82959302abcb45b09c39d0da5f9d9edb18d9e7d6e9fcc9c3fcef0c4c02ea7f3d96bbcec1885aea899e0da9b4d6fa9
+DIST kactivities-stats-5.94.0.tar.xz 84580 BLAKE2B 196e7d2db4657eda51585ed404263790571a5cf4a1f7ddc0a2ca023f8a7e1527ba76b4e368417f6f1de0606711b350b07e7584cc044e7e6dd2729aec50713745 SHA512 0ae5d4ca81ef58b2d4857f737436eaed85bc50da910d7f1dc348e972c8511862b67869bd85a577eb43c06d8cd4e796092a90cb6ec1cb83013e76175643bc5cf5
diff --git a/kde-frameworks/kactivities-stats/kactivities-stats-5.85.0.ebuild b/kde-frameworks/kactivities-stats/kactivities-stats-5.92.0.ebuild
index ebd4b4281d8..bf117966688 100644
--- a/kde-frameworks/kactivities-stats/kactivities-stats-5.85.0.ebuild
+++ b/kde-frameworks/kactivities-stats/kactivities-stats-5.92.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -19,5 +19,5 @@ RDEPEND="
=kde-frameworks/kconfig-${PVCUT}*:5
"
DEPEND="${RDEPEND}
- >=dev-libs/boost-1.54
+ test? ( >=dev-libs/boost-1.54 )
"
diff --git a/kde-frameworks/kactivities-stats/kactivities-stats-5.88.0.ebuild b/kde-frameworks/kactivities-stats/kactivities-stats-5.94.0.ebuild
index 02989e763ca..94cdfbaf982 100644
--- a/kde-frameworks/kactivities-stats/kactivities-stats-5.88.0.ebuild
+++ b/kde-frameworks/kactivities-stats/kactivities-stats-5.94.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# 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.2
+QTMIN=5.15.3
inherit ecm kde.org
DESCRIPTION="Framework for getting the usage statistics collected by the activities service"
@@ -19,5 +19,5 @@ RDEPEND="
=kde-frameworks/kconfig-${PVCUT}*:5
"
DEPEND="${RDEPEND}
- >=dev-libs/boost-1.54
+ test? ( >=dev-libs/boost-1.54 )
"
diff --git a/kde-frameworks/kactivities/Manifest b/kde-frameworks/kactivities/Manifest
index 55095863f54..6d3ebadb5eb 100644
--- a/kde-frameworks/kactivities/Manifest
+++ b/kde-frameworks/kactivities/Manifest
@@ -1,2 +1,2 @@
-DIST kactivities-5.85.0.tar.xz 71328 BLAKE2B 59f01075a0cc785061251ab9da1cde122b0bdd7cd02c870f875513c54e8a008e3069952e860b60399b714f30eb15229f2581557948d951d47eff038ce3393c91 SHA512 62769a6a0f8d243e9774c819658b5e451c0d1fa4910987d7b07d809d61d63355300d5ef29f91193f62f66d032539066286ac11b4da87e7b60eac4277df68c0ab
-DIST kactivities-5.88.0.tar.xz 71788 BLAKE2B 5fea549b34a54f6dc2fcbf7537b52319c5d2bcc98fe9747384c5c13b908ea12f0934ea2215bbc9846d79af98216c1af5481c02ac27ab5b19425bc08a272cc0ea SHA512 96112d7f4e5817e3dd0c0cc8e4d8e7eba7a2ed1e0a9d92da563bfad8141b340e7fff3b5e41809c8c8c9f9cae07ad7523e360da8c018d28963377736f253d8259
+DIST kactivities-5.92.0.tar.xz 73784 BLAKE2B 1f602226a12328de787836d3b158a5cecd792ca429f62fcdafa723576f5b6df74dcd2858cdf11c6b40dfef7f9e2dba2616a4d3e2cae1218b690961b2fceca1cd SHA512 ff560ae0554342bc6e86b556270ce87267c8ba9f01b931b8fd9012e9deb5202ef2c6ddef18edf268f0eada651c0ff6e27d83876fdcb6767d1ff9fee6155bfdae
+DIST kactivities-5.94.0.tar.xz 73788 BLAKE2B c316e8cb8d5ad54a5a850daa5597721899889075632fa1ae901f601e3c45f44fde2c400af3cd45d98a2609415e0ecf444c3bad34887d86b987e5df085451443c SHA512 59b82dfa3bec93726dc3924bc5675a970bb935823430362271599545ca80e07d73280d8b0a0af915739147f68ea6b22f7382c07d9c830497305a2dcadadcb89b
diff --git a/kde-frameworks/kactivities/kactivities-5.85.0.ebuild b/kde-frameworks/kactivities/kactivities-5.92.0.ebuild
index f158e362871..fb96a0b59a8 100644
--- a/kde-frameworks/kactivities/kactivities-5.85.0.ebuild
+++ b/kde-frameworks/kactivities/kactivities-5.92.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
diff --git a/kde-frameworks/kactivities/kactivities-5.88.0.ebuild b/kde-frameworks/kactivities/kactivities-5.94.0.ebuild
index 426ccf34ebb..3ec4b5996a5 100644
--- a/kde-frameworks/kactivities/kactivities-5.88.0.ebuild
+++ b/kde-frameworks/kactivities/kactivities-5.94.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# 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.2
+QTMIN=5.15.3
inherit ecm kde.org
DESCRIPTION="Framework for working with KDE activities"
diff --git a/kde-frameworks/kapidox/Manifest b/kde-frameworks/kapidox/Manifest
index 0233cb34f66..d43be11da15 100644
--- a/kde-frameworks/kapidox/Manifest
+++ b/kde-frameworks/kapidox/Manifest
@@ -1,2 +1,2 @@
-DIST kapidox-5.85.0.tar.xz 195060 BLAKE2B 9ae5cf5f6930174ad966e6b5625b1a1619f4ff241388c3f692cbdbd6f56c2df685ca78b4dfbc07ea307db16f39c2bd6c81cb78b41584c25dcf7c119805c428e8 SHA512 afbcace81c249fbd5e26cbb53afea0f30d690fbef0c35bcca674ffaf2fffbcd73f00a21c4f50bdb4e32d8349c40f680fe1879df2d8f79eb284e5863fa7afd07f
-DIST kapidox-5.88.0.tar.xz 195376 BLAKE2B 62d53a7ba4d2cf792c8080cf80bcd6d0ec97f90b3b1fa49e1b6f9a7b7f84bfa946cf8fa5e31aa2b833071a1b8b784df5e1c567887cb8a14067014f64bc873b89 SHA512 aeef95e9069c7da82ee1650492384b0f89685826547466e77152e06593d02505e49bf6c8b49add6a001811bc6e6130ebc4d6b184f2b9c9edafb347cc307f56f1
+DIST kapidox-5.92.0.tar.xz 197232 BLAKE2B 08e616fb0a4bb21f0d747ab571401121e81203f81ef96cb2108da84e314c03a8e296507ec025a2431989dc443dceede146a26749e0789f4d0d2048966611f088 SHA512 876f8f5a1e7db8bdcaa1a6e206deb9630cf35ba6e8f0c3616557ac95e28b8a9b2c7d40abbc22c19abbef3e310070d61a7b71a03ad62d32d75f014d8ae7b2ce37
+DIST kapidox-5.94.0.tar.xz 197472 BLAKE2B f3ada3400028ba879d8632935544c33f05e1efbc3965831585e73e85ab97e0d44c9621219d789beb5800b394a696d6e025f589ea0e5b93497b9844c4505949ba SHA512 63e0431ac92fd8435af90ae49cf33c47b4a2291462b2e6336f1aee6bdba94d3571a4bf684b8f511d1ec656a64e80261a5fcfd112f6d86ea6d355f0e73439158b
diff --git a/kde-frameworks/kapidox/kapidox-5.85.0.ebuild b/kde-frameworks/kapidox/kapidox-5.92.0.ebuild
index 43cd09f2a62..8f32d609260 100644
--- a/kde-frameworks/kapidox/kapidox-5.85.0.ebuild
+++ b/kde-frameworks/kapidox/kapidox-5.92.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -10,7 +10,7 @@ inherit 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 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
IUSE=""
RDEPEND="
diff --git a/kde-frameworks/kapidox/kapidox-5.88.0.ebuild b/kde-frameworks/kapidox/kapidox-5.94.0.ebuild
index 904180677a0..b7d642f17ac 100644
--- a/kde-frameworks/kapidox/kapidox-5.88.0.ebuild
+++ b/kde-frameworks/kapidox/kapidox-5.94.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -10,7 +10,7 @@ inherit 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 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND="
diff --git a/kde-frameworks/karchive/Manifest b/kde-frameworks/karchive/Manifest
index e02cec0b32c..3356d46c12d 100644
--- a/kde-frameworks/karchive/Manifest
+++ b/kde-frameworks/karchive/Manifest
@@ -1,2 +1,2 @@
-DIST karchive-5.85.0.tar.xz 985392 BLAKE2B 1a38aff9e62ed0cd5936992d514707548fc0d727b9c3da019d97ca600a34c303e9c88962c96d3c897a9d95dab8f9a02253be91d3ecf7ba490870f9ddd0b7df9a SHA512 5890e1b7e354420a63f8deaca0375b8caf1d798c5682ee4ef902c40435d493e232d66528fcd40c7efa40a390d76a22ce6d6f73e884e95528f5d56639cddbf7f5
-DIST karchive-5.88.0.tar.xz 984040 BLAKE2B 7634cdf0622412cb5015c9335fd348abd824e576cb1e968d5603adb9abb9934b3bfbcc1ac81cc0b5bf6511096f75fc42bce9b816f74ab14b4b177e4ec8552046 SHA512 c24712bf112870dda73d61574155c3858f10283d7692bea5a588f3138017b15883a9c81f7a5b1f6763df3efd7b08886c77fbef4320c8c0dd25c57e2d6e4a6560
+DIST karchive-5.92.0.tar.xz 986308 BLAKE2B 5b549f6130b79cc76c817cae3fac6024724fdfcb207d5bd586b135351b1b07351884ddc0edb7331f595c40c964ed70ad1ee1892473e56c74d76cb636801221f8 SHA512 c6375c14805470e4d61142a97871d5255769f92e3d3e9716218d3b761c464b4e0443b1126b57ddccc33fe34e5d63c7468fba1d083dca49e2ae1dc38d583db770
+DIST karchive-5.94.0.tar.xz 986356 BLAKE2B e419f276c50f2c80eae88f6b429e70da5cea19c807ef8ddd4980441a83133592658b99930600a3be2b072329c39f83b85b4e603c1315e689a2a645eeaf76c388 SHA512 a77224ed59c0fcfd7637458bc0d165e9226e3858e632915c9f78a2d2e5725cc2595672edd3b05260b6dfc69a50a8a6f690e06ca04633df33a1b9889260d368b5
diff --git a/kde-frameworks/karchive/karchive-5.85.0.ebuild b/kde-frameworks/karchive/karchive-5.92.0.ebuild
index 178dbad27e7..6c8198d78f7 100644
--- a/kde-frameworks/karchive/karchive-5.85.0.ebuild
+++ b/kde-frameworks/karchive/karchive-5.92.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
diff --git a/kde-frameworks/karchive/karchive-5.88.0.ebuild b/kde-frameworks/karchive/karchive-5.94.0.ebuild
index 37a163f3415..15034e1438e 100644
--- a/kde-frameworks/karchive/karchive-5.88.0.ebuild
+++ b/kde-frameworks/karchive/karchive-5.94.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
diff --git a/kde-frameworks/kauth/Manifest b/kde-frameworks/kauth/Manifest
index 4c6282abc8e..b685c7fa7aa 100644
--- a/kde-frameworks/kauth/Manifest
+++ b/kde-frameworks/kauth/Manifest
@@ -1,2 +1,2 @@
-DIST kauth-5.85.0.tar.xz 88580 BLAKE2B bbb6d0d65c3ee0090ee8c7201938ca92cd59d9fbab84c6051b0937d9a6acd8fa3770f11a4e7cff32662c4d6d98296a58960700a87d9359124719be57f893ecaf SHA512 a775f1952ae112fc80a8119dd7060146dd427da6f73d9d3bb308c9683ffa263949e5f06615bc397806e951cf6156631a3d02505edc390c5982732199f17d812d
-DIST kauth-5.88.0.tar.xz 88876 BLAKE2B fdf0535943af84355345d4f67e5f842ccd65d4ae4251eacd5f400d8da5f75d36ab0c685d6ba0440d165d4677618a605a038da6cf2657d064207e90815d27e55b SHA512 8de3f7acc151ed865f8e1f01a2282bf638a1306c6907fac7e85d4a5475fdfd289a8b627544129d83a1aad6af40a3c8febbedee0ab54b7e99c3fb9ff343a8b3f1
+DIST kauth-5.92.0.tar.xz 90132 BLAKE2B 848d5654a95006c6ea4529be4568ebc6f3f975b87ffcc778730e0f7c67c08462a3aa5e3f9443fb31e173fb61d38faa08759bdc2415cd72f77ce7743a5bf83a6d SHA512 1c89f5668193a70cc1e74d5b671584d5b2fe003d6bbf9136933a6fd93c4516766a5e2369ac80ea78a0ae3adf4a454ae4be8558e06eeb34640779a9c7b645a244
+DIST kauth-5.94.0.tar.xz 90372 BLAKE2B 656b03ef3df5300dcd9cf58d1fae234c89403ee14ef4505d3e2143ac336d648f1e999f53db17005ef9968c7b3aacf726fcb66be56af610f1256228a91d163ffc SHA512 f5466b388c5e815ca877777622aa1cd67953b11ed501ccc212f791df96d38ac55912f0e38afdf9dda5dcaca354b08ee425ccb6cf2bc689c5347af28ee7e45a8b
diff --git a/kde-frameworks/kauth/kauth-5.85.0.ebuild b/kde-frameworks/kauth/kauth-5.92.0.ebuild
index 2dde0b617eb..c7ca91da1c2 100644
--- a/kde-frameworks/kauth/kauth-5.85.0.ebuild
+++ b/kde-frameworks/kauth/kauth-5.92.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -28,7 +28,6 @@ PDEPEND="policykit? ( kde-plasma/polkit-kde-agent )"
src_configure() {
local mycmakeargs=(
- -DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON # bug 746866
$(cmake_use_find_package policykit PolkitQt5-1)
)
diff --git a/kde-frameworks/kauth/kauth-5.88.0.ebuild b/kde-frameworks/kauth/kauth-5.94.0.ebuild
index 1b89dd9ac25..6f2b2595bd0 100644
--- a/kde-frameworks/kauth/kauth-5.88.0.ebuild
+++ b/kde-frameworks/kauth/kauth-5.94.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# 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.2
+QTMIN=5.15.3
VIRTUALX_REQUIRED="test"
inherit ecm kde.org
@@ -28,7 +28,6 @@ PDEPEND="policykit? ( kde-plasma/polkit-kde-agent )"
src_configure() {
local mycmakeargs=(
- -DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON # bug 746866
$(cmake_use_find_package policykit PolkitQt5-1)
)
diff --git a/kde-frameworks/kbookmarks/Manifest b/kde-frameworks/kbookmarks/Manifest
index 67f75fa29f0..9ecc29897b7 100644
--- a/kde-frameworks/kbookmarks/Manifest
+++ b/kde-frameworks/kbookmarks/Manifest
@@ -1,2 +1,2 @@
-DIST kbookmarks-5.85.0.tar.xz 127000 BLAKE2B 8d334192686f1696aff395acf7d562c55201d20eb3588083b44678bb9aa3a589e056e092584821c805be159283b3c22fdc5aa752648c286bb7610901726d0176 SHA512 f67f59c4fa6ee0eec16c431216223f352bdc4852c0ba4fb89cb50f477485a6a0dcfae161c69b49956d19b533d1624968e2275e3e2ac26a2da66a126c7c4334c2
-DIST kbookmarks-5.88.0.tar.xz 127436 BLAKE2B 50cdd4ddd2900b2d168af1b5d90c194f88804efe79f3f55846dce809debc867ad41e57d8d1faa618d56625074d28a2d817e6dd2556b234eb5a5ba04b025e66f8 SHA512 147cb700ae3dd844319f7984d9dee12ab9f81a06d388670882cabd9f301dcc21bf057cdf1b4b41b4d0381465afedbf4e72b3231841c91014a08445bda5667616
+DIST kbookmarks-5.92.0.tar.xz 130288 BLAKE2B 191e916e4e9702a97ef105bd2e31ba4b2cb222d0dfd2a26742c8ec9f296c3f1a26ca7406fff8984aa90cf63270bec4348b5fbf90720287e6c2dbdd0c2f0c1323 SHA512 c5cbcdf1476b9c3f5285893469d6543e12ef3172312c12f04728b48a15d26bf7cdc5181a5db91a7aac2dba90c088db8086a25436614ca0ca04a000705b2198b1
+DIST kbookmarks-5.94.0.tar.xz 130124 BLAKE2B e0985b3508078e44cc36343ff436b82294ad0ad7b196a873c7ca61b944f280bcaf773834d2d828408001865548de602b8be0c2382d1a5c8932fd64576f425e76 SHA512 0ab54590cc2a26039804d792d8c6399257e4bfbd92b34cbe8043b1d6e02f102783c229a7e457acefd6da5876481af2558d026dd3e9d4234a6adce14c8aa6c8b3
diff --git a/kde-frameworks/kbookmarks/kbookmarks-5.85.0.ebuild b/kde-frameworks/kbookmarks/kbookmarks-5.92.0.ebuild
index a2f2372f818..4b1d39a8e0b 100644
--- a/kde-frameworks/kbookmarks/kbookmarks-5.85.0.ebuild
+++ b/kde-frameworks/kbookmarks/kbookmarks-5.92.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
diff --git a/kde-frameworks/kbookmarks/kbookmarks-5.88.0.ebuild b/kde-frameworks/kbookmarks/kbookmarks-5.94.0.ebuild
index 01f3a9d2a95..f49515386a7 100644
--- a/kde-frameworks/kbookmarks/kbookmarks-5.88.0.ebuild
+++ b/kde-frameworks/kbookmarks/kbookmarks-5.94.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# 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.2
+QTMIN=5.15.3
VIRTUALX_REQUIRED="test"
inherit ecm kde.org
diff --git a/kde-frameworks/kcalendarcore/Manifest b/kde-frameworks/kcalendarcore/Manifest
index 0d6e3073634..49e6e483005 100644
--- a/kde-frameworks/kcalendarcore/Manifest
+++ b/kde-frameworks/kcalendarcore/Manifest
@@ -1,2 +1,2 @@
-DIST kcalendarcore-5.85.0.tar.xz 258044 BLAKE2B 469af118c30c5fa685625271fea5490a2d13b611541787e1998c5434bbea1a30fa283b9fb9cf60cbde75d9e7fe2ce9511ee9f81613c2675b09d594b72e3158e5 SHA512 91d37a49bcaace1c7717b1ea0e710b13f1e56edfbb0db2b7c012e7b86e0a4437466289a6770c745cc1993c6b1bbf670f238b3dd1b033225e6e6d36c19584c79e
-DIST kcalendarcore-5.88.0.tar.xz 262876 BLAKE2B f08dee70e4c35beb4fd633e25fc32bd13018d99387fa72456f6b52ffcc80e22388d858c569f52dd0cae1b859cbe587434aa93ea12c4b3edb12a5664520f74642 SHA512 9e9647db25e9fc165bfed5cf7b0843172086ce8e5300623d951f1a1b24fde2b0b711bfb1dd00eb5b2d0e445659fc5fdf757b99d12831e3d5d68a4157fcc52ce0
+DIST kcalendarcore-5.92.0.tar.xz 263032 BLAKE2B 1b3f07a6618537bdbc7ec62522a4cd852292d8cf46670f222a0b2a978234c8bf898148cae7a64609d41daffe1f053351a35727ca3f126b76009277db4f25a3cc SHA512 4efb6fbd6a3728648a23d608af4c4732402fd133911968b103c4b34876ee469e4680992e5d5755b8a9892ad60ed53a33f6a0c4c95418122258faf5299caa5413
+DIST kcalendarcore-5.94.0.tar.xz 266328 BLAKE2B d5765bff5f121209831bc3181555a55cb0250c39b4a88d073c0c6099f1d3a1ad42a8ac764968efc7287e316bf7b5b9c304ab0294203fc72fc89c46caa143fadd SHA512 e9747a1965ca78d6112276cbd501cf00494fe7ba777a24a92e7f0f1b605770f924bca2d1b7e30b69b19051f2c823d71faa37ae4768857d6adb38d7c0dfd9a32c
diff --git a/kde-frameworks/kcalendarcore/kcalendarcore-5.85.0.ebuild b/kde-frameworks/kcalendarcore/kcalendarcore-5.92.0.ebuild
index 928545c5c76..42913395dff 100644
--- a/kde-frameworks/kcalendarcore/kcalendarcore-5.85.0.ebuild
+++ b/kde-frameworks/kcalendarcore/kcalendarcore-5.92.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -15,13 +15,9 @@ IUSE=""
RESTRICT="test" # multiple tests fail or hang indefinitely
-BDEPEND="
- sys-devel/bison
-"
DEPEND="
>=dev-libs/libical-3.0.5:=
>=dev-qt/qtgui-${QTMIN}:5
"
-RDEPEND="${DEPEND}
- !kde-apps/kcalcore:5
-"
+RDEPEND="${DEPEND}"
+BDEPEND="sys-devel/bison"
diff --git a/kde-frameworks/kcalendarcore/kcalendarcore-5.88.0.ebuild b/kde-frameworks/kcalendarcore/kcalendarcore-5.94.0.ebuild
index c8d79be4c99..afbee107958 100644
--- a/kde-frameworks/kcalendarcore/kcalendarcore-5.88.0.ebuild
+++ b/kde-frameworks/kcalendarcore/kcalendarcore-5.94.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
ECM_TEST="true"
-QTMIN=5.15.2
+QTMIN=5.15.3
VIRTUALX_REQUIRED="test"
inherit ecm kde.org
@@ -15,13 +15,9 @@ IUSE=""
RESTRICT="test" # multiple tests fail or hang indefinitely
-BDEPEND="
- sys-devel/bison
-"
DEPEND="
>=dev-libs/libical-3.0.5:=
>=dev-qt/qtgui-${QTMIN}:5
"
-RDEPEND="${DEPEND}
- !kde-apps/kcalcore:5
-"
+RDEPEND="${DEPEND}"
+BDEPEND="sys-devel/bison"
diff --git a/kde-frameworks/kcmutils/Manifest b/kde-frameworks/kcmutils/Manifest
index 9f9f6ee421b..57f9d257ad1 100644
--- a/kde-frameworks/kcmutils/Manifest
+++ b/kde-frameworks/kcmutils/Manifest
@@ -1,2 +1,2 @@
-DIST kcmutils-5.85.0.tar.xz 163296 BLAKE2B d392902e5629920f307b224bafe07037426152660a4ba8c66eab17aba356304c99456b6f487a8f8954266ab3a7b4d0b207dbb8daa692485060046ae6b853050b SHA512 38c7168d91b535a58317ee36442ef2857aa3c43c7a33ba2abab115f7f890f7c53f29b488c0d5597a93b500814bf0a0bc8d8347124f5ced5d13118a0efc95f1fa
-DIST kcmutils-5.88.0.tar.xz 165448 BLAKE2B 4c91c0cd82005648c8c534f92cb23ebede03a7aa657218036890a817680cda4d32c69441473b2bca9b303af89b04ff33631eef7c8847dcf663c7fdbe03c3e870 SHA512 7a575cc8bc5eac736bb6c519daa7c93179926cfaf42463462871c83e660d0495f3abd9e08e726b0d07e956eed33414eeab63bbe85ccc72019ff7d7b8226ab2ce
+DIST kcmutils-5.92.0.tar.xz 172120 BLAKE2B 221482f15f1c8138f60565215f5c0c2d6e9922d82d81d3a90a1685f9e7a9407e459d56dd5e91a8dfc5b6dc322ec012a15422d265ca0cfaff54a8b7effb1ba0aa SHA512 b0810f87fc7b641ff05ae8b9816434175e494786ee86201a34bd435c2177e6b8dd963e60804747cec954ca7f02d54bdc7f944b72c0a774ff4dd86b186e9e2f8f
+DIST kcmutils-5.94.0.tar.xz 185096 BLAKE2B 1a1b05536a754530cbe30e70f8f70a5d61fcc95e31b056545d9338be493c37b9d8e67ee16299bcb91b1cdb742018c4e678cd1561c38f789941dba78ab079e064 SHA512 c5ca1e1b61da4c7c96bb8e95593e4799c86345a6d4ae222284c31e31ac3c60ace81bd1f8e62c5e1956b25f2f6f32d9586912505380dce888a7e76ed86f45fdca
diff --git a/kde-frameworks/kcmutils/files/kcmutils-5.92.0-KDEBUG-444378.patch b/kde-frameworks/kcmutils/files/kcmutils-5.92.0-KDEBUG-444378.patch
new file mode 100644
index 00000000000..b0f5b947dfc
--- /dev/null
+++ b/kde-frameworks/kcmutils/files/kcmutils-5.92.0-KDEBUG-444378.patch
@@ -0,0 +1,52 @@
+From c9c58de65c07c8a940cb4c9b91777450698f635c Mon Sep 17 00:00:00 2001
+From: Alexander Lohnau <alexander.lohnau@gmx.de>
+Date: Sun, 6 Mar 2022 21:31:51 +0100
+Subject: [PATCH] Fix KPluginSelector KCMs missing their metadata on plugin
+ loading
+
+For the KWin KCMs we need the full metadata, because we read the
+plugin keyword.
+
+Without the X-KDE-ConfigModule key, plugins used to create a symlink
+in the kservices5 folder to their metadata, which then goes through the
+legacy code path we would read all the metadata.
+This includes the plugin keyword.
+
+When consumers would this key, but have an old KWin version which
+used the KPluginSelector class and a kcmutils version which reads X-KDE-ConfigModule, but does not
+include this bugfix, the plugin keyword will be empty and thus the config
+files can not be located.
+
+This makes it hard to fix the loading on kcmutils < 5.91, but keeping the
+code working with KWin < 5.24.
+
+To test this, you should check out KWin 5.23 and kcmutils master.
+Fox example https://github.com/nclarius/tile-gaps/ will then fail
+to load it's config. With this change included, it should load properly.
+
+BUG: 444378
+---
+ src/kpluginselector.cpp | 7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/src/kpluginselector.cpp b/src/kpluginselector.cpp
+index d5248d3..1f4c651 100644
+--- a/src/kpluginselector.cpp
++++ b/src/kpluginselector.cpp
+@@ -969,10 +969,9 @@ void KPluginSelector::Private::PluginDelegate::configure(const QModelIndex &inde
+ const QString pluginId = configModule.mid(idx + 1);
+ metaDataList = {KPluginMetaData::findPluginById(pluginNamespace, pluginId)}; // Clear the list to avoid old desktop files to appear twice
+ } else {
+- // the KCMs don't need any metadata themselves, just set the name to make sure the KPluginMetaData object
+- // is valid & the internal usage has the data it needs
+- QJsonObject kplugin({{QLatin1String("Name"), pluginInfo.name()}});
+- KPluginMetaData data(QJsonObject{{QLatin1String("KPlugin"), kplugin}}, absoluteKCMPath);
++ // the KCMs don't need any metadata themselves, just use the one from the KPluginInfo object
++ // this way for example a KPackage plugin can specify plugin keyword
++ KPluginMetaData data(pluginInfo.toMetaData().rawData(), absoluteKCMPath);
+ metaDataList = {data}; // Clear the list to avoid old desktop files to appear twice
+ }
+ }
+--
+GitLab
+
diff --git a/kde-frameworks/kcmutils/kcmutils-5.85.0.ebuild b/kde-frameworks/kcmutils/kcmutils-5.92.0-r1.ebuild
index 2f4eb47d8c2..3b06f270a6d 100644
--- a/kde-frameworks/kcmutils/kcmutils-5.85.0.ebuild
+++ b/kde-frameworks/kcmutils/kcmutils-5.92.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -32,3 +32,5 @@ DEPEND="
=kde-frameworks/kxmlgui-${PVCUT}*:5
"
RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-KDEBUG-444378.patch" )
diff --git a/kde-frameworks/kcmutils/kcmutils-5.88.0.ebuild b/kde-frameworks/kcmutils/kcmutils-5.94.0.ebuild
index 52061f0cd40..eb9f164425a 100644
--- a/kde-frameworks/kcmutils/kcmutils-5.88.0.ebuild
+++ b/kde-frameworks/kcmutils/kcmutils-5.94.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# 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.2
+QTMIN=5.15.3
VIRTUALX_REQUIRED="test"
inherit ecm kde.org
diff --git a/kde-frameworks/kcodecs/Manifest b/kde-frameworks/kcodecs/Manifest
index 5cc9fe817f5..fc4b8b06544 100644
--- a/kde-frameworks/kcodecs/Manifest
+++ b/kde-frameworks/kcodecs/Manifest
@@ -1,2 +1,2 @@
-DIST kcodecs-5.85.0.tar.xz 232016 BLAKE2B 1165a5c89682d2987d414c134a6e0481d9ed5b7d17f3e76899105feed510a4deb27d018b4f1dc6c7c9c70712aa66c36c1768ad557490f527375de8e29e8a1667 SHA512 1ea9b627d71cbe5435ba584f4af6e28b2c68ecbe5c415e125aefcd66c3418535cac6b5688e138aa60b3722374d9dade736590ee0900cbe65638814c80921ace0
-DIST kcodecs-5.88.0.tar.xz 235172 BLAKE2B ff48297999afcd551d3b4138794f6520bea9a8f19be0e944c4847ece4fcf74d93b9ddb17d5809afcc8560ebe2aa5239022bf6ee4d7e3a533b160a9f867817b17 SHA512 82640789b478b1de525f4423c8292463357d48b059a070bd0a2848747d884c8216df13c03e61b7d524ff412228f6d5b16a94b3af7acef5864def04b9d2d4afd4
+DIST kcodecs-5.92.0.tar.xz 236760 BLAKE2B f93d7d9bd01db85206d39a36ce05ea690b51bc11cdc933aada4f346b0c934d68c96ad3c6abc18ab5fa93039c16edf6f9c1dc6ced754906f55c73862c846b06e4 SHA512 d7d89f08b6ec789afe6267c2c9d7a1b259cfd720d3b52a83eab6cea527dde414d509b44100cba9ab5727f10b02ca090cb33038748ea41d21f21aac12b65200ed
+DIST kcodecs-5.94.0.tar.xz 236892 BLAKE2B 9a142926c53c7ade47ed7fdc0423ef8b6033baa3235341df1aab717250adee41f3ab7fd82247cc9681b3f254390965f8666af55cf4c38858c271af0ced040320 SHA512 553d093d3b030552101c212d90fdd1ffdd04feb59d96e9e859ad64b6abbda8d43690c5cfbbf3383cdaa25f9bc7620a6105c839a8446f109386e08cd74504b0c9
diff --git a/kde-frameworks/kcodecs/kcodecs-5.85.0.ebuild b/kde-frameworks/kcodecs/kcodecs-5.92.0.ebuild
index b35fe599cd0..3c5be522870 100644
--- a/kde-frameworks/kcodecs/kcodecs-5.85.0.ebuild
+++ b/kde-frameworks/kcodecs/kcodecs-5.92.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -15,10 +15,3 @@ BDEPEND="
dev-util/gperf
nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
"
-
-src_configure() {
- local mycmakeargs=(
- -DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON # bug 746866
- )
- ecm_src_configure
-}
diff --git a/kde-frameworks/kcodecs/kcodecs-5.88.0.ebuild b/kde-frameworks/kcodecs/kcodecs-5.94.0.ebuild
index a624d494406..1b6a92ebf2a 100644
--- a/kde-frameworks/kcodecs/kcodecs-5.88.0.ebuild
+++ b/kde-frameworks/kcodecs/kcodecs-5.94.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-QTMIN=5.15.2
+QTMIN=5.15.3
inherit ecm kde.org
DESCRIPTION="Framework for manipulating strings using various encodings"
@@ -15,10 +15,3 @@ BDEPEND="
dev-util/gperf
nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
"
-
-src_configure() {
- local mycmakeargs=(
- -DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON # bug 746866
- )
- ecm_src_configure
-}
diff --git a/kde-frameworks/kcompletion/Manifest b/kde-frameworks/kcompletion/Manifest
index 6a782b2f18e..586bf94adbc 100644
--- a/kde-frameworks/kcompletion/Manifest
+++ b/kde-frameworks/kcompletion/Manifest
@@ -1,2 +1,2 @@
-DIST kcompletion-5.85.0.tar.xz 122020 BLAKE2B 064b6074827722ceb852faa93c0a1132ab8dfb7496eddcb951deb52d9b6acfbaaf0cf2ef5f74449889998b734b4db9d9114972ceb2017ccf26dcb1a25c1cf5d4 SHA512 c10cf1e5710dc7cabc107b8e9320f79a3eda28bc7ca386853043fbc229736ad10f1ea3bdd2cd77c4a1c0ffa4f0e7407bd400929d0d4bb8d61afa8832889b31a0
-DIST kcompletion-5.88.0.tar.xz 122892 BLAKE2B 182fe181fb06e1d8387b31c50a8cfb64b141e146d8982bca4c13b964eed9ed54244e69fc9382470dfbf2a258af333b5e11ef150bb76520dd3218524d14478467 SHA512 4a2c42014b1d6e933a48e289a1c3ed8dc6ad4aee95eb8f2195c52272dcd57a7b1e4b97bad8ab72ce3800591accf2a2cb561997b828275ecf8f8f34727368bd6b
+DIST kcompletion-5.92.0.tar.xz 124500 BLAKE2B da722905cd3f1dbb7c4628ee8957899a116b8ee2f2ebaabca3aebb1330ff44f428798180726d08e9970ab3a286a831c89facc9f9fdd46405102ad13bc1a6c104 SHA512 3253a54cbef68d2b71bd457f240db40be0a590974de95aa6f0f2a5a6c095279f45f8c1b5111644f04039423ef783d0bd0e75fff7eff403c7ffc8197ee9008e03
+DIST kcompletion-5.94.0.tar.xz 124556 BLAKE2B 85bc7da96d266b6defb26fc3668dc793a5abf2605bea85504c2ded3f477e2c6ab22419c1aa571b639f0532caaa1e4cf6bb96757413f3d4233bc8948d4ef64651 SHA512 fe0adcafba6f2d72c504f900f90fe04d5c10d198ead1c43e386736df8ac97da923f34b4e623b63da9edd8455dbbf31a671c216c0f58884c6ee93a9dc5e5b7b04
diff --git a/kde-frameworks/kcompletion/kcompletion-5.85.0.ebuild b/kde-frameworks/kcompletion/kcompletion-5.92.0.ebuild
index ed1477a2aac..d7dd9c7924a 100644
--- a/kde-frameworks/kcompletion/kcompletion-5.85.0.ebuild
+++ b/kde-frameworks/kcompletion/kcompletion-5.92.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -10,13 +10,11 @@ VIRTUALX_REQUIRED="test"
inherit ecm kde.org
DESCRIPTION="Framework for common completion tasks such as filename or URL completion"
+
LICENSE="LGPL-2+"
KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
IUSE="nls"
-BDEPEND="
- nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
DEPEND="
>=dev-qt/qtgui-${QTMIN}:5
>=dev-qt/qtwidgets-${QTMIN}:5
@@ -24,10 +22,4 @@ DEPEND="
=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
"
RDEPEND="${DEPEND}"
-
-src_configure() {
- local mycmakeargs=(
- -DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON # bug 746866
- )
- ecm_src_configure
-}
+BDEPEND="nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )"
diff --git a/kde-frameworks/kcompletion/kcompletion-5.88.0.ebuild b/kde-frameworks/kcompletion/kcompletion-5.94.0.ebuild
index f0f1b4037ef..0e6a74cbba1 100644
--- a/kde-frameworks/kcompletion/kcompletion-5.88.0.ebuild
+++ b/kde-frameworks/kcompletion/kcompletion-5.94.0.ebuild
@@ -1,22 +1,20 @@
-# Copyright 1999-2021 Gentoo Authors
+# 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.2
+QTMIN=5.15.3
VIRTUALX_REQUIRED="test"
inherit ecm kde.org
DESCRIPTION="Framework for common completion tasks such as filename or URL completion"
+
LICENSE="LGPL-2+"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
IUSE="nls"
-BDEPEND="
- nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
DEPEND="
>=dev-qt/qtgui-${QTMIN}:5
>=dev-qt/qtwidgets-${QTMIN}:5
@@ -24,10 +22,4 @@ DEPEND="
=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
"
RDEPEND="${DEPEND}"
-
-src_configure() {
- local mycmakeargs=(
- -DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON # bug 746866
- )
- ecm_src_configure
-}
+BDEPEND="nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )"
diff --git a/kde-frameworks/kconfig/Manifest b/kde-frameworks/kconfig/Manifest
index df690f74707..d1ece8ee14f 100644
--- a/kde-frameworks/kconfig/Manifest
+++ b/kde-frameworks/kconfig/Manifest
@@ -1,2 +1,2 @@
-DIST kconfig-5.85.0.tar.xz 270420 BLAKE2B d2de8ba3f91857d9b806627df685ebaf14b9e02620fc820163f15d8a36b51b190a2984d06ec1133bd2eec2f548c38089d7d50105e3514cecb64ac052b1f8b4ee SHA512 38cefed52e322be34bfd4b26a243b4f931442239a14bcb1f496f9223d2b87e05cdb9931a2aec9579b8bbe31d716bb6a1ce7901ba3cb525607bbef2aee7b96d52
-DIST kconfig-5.88.0.tar.xz 274252 BLAKE2B 1e2f3373defd270a0790b8acc9c94420565dc2bc367a19c55c81bb1a6d5ef1f4cc7b2d87d15d5c28c9483841a11cd31f2c836fd45631030a84e8a688710043a7 SHA512 359517852ef5a19d75b829929bdd7b5932a5aadc7a7abfa85a43d968f5f4a3b268e3b2ce65d60528645181aa29efbf75ce9aadb78c9c9c693079b024699ba5c0
+DIST kconfig-5.92.0.tar.xz 281432 BLAKE2B 268114c759f586f305a10da2471c98b7110033646d6e02406e1659e5feb2b71c9f3d6c9aa90987e0710a82471a14129995407918ae873a1baf855b906015e0a3 SHA512 751fed42c90c8319fecaca106cbc1a8797cc1490a3732ca9071dd5ce27bf1cdf3acbc048ae14b8a7920036b47fc5f554bab4742f00c1d0391d2c130a5e0aba4d
+DIST kconfig-5.94.0.tar.xz 282028 BLAKE2B c86541a29e1f9bf14c49e666ea7abc4c57b3bfba4f7e0a6bae54d7dd4702cd697b7f539f93392c18e9a522b7c12323bc05dede3b0f28408ec2ca03deeb655413 SHA512 59d7d957313e421a332fb0a83eef6be68455c3de50cee0cd0d1b6b22f2b97ad9fdfddac282f03c4cedc5f364d4b3321c3f3fdadd7824e0523c5260446dc31ac9
diff --git a/kde-frameworks/kconfig/kconfig-5.85.0.ebuild b/kde-frameworks/kconfig/kconfig-5.92.0.ebuild
index 90cc4b6fb05..219f7ebd2c6 100644
--- a/kde-frameworks/kconfig/kconfig-5.85.0.ebuild
+++ b/kde-frameworks/kconfig/kconfig-5.92.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -8,31 +8,33 @@ VIRTUALX_REQUIRED="test"
inherit ecm kde.org
DESCRIPTION="Framework for reading and writing configuration"
+
LICENSE="LGPL-2+"
KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-IUSE="dbus nls"
+IUSE="dbus nls qml"
# bug 560086
RESTRICT="test"
-BDEPEND="
- nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
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=(
- -DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON # bug 746866
-DKCONFIG_USE_DBUS=$(usex dbus)
+ $(cmake_use_find_package qml Qt5Qml)
)
ecm_src_configure
}
diff --git a/kde-frameworks/kconfig/kconfig-5.88.0.ebuild b/kde-frameworks/kconfig/kconfig-5.94.0.ebuild
index f2f24bbd72a..ceaeed44d9c 100644
--- a/kde-frameworks/kconfig/kconfig-5.88.0.ebuild
+++ b/kde-frameworks/kconfig/kconfig-5.94.0.ebuild
@@ -1,38 +1,40 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-QTMIN=5.15.2
+QTMIN=5.15.3
VIRTUALX_REQUIRED="test"
inherit ecm kde.org
DESCRIPTION="Framework for reading and writing configuration"
+
LICENSE="LGPL-2+"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="dbus nls"
+IUSE="dbus nls qml"
# bug 560086
RESTRICT="test"
-BDEPEND="
- nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
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=(
- -DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON # bug 746866
-DKCONFIG_USE_DBUS=$(usex dbus)
+ $(cmake_use_find_package qml Qt5Qml)
)
ecm_src_configure
}
diff --git a/kde-frameworks/kconfig/metadata.xml b/kde-frameworks/kconfig/metadata.xml
index 506ecf605bc..4e3b65426dd 100644
--- a/kde-frameworks/kconfig/metadata.xml
+++ b/kde-frameworks/kconfig/metadata.xml
@@ -8,6 +8,9 @@
<upstream>
<bugs-to>https://bugs.kde.org/</bugs-to>
</upstream>
+ <use>
+ <flag name="qml">Enable QML/QtQuick support via dev-qt/qtdeclarative</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/kconfigwidgets/Manifest b/kde-frameworks/kconfigwidgets/Manifest
index c040eb2b247..8dcbab73bf1 100644
--- a/kde-frameworks/kconfigwidgets/Manifest
+++ b/kde-frameworks/kconfigwidgets/Manifest
@@ -1,2 +1,2 @@
-DIST kconfigwidgets-5.85.0.tar.xz 410632 BLAKE2B cbeb31c40a5cd22c5a0ebbb83089387482e1b54571d02a7c7dff8e373ce11bcb9215ce778be45b9deda544e82140080edce6408282af1ecdcad7ef790178b75a SHA512 dddcfd54e36b2c45ab42d5e61811141eff2bb8d2d70a5bd09993e742bee05bf18a3b2e94b2ff8bcf6199db84044542a8d3d01a36f6b29d7d9b33e6c82392ac7b
-DIST kconfigwidgets-5.88.0.tar.xz 412648 BLAKE2B 45b08f839fea13f848a8c6f0990b0da1fad44c27659d18102fcba9ec407fed7588cafc20d401f9b0253fb26baba484bb901b5ffe310f2e8ad4b666673773968d SHA512 cbc4af1f19509325528cef138746b081552547bbbd5c741dada8d9b58e6d510eb3611867335d94b892d42fa1eb771f0ab4b93c56014cede65bf6769cf10b5a3e
+DIST kconfigwidgets-5.92.0.tar.xz 414528 BLAKE2B 688c6c509577e67558e0d3d080c7b11dc0041a6607c9b5d10d7e057e7c38db57b49bb0e28535a4314f32906d2a9bf55a6b96dc8e064a8775d08d3faf270351aa SHA512 50d07daab3469a3ac9bea2a5ff37b9b1be13bd833a94892825d25f5cd066dc5eb8d44d37319811463e6edc94123da0255851d4f6463ed3c723c6fc69e1902a5f
+DIST kconfigwidgets-5.94.0.tar.xz 417072 BLAKE2B a84231f4224e47e00d2666ed60260e7d2027009c4519c61e49c7bc9c9cbf12858772ac3292bb401a9b44d3706232289ff461fe9abba1ecac378406cdd1cb0443 SHA512 1b99bb215d6f00204e6605cc078062d3e6d9b8c3e5b4a2166e82aaf1a50ac02bbede955908bb7c3bd04e6d1733b103f4e50850358d462d3568bd59f8cf43d02e
diff --git a/kde-frameworks/kconfigwidgets/files/kconfigwidgets-5.88.0-KCommandBar-alignment.patch b/kde-frameworks/kconfigwidgets/files/kconfigwidgets-5.88.0-KCommandBar-alignment.patch
deleted file mode 100644
index 1ebd8e3dd55..00000000000
--- a/kde-frameworks/kconfigwidgets/files/kconfigwidgets-5.88.0-KCommandBar-alignment.patch
+++ /dev/null
@@ -1,494 +0,0 @@
-From 34d5352c1f30d92b10667574cb7fcc1cf7e9af66 Mon Sep 17 00:00:00 2001
-From: Eugene Popov <popov895@ukr.net>
-Date: Sat, 6 Nov 2021 18:49:37 +0000
-Subject: [PATCH] [KCommandBar] Dynamic column widths + shortcuts alignment
-
----
- src/kcommandbar.cpp | 278 +++++++++++++++++++++----------------
- src/kcommandbarmodel_p.cpp | 17 +--
- src/kcommandbarmodel_p.h | 9 +-
- tests/kcommandbartest.cpp | 9 ++
- 4 files changed, 176 insertions(+), 137 deletions(-)
-
-diff --git a/src/kcommandbar.cpp b/src/kcommandbar.cpp
-index 0d17ffa0..4d0987d7 100644
---- a/src/kcommandbar.cpp
-+++ b/src/kcommandbar.cpp
-@@ -16,6 +16,7 @@
- #include <QTextLayout>
- #include <QTreeView>
- #include <QVBoxLayout>
-+#include <QHeaderView>
-
- #include <KConfigGroup>
- #include <KFuzzyMatcher>
-@@ -147,32 +148,24 @@ public:
-
- void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override
- {
-- QStyleOptionViewItem options = option;
-- initStyleOption(&options, index);
--
- painter->save();
-
-- // paint background
-- if (option.state & QStyle::State_Selected) {
-- painter->fillRect(option.rect, option.palette.highlight());
-- } else {
-- painter->fillRect(option.rect, option.palette.base());
-- }
--
- /**
- * Draw everything, (widget, icon etc) except the text
- */
-- options.text = QString(); // clear old text
-- QStyle *style = options.widget->style();
-- style->drawControl(QStyle::CE_ItemViewItem, &options, painter, options.widget);
-+ QStyleOptionViewItem optionCopy = option;
-+ initStyleOption(&optionCopy, index);
-+ optionCopy.text.clear(); // clear old text
-+ QStyle *style = option.widget->style();
-+ style->drawControl(QStyle::CE_ItemViewItem, &optionCopy, painter, option.widget);
-
-- const int hMargin = style->pixelMetric(QStyle::PM_FocusFrameHMargin, &options, options.widget);
-+ const int hMargin = style->pixelMetric(QStyle::PM_FocusFrameHMargin, &option, option.widget);
-
- QRect outputRect = option.rect;
-
- const CommandBarFilterModel *model = static_cast<const CommandBarFilterModel*>(index.model());
- if (model->hasActionsWithIcons()) {
-- const int iconWidth = options.decorationSize.width() + hMargin;
-+ const int iconWidth = option.decorationSize.width() + hMargin;
- if (option.direction == Qt::RightToLeft) {
- outputRect.adjust(0, 0, -iconWidth, 0);
- } else {
-@@ -198,7 +191,7 @@ public:
- }
-
- QTextCharFormat fmt;
-- fmt.setForeground(options.palette.link().color());
-+ fmt.setForeground(option.palette.link().color());
- fmt.setFontWeight(QFont::Bold);
-
- /**
-@@ -206,13 +199,13 @@ public:
- */
- const auto fmtRanges = KFuzzyMatcher::matchedRanges(m_filterString, str);
- QTextCharFormat f;
-- f.setForeground(options.palette.link());
-+ f.setForeground(option.palette.link());
- std::transform(fmtRanges.begin(), fmtRanges.end(), std::back_inserter(formats), [f, actionNameStart](const KFuzzyMatcher::Range &fr) {
- return QTextLayout::FormatRange{fr.start + actionNameStart, fr.length, f};
- });
-
- outputRect.adjust(hMargin, 0, -hMargin, 0);
-- paintItemText(painter, original, outputRect, options, std::move(formats));
-+ paintItemText(painter, original, outputRect, option, std::move(formats));
-
- painter->restore();
- }
-@@ -240,122 +233,159 @@ public:
- return shortcutString.split(QLatin1String(", "), Qt::SkipEmptyParts);
- }
-
-+ // returns the width needed to draw the shortcut
-+ static int shortcutDrawingWidth(const QStyleOptionViewItem &option, const QString &shortcut, int hMargin)
-+ {
-+ int width = 0;
-+ if (!shortcut.isEmpty()) {
-+ // adapt the shortcut as it will be drawn
-+ // "Ctrl+A, Alt+B" => "Ctrl+A+Alt+B"
-+ QString adaptedShortcut = shortcut;
-+ adaptedShortcut.replace(QStringLiteral(", "), QStringLiteral("+"));
-+
-+ width = option.fontMetrics.horizontalAdvance(adaptedShortcut);
-+
-+ // count the number of segments
-+ // "Ctrl+A+Alt+B" => ["Ctrl", "+", "A", "+", "Alt", "+", "B"]
-+ static const QRegularExpression regExp(QStringLiteral("(\\+(?!\\+)|\\+(?=\\+{2}))"));
-+ const int segmentsCount = 2 * adaptedShortcut.count(regExp) + 1;
-+
-+ // add left and right margins for each segment
-+ width += segmentsCount * 2 * hMargin;
-+ }
-+
-+ return width;
-+ }
-+
- void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override
- {
-- QStyleOptionViewItem options = option;
-- initStyleOption(&options, index);
-- painter->save();
-+ // draw background
-+ option.widget->style()->drawPrimitive(QStyle::PE_PanelItemViewItem, &option, painter);
-
- const QString shortcutString = index.data().toString();
--
-- // paint background
-- if (option.state & QStyle::State_Selected) {
-- painter->fillRect(option.rect, option.palette.highlight());
-- } else {
-- painter->fillRect(option.rect, option.palette.base());
-+ if (shortcutString.isEmpty()) {
-+ return;
- }
-
-- options.text = QString(); // clear old text
-- options.widget->style()->drawControl(QStyle::CE_ItemViewItem, &options, painter, options.widget);
--
-- if (!shortcutString.isEmpty()) {
-- /**
-- * Shortcut string splitting
-- *
-- * We do it in two steps
-- * 1. Split on ", " so that if we have multi modifier shortcuts they are nicely
-- * split into strings.
-- * 2. Split each shortcut from step 1 into individual string.
-- *
-- * Example:
-- *
-- * "Ctrl+,, Alt+:"
-- * Step 1: [ "Ctrl+," , "Alt+:"]
-- * Step 2: [ "Ctrl", ",", "Alt", ":"]
-- */
-- const QStringList spaceSplitted = splitShortcutString(shortcutString);
-- QStringList list;
-- list.reserve(spaceSplitted.size() * 2);
-- for (const QString &shortcut : spaceSplitted) {
-- list += shortcut.split(QLatin1Char('+'), Qt::SkipEmptyParts);
-- if (shortcut.endsWith(QLatin1Char('+'))) {
-- list.append(QStringLiteral("+"));
-- }
-+ /**
-+ * Shortcut string splitting
-+ *
-+ * We do it in two steps
-+ * 1. Split on ", " so that if we have multi modifier shortcuts they are nicely
-+ * split into strings.
-+ * 2. Split each shortcut from step 1 into individual string.
-+ *
-+ * Example:
-+ *
-+ * "Ctrl+,, Alt+:"
-+ * Step 1: [ "Ctrl+," , "Alt+:"]
-+ * Step 2: [ "Ctrl", ",", "Alt", ":"]
-+ */
-+ const QStringList spaceSplitted = splitShortcutString(shortcutString);
-+ QStringList list;
-+ list.reserve(spaceSplitted.size() * 2);
-+ for (const QString &shortcut : spaceSplitted) {
-+ list += shortcut.split(QLatin1Char('+'), Qt::SkipEmptyParts);
-+ if (shortcut.endsWith(QLatin1Char('+'))) {
-+ list.append(QStringLiteral("+"));
- }
-+ }
-
-- /**
-- * Create rects for each string from the previous step
-- *
-- * @todo boundingRect may give issues here, use horizontalAdvance
-- * @todo We probably dont need the full rect, just the width so the
-- * "btns" vector can just be vector<pair<int, string>>
-- */
-- QVector<QPair<QRect, QString>> btns;
-- btns.reserve(list.size());
-- const int height = options.rect.height();
-- for (const QString &text : std::as_const(list)) {
-- if (text.isEmpty()) {
-- continue;
-- }
-- QRect r = option.fontMetrics.boundingRect(text);
-- // this happens on gnome so we manually decrease the
-- // height a bit
-- if (r.height() == height) {
-- r.setHeight(r.height() - 4);
-- }
-- r.setWidth(r.width() + 8);
-- btns.append({r, text});
-+ /**
-+ * Create rects for each string from the previous step
-+ *
-+ * @todo We probably dont need the full rect, just the width so the
-+ * "btns" vector can just be vector<pair<int, string>>
-+ */
-+ QVector<QPair<QRect, QString>> btns;
-+ btns.reserve(list.size());
-+ const int height = option.rect.height();
-+ const int hMargin = horizontalMargin(option);
-+ for (const QString &text : std::as_const(list)) {
-+ if (text.isEmpty()) {
-+ continue;
- }
--
-- // we have nothing, just return
-- if (btns.isEmpty()) {
-- return;
-+ QRect r(0, 0, option.fontMetrics.horizontalAdvance(text), option.fontMetrics.lineSpacing());
-+ // this happens on gnome so we manually decrease the
-+ // height a bit
-+ if (r.height() == height) {
-+ r.setHeight(r.height() - 4);
- }
-+ r.setWidth(r.width() + 2 * hMargin);
-+ btns.append({r, text});
-+ }
-+
-+ // we have nothing, just return
-+ if (btns.isEmpty()) {
-+ return;
-+ }
-+
-+ const QRect plusRect = option.fontMetrics.boundingRect(QLatin1Char('+'));
-
-- const QRect plusRect = option.fontMetrics.boundingRect(QLatin1Char('+'));
--
-- // draw them
-- int x = option.rect.x();
-- const int y = option.rect.y();
-- const int plusY = option.rect.y() + plusRect.height() / 2;
-- const int total = btns.size();
--
-- // make sure our rects are nicely V-center aligned in the row
-- painter->translate(QPoint(0, (option.rect.height() - btns.at(0).first.height()) / 2));
--
-- int i = 0;
-- painter->setRenderHint(QPainter::Antialiasing);
-- for (const auto &btn : std::as_const(btns)) {
-- painter->setPen(Qt::NoPen);
-- const QRect &rect = btn.first;
--
-- QRect buttonRect(x, y, rect.width(), rect.height());
--
-- // draw rounded rect shadow
-- auto shadowRect = buttonRect.translated(0, 1);
-- painter->setBrush(option.palette.shadow());
-- painter->drawRoundedRect(shadowRect, 3.0, 3.0);
--
-- // draw rounded rect itself
-- painter->setBrush(option.palette.button());
-- painter->drawRoundedRect(buttonRect, 3.0, 3.0);
--
-- // draw text inside rounded rect
-- painter->setPen(option.palette.buttonText().color());
-- painter->drawText(buttonRect, Qt::AlignCenter, btn.second);
--
-- // draw '+'
-- if (i + 1 < total) {
-- x += rect.width() + 5;
-- painter->drawText(QPoint(x, plusY + (rect.height() / 2)), QStringLiteral("+"));
-- x += plusRect.width() + 5;
-- }
-- i++;
-+ // draw them
-+ int x;
-+ if (option.direction == Qt::RightToLeft) {
-+ x = option.rect.x() + hMargin;
-+ } else {
-+ x = option.rect.right() - shortcutDrawingWidth(option, shortcutString, hMargin) - hMargin;
-+ }
-+ const int y = option.rect.y() + (option.rect.height() - btns.at(0).first.height()) / 2;
-+ const int plusY = option.rect.y() + (option.rect.height() - plusRect.height()) / 2;
-+ const int total = btns.size();
-+
-+ int i = 0;
-+ painter->save();
-+ painter->setRenderHint(QPainter::Antialiasing);
-+ for (const auto &btn : std::as_const(btns)) {
-+ painter->setPen(Qt::NoPen);
-+ const QRect &rect = btn.first;
-+
-+ QRect buttonRect(x, y, rect.width(), rect.height());
-+
-+ // draw rounded rect shadow
-+ auto shadowRect = buttonRect.translated(0, 1);
-+ painter->setBrush(option.palette.shadow());
-+ painter->drawRoundedRect(shadowRect, 3.0, 3.0);
-+
-+ // draw rounded rect itself
-+ painter->setBrush(option.palette.button());
-+ painter->drawRoundedRect(buttonRect, 3.0, 3.0);
-+
-+ // draw text inside rounded rect
-+ painter->setPen(option.palette.buttonText().color());
-+ painter->drawText(buttonRect, Qt::AlignCenter, btn.second);
-+
-+ // draw '+'
-+ if (i + 1 < total) {
-+ x += rect.width() + hMargin;
-+ painter->drawText(QPoint(x, plusY + (rect.height() / 2)), QStringLiteral("+"));
-+ x += plusRect.width() + hMargin;
- }
-+ i++;
- }
-
- painter->restore();
- }
-+
-+ QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const override
-+ {
-+ if (index.isValid() && index.column() == KCommandBarModel::Column_Shortcut) {
-+ QString shortcut = index.data().toString();
-+ if (!shortcut.isEmpty()) {
-+ const int hMargin = horizontalMargin(option);
-+ const int width = shortcutDrawingWidth(option, shortcut, hMargin) + 2 * hMargin;
-+
-+ return QSize(width, 0);
-+ }
-+ }
-+
-+ return QStyledItemDelegate::sizeHint(option, index);
-+ }
-+
-+ int horizontalMargin(const QStyleOptionViewItem &option) const
-+ {
-+ return option.widget->style()->pixelMetric(QStyle::PM_FocusFrameHMargin, &option) + 2;
-+ }
- };
-
- // BEGIN KCommandBarPrivate
-@@ -410,9 +440,6 @@ void KCommandBarPrivate::updateViewGeometry(KCommandBar *q)
-
- const QSize viewMaxSize(centralSize.width() / 2.4, centralSize.height() / 2);
-
-- // First column occupies 60% of the width
-- m_treeView.setColumnWidth(0, viewMaxSize.width() * 0.6);
--
- // Position should be central over window
- const int xPos = std::max(0, (centralSize.width() - viewMaxSize.width()) / 2);
- const int yPos = std::max(0, (centralSize.height() - viewMaxSize.height()) * 1 / 4);
-@@ -505,8 +532,8 @@ KCommandBar::KCommandBar(QWidget *parent)
-
- CommandBarStyleDelegate *delegate = new CommandBarStyleDelegate(this);
- ShortcutStyleDelegate *del = new ShortcutStyleDelegate(this);
-- d->m_treeView.setItemDelegateForColumn(0, delegate);
-- d->m_treeView.setItemDelegateForColumn(1, del);
-+ d->m_treeView.setItemDelegateForColumn(KCommandBarModel::Column_Command, delegate);
-+ d->m_treeView.setItemDelegateForColumn(KCommandBarModel::Column_Shortcut, del);
-
- connect(&d->m_lineEdit, &QLineEdit::returnPressed, this, [this]() {
- d->slotReturnPressed(this);
-@@ -525,6 +552,11 @@ KCommandBar::KCommandBar(QWidget *parent)
- d->m_treeView.setSortingEnabled(true);
- d->m_treeView.setModel(&d->m_proxyModel);
-
-+ d->m_treeView.header()->setMinimumSectionSize(0);
-+ d->m_treeView.header()->setStretchLastSection(false);
-+ d->m_treeView.header()->setSectionResizeMode(KCommandBarModel::Column_Command, QHeaderView::Stretch);
-+ d->m_treeView.header()->setSectionResizeMode(KCommandBarModel::Column_Shortcut, QHeaderView::ResizeToContents);
-+
- d->m_treeView.installEventFilter(this);
- d->m_lineEdit.installEventFilter(this);
-
-diff --git a/src/kcommandbarmodel_p.cpp b/src/kcommandbarmodel_p.cpp
-index fee271c5..6a172c9c 100644
---- a/src/kcommandbarmodel_p.cpp
-+++ b/src/kcommandbarmodel_p.cpp
-@@ -69,12 +69,9 @@ void KCommandBarModel::refresh(const QVector<KCommandBar::ActionGroup> &actionGr
- QVector<Item> temp_rows;
- std::unordered_set<QAction *> uniqueActions;
- temp_rows.reserve(totalActions);
-- int actionGroupIdx = 0;
- for (const auto &ag : actionGroups) {
- const auto &agActions = ag.actions;
- fillRows(temp_rows, ag.name, agActions, uniqueActions);
--
-- actionGroupIdx++;
- }
-
- /**
-@@ -117,22 +114,16 @@ QVariant KCommandBarModel::data(const QModelIndex &index, int role) const
-
- switch (role) {
- case Qt::DisplayRole:
-- if (col == 0) {
-+ if (col == Column_Command) {
- return entry.displayName();
-- } else {
-- return entry.action->shortcut().toString();
- }
-+ Q_ASSERT(col == Column_Shortcut);
-+ return entry.action->shortcut().toString();
- case Qt::DecorationRole:
-- if (col == 0) {
-+ if (col == Column_Command) {
- return entry.action->icon();
- }
- break;
-- case Qt::TextAlignmentRole:
-- if (col == 0) {
-- return Qt::AlignLeft;
-- } else {
-- return Qt::AlignRight;
-- }
- case Qt::ToolTipRole: {
- QString toolTip = entry.displayName();
- if (!entry.action->shortcut().isEmpty()) {
-diff --git a/src/kcommandbarmodel_p.h b/src/kcommandbarmodel_p.h
-index 29a0249c..af547104 100644
---- a/src/kcommandbarmodel_p.h
-+++ b/src/kcommandbarmodel_p.h
-@@ -29,6 +29,13 @@ public:
-
- enum Role { Score = Qt::UserRole + 1 };
-
-+ enum Column
-+ {
-+ Column_Command,
-+ Column_Shortcut,
-+ Column_Count
-+ };
-+
- /**
- * Resets the model
- *
-@@ -48,7 +55,7 @@ public:
- int columnCount(const QModelIndex &parent = QModelIndex()) const override
- {
- Q_UNUSED(parent);
-- return 2;
-+ return Column_Count;
- }
-
- /**
-diff --git a/tests/kcommandbartest.cpp b/tests/kcommandbartest.cpp
-index 46e1bc86..1c631bbb 100644
---- a/tests/kcommandbartest.cpp
-+++ b/tests/kcommandbartest.cpp
-@@ -103,6 +103,9 @@ public:
- for (; i < 2; ++i) {
- acts[1].actions.append(genAction(this, QStringLiteral("folder"), i));
- }
-+ acts[1].actions[0]->setShortcut(QStringLiteral("G"));
-+ acts[1].actions[1]->setCheckable(true);
-+ acts[1].actions[1]->setShortcut(QStringLiteral("Ctrl++"));
-
- acts[2].name = QStringLiteral("Second Menu Group - Disabled acts");
- for (; i < 4; ++i) {
-@@ -116,6 +119,8 @@ public:
- for (; i < 6; ++i) {
- acts[3].actions.append(genAction(this, QStringLiteral("security-low"), i, Qt::CTRL | Qt::ALT));
- }
-+ acts[3].actions[0]->setCheckable(true);
-+ acts[3].actions[0]->setShortcut(QStringLiteral("Ctrl+,, Ctrl++, Ctrl+K"));
-
- return acts;
- }
-@@ -128,10 +133,14 @@ public:
- acts[0].name = QStringLiteral("مینو گروپ");
- acts[0].actions = {new QAction(QIcon::fromTheme("folder"), QStringLiteral("یہ فولڈر ایکشن ہے"), this),
- new QAction(QIcon::fromTheme("folder"), QStringLiteral("یہ ایک اور فولڈر ایکشن ہے"), this)};
-+ acts[0].actions[1]->setCheckable(true);
-+ acts[0].actions[1]->setShortcut(QStringLiteral("Ctrl+Shift++"));
-
- acts[1].name = QStringLiteral("گروپ");
- acts[1].actions = {new QAction(QIcon::fromTheme("zoom-out"), QStringLiteral("یہ فولڈر ایکشن ہے"), this),
- new QAction(QIcon::fromTheme("security-low"), QStringLiteral("یہ ایک اور فولڈر ایکشن ہے"), this)};
-+ acts[1].actions[1]->setCheckable(true);
-+ acts[1].actions[1]->setShortcut(QStringLiteral("Ctrl+-"));
-
- return acts;
- }
---
-GitLab
-
diff --git a/kde-frameworks/kconfigwidgets/files/kconfigwidgets-5.88.0-hamburger-menu-no-window-on-wayland.patch b/kde-frameworks/kconfigwidgets/files/kconfigwidgets-5.88.0-hamburger-menu-no-window-on-wayland.patch
deleted file mode 100644
index 8cf60aeb759..00000000000
--- a/kde-frameworks/kconfigwidgets/files/kconfigwidgets-5.88.0-hamburger-menu-no-window-on-wayland.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From 82c40f18709484fd462643aa113a8ccf961b646a Mon Sep 17 00:00:00 2001
-From: Felix Ernst <fe.a.ernst@gmail.com>
-Date: Tue, 26 Oct 2021 17:28:09 +0200
-Subject: [PATCH] Fix hamburger menu opening as a window on Wayland
-
-Before this commit, if an app window is unfocused and the first
-click on the window is the hamburger menu button, the menu would
-appear displaced as a separate window on Wayland.
-
-This commit fixes this by setting a sane transientParent for the
-menu. This is slightly difficult because there can be any number
-of hamburger buttons in any number of different windows so we need
-to figure out spontaneously which button was pressed to open the
-menu.
-
-BUG: 442375
----
- src/khamburgermenuhelpers.cpp | 26 ++++++++++++++++++++++++--
- src/khamburgermenuhelpers_p.h | 2 +-
- 2 files changed, 25 insertions(+), 3 deletions(-)
-
-diff --git a/src/khamburgermenuhelpers.cpp b/src/khamburgermenuhelpers.cpp
-index 88242aa5..d1ae2835 100644
---- a/src/khamburgermenuhelpers.cpp
-+++ b/src/khamburgermenuhelpers.cpp
-@@ -10,7 +10,10 @@
- #include "khamburgermenu.h"
-
- #include <QEvent>
-+#include <QMenu>
-+#include <QToolButton>
- #include <QWidget>
-+#include <QWindow>
-
- ListenerContainer::ListenerContainer(KHamburgerMenuPrivate *hamburgerMenuPrivate)
- : QObject{hamburgerMenuPrivate},
-@@ -28,13 +31,32 @@ bool AddOrRemoveActionListener::eventFilter(QObject * /*watched*/, QEvent *event
- return false;
- }
-
--bool ButtonPressListener::eventFilter(QObject * /*watched*/, QEvent *event)
-+bool ButtonPressListener::eventFilter(QObject *watched, QEvent *event)
- {
- if (event->type() == QEvent::KeyPress || event->type() == QEvent::MouseButtonPress) {
- auto hamburgerMenuPrivate = static_cast<KHamburgerMenuPrivate *>(parent());
- auto q = static_cast<KHamburgerMenu *>(hamburgerMenuPrivate->q_ptr);
- Q_EMIT q->aboutToShowMenu();
-- hamburgerMenuPrivate->resetMenu();
-+ hamburgerMenuPrivate->resetMenu(); // This menu never has a parent which can be
-+ // problematic because it can lead to situations in which the QMenu itself is
-+ // treated like its own window.
-+ // To avoid this we set a sane transientParent() now even if it already has one
-+ // because the menu might be opened from another window this time.
-+ const auto watchedButton = qobject_cast<QToolButton *>(watched);
-+ if (!watchedButton) {
-+ return false;
-+ }
-+ auto menu = watchedButton->menu();
-+ if (!menu) {
-+ return false;
-+ }
-+ menu->winId(); // trigger being a native widget already, to ensure windowHandle created
-+ // generic code if not known if the available parent widget is a native widget or not
-+ auto parentWindowHandle = watchedButton->windowHandle();
-+ if (!parentWindowHandle) {
-+ parentWindowHandle = watchedButton->nativeParentWidget()->windowHandle();
-+ }
-+ menu->windowHandle()->setTransientParent(parentWindowHandle);
- }
- return false;
- }
-diff --git a/src/khamburgermenuhelpers_p.h b/src/khamburgermenuhelpers_p.h
-index f0d98790..4993ee61 100644
---- a/src/khamburgermenuhelpers_p.h
-+++ b/src/khamburgermenuhelpers_p.h
-@@ -80,7 +80,7 @@ class ButtonPressListener : public QObject
- protected:
- inline ButtonPressListener(QObject *parent) : QObject{parent} { };
-
-- bool eventFilter(QObject * /*watched*/, QEvent *event) override;
-+ bool eventFilter(QObject *watched, QEvent *event) override;
-
- friend class ListenerContainer;
- };
---
-GitLab
-
diff --git a/kde-frameworks/kconfigwidgets/files/kconfigwidgets-5.92.0-khamburgermenu-ensure-polished.patch b/kde-frameworks/kconfigwidgets/files/kconfigwidgets-5.92.0-khamburgermenu-ensure-polished.patch
new file mode 100644
index 00000000000..34249bb1d7d
--- /dev/null
+++ b/kde-frameworks/kconfigwidgets/files/kconfigwidgets-5.92.0-khamburgermenu-ensure-polished.patch
@@ -0,0 +1,32 @@
+From babd8078cc92b3f46dbab0286d7629ada1c2d10f Mon Sep 17 00:00:00 2001
+From: David Redondo <kde@david-redondo.de>
+Date: Tue, 22 Mar 2022 10:52:04 +0100
+Subject: [PATCH] khamburgermenu: Ensure menu is polished before creating
+ window
+
+By force creating the window, there is no chance for the style
+to change the surface format that will be used because it's fixed
+once the window has been created.
+This caused for example in a graphical glitch with Breeze, so
+manually ensure the menu is polished.
+---
+ src/khamburgermenuhelpers.cpp | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/khamburgermenuhelpers.cpp b/src/khamburgermenuhelpers.cpp
+index d1ae2835..beecba7c 100644
+--- a/src/khamburgermenuhelpers.cpp
++++ b/src/khamburgermenuhelpers.cpp
+@@ -50,6 +50,9 @@ bool ButtonPressListener::eventFilter(QObject *watched, QEvent *event)
+ if (!menu) {
+ return false;
+ }
++ // ensure polished so the style can change the surfaceformat of the window which is
++ // not possible once the window has been created
++ menu->ensurePolished();
+ menu->winId(); // trigger being a native widget already, to ensure windowHandle created
+ // generic code if not known if the available parent widget is a native widget or not
+ auto parentWindowHandle = watchedButton->windowHandle();
+--
+GitLab
+
diff --git a/kde-frameworks/kconfigwidgets/kconfigwidgets-5.85.0.ebuild b/kde-frameworks/kconfigwidgets/kconfigwidgets-5.92.0-r1.ebuild
index b6afde10bc3..2b82a69a536 100644
--- a/kde-frameworks/kconfigwidgets/kconfigwidgets-5.85.0.ebuild
+++ b/kde-frameworks/kconfigwidgets/kconfigwidgets-5.92.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -10,13 +10,11 @@ VIRTUALX_REQUIRED="test"
inherit ecm kde.org
DESCRIPTION="Framework providing an assortment of configuration-related widgets"
+
LICENSE="LGPL-2+"
KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
IUSE="+man"
-BDEPEND="
- man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )
-"
DEPEND="
>=dev-qt/qtdbus-${QTMIN}:5
>=dev-qt/qtgui-${QTMIN}:5
@@ -30,10 +28,12 @@ DEPEND="
=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
"
RDEPEND="${DEPEND}"
+BDEPEND="man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )"
+
+PATCHES=( "${FILESDIR}/${P}-khamburgermenu-ensure-polished.patch" ) # KDE-bug 452211
src_configure() {
local mycmakeargs=(
- -DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON # bug 746866
$(cmake_use_find_package man KF5DocTools)
)
diff --git a/kde-frameworks/kconfigwidgets/kconfigwidgets-5.88.0-r1.ebuild b/kde-frameworks/kconfigwidgets/kconfigwidgets-5.94.0.ebuild
index 0528d343b7a..bbef910c69e 100644
--- a/kde-frameworks/kconfigwidgets/kconfigwidgets-5.88.0-r1.ebuild
+++ b/kde-frameworks/kconfigwidgets/kconfigwidgets-5.94.0.ebuild
@@ -1,22 +1,20 @@
-# Copyright 1999-2021 Gentoo Authors
+# 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.2
+QTMIN=5.15.3
VIRTUALX_REQUIRED="test"
inherit ecm kde.org
DESCRIPTION="Framework providing an assortment of configuration-related widgets"
+
LICENSE="LGPL-2+"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
IUSE="+man"
-BDEPEND="
- man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )
-"
DEPEND="
>=dev-qt/qtdbus-${QTMIN}:5
>=dev-qt/qtgui-${QTMIN}:5
@@ -30,15 +28,10 @@ DEPEND="
=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
"
RDEPEND="${DEPEND}"
-
-PATCHES=(
- "${FILESDIR}"/${P}-hamburger-menu-no-window-on-wayland.patch
- "${FILESDIR}"/${P}-KCommandBar-alignment.patch
-)
+BDEPEND="man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )"
src_configure() {
local mycmakeargs=(
- -DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON # bug 746866
$(cmake_use_find_package man KF5DocTools)
)
diff --git a/kde-frameworks/kcontacts/Manifest b/kde-frameworks/kcontacts/Manifest
index aa061c35004..bce641eb5a9 100644
--- a/kde-frameworks/kcontacts/Manifest
+++ b/kde-frameworks/kcontacts/Manifest
@@ -1,2 +1,2 @@
-DIST kcontacts-5.85.0.tar.xz 543896 BLAKE2B 68ce1d43539f7d4a5d41e26e45f8267c6ca70cd04991d8917708352b44a71b95d891a5fd8c931d08a3ac2b6df67e304d1d72a3acbd14de0b12ed8ad74e079afa SHA512 bd43baaee638455038c7278eed5bb3a46ea8171edc1aeef86e150a4d5e2e07a45fc0a4e7e93d70bdd53603e43771256e0a5e85c8d59456651bf4370fffa7427f
-DIST kcontacts-5.88.0.tar.xz 180568 BLAKE2B 0913774ef56b2154b2f3d8941bd4e7e2977286e6b72390cc7a9828697f822f7617cc1a6033eb1a6a0ab38db341fb3d3958ffd0a63a3b9e8e30d7b1169119ed53 SHA512 441d5cf9e18a8c21d1d56936fb680b2b438b33ac9a9d58a5630a1807e9e65d1f0daaca6a2884be84c6fc264ae5201ecc5a0b0206f05914982bb2a6e05ee4c239
+DIST kcontacts-5.92.0.tar.xz 192640 BLAKE2B a1a91e897200cf85dc24d916dfe57cf8e04b9ef1e355fdb915b85f3763263feefa53357a7f56177ad854dac38fb5b71a2b469a4a2930a1dfbd09db4500451e70 SHA512 8d5f08afccf5b01d72a9881ef4805ec2ae8dba3afeb93efaf82b80fc60aa917302681387d77d7f104f2846958077ce7418712cccf677f9067eccda92cfb4b2db
+DIST kcontacts-5.94.0.tar.xz 193068 BLAKE2B 1d9cd692ced982a893772924b721d737e8853ac8868b39c3f726f0457711aee2ee229d9f1154e0158a84b42a0eeccc7990e80291c3ba6f7a9239d10ac1b23718 SHA512 59291b9639ecf0bf3f28cf1b6cf46239381acc4354fc6cf5d9578ab4eaa5bccfa5e1504478f1be8c435b9b57c77f3c53e41bcae12ddc12ec1fa419ed4bf8f0ec
diff --git a/kde-frameworks/kcontacts/kcontacts-5.85.0.ebuild b/kde-frameworks/kcontacts/kcontacts-5.92.0.ebuild
index 495709d99aa..ca49f77d966 100644
--- a/kde-frameworks/kcontacts/kcontacts-5.85.0.ebuild
+++ b/kde-frameworks/kcontacts/kcontacts-5.92.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -10,24 +10,25 @@ VIRTUALX_REQUIRED="test"
inherit ecm kde.org
DESCRIPTION="Address book API based on KDE Frameworks"
+
LICENSE="GPL-2+"
KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
IUSE=""
-DEPEND="
+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
"
-RDEPEND="${DEPEND}
- !kde-apps/kcontacts:5
- app-text/iso-codes
+DEPEND="${RDEPEND}
+ test? ( >=dev-qt/qtdeclarative-${QTMIN}:5 )
"
src_test() {
- # bug #566648 (access to /dev/dri/card0 denied), bug #625988
+ # bug #566648 (access to /dev/dri/card0 denied)
+ # bug #838502 (again some Qt translations loading related err...)
local myctestargs=(
-E "(kcontacts-addresstest|kcontacts-picturetest)"
)
diff --git a/kde-frameworks/kcontacts/kcontacts-5.88.0.ebuild b/kde-frameworks/kcontacts/kcontacts-5.94.0.ebuild
index edd0510cf50..6859e221871 100644
--- a/kde-frameworks/kcontacts/kcontacts-5.88.0.ebuild
+++ b/kde-frameworks/kcontacts/kcontacts-5.94.0.ebuild
@@ -1,30 +1,34 @@
-# Copyright 1999-2021 Gentoo Authors
+# 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.2
+QTMIN=5.15.3
VIRTUALX_REQUIRED="test"
inherit ecm kde.org
DESCRIPTION="Address book API based on KDE Frameworks"
+
LICENSE="GPL-2+"
KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
-DEPEND="
+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
"
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+ test? ( >=dev-qt/qtdeclarative-${QTMIN}:5 )
+"
src_test() {
- # bug #566648 (access to /dev/dri/card0 denied), bug #625988
+ # bug #566648 (access to /dev/dri/card0 denied)
+ # bug #838502 (again some Qt translations loading related err...)
local myctestargs=(
-E "(kcontacts-addresstest|kcontacts-picturetest)"
)
diff --git a/kde-frameworks/kcoreaddons/Manifest b/kde-frameworks/kcoreaddons/Manifest
index 278694c8999..4d7a936d5f5 100644
--- a/kde-frameworks/kcoreaddons/Manifest
+++ b/kde-frameworks/kcoreaddons/Manifest
@@ -1,2 +1,2 @@
-DIST kcoreaddons-5.85.0.tar.xz 427876 BLAKE2B 2e4dda676209333cc735ae4028bb245d4828af49e79cc3e3a7101f06452b35f04d72496a777a9039668597c9703b518674ed17dd0e05215daefe29da38fdc8e4 SHA512 46509b91a138924c040a7dcee87be1ebe5d5324a040fc76cab1b19e427b03eaf80766a0bfe708d1226be83d8307253061f11604ce122dc8ef354b47dbe3f7753
-DIST kcoreaddons-5.88.0.tar.xz 442268 BLAKE2B 8bb7a7b8a9e28da595d305b90bb90dfdb14be83081d68d8586ad224ff0800c3f0d3585801f6b8bf33cd809495189678af9da161b1aa8721204f1900b4e281b8b SHA512 3e83d18087d20d2f5115b2dc85df85b1c72078a49425009072a76194ea926149b0ed2ecd64da2f66bd093c147c67ef49a98b59d3c15277b20cf3b39f9767806b
+DIST kcoreaddons-5.92.0.tar.xz 454876 BLAKE2B 6c81cb1940145d21652f61e1808a07ef7bd673f54f955568cb063d9a694c4c314444ae829de6b6a8236ef91147df396e82e9dd1c73725861964b774a31a9ef88 SHA512 b46a7aab486c0ed355e8400ce4d81f7d8d7e9e134305a1251d0d92a7919d2a18bcbc24c0306f34ae3781c7e1c4b73975e009e50bbca74eea22bca44994ff6067
+DIST kcoreaddons-5.94.0.tar.xz 456556 BLAKE2B f7d70649524e4863a42fcb8f5bf63c22efd93f489f25bbb7d50ffde5d239e5096ea8cc4cb9844c42491708edcc2e6fe796364cfcd665bc1527307878a4066ce3 SHA512 b94ffa2e845dcfb481d496348969b1ec4ddba0a3c1fdcec636567a89fb6f65179a10b43add14cf5c4e720dce4459e725dca6ee5800fdf9551385ec7fffc1b462
diff --git a/kde-frameworks/kcoreaddons/kcoreaddons-5.85.0.ebuild b/kde-frameworks/kcoreaddons/kcoreaddons-5.92.0.ebuild
index 64e03f3721d..4d3056be47e 100644
--- a/kde-frameworks/kcoreaddons/kcoreaddons-5.85.0.ebuild
+++ b/kde-frameworks/kcoreaddons/kcoreaddons-5.92.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -7,23 +7,25 @@ QTMIN=5.15.2
inherit ecm kde.org xdg-utils
DESCRIPTION="Framework for solving common problems such as caching, randomisation, and more"
+
LICENSE="LGPL-2+"
KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
IUSE="fam nls"
-BDEPEND="
- nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
DEPEND="
>=dev-qt/qtcore-${QTMIN}:5[icu]
fam? ( virtual/fam )
"
-RDEPEND="${DEPEND}"
+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
- -DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON # bug 746866
$(cmake_use_find_package fam FAM)
)
diff --git a/kde-frameworks/kcoreaddons/kcoreaddons-5.88.0.ebuild b/kde-frameworks/kcoreaddons/kcoreaddons-5.94.0.ebuild
index fd23dd204b0..d0eff0ceaf0 100644
--- a/kde-frameworks/kcoreaddons/kcoreaddons-5.88.0.ebuild
+++ b/kde-frameworks/kcoreaddons/kcoreaddons-5.94.0.ebuild
@@ -1,29 +1,31 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-QTMIN=5.15.2
+QTMIN=5.15.3
inherit ecm kde.org xdg-utils
DESCRIPTION="Framework for solving common problems such as caching, randomisation, and more"
+
LICENSE="LGPL-2+"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
IUSE="fam nls"
-BDEPEND="
- nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
DEPEND="
>=dev-qt/qtcore-${QTMIN}:5[icu]
fam? ( virtual/fam )
"
-RDEPEND="${DEPEND}"
+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
- -DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON # bug 746866
$(cmake_use_find_package fam FAM)
)
diff --git a/kde-frameworks/kcrash/Manifest b/kde-frameworks/kcrash/Manifest
index 53a7e18f4b0..8b44b34d637 100644
--- a/kde-frameworks/kcrash/Manifest
+++ b/kde-frameworks/kcrash/Manifest
@@ -1,2 +1,2 @@
-DIST kcrash-5.85.0.tar.xz 27936 BLAKE2B 943e42fc7aa4db8e1179970f3f4e1b532c9efd4a609263919adefa90e2288e8412b52e84bab8a520ec04d4114f64803e9e6581c0be689c33d2de9041b444f6ae SHA512 26ae87cf816f104cd2da4052eeb8a49a6afb1227e873a4ccd829e8a7addc162ec86dd5ebee83b47d57d9c5cb79471239b1504c54603828dd8589f9ac0915adba
-DIST kcrash-5.88.0.tar.xz 28176 BLAKE2B 128164dddc80f7f132c71c3dab742058ccea688abb0260934fba444561865ec84773d26b4bc6f360eafc7abf05dc5a27e91fa44b4775e433dc4e3af98bd7b6b1 SHA512 5afa345b0d98e643b8e9577dab2d507d17b33548cb9e60116deb35a29ae32c13b786bbbf9fddbbc8e301d6e34bb60689c26edd2e9a51298e8bdacf7f866d5f9a
+DIST kcrash-5.92.0.tar.xz 28376 BLAKE2B 6638906041e0e2d1af791d0c90dacd9fe5b6120d739ae6886b66e09ad51f8d327a85d75823b6269e15e82c82ce0e17a6e0d07db970e0153f35f71e2328313934 SHA512 200ac9999e235f968653141446d3203db9730abc078cbb56922f15869bbfb27a9da3384a1127bd2a79513bec97e10d67d693ce8325b53588e4fb7304abbf6f8d
+DIST kcrash-5.94.0.tar.xz 28364 BLAKE2B be0f42864590d9c4855b9cd088a87c1e8d1bc9360ded5330b1fe437cdb5964c91b2ed4ba466dea87fa2323330fbf07bed12dad5fbc7a2c4d7b342a786001b9ec SHA512 ce0b9de0f2a4816f40f2a958d101434d0940d2bc26a671d26814c02f836d2e1f3b862d38d37895b6d096091333e12bb76eff5c99ccabba21c12e485eedb6facc
diff --git a/kde-frameworks/kcrash/kcrash-5.85.0.ebuild b/kde-frameworks/kcrash/kcrash-5.92.0.ebuild
index f5e0d628b29..a4e64e1c9ff 100644
--- a/kde-frameworks/kcrash/kcrash-5.85.0.ebuild
+++ b/kde-frameworks/kcrash/kcrash-5.92.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -11,22 +11,31 @@ inherit ecm kde.org
DESCRIPTION="Framework for intercepting and handling application crashes"
LICENSE="LGPL-2+"
KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-IUSE="nls"
+IUSE="nls X"
-# requires running kde environment
+# requires running Plasma environment
RESTRICT="test"
-BDEPEND="
- nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
RDEPEND="
>=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtx11extras-${QTMIN}:5
=kde-frameworks/kcoreaddons-${PVCUT}*:5
=kde-frameworks/kwindowsystem-${PVCUT}*:5
- x11-libs/libX11
+ X? (
+ >=dev-qt/qtx11extras-${QTMIN}:5
+ x11-libs/libX11
+ )
"
DEPEND="${RDEPEND}
- x11-base/xorg-proto
+ X? ( x11-base/xorg-proto )
test? ( >=dev-qt/qtwidgets-${QTMIN}:5 )
"
+BDEPEND="
+ nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
+"
+
+src_configure() {
+ local mycmakeargs=(
+ -DWITH_X11=$(usex X)
+ )
+ ecm_src_configure
+}
diff --git a/kde-frameworks/kcrash/kcrash-5.88.0.ebuild b/kde-frameworks/kcrash/kcrash-5.94.0.ebuild
index 2bb0249cb3f..e43ec363a2d 100644
--- a/kde-frameworks/kcrash/kcrash-5.88.0.ebuild
+++ b/kde-frameworks/kcrash/kcrash-5.94.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# 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.2
+QTMIN=5.15.3
VIRTUALX_REQUIRED="test"
inherit ecm kde.org
diff --git a/kde-frameworks/kdav/Manifest b/kde-frameworks/kdav/Manifest
index cf2108c03bc..ff052f5a23c 100644
--- a/kde-frameworks/kdav/Manifest
+++ b/kde-frameworks/kdav/Manifest
@@ -1,2 +1,2 @@
-DIST kdav-5.85.0.tar.xz 61600 BLAKE2B da4ec7e2683f15e8fa8d4d6ffc9cd6408a2d8ab42738278e778307b01f9674cd287050879aa08b072144f3243ceae077185670384ed1218ba77df58b241fc2e8 SHA512 85c463c742b48a07de9f72e9ee922876f50742d6a82f897d564fe59f71cc4fd39d77e520d432fda4418a8e574657cf8daac86744885ff46467495c0e693b96d1
-DIST kdav-5.88.0.tar.xz 61920 BLAKE2B 3cd6394c56f23045399abc936a962859d0f798718c2f9c18b78b5ff16b1e70b6f1119f47538c067798f983cc298f4f3bca8be8a73596f3bb14d646e784c2c825 SHA512 31e7b15a2a68184d33cf3f5f046f2599dadc0921297c64a55d26982973bbdf2bef096880b40498d6ddd97f523fe6068e2f4865d1ffbf877e76dd0b8b264e1f2f
+DIST kdav-5.92.0.tar.xz 63928 BLAKE2B bd08d582c3135db6ccd0f7194bb011d26b4a0e29643d0eb93ea1c126206a4b67974fdf6fdb34062c7309b119ff5e247c41562197701657dc717f2521bdb14aa1 SHA512 4e11c721c0338753810b1a02cc3850e2ce14f2760d7461cbacb7204c32e2f48dd7045d88118e6444ec5ec7a701783bcf2c6c520e822c14849593510a25d374e2
+DIST kdav-5.94.0.tar.xz 64448 BLAKE2B 5c911078abe1c5fe9fdd6ed9fc9f90b7a445f09827a4d6d471011f14012278604cc33943192c75c6b76b886a3dc8200479679aed594a7c698256a0550c6ee440 SHA512 4aaadadd74813cd5fbfa713dc96c217aee98149e3ca4e0e7ae642cf7b6e028956c118612e4700bc09966af11deb9b29ab9cc4fcd38b0f98faa2c59a77941f11e
diff --git a/kde-frameworks/kdav/kdav-5.85.0.ebuild b/kde-frameworks/kdav/kdav-5.92.0.ebuild
index 742ea8ba78c..7408082888f 100644
--- a/kde-frameworks/kdav/kdav-5.85.0.ebuild
+++ b/kde-frameworks/kdav/kdav-5.92.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -12,13 +12,12 @@ inherit ecm kde.org
DESCRIPTION="DAV protocol implemention with KJobs"
LICENSE="LGPL-2+"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
IUSE=""
DEPEND="
>=dev-qt/qtgui-${QTMIN}:5
>=dev-qt/qtxml-${QTMIN}:5
- >=dev-qt/qtxmlpatterns-${QTMIN}:5
>=kde-frameworks/kcoreaddons-${PVCUT}:5
>=kde-frameworks/ki18n-${PVCUT}:5
>=kde-frameworks/kio-${PVCUT}:5
diff --git a/kde-frameworks/kdav/kdav-5.88.0.ebuild b/kde-frameworks/kdav/kdav-5.94.0.ebuild
index 1b84f1a6e82..8306765733f 100644
--- a/kde-frameworks/kdav/kdav-5.88.0.ebuild
+++ b/kde-frameworks/kdav/kdav-5.94.0.ebuild
@@ -1,24 +1,23 @@
-# Copyright 1999-2021 Gentoo Authors
+# 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.2
+QTMIN=5.15.3
VIRTUALX_REQUIRED="test"
inherit ecm kde.org
DESCRIPTION="DAV protocol implemention with KJobs"
LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
DEPEND="
>=dev-qt/qtgui-${QTMIN}:5
>=dev-qt/qtxml-${QTMIN}:5
- >=dev-qt/qtxmlpatterns-${QTMIN}:5
>=kde-frameworks/kcoreaddons-${PVCUT}:5
>=kde-frameworks/ki18n-${PVCUT}:5
>=kde-frameworks/kio-${PVCUT}:5
diff --git a/kde-frameworks/kdbusaddons/Manifest b/kde-frameworks/kdbusaddons/Manifest
index 2b9e717d68b..121136dfc21 100644
--- a/kde-frameworks/kdbusaddons/Manifest
+++ b/kde-frameworks/kdbusaddons/Manifest
@@ -1,2 +1,2 @@
-DIST kdbusaddons-5.85.0.tar.xz 43212 BLAKE2B 8e11c4298e0e46224bd2d61e666ff504c0a112224452b2f25ad7cab618524f17cf166abf2d74ae05f0e945d3b95e872a84f01bda14baa635d96855329e87aea9 SHA512 7c83b546795ca944afd58e95bee2dc5491b295a3adadbf0ab027a75d2ce16ad6100f2cf92bf3c20fe2ea17c68338cb5a05da56b0ae1e03682b4276021d8ec370
-DIST kdbusaddons-5.88.0.tar.xz 45200 BLAKE2B b226102cfaa1c786d850144f98e02fb49adf707447666fc3e4b874a6c0e22e0a7d618042a8e2f8ae72f0e0a733501c3fb9c7de05590ceb39dc77fb436368611e SHA512 103ff1d382231551263a8d2b4a4519d99bd92ff4955cc19eacce5d63db930af828d7f23117fe975509ec447d889d154d75deb63f10ec1482ae4cb5f49f7cd830
+DIST kdbusaddons-5.92.0.tar.xz 47688 BLAKE2B c2be6e5a10a0db32dded038b3a88e6b9ca800b2879c64c66dc721002bc5504af7a36676a7e0af9d7225aeaf82a1ee54ecd1a6dfcfdc56210c0d0f19a679f7105 SHA512 74a5b65ef760b0dff1d3ce86a32685b18e623de5330d2b3b7e089adb158871de6939f82f6f10167f0b2735b1ec0bca5411a24f4b8cfe64ec870cd9927cdc09bd
+DIST kdbusaddons-5.94.0.tar.xz 47688 BLAKE2B 0f645ad371a07db7f028bc4f23a0b42b6058dcc91177b3d712534e6f136438728f7482f8a8bc281f777d744d5bef2a36399c6fa61c49a6bce6145196cb6244c4 SHA512 8075330a54c41a94ad97b2514635ad3845128dd856510ebd4441ee3d349c125ac189cf4d3d582dd5e19cef29f07e7df8d22f4f72c8b3fe26d4ca5e262c527929
diff --git a/kde-frameworks/kdbusaddons/kdbusaddons-5.85.0.ebuild b/kde-frameworks/kdbusaddons/kdbusaddons-5.92.0.ebuild
index 5915813b2e5..88c10547436 100644
--- a/kde-frameworks/kdbusaddons/kdbusaddons-5.85.0.ebuild
+++ b/kde-frameworks/kdbusaddons/kdbusaddons-5.92.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -23,7 +23,6 @@ RDEPEND="${DEPEND}"
src_configure() {
local mycmakeargs=(
- -DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON # bug 746866
$(cmake_use_find_package X Qt5X11Extras)
)
diff --git a/kde-frameworks/kdbusaddons/kdbusaddons-5.88.0.ebuild b/kde-frameworks/kdbusaddons/kdbusaddons-5.94.0.ebuild
index fec82a5650a..b32cb64cac5 100644
--- a/kde-frameworks/kdbusaddons/kdbusaddons-5.88.0.ebuild
+++ b/kde-frameworks/kdbusaddons/kdbusaddons-5.94.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-QTMIN=5.15.2
+QTMIN=5.15.3
VIRTUALDBUS_TEST="true"
inherit ecm kde.org
@@ -23,7 +23,6 @@ RDEPEND="${DEPEND}"
src_configure() {
local mycmakeargs=(
- -DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON # bug 746866
$(cmake_use_find_package X Qt5X11Extras)
)
diff --git a/kde-frameworks/kdeclarative/Manifest b/kde-frameworks/kdeclarative/Manifest
index 04d402aff1b..4a6c167265f 100644
--- a/kde-frameworks/kdeclarative/Manifest
+++ b/kde-frameworks/kdeclarative/Manifest
@@ -1,2 +1,2 @@
-DIST kdeclarative-5.85.0.tar.xz 189632 BLAKE2B 9c0f83849337d2dee0c1b104fcba556633e013a0902cf02c6958bda0296a2c84064dec4fb0bc88f4d3c79ebe2c6c7d9b2ca28639341884dc0a1d7288b989f91a SHA512 49eb6f6318875af5c5aae1d6c937c600bec395d5a4edbeadf5e36c68d40f5fe400c0b7ef127e1ed10d442b42564c8dee6ebf159915f5cd0618392ca07b858276
-DIST kdeclarative-5.88.0.tar.xz 191048 BLAKE2B 113ed6a1ff297251cec4baf143352d3b8cb1d80cd0aca45ad21ec4d1583a5a9603897c9edfda99fe0bfc3c5c09a78c609c563602accb2e2fe7b76c3b1e7e0d1e SHA512 f72221bd6bd5fa739994482607161ea2ed7e659c18c4c9f3a161a765925c10a18cf7b5737a0489e589de13201c624d5a597e248eddaa77e1006b22ef8f19efb2
+DIST kdeclarative-5.92.0.tar.xz 202924 BLAKE2B bb7d67ee68bcef340223c89f827357bbcf04cc8838c643dbbe0338ddb9fbbcd35306bd293b6a8b00dca5d76a75476b63f659b8308deeeee3b51c776290908cff SHA512 f4dee788269405607be0818593420ca7e018fc48972d38f716e9d0319a8ef6557557ca553cff3c62d4f123999e6639e106089c2a4eccd0df824cd0bbdd5cad4b
+DIST kdeclarative-5.94.0.tar.xz 204884 BLAKE2B 232305d27f3192bad376b5a24b41836b6fa0dac01ce58b2df4d269ed6751561b6363608f147c0b169101c4cc1d91b92299377d51f04c43bdcdfc55ea69477f2c SHA512 dfe5359a0dcc75e00ef0ece97903b4217e896d3427633e9dbec834cf924d921982576651139e9215b01d283213ce0d73d03ab67b9d3561763ca0596ad80067b4
diff --git a/kde-frameworks/kdeclarative/files/kdeclarative-5.88.0-KeySequenceItem-record-on-correct-window.patch b/kde-frameworks/kdeclarative/files/kdeclarative-5.88.0-KeySequenceItem-record-on-correct-window.patch
deleted file mode 100644
index bf4d6fc5ddd..00000000000
--- a/kde-frameworks/kdeclarative/files/kdeclarative-5.88.0-KeySequenceItem-record-on-correct-window.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 2caa62d11f322ca5c9829b6bc91839e8afd42686 Mon Sep 17 00:00:00 2001
-From: David Redondo <kde@david-redondo.de>
-Date: Mon, 22 Nov 2021 14:22:14 +0100
-Subject: [PATCH] KeySequenceItem: Make sure we record on the correct window
-
-Unfortunately renderWindowFor is just a simple function call and
-so the binding is not updated when it would change. Now we make sure
-to update the window before each recording.
-BUG:445277
----
- src/qmlcontrols/kquickcontrols/KeySequenceItem.qml | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/qmlcontrols/kquickcontrols/KeySequenceItem.qml b/src/qmlcontrols/kquickcontrols/KeySequenceItem.qml
-index 7b404bd..a41bf18 100644
---- a/src/qmlcontrols/kquickcontrols/KeySequenceItem.qml
-+++ b/src/qmlcontrols/kquickcontrols/KeySequenceItem.qml
-@@ -42,7 +42,6 @@ RowLayout {
-
- KQuickControlsPrivate.KeySequenceHelper {
- id: _helper
-- window: renderWindow(parent.Window.window)
- onGotKeySequence: {
- if (isKeySequenceAvailable(keySequence)) {
- root.keySequence = keySequence
-@@ -95,6 +94,7 @@ RowLayout {
-
- onCheckedChanged: {
- if (checked) {
-+ _helper.window = _helper.renderWindow(parent.Window.window)
- mainButton.forceActiveFocus()
- _helper.startRecording()
- }
---
-GitLab
-
diff --git a/kde-frameworks/kdeclarative/kdeclarative-5.85.0.ebuild b/kde-frameworks/kdeclarative/kdeclarative-5.92.0.ebuild
index e3439ead781..8b04052c9d6 100644
--- a/kde-frameworks/kdeclarative/kdeclarative-5.85.0.ebuild
+++ b/kde-frameworks/kdeclarative/kdeclarative-5.92.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
diff --git a/kde-frameworks/kdeclarative/kdeclarative-5.88.0-r1.ebuild b/kde-frameworks/kdeclarative/kdeclarative-5.94.0.ebuild
index e3888c95d29..6333ef416a3 100644
--- a/kde-frameworks/kdeclarative/kdeclarative-5.88.0-r1.ebuild
+++ b/kde-frameworks/kdeclarative/kdeclarative-5.94.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# 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.2
+QTMIN=5.15.3
inherit ecm kde.org
DESCRIPTION="Framework providing integration of QML and KDE work spaces"
@@ -33,7 +33,3 @@ DEPEND="
media-libs/libepoxy
"
RDEPEND="${DEPEND}"
-
-PATCHES=(
- "${FILESDIR}/${P}-KeySequenceItem-record-on-correct-window.patch" # KDE-bug 445277
-)
diff --git a/kde-frameworks/kded/Manifest b/kde-frameworks/kded/Manifest
index 0a0680e5861..773115ceb2c 100644
--- a/kde-frameworks/kded/Manifest
+++ b/kde-frameworks/kded/Manifest
@@ -1,2 +1,2 @@
-DIST kded-5.85.0.tar.xz 36952 BLAKE2B d237349d95f2186a102181f420bb1deafb9fc83332dc535084531a6b73c5feac2c37e6c15589ed8225d0391f4f6541720525d3cd7d2645e6e90789a013c6e5eb SHA512 cbc8e8c101d4af7df0d47d91c51273e41dfff4bf8e558f93a0d2c16cd814cfb4ba73e69a00b3bacd944d677de778456b0020e063af6a4cbd3957296387eccb8f
-DIST kded-5.88.0.tar.xz 37084 BLAKE2B 34035f8b906c807dc77398ed3b42664a05df5fd698d0e9ff1203a697d3877f972fbe828f1207de00da2b137b94acbc85d82f3d8f1caf7b319a734da0e4e060e4 SHA512 fcc29a0a260528d4afc765106736019ffb142a1ead54696dcb0de70d4640a5306094cb4bff62f616b45a622e2ae01e19ffd9903d621e88a4783ee377c53c0e6b
+DIST kded-5.92.0.tar.xz 39260 BLAKE2B c6a1476e87faa5723a65f3ad9fc34bb817fff4f4b0fed35c46e0c77a4ebdd40d15c4ed978f9ff607d9570bbb3ba5a9c0afafd274eb1e0fd9a5c004d49a240590 SHA512 c5fb2d74a2186e4bd784f3a16df9079e7bdf84272764c62c809b3b316209b30e9de36afdf2a3ac12dcc80163cf37cade3e53dd6ded79ad93c35e3b1a4fdb3ae0
+DIST kded-5.94.0.tar.xz 39316 BLAKE2B 60f8f8aadf4f7a3ac025cb43ffbb410094851b262029eecb5c008ac1e4506c67caf80d279f4592531402372c522efa7c6cca3efc5ce0dbf467ee2f386178b1bc SHA512 35da63b63f5e595c225f30879cdff6cdc0b74b93028a7cefc71dd93447759488f6419492449c1f4c25b71b5b3ec4299a4e785b3be37c792468751a5e5c6ac32a
diff --git a/kde-frameworks/kded/kded-5.85.0.ebuild b/kde-frameworks/kded/kded-5.92.0.ebuild
index b257e0d1002..696655e853e 100644
--- a/kde-frameworks/kded/kded-5.85.0.ebuild
+++ b/kde-frameworks/kded/kded-5.92.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
diff --git a/kde-frameworks/kded/kded-5.88.0.ebuild b/kde-frameworks/kded/kded-5.94.0.ebuild
index d80bb022fe1..167c38a871b 100644
--- a/kde-frameworks/kded/kded-5.88.0.ebuild
+++ b/kde-frameworks/kded/kded-5.94.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -6,7 +6,7 @@ EAPI=8
ECM_QTHELP="false"
ECM_TEST="false"
PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
+QTMIN=5.15.3
inherit ecm kde.org
DESCRIPTION="Central daemon of KDE workspaces"
diff --git a/kde-frameworks/kdelibs4support/Manifest b/kde-frameworks/kdelibs4support/Manifest
index ca2e5f9c172..52e32d4daf1 100644
--- a/kde-frameworks/kdelibs4support/Manifest
+++ b/kde-frameworks/kdelibs4support/Manifest
@@ -1,2 +1,2 @@
-DIST kdelibs4support-5.85.0.tar.xz 3642876 BLAKE2B 436645e8ac519b5078c37797fdea854e25e71a8079a49a33436a88576f1f370409a6fd780ab778520c474263df66b3a37d06398fdcc1ddfbeef8be5933f30192 SHA512 6edf7d612be56f81b7908ae85f6cfcc9618b14e8b9741fb19e0c8eb55ac73b9b82963be923d67ddfd450401fffc29bf164d112e45cba3657f10a1c84f86e346c
-DIST kdelibs4support-5.88.0.tar.xz 3644168 BLAKE2B fe4e2411bfe1bf2e6bc661dd8b408f17f603027550f5774d99c18043cba67efe5b213a64a51d76b52fa55ec029891f79735389f9e254479683cba02db48ed6e3 SHA512 65dee336fb82f99cdb84e5ea0385fcd86edd0f5db8bf93ce9ff3a52df017e0f4b29042f9b667e6ea5250306f95331ff541d7e63bf775c8bf5e6d6fd045b45f23
+DIST kdelibs4support-5.92.0.tar.xz 3649060 BLAKE2B c3989cb4a0d9365a46cd42519abf82b65238234010207e1eb00d214eae11eb27525642689c791e6140db6de481a622b07b11a5d16355388fb6182ad3d7f230d3 SHA512 ff42d5ad75c073c3f5c856b611b3235982f513c1bc1186a9c7b4ceecf2cb7561dc37485a8e5d53582546141493b6038177a72cc94ac76bd999913ea83d22297d
+DIST kdelibs4support-5.94.0.tar.xz 3651300 BLAKE2B e6ddd55693f1e233b03f80d65ebe07db54eb93456019c4a1bb18eb75281e93471e3638fd1e40da5b1c7e31e247823192d7ab748b5016f264b578a3b39de7b3ac SHA512 8b48b7d67201bc6e0fb67fa00b75dbaf8e35e21f7527b4bc79939c2b689c027bfa75eb60b13686bd8bce710a61682a27cac85481edd6e321063aefb186cdd2f2
diff --git a/kde-frameworks/kdelibs4support/files/kdelibs4support-5.82.0-unused-dep.patch b/kde-frameworks/kdelibs4support/files/kdelibs4support-5.82.0-unused-dep.patch
deleted file mode 100644
index e6a287ebda3..00000000000
--- a/kde-frameworks/kdelibs4support/files/kdelibs4support-5.82.0-unused-dep.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From b51d32df6a89e559871469178de1c6fd8c8a2882 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Sun, 22 Nov 2020 00:27:55 +0100
-Subject: [PATCH 2/2] Drop Qt5Designer dependency
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- CMakeLists.txt | 2 +-
- cmake/modules/ECMQt4To5Porting.cmake | 1 -
- cmake/modules/FindQt5Transitional.cmake | 1 -
- 3 files changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 2a432591..e503999d 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -20,7 +20,7 @@ include(GenerateExportHeader)
- include(CMakeFindFrameworks)
-
- set(REQUIRED_QT_VERSION 5.15.0)
--find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Network Widgets DBus Test Svg PrintSupport Designer)
-+find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Network Widgets DBus Test Svg PrintSupport)
-
- find_package(KF5Completion ${KF_DEP_VERSION} REQUIRED)
- find_package(KF5Config ${KF_DEP_VERSION} REQUIRED)
-diff --git a/cmake/modules/ECMQt4To5Porting.cmake b/cmake/modules/ECMQt4To5Porting.cmake
-index 4204fa54..01b8f995 100644
---- a/cmake/modules/ECMQt4To5Porting.cmake
-+++ b/cmake/modules/ECMQt4To5Porting.cmake
-@@ -160,7 +160,6 @@ set(_qt_modules
- DBus
- Network
- Test
-- Designer
- Concurrent
- Xml
- UiTools
-diff --git a/cmake/modules/FindQt5Transitional.cmake b/cmake/modules/FindQt5Transitional.cmake
-index df354fc6..68fa6d47 100644
---- a/cmake/modules/FindQt5Transitional.cmake
-+++ b/cmake/modules/FindQt5Transitional.cmake
-@@ -6,7 +6,6 @@ if (Qt5Core_FOUND)
- Core
- Gui
- DBus
-- Designer
- Declarative
- Script
- ScriptTools
---
-2.30.0
diff --git a/kde-frameworks/kdelibs4support/kdelibs4support-5.85.0.ebuild b/kde-frameworks/kdelibs4support/kdelibs4support-5.92.0.ebuild
index 32f631baaaa..7dce2d0e2ef 100644
--- a/kde-frameworks/kdelibs4support/kdelibs4support-5.85.0.ebuild
+++ b/kde-frameworks/kdelibs4support/kdelibs4support-5.92.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -17,10 +17,6 @@ IUSE="X"
RESTRICT="test"
-BDEPEND="
- dev-lang/perl
- dev-perl/URI
-"
COMMON_DEPEND="
app-text/docbook-xml-dtd:4.2
dev-libs/openssl:0
@@ -49,13 +45,13 @@ COMMON_DEPEND="
=kde-frameworks/kio-${PVCUT}*:5
=kde-frameworks/kitemviews-${PVCUT}*:5
=kde-frameworks/kjobwidgets-${PVCUT}*:5
- =kde-frameworks/knotifications-${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
+ =kde-frameworks/kwindowsystem-${PVCUT}*:5[X=]
=kde-frameworks/kxmlgui-${PVCUT}*:5
=kde-frameworks/solid-${PVCUT}*:5
virtual/libintl
@@ -73,20 +69,28 @@ DEPEND="${COMMON_DEPEND}
"
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"
- "${FILESDIR}/${PN}-5.82.0-unused-dep.patch"
+ "${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() {
diff --git a/kde-frameworks/kdelibs4support/kdelibs4support-5.88.0.ebuild b/kde-frameworks/kdelibs4support/kdelibs4support-5.94.0.ebuild
index d8c19122d71..a9f9f2882d1 100644
--- a/kde-frameworks/kdelibs4support/kdelibs4support-5.88.0.ebuild
+++ b/kde-frameworks/kdelibs4support/kdelibs4support-5.94.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -6,7 +6,7 @@ EAPI=8
ECM_HANDBOOK="true"
ECM_QTHELP="false"
PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
+QTMIN=5.15.3
VIRTUALX_REQUIRED="test"
inherit ecm kde.org
@@ -69,6 +69,7 @@ DEPEND="${COMMON_DEPEND}
"
RDEPEND="${COMMON_DEPEND}
>=dev-qt/qtxml-${QTMIN}:5
+ >=kde-frameworks/countryflags-${PVCUT}:5
=kde-frameworks/kinit-${PVCUT}*:5
=kde-frameworks/kitemmodels-${PVCUT}*:5
"
@@ -84,9 +85,12 @@ PATCHES=(
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() {
diff --git a/kde-frameworks/kdesu/Manifest b/kde-frameworks/kdesu/Manifest
index 1a41fd018a6..aaba631ba48 100644
--- a/kde-frameworks/kdesu/Manifest
+++ b/kde-frameworks/kdesu/Manifest
@@ -1,2 +1,2 @@
-DIST kdesu-5.85.0.tar.xz 52460 BLAKE2B b5a9c5c5bf0842ac7686bf4f2888186bc5534f8af4330c07bb757a90123be22c7460836c2508124f2f2a9a78d686493c0cf666a048cfeb5f72170b6c2fb7f5e6 SHA512 77e5fcfb00ecda59a6e1496f97cda10b6dde40ab3ea3c4537990ccb02561018d540d89988633fd17e2f22f64f6bbbbe02e6d0bea0c7484790f59812d94773c9d
-DIST kdesu-5.88.0.tar.xz 52756 BLAKE2B a346982ba547ceaa0d7202ea46a296d7d28399063b521193d9184dda5de4d485df109a8ea8338e0be72db55a255debb2458aad3916056bf2dc4d43a87f677ee9 SHA512 faca2f4d8b406efe447b100a8c8d115b4e598d7bd2887b77464110a71b7d7c37f742da177a3923037e3fec61be7da8ca9bf04a5a07e7a3e4022edbfcd3536231
+DIST kdesu-5.92.0.tar.xz 55452 BLAKE2B 6c150c1f623fe8132b23abfe2ccf4defb4c9b9bdb538da170585247d3fdca615eeb76d31050f62e28d947a0926fc4731197b25b70a59e87711136de56062cf0f SHA512 6820edaf1233dacc4e71d7cac3e38048fc4fe19df7ef45f51346b07157a57107272fff3386547f0105597b3a7da6076305d955ab0fbcafe5ab9dc4160582deee
+DIST kdesu-5.94.0.tar.xz 55500 BLAKE2B 80b1004997ff113f8ae2550e20b371a44fa6df8f4cc7294b1184c5a4217a85af30032868a39e37ce1080a998e0761354abdce5f89ec98c3e7809862979b70197 SHA512 850c35338d08c16e6fc82fe844640629e1198c1f127c286bf8e443e5b7e8b3b53529e8fc24a0ea62b824c7be4e42df933e49d6c5870562d971322574581bc664
diff --git a/kde-frameworks/kdesu/kdesu-5.85.0.ebuild b/kde-frameworks/kdesu/kdesu-5.92.0.ebuild
index 9a08914cd44..efd090f3976 100644
--- a/kde-frameworks/kdesu/kdesu-5.85.0.ebuild
+++ b/kde-frameworks/kdesu/kdesu-5.92.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -8,6 +8,7 @@ PVCUT=$(ver_cut 1-2)
inherit ecm kde.org
DESCRIPTION="Framework to handle super user actions"
+
LICENSE="LGPL-2"
KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
IUSE="X"
@@ -17,7 +18,6 @@ RDEPEND="
=kde-frameworks/kcoreaddons-${PVCUT}*:5
=kde-frameworks/ki18n-${PVCUT}*:5
=kde-frameworks/kpty-${PVCUT}*:5
- =kde-frameworks/kservice-${PVCUT}*:5
X? ( x11-libs/libX11 )
"
DEPEND="${RDEPEND}
diff --git a/kde-frameworks/kdesu/kdesu-5.88.0.ebuild b/kde-frameworks/kdesu/kdesu-5.94.0.ebuild
index 9f1f81824f2..642ef2c2ee3 100644
--- a/kde-frameworks/kdesu/kdesu-5.88.0.ebuild
+++ b/kde-frameworks/kdesu/kdesu-5.94.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -8,6 +8,7 @@ PVCUT=$(ver_cut 1-2)
inherit ecm kde.org
DESCRIPTION="Framework to handle super user actions"
+
LICENSE="LGPL-2"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
IUSE="X"
@@ -17,7 +18,6 @@ RDEPEND="
=kde-frameworks/kcoreaddons-${PVCUT}*:5
=kde-frameworks/ki18n-${PVCUT}*:5
=kde-frameworks/kpty-${PVCUT}*:5
- =kde-frameworks/kservice-${PVCUT}*:5
X? ( x11-libs/libX11 )
"
DEPEND="${RDEPEND}
diff --git a/kde-frameworks/kdnssd/Manifest b/kde-frameworks/kdnssd/Manifest
index 2412a574f8c..d2b55aa80cc 100644
--- a/kde-frameworks/kdnssd/Manifest
+++ b/kde-frameworks/kdnssd/Manifest
@@ -1,2 +1,2 @@
-DIST kdnssd-5.85.0.tar.xz 58676 BLAKE2B 174114189daee2a2fff8b42c81a81d640af2b2f43bc4a889978db468873dc5b330495fa5c5a0283fb2e5a4e0083a97d47296002c29bbd5641f5b4ed4e57c65b0 SHA512 a6356b5c643a1e7e1f7d30e67a1ac8f13427ee3758709ccaad83af68f30a085f46a3d12e814ea8ec29adc1f9bea2a48e2c180b20ad9d5bb5834c02894f4286b4
-DIST kdnssd-5.88.0.tar.xz 58908 BLAKE2B dff0a6c6f05ed276cf0b10d94325355e131861817de50e5ff3e60dbca7da8cacef68c14e01a190dcbfba8bb921c502137371896eaa215ffb39faf6cc7e0d481c SHA512 42b503a5afc373f56cb0f0e966733bd6af5e12480cc8e4813eaeff320e18546d41a71f0aec080af46464e96f8de4704c66cc565067e76d34c1147f75855bb592
+DIST kdnssd-5.92.0.tar.xz 61124 BLAKE2B d6972462218e743052642d11c2aafd1ccfac92eff803e03be2f6b85eee6c19ab2269bb66b877d5e6f397f8d26c0079b3f8c309c4a585d95c71dfaa7202e8f298 SHA512 35bf07b7828a77598b6365bb3abc4f235dfe2ccafe936149360f6f3e738bca7a20f48f8f926078ae4f34c556f2da5cd505aa69949b9050550b341c4c511452b4
+DIST kdnssd-5.94.0.tar.xz 61160 BLAKE2B a809253a6f2ef2b2c3ad9e5931e9f64abb470cb30c6f96d46d4b582079bf8c4c25eb0f1c9f5ec3146d64deed8751c8e8f330386821f6fe08c64d3516dd7d0b18 SHA512 e85f6ad4eecaa2e710f8cf4c989e04b0865158a3ab3d11ff0a6bfcfeed81bccc404313aa62921011a89ff23e6840f6222a38884c0c53e621930b354a309222bf
diff --git a/kde-frameworks/kdnssd/kdnssd-5.85.0.ebuild b/kde-frameworks/kdnssd/kdnssd-5.92.0.ebuild
index 98cc4dde11f..229be47342a 100644
--- a/kde-frameworks/kdnssd/kdnssd-5.85.0.ebuild
+++ b/kde-frameworks/kdnssd/kdnssd-5.92.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -25,9 +25,9 @@ RDEPEND="${DEPEND}"
src_configure() {
local mycmakeargs=(
- -DCMAKE_DISABLE_FIND_PACKAGE_DNSSD=ON
$(cmake_use_find_package zeroconf Avahi)
)
+ use zeroconf || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_DNSSD=ON )
ecm_src_configure
}
diff --git a/kde-frameworks/kdnssd/kdnssd-5.88.0.ebuild b/kde-frameworks/kdnssd/kdnssd-5.94.0.ebuild
index 286299b7a37..9cd1ca83e31 100644
--- a/kde-frameworks/kdnssd/kdnssd-5.88.0.ebuild
+++ b/kde-frameworks/kdnssd/kdnssd-5.94.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-QTMIN=5.15.2
+QTMIN=5.15.3
inherit ecm kde.org
DESCRIPTION="Framework for network service discovery using Zeroconf"
@@ -25,9 +25,9 @@ RDEPEND="${DEPEND}"
src_configure() {
local mycmakeargs=(
- -DCMAKE_DISABLE_FIND_PACKAGE_DNSSD=ON
$(cmake_use_find_package zeroconf Avahi)
)
+ use zeroconf || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_DNSSD=ON )
ecm_src_configure
}
diff --git a/kde-frameworks/kdoctools/Manifest b/kde-frameworks/kdoctools/Manifest
index bb5ac977518..ec85f27ceff 100644
--- a/kde-frameworks/kdoctools/Manifest
+++ b/kde-frameworks/kdoctools/Manifest
@@ -1,2 +1,2 @@
-DIST kdoctools-5.85.0.tar.xz 437036 BLAKE2B 76b1e2e10e058e541b45f520c11503a1360af2a053d5ab493b867f5166d84271d53a41c8dc547b78bff22cac06f25e66605337cc4e5a735513475ba14f2b4300 SHA512 b0118c94a3a4520076e9849ca4a7cfe13ec13ea7486d2c7bf81689a6ec6b23280793d87057513ebf45291c400a59d110583411eca9ffdacddc5c53d5a2ff4620
-DIST kdoctools-5.88.0.tar.xz 437536 BLAKE2B a4b0b0a9f6f7b817e62867e9094cd8fb0180364c9f26e94aff95747b2bcb6fd313a68275e0a5d9bc3d81bf5ecad6f5740c8ddcb696f0a6bd90ce8eb10233c75e SHA512 d592597eb414e85b5dcca303d8fa19a8d96fdc683c2ba3b87c80976d68ff608d1b0d92c50f23ebc2f01d547ddd54fac797995ed27a3dd2e3db05e9e2caea7341
+DIST kdoctools-5.92.0.tar.xz 440352 BLAKE2B 95a4202c31d7880ae7c6ee35877e4b156edbcc89f25ea3bc9f756359d710c296831b19943ec0704c2bc15c8d17b5aa93a01a1751719485bf4a7fe794eea77e4d SHA512 bf87ca5cf7709d634dba631564f45dc5b1bfc6d1ba688ef6534045f5946a9b5cfd3746c5f599b34b25b2b3c174e7a78cf598036e80959b3c7d47e2f08fdbdf99
+DIST kdoctools-5.94.0.tar.xz 440500 BLAKE2B 3a1fcfd7324aee5dab0c140178f58bf485a5f0bfa1a7da48020edf7410f98e7c4a4b7255b78af53d228de6c0ca2123f369bd43e142d2f22d19be38074b9b9d06 SHA512 754b1598f4db9112430de9cc559f522c66e33b773d425e3b24763ffe330a3c3f8d3a5a6eeb6d865d770c0ed85f2bb89b72a75b7053ca96bf0f730635c8524038
diff --git a/kde-frameworks/kdoctools/kdoctools-5.85.0.ebuild b/kde-frameworks/kdoctools/kdoctools-5.92.0.ebuild
index f971084b414..a8fa655b839 100644
--- a/kde-frameworks/kdoctools/kdoctools-5.85.0.ebuild
+++ b/kde-frameworks/kdoctools/kdoctools-5.92.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
diff --git a/kde-frameworks/kdoctools/kdoctools-5.88.0.ebuild b/kde-frameworks/kdoctools/kdoctools-5.94.0.ebuild
index 70d5563f300..24615f4122f 100644
--- a/kde-frameworks/kdoctools/kdoctools-5.88.0.ebuild
+++ b/kde-frameworks/kdoctools/kdoctools-5.94.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
diff --git a/kde-frameworks/kemoticons/Manifest b/kde-frameworks/kemoticons/Manifest
index c740f330e85..f6f3e22fa07 100644
--- a/kde-frameworks/kemoticons/Manifest
+++ b/kde-frameworks/kemoticons/Manifest
@@ -1,2 +1,2 @@
-DIST kemoticons-5.85.0.tar.xz 1698484 BLAKE2B 46c7a07b3bc80c54a461b1f47b57d6f155af3fc71b6eb4cd8f0c56b3c9c7571ffa93703f07ac4281453bfa6d19922f21bc4ca6e92b66fafc7d87fee7accb1ff3 SHA512 62fda2265b0fa7154f68d2535e331e38fa899b1517b7fd08faee1419bdaee46f2a3fc63469a54277ce25997df4215d3314219e608927389da4451c8fa3bdf526
-DIST kemoticons-5.88.0.tar.xz 1698716 BLAKE2B 8e4d737611f5d2b43d17a754245bb47cfce6ca95847d9556e386b699197640f7a8282b6e6ff1d99317a209bbaa8252497d56ae5dc97dbb9e3d20e79edb4bfae4 SHA512 1983324edfb26f1b96cdd961215743cac22cd94225bf7a782d4d67f8772d0c70b93e8854d1f756187ef3a0aad5f642e8a37a1fbf1be64e6007f1542e0e48869f
+DIST kemoticons-5.92.0.tar.xz 1700664 BLAKE2B 5ea44283217649b47326e03c7d64e1dcc5d1d409acfd54b64a8550662e88b25b082e97daffb8b4cea11982b35b0bf9dd1fbd762876d5f35ca29877206aa09f1e SHA512 4f04a0df71d16436db7b2c7007c183ba67f29151e9782a395bb674e6ffafe99adf255f32208304052d057c6519d3c35266e85665c7c91c061ae7ab3823fc9037
+DIST kemoticons-5.94.0.tar.xz 1700696 BLAKE2B dd193e5e7286b5e76ef147fce32a815c53ba05aea1520127fbaf1754d9d309e361978eeb6e939abdde9d87d398c9bc01ff182bc46ad726ca8b653465033168c6 SHA512 1b8d34fb58ef6b8ba83cc13eac719143606d1011b39551513773e78f660a3c7c4f3ed3402cb68bac9c216275cba7c1fdf6fdf2d905d377f9bf79a1eeac850b46
diff --git a/kde-frameworks/kemoticons/kemoticons-5.85.0.ebuild b/kde-frameworks/kemoticons/kemoticons-5.92.0.ebuild
index e116c3f7868..1c4a903873e 100644
--- a/kde-frameworks/kemoticons/kemoticons-5.85.0.ebuild
+++ b/kde-frameworks/kemoticons/kemoticons-5.92.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
diff --git a/kde-frameworks/kemoticons/kemoticons-5.88.0.ebuild b/kde-frameworks/kemoticons/kemoticons-5.94.0.ebuild
index eee0296e94d..b6f91ed363a 100644
--- a/kde-frameworks/kemoticons/kemoticons-5.88.0.ebuild
+++ b/kde-frameworks/kemoticons/kemoticons-5.94.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# 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.2
+QTMIN=5.15.3
VIRTUALX_REQUIRED="test"
inherit ecm kde.org
diff --git a/kde-frameworks/kfilemetadata/Manifest b/kde-frameworks/kfilemetadata/Manifest
index b969d94040b..e2b0b3cba8b 100644
--- a/kde-frameworks/kfilemetadata/Manifest
+++ b/kde-frameworks/kfilemetadata/Manifest
@@ -1,2 +1,2 @@
-DIST kfilemetadata-5.85.0.tar.xz 426336 BLAKE2B f68125f17afb6f3f9c65486670ad2eca8ad057927c30ad3f765d6551cf3cb1801512c9432c70f2e87a992e7ef8f81ef23908cfdcac0df5c466eb4a0e932e58ab SHA512 f531a1519ee3efc8b6973bf979ce2ee1380c9b425f06233267d007c1b79f6b7c2166e47212093ec8250f75dc9897dbb0d9b8b17ee4d999c487f10451a725ffd7
-DIST kfilemetadata-5.88.0.tar.xz 426936 BLAKE2B 82e73bdc082adb57323421ded8b3782597084ec069f1a1e95418bd9b54af96a1a407a0852561f61ef874727715afa23d9fb3d9f1f78caf3dfac062f8314ba6ba SHA512 e65952754914ad3697c17fc7b5406235eeaa532a51828dd9016ca9b0009f3592e1c1ae575b6bbba046c00b2cc689290cdf61b7ef7626126500b3ec2358ccf0c4
+DIST kfilemetadata-5.92.0.tar.xz 430260 BLAKE2B d18d8a537cea3ccddb93a04f09cb63f6bd603a446d0e79c397b1dd34f6cb33661b89a62e9687579eab28567bdf92c0ef3baf252a16a0df350c01d0869895c6e4 SHA512 62eea78ae945344badd780223a929829dde759bcf515191f7cc0ab9c0cffc6510f599cf9b7a73cce3fcbeb0bb6476df9b97fdfc1744f27439d7f743b7879e12e
+DIST kfilemetadata-5.94.0.tar.xz 435792 BLAKE2B 331518d9e6162ceee20a3218ba13875f5450eb1c29596a380b71f9feac4b999a951edbdad69bbb7697916a32bcd152ffae4140d3e4fe12ef8aa8cf09ea04b1bd SHA512 76b357c47791d352dfc34036041df6be204031260d95597967410836887f0a2e80dd1aab250e092848ceda674ab164e8e98aa811593e971a27a7aace8d2be28f
diff --git a/kde-frameworks/kfilemetadata/kfilemetadata-5.85.0.ebuild b/kde-frameworks/kfilemetadata/kfilemetadata-5.92.0.ebuild
index 9ebda1b89d1..0922efac1cf 100644
--- a/kde-frameworks/kfilemetadata/kfilemetadata-5.85.0.ebuild
+++ b/kde-frameworks/kfilemetadata/kfilemetadata-5.92.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -11,7 +11,7 @@ inherit ecm kde.org optfeature python-any-r1
DESCRIPTION="Library for extracting file metadata"
LICENSE="LGPL-2+"
KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-IUSE="epub exif ffmpeg kernel_linux office pdf taglib"
+IUSE="epub exif ffmpeg mobi office pdf taglib"
RESTRICT="test"
@@ -25,6 +25,7 @@ RDEPEND="
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 )
@@ -43,6 +44,7 @@ src_configure() {
$(cmake_use_find_package epub EPub)
$(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)
diff --git a/kde-frameworks/kfilemetadata/kfilemetadata-5.88.0.ebuild b/kde-frameworks/kfilemetadata/kfilemetadata-5.94.0.ebuild
index b66b72669f8..fc3f2da9df8 100644
--- a/kde-frameworks/kfilemetadata/kfilemetadata-5.88.0.ebuild
+++ b/kde-frameworks/kfilemetadata/kfilemetadata-5.94.0.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
PYTHON_COMPAT=( python3_{8..10} )
PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
+QTMIN=5.15.3
inherit ecm kde.org optfeature python-any-r1
DESCRIPTION="Library for extracting file metadata"
LICENSE="LGPL-2+"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="epub exif ffmpeg kernel_linux office pdf taglib"
+IUSE="epub exif ffmpeg mobi office pdf taglib"
RESTRICT="test"
@@ -25,6 +25,7 @@ RDEPEND="
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 )
@@ -43,6 +44,7 @@ src_configure() {
$(cmake_use_find_package epub EPub)
$(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)
diff --git a/kde-frameworks/kfilemetadata/metadata.xml b/kde-frameworks/kfilemetadata/metadata.xml
index 52248a3fdbb..b2dffe74018 100644
--- a/kde-frameworks/kfilemetadata/metadata.xml
+++ b/kde-frameworks/kfilemetadata/metadata.xml
@@ -10,6 +10,7 @@
</upstream>
<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>
diff --git a/kde-frameworks/kglobalaccel/Manifest b/kde-frameworks/kglobalaccel/Manifest
index c9c8561b876..bb78bd198e1 100644
--- a/kde-frameworks/kglobalaccel/Manifest
+++ b/kde-frameworks/kglobalaccel/Manifest
@@ -1,2 +1,2 @@
-DIST kglobalaccel-5.85.0.tar.xz 87868 BLAKE2B c76a60426406689434b8b7e90ff9f107173ffa8bb6e6f78603541c2f7fdba62719d141f01ac2a7e3ebeae06a2a891a5467e6ee87eb5d30a53ed4e3faa98a1b28 SHA512 091194d3171820c121c32356bf1dfd98416b91952b745afbf35fc75a7e944a5c80f17fb1f8418016513eaaf63ccb07c1aec822f5f3823f3f4aa604c3dd9963f2
-DIST kglobalaccel-5.88.0.tar.xz 88180 BLAKE2B a1642db79366428c9fd1b644c03258633386a23d290545635bf787e22a362ae7c7d8701380498e9ecc5cea1ff230aeeec500f9c58d920b34d234b74f011d71ad SHA512 aeaf82a2371a9259493f89cec46f40abb6c0ddac48c4831b75a3a31c46bad63b390fd6948cd473124cdc28b2b3d8018834a986e11f4648028697ab871534787f
+DIST kglobalaccel-5.92.0.tar.xz 93704 BLAKE2B a7b38b1c7b6bd0a7d20de7dd1893ae42d70888262fff6e196b8c64b5dd16d0c1ec5f8aaa44e1a0cbd39cc675df957e3e86c509ea7418105ef4df1071502d3c41 SHA512 b839dff3fcf191b2bdd99d6ba2e66169e86e73bef06bfaf990a30ad2d4a89d9150c798297f9cd98407a4ff390252b5d15fed8e51fc76a01199498099aa45f9cc
+DIST kglobalaccel-5.94.0.tar.xz 95840 BLAKE2B 2be9ab5c74e0ad9510edbc7c749f44bd8d80e78246d3681e8ba172ff7ce94738179309e64903a829eac1c76d26def265f22c017a09f73a72b2d01892e108ca1b SHA512 9e0b81716acaf27a5a6f6f64e7bafca96a3820eaec5627193f45cd95122f46b3a02d2bd18791c23bf74b3c84eba7eef9b331bd2ae093f7590e56c65bee66f78f
diff --git a/kde-frameworks/kglobalaccel/files/kglobalaccel-5.85.0-start-processes-w-kstart5-if-available.patch b/kde-frameworks/kglobalaccel/files/kglobalaccel-5.85.0-start-processes-w-kstart5-if-available.patch
deleted file mode 100644
index 0a5dcd5c4f3..00000000000
--- a/kde-frameworks/kglobalaccel/files/kglobalaccel-5.85.0-start-processes-w-kstart5-if-available.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From c6c14830a98050cbee5aa48dd8812e2197515de3 Mon Sep 17 00:00:00 2001
-From: David Redondo <kde@david-redondo.de>
-Date: Mon, 30 Aug 2021 15:45:36 +0200
-Subject: [PATCH] Start processes with kstart5 if available
-
-The intention of 717e4ea9f8e9d3f9ea5e6c8de2efbffd5ef2af82 was to start
-processes with kstart5 so they are in the correct cgroup. We should
-always check if it's available first as we still want to prefer it once
-klauncher is registered.
-BUG:433362
-
-* asturm 2021-09-04: Merged with:
-
-From 061c45df933f6a346c85c34fe10df6f1bd857908 Mon Sep 17 00:00:00 2001
-From: Nikos Chantziaras <realnc@gmail.com>
-Date: Thu, 2 Sep 2021 09:42:51 -0600
-Subject: [PATCH] Fix launching commands with args using kstart5
-
-By prepending "--" to the command, kstart5 parses it all as one thing,
-so additional arguments are executed as expected.
-
-BUG: 433362
----
- src/runtime/kserviceactioncomponent.cpp | 17 +++++++++--------
- 1 file changed, 9 insertions(+), 8 deletions(-)
-
-diff --git a/src/runtime/kserviceactioncomponent.cpp b/src/runtime/kserviceactioncomponent.cpp
-index 8bb6962..09b3d7a 100644
---- a/src/runtime/kserviceactioncomponent.cpp
-+++ b/src/runtime/kserviceactioncomponent.cpp
-@@ -48,7 +48,13 @@
- }
-
- const QString command = parts.takeFirst();
-- if (klauncherAvailable) {
-+
-+ const auto kstart = QStandardPaths::findExecutable(QStringLiteral("kstart5"));
-+ if (!kstart.isEmpty()) {
-+ parts.prepend(command);
-+ parts.prepend(QStringLiteral("--"));
-+ QProcess::startDetached(kstart, parts);
-+ } else if (klauncherAvailable) {
- QDBusMessage msg = QDBusMessage::createMethodCall(QStringLiteral("org.kde.klauncher5"),
- QStringLiteral("/KLauncher"),
- QStringLiteral("org.kde.KLauncher"),
-@@ -57,18 +63,14 @@
-
- QDBusConnection::sessionBus().asyncCall(msg);
- } else {
-- const auto kstart = QStandardPaths::findExecutable(QStringLiteral("kstart5"));
-- if (kstart.isEmpty()) {
-- QProcess::startDetached(command, parts);
-- } else {
-- parts.prepend(command);
-- QProcess::startDetached(kstart, parts);
-- }
-+ QProcess::startDetached(command, parts);
- }
- }
-
- void KServiceActionComponent::emitGlobalShortcutPressed(const GlobalShortcut &shortcut)
- {
-+ // TODO KF6 use ApplicationLauncherJob to start processes when it's available in a framework that we depend on
-+
- // DBusActivatatable spec as per https://specifications.freedesktop.org/desktop-entry-spec/desktop-entry-spec-latest.html#dbus
- if (m_desktopFile->desktopGroup().readEntry("DBusActivatable", false)) {
- QString method;
diff --git a/kde-frameworks/kglobalaccel/kglobalaccel-5.85.0-r1.ebuild b/kde-frameworks/kglobalaccel/kglobalaccel-5.92.0.ebuild
index 52e82e49155..cbefd46016d 100644
--- a/kde-frameworks/kglobalaccel/kglobalaccel-5.85.0-r1.ebuild
+++ b/kde-frameworks/kglobalaccel/kglobalaccel-5.92.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -14,6 +14,9 @@ LICENSE="LGPL-2+"
KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
IUSE="nls"
+# requires installed instance
+RESTRICT="test"
+
DEPEND="
>=dev-qt/qtdbus-${QTMIN}:5
>=dev-qt/qtgui-${QTMIN}:5
@@ -30,10 +33,6 @@ DEPEND="
RDEPEND="${DEPEND}"
BDEPEND="nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )"
-PATCHES=(
- "${FILESDIR}"/${P}-start-processes-w-kstart5-if-available.patch # KDE-bug 433362
-)
-
src_test() {
XDG_CURRENT_DESKTOP="KDE" ecm_src_test # bug 789342
}
diff --git a/kde-frameworks/kglobalaccel/kglobalaccel-5.88.0.ebuild b/kde-frameworks/kglobalaccel/kglobalaccel-5.94.0.ebuild
index 43fdf06f50f..c909200d6fd 100644
--- a/kde-frameworks/kglobalaccel/kglobalaccel-5.88.0.ebuild
+++ b/kde-frameworks/kglobalaccel/kglobalaccel-5.94.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# 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.2
+QTMIN=5.15.3
VIRTUALX_REQUIRED="test"
inherit ecm kde.org
@@ -14,7 +14,10 @@ LICENSE="LGPL-2+"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
IUSE="nls"
-DEPEND="
+# requires installed instance
+RESTRICT="test"
+
+RDEPEND="
>=dev-qt/qtdbus-${QTMIN}:5
>=dev-qt/qtgui-${QTMIN}:5
>=dev-qt/qtwidgets-${QTMIN}:5
@@ -27,7 +30,13 @@ DEPEND="
x11-libs/libxcb
x11-libs/xcb-util-keysyms
"
-RDEPEND="${DEPEND}"
+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_test() {
diff --git a/kde-frameworks/kguiaddons/Manifest b/kde-frameworks/kguiaddons/Manifest
index 28bfd2e4b4c..2bfa66a4e97 100644
--- a/kde-frameworks/kguiaddons/Manifest
+++ b/kde-frameworks/kguiaddons/Manifest
@@ -1,2 +1,2 @@
-DIST kguiaddons-5.85.0.tar.xz 60620 BLAKE2B 11910055959a4d257969c665be64f6e1933ae7afcbfa16f3fd5e31503935ffe5b62188f0da7e0b9621cb158e01512c88eb07d7e2c4e6ec1600fa932157a08b53 SHA512 0f2b1f0201028da520ac0b04fd66c753a953a675cd29249bab79807b08739979601499530be119b5bda124bda4dd09e10c8e11b68d0bcaf8a1a2283e853cadc5
-DIST kguiaddons-5.88.0.tar.xz 60904 BLAKE2B efe3575446b8858edb83e938e66febac3f1704064f5b8f977f418f1c6dce38c46a19a948990749d2028b4a33e4b3a25d23b1663e9e0a691da8331d86634f7d23 SHA512 fdd8139367a021c5e55525c4e8393c377b772e75512147d30431012f472a827b9b67b57f8c89f2954cb1259bee6dbb1cfcada5ed2dd4597cad7a3422f67d56bc
+DIST kguiaddons-5.92.0.tar.xz 72424 BLAKE2B cbeedd3a0668edca5cbf712dcfa1264a6449b80ade73555fde11b4410f0c9ce403ca6a884429cab8e87ac4b933b2f03fb24a7f5138c23cb1d6cdedb98e076af6 SHA512 8a5e7db33938a43151b3c1e2bdd3f4b273abfc8f35ab24bc9f8ef99e541ffd92350e4f6d4be5c5123e98b1db73ef00b687c7bac9ed950dfeb041c0ecab074acf
+DIST kguiaddons-5.94.0.tar.xz 73120 BLAKE2B f0dcd7e0da3722c68fc3446809206b0103d9bf66e92aab7c36cb20a144661470d16808e877cc673d05d41ceb855f787afc854eb38be333b9464265d630eb3ae9 SHA512 b8fe5c809035f194c2118ed9a4cd4bae29c610447b67c9cca5b02365fe4111b35252ea6c898d9df717ca9867ccd96faf2845404b0158acee7854c8407218f7e5
diff --git a/kde-frameworks/kguiaddons/kguiaddons-5.88.0.ebuild b/kde-frameworks/kguiaddons/kguiaddons-5.92.0.ebuild
index ca5ae913e5e..08b0f635bf8 100644
--- a/kde-frameworks/kguiaddons/kguiaddons-5.88.0.ebuild
+++ b/kde-frameworks/kguiaddons/kguiaddons-5.92.0.ebuild
@@ -1,15 +1,16 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
+ECM_NONGUI="false"
QTMIN=5.15.2
VIRTUALX_REQUIRED="test"
inherit ecm kde.org
DESCRIPTION="Framework providing assorted high-level user interface components"
LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
IUSE="wayland X"
# slot op: includes qpa/qplatformnativeinterface.h
@@ -29,10 +30,10 @@ DEPEND="${RDEPEND}
x11-base/xorg-proto
X? ( x11-libs/libxcb )
"
+BDEPEND="wayland? ( >=dev-qt/qtwaylandscanner-${QTMIN}:5 )"
src_configure() {
local mycmakeargs=(
- -DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON # bug 746866
-DWITH_WAYLAND=$(usex wayland)
-DWITH_X11=$(usex X)
)
diff --git a/kde-frameworks/kguiaddons/kguiaddons-5.85.0-r1.ebuild b/kde-frameworks/kguiaddons/kguiaddons-5.94.0.ebuild
index 97ad069422d..c091872463a 100644
--- a/kde-frameworks/kguiaddons/kguiaddons-5.85.0-r1.ebuild
+++ b/kde-frameworks/kguiaddons/kguiaddons-5.94.0.ebuild
@@ -1,37 +1,42 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-QTMIN=5.15.2
+ECM_NONGUI="false"
+QTMIN=5.15.3
VIRTUALX_REQUIRED="test"
inherit ecm kde.org
DESCRIPTION="Framework providing assorted high-level user interface components"
LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-IUSE="wayland"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="wayland X"
# slot op: includes qpa/qplatformnativeinterface.h
RDEPEND="
>=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtx11extras-${QTMIN}:5
- x11-libs/libX11
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
- x11-libs/libxcb
+ wayland? ( >=dev-libs/plasma-wayland-protocols-1.7.0 )
+ X? ( x11-libs/libxcb )
"
+BDEPEND="wayland? ( >=dev-qt/qtwaylandscanner-${QTMIN}:5 )"
src_configure() {
local mycmakeargs=(
- -DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON # bug 746866
-DWITH_WAYLAND=$(usex wayland)
+ -DWITH_X11=$(usex X)
)
ecm_src_configure
}
diff --git a/kde-frameworks/kholidays/Manifest b/kde-frameworks/kholidays/Manifest
index 883322fd8d1..8f3f57baf51 100644
--- a/kde-frameworks/kholidays/Manifest
+++ b/kde-frameworks/kholidays/Manifest
@@ -1,2 +1,2 @@
-DIST kholidays-5.85.0.tar.xz 230532 BLAKE2B c9212b1036af4767eb7dde0cf504cf1ff255ff329c041d9d00f656419b3b92f9a82b0c0c0008511bdc59e485f60a5f57fa91af31842a1bf053c94d42d4b3b030 SHA512 c58ac20764db8eec399ba0ae77d227023cfc455c76289faa4a688f8dc3e6987a87c7b0825ed4d4bba4198915d39ad9d74dd6abb3a10b04d2128764c201bd4ab1
-DIST kholidays-5.88.0.tar.xz 232400 BLAKE2B 5d72a0d86c91f1061e4c01b9df6f53abbc0837577df9ac3d53a171225eca3b9a714fdfd44e0afacca99f2f85ef67dff9e99099d05875f1f42e6be1ed3d9d3884 SHA512 364bee9a2798cc47e26c359d31fcca4d7fcffb4e85baeadacfbfb62d199b7ca9a1e177d7f1e853e669888c8ddf83512fde5794c30a64abc3b9f897068bce982a
+DIST kholidays-5.92.0.tar.xz 235388 BLAKE2B 3ce0840c458522a8d4d407d620ef7f69fea8f0da5f42d33ec896147e436355aeeabc028b823a2e23a339ac31eeece61e381ca8eaa59e9fff5fb2801344766ff3 SHA512 1ec4c5bc513685e7f8834621ce464a003876b4c26ee4ff84db5f13e1cb253fb7e1c04fc7ed1b9ad92dc7990498e8d5d10fe4b3799f33762eabe155296093a3f7
+DIST kholidays-5.94.0.tar.xz 238860 BLAKE2B 5fa67d8104a3fc6a7039101baee63107e3f33dff3d25e1d31c4bce893dbc5156253421280bdf7c170caad395d47380923a73d8f05d6ec81fd91508548823ec0a SHA512 7c362a8ba852258c95c6eceb9f7dbd82fd3bdfdeab5c844c5efd772244c823f772616e68e67f40f3c641278eec65126b9ee599942b8393103600b24d97e9e77e
diff --git a/kde-frameworks/kholidays/kholidays-5.85.0.ebuild b/kde-frameworks/kholidays/kholidays-5.92.0.ebuild
index bc0d1490af6..0da2702df9c 100644
--- a/kde-frameworks/kholidays/kholidays-5.85.0.ebuild
+++ b/kde-frameworks/kholidays/kholidays-5.92.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
diff --git a/kde-frameworks/kholidays/kholidays-5.88.0.ebuild b/kde-frameworks/kholidays/kholidays-5.94.0.ebuild
index db511b412b8..40ec321b429 100644
--- a/kde-frameworks/kholidays/kholidays-5.88.0.ebuild
+++ b/kde-frameworks/kholidays/kholidays-5.94.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# 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.2
+QTMIN=5.15.3
inherit ecm kde.org
DESCRIPTION="Library to determine holidays and other special events for a geographical region"
diff --git a/kde-frameworks/khtml/Manifest b/kde-frameworks/khtml/Manifest
index 9be9e9e3db3..921029f8713 100644
--- a/kde-frameworks/khtml/Manifest
+++ b/kde-frameworks/khtml/Manifest
@@ -1,2 +1,2 @@
-DIST khtml-5.85.0.tar.xz 2093124 BLAKE2B 627bfa8581c6a5574027ddbc8c9c87544e218068ea6deed5190b0528cc8a9035eb8154b1847fcceb7f4edb664d72aea23e608880cda84eb610da66ea9a74a85a SHA512 772aa4bc541be3f03274f01810bd7d49486f9a7497e8f6e2bd4cbdf3dee4776318fddff0c2b221181184dc185ac4549457ae372b5521462749f5213c62e1dddd
-DIST khtml-5.88.0.tar.xz 2093664 BLAKE2B 85379c7d3fffed82794c33977f8d1ebaf2670158ea52feff72db694a47a5a5223d2d91850e5ccf21cb4f495c6bd4c884aae65b65f5ba2ce3962ce9b7dc410258 SHA512 7fa39361e2353b5abdd7c92ddc91c0e9a8216a756d6976ae57249649d9fad97957793ca446a5668a7d0f44031eae3ed38c35d6331f07d1286af18f3346bc4a87
+DIST khtml-5.92.0.tar.xz 2093568 BLAKE2B 1c94b1ee041fe69d173798ade211feada3c9f123fd9a6f6775cf3453ab677f8001053f7785dd492acb81c6908286bebb592eded670771c2dab42a8a9aa58c300 SHA512 270d3ba357ed5c031b41564a56e0d91df87702cd05ea810434a8e2cafd87fbdc0be8984ed535745edf592c318107464f0aaada0c2ef42fbde7a6f87228edfcef
+DIST khtml-5.94.0.tar.xz 2094048 BLAKE2B 71bd3e0320fd0a6ea20f1ec27ece7ec7fb6e63e40bfdfe213c79b241285e57985e7ab00ead9571f2341ffdc56344b73e0f350fd362d6ea3c60fe26bf71f0d954 SHA512 46ba7aa0f29868773db54e632aeeefdd6a92f9b6ac55f9bebb5d903f04f7a41fe9afae52fe43cd23c9f512382042e8c709f5b7897d8ed98e73e710188d1be568
diff --git a/kde-frameworks/khtml/khtml-5.85.0.ebuild b/kde-frameworks/khtml/khtml-5.92.0.ebuild
index b6b9204f242..5d433e5c627 100644
--- a/kde-frameworks/khtml/khtml-5.85.0.ebuild
+++ b/kde-frameworks/khtml/khtml-5.92.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
diff --git a/kde-frameworks/khtml/khtml-5.88.0.ebuild b/kde-frameworks/khtml/khtml-5.94.0.ebuild
index e20decaca23..7fbeec406be 100644
--- a/kde-frameworks/khtml/khtml-5.88.0.ebuild
+++ b/kde-frameworks/khtml/khtml-5.94.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# 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.2
+QTMIN=5.15.3
VIRTUALX_REQUIRED="test"
inherit ecm kde.org
@@ -14,10 +14,6 @@ LICENSE="LGPL-2"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
IUSE="X"
-BDEPEND="
- dev-lang/perl
- dev-util/gperf
-"
RDEPEND="
dev-libs/openssl:0
>=dev-qt/qtdbus-${QTMIN}:5
@@ -48,10 +44,10 @@ RDEPEND="
=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
- virtual/jpeg:0
X? (
>=dev-qt/qtx11extras-${QTMIN}:5
x11-libs/libX11
@@ -61,6 +57,10 @@ DEPEND="${RDEPEND}
test? ( >=dev-qt/qtx11extras-${QTMIN}:5 )
X? ( x11-base/xorg-proto )
"
+BDEPEND="
+ dev-lang/perl
+ dev-util/gperf
+"
src_configure() {
local mycmakeargs=(
diff --git a/kde-frameworks/ki18n/Manifest b/kde-frameworks/ki18n/Manifest
index 541e08c0c63..93bd6279038 100644
--- a/kde-frameworks/ki18n/Manifest
+++ b/kde-frameworks/ki18n/Manifest
@@ -1,2 +1,2 @@
-DIST ki18n-5.85.0.tar.xz 590384 BLAKE2B 337898b907e673365175a3fd7f122baa156266e60ae47d0f5f7f9afa577c4ed2abfd34d8b2189c162fa4c15e4b726984cf620d699a65b8dfebbeeea99eab0079 SHA512 01053f5715d907eba28daab411880013b9f0305f72d84d1a26edd1aeae6b3f05c1b580ea95aae4de122a57a3bcabb11c4737a82bd51facf8201d584c64708856
-DIST ki18n-5.88.0.tar.xz 954564 BLAKE2B c482e3d0839c90e5abf73cbbb6e2fb6478bcfff2dc7d8945316c04bece8d278f90ce97868cde2fe9bc2270c17f0aae2e91fbb872a422d6e70278c30dae353cc8 SHA512 7d417a34667ca0e63a49e8d7cc2608028ea66e51adb6f22934a694fda65bb3f858b1e36960b184dcfd919d90107264682bd6426b27cbaba92faf34758668784c
+DIST ki18n-5.92.0.tar.xz 956048 BLAKE2B 451f091aa44c6845a7aae509c8e13ca3c707ad1858330ad97edbe94ded6646a02dcaa6d2d852686633f62539c332dab6189502ebedfd40b8374144c43930c946 SHA512 0eba368abe4ff385594e22e808d30b5d4a9af95e8bb2a3f4379518b374aab8ddabef18ebdfc2afd121ebb5f8865a427a49c8abf9c59b126cecf78a48640439e7
+DIST ki18n-5.94.0.tar.xz 955304 BLAKE2B 75c5cb3e26648cc20ff9bcf957103c787f19b02a6e5c3e8a804a211a2c184fb59d38d3920d316009321695a607e8c3e8366b7b70d4c35191fae8b0dbc0166515 SHA512 ff00a56f1d6e5a425d025320be6f6e1559e329f56e68975df9d7c1ecdc0108f2118af37373db583d7760f34877bd0f18bef47080a70dfca628d958f35e8f9e15
diff --git a/kde-frameworks/ki18n/ki18n-5.85.0.ebuild b/kde-frameworks/ki18n/ki18n-5.92.0.ebuild
index c5ca621f000..3e9dcce2a1d 100644
--- a/kde-frameworks/ki18n/ki18n-5.85.0.ebuild
+++ b/kde-frameworks/ki18n/ki18n-5.92.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -14,14 +14,17 @@ IUSE=""
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RDEPEND="${PYTHON_DEPS}
+COMMON_DEPEND="${PYTHON_DEPS}
>=dev-qt/qtdeclarative-${QTMIN}:5
sys-devel/gettext
virtual/libintl
"
-DEPEND="${RDEPEND}
+DEPEND="${COMMON_DEPEND}
test? ( >=dev-qt/qtconcurrent-${QTMIN}:5 )
"
+RDEPEND="${COMMON_DEPEND}
+ app-text/iso-codes
+"
PATCHES=( "${FILESDIR}/${PN}-5.57.0-python.patch" )
@@ -32,8 +35,13 @@ pkg_setup() {
src_configure() {
local mycmakeargs=(
- -DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON # bug 746866
-DPYTHON_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/ki18n/ki18n-5.88.0.ebuild b/kde-frameworks/ki18n/ki18n-5.94.0.ebuild
index b66464e8f3b..da8b02fe7d7 100644
--- a/kde-frameworks/ki18n/ki18n-5.88.0.ebuild
+++ b/kde-frameworks/ki18n/ki18n-5.94.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
PYTHON_COMPAT=( python3_{8..10} )
-QTMIN=5.15.2
+QTMIN=5.15.3
inherit ecm kde.org python-single-r1
DESCRIPTION="Framework based on Gettext for internationalizing user interface text"
@@ -35,7 +35,6 @@ pkg_setup() {
src_configure() {
local mycmakeargs=(
- -DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON # bug 746866
-DPYTHON_EXECUTABLE="${PYTHON}"
)
ecm_src_configure
diff --git a/kde-frameworks/kiconthemes/Manifest b/kde-frameworks/kiconthemes/Manifest
index 34343a7537b..3f3356f06a5 100644
--- a/kde-frameworks/kiconthemes/Manifest
+++ b/kde-frameworks/kiconthemes/Manifest
@@ -1,2 +1,2 @@
-DIST kiconthemes-5.85.0.tar.xz 221352 BLAKE2B ee619a6192b1d6dbfa000b1f6366ebe1dd8c25df41dabd2dd15f888f7cae2a9f5cf53d5d0a0a2d5ff7d95a224137a69a31f4c2e67fb6419b750241c7cdf05c81 SHA512 87e041835401273627c596338f94a0507f3184fb3e0a004ad4ba0c878fc2ef9ceac5bd4a9318d8c8e852e1ab26944368ca6b27a3efcd4269643d8e0cd0d60953
-DIST kiconthemes-5.88.0.tar.xz 223284 BLAKE2B 374935539c45468dd60364701ad2ca9ba1b7bc5852692a4299d74efd99fe615913626e42525deeebc5ea27ae44aab7795ffbaefa2978f3a214c3a3359e1cc664 SHA512 56bb3da876cfe7bc4999730ae91c9e71001aff63c904c4bdeb5989b6465c981b848af36942a5a5979e08af0b654c9e403210b037cab7b085d14281ed769650c9
+DIST kiconthemes-5.92.0.tar.xz 226260 BLAKE2B d05388c112934827d5257ea03f20d6936194ea9b8a9d3390a6d34d001efb254e9bcd3a8a8dc3d91edec683f060d73d27c1a8ab21e966994bb939bb4e81d1266f SHA512 b05d414690c0d1c304145c57f8a594879580423efb121cd6597eae5afbcb28e1cfc87bf9e44ef8f9722554e6b8135d299ba90c49a4d50e2ecbe64440806bb199
+DIST kiconthemes-5.94.0.tar.xz 226420 BLAKE2B d7796a675074942ece8e47f6c6c38b22d795a87720fc508c5b80f46747773cfd876e999b64e66ac215b2ade04b7d67786a0eb9af91cb7cc9fe368eb9616de1d5 SHA512 3cd2c0302a94656322dff1e79083ee4f8fbf29d2acfbfaa4a22cdaec9a7df6fc997c8c00ee98dee2fac1a499795bdb0a4b178b8b9b97b5fe40509661d6e5acaf
diff --git a/kde-frameworks/kiconthemes/kiconthemes-5.85.0.ebuild b/kde-frameworks/kiconthemes/kiconthemes-5.92.0.ebuild
index a021e3ff92d..2c3961c4a62 100644
--- a/kde-frameworks/kiconthemes/kiconthemes-5.85.0.ebuild
+++ b/kde-frameworks/kiconthemes/kiconthemes-5.92.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
diff --git a/kde-frameworks/kiconthemes/kiconthemes-5.88.0.ebuild b/kde-frameworks/kiconthemes/kiconthemes-5.94.0.ebuild
index 1898cad3ba0..9b87db7e2a4 100644
--- a/kde-frameworks/kiconthemes/kiconthemes-5.88.0.ebuild
+++ b/kde-frameworks/kiconthemes/kiconthemes-5.94.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# 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.2
+QTMIN=5.15.3
VIRTUALX_REQUIRED="test"
inherit ecm kde.org
diff --git a/kde-frameworks/kidletime/Manifest b/kde-frameworks/kidletime/Manifest
index 94ee14159e9..4371398d914 100644
--- a/kde-frameworks/kidletime/Manifest
+++ b/kde-frameworks/kidletime/Manifest
@@ -1,2 +1,2 @@
-DIST kidletime-5.85.0.tar.xz 26116 BLAKE2B 45a51974ec3e3db3a9528d7c2073b13536ed291691fda7fd3fd5810cf4b602ab394419bc67286634d6beee65a1f6e12f7962431cd34e64b819c16dd7ed207b03 SHA512 1a3c322bffe3d596283ac4b48c10b83deb9cd5f792bb47974e048994f74117d3f65148424f48a9b4f812cab3b96a1ecc5360b0fd69efc9c4f0326d630046e880
-DIST kidletime-5.88.0.tar.xz 26540 BLAKE2B ec4f7cbc48c08235a3d8fd1f07150b4440e15d1eafa094294100cce84938562f37d9d516791e2aacf1e2d0eca0ad00eb571cd552c7399b710fce6d38ccaa74f9 SHA512 542988271641752dc2766855b5d05ec591c130dd0714f0bda8874dcfc0c016a14432013bf333d96c0c35a3d53ea43c59cda2663f52dc52487bcb58a62280f774
+DIST kidletime-5.92.0.tar.xz 29072 BLAKE2B 7c1ab01005400b9034693c0099df980b20806a8ee5c225fcd9e3a761ea587cbfa98c52f9efdd5762ba93c9999deb5026ed189c3267369c8a04ec9a36fd20c763 SHA512 58d9c2ef675d0e3092cda43f14ea0cc51105412a0b19828659f0e4eb386870675bf9f8765327777aa7829ae29c878a63cfe7a00954c09315c0d4840eca8313ec
+DIST kidletime-5.94.0.tar.xz 29104 BLAKE2B 7af9960da627b9fcd8b7d963b58eae8df1aeebafd212bc221662c850023ad243f10ec4c30b63653787400e3899fa1266e3784fb87bd6931e4545f8a03b06665d SHA512 121d6684b699f1319979d4736e45d20a66f2e21211d66c35f9dfec32487cc1eb50d9704725ea7016023966375d45911f5417eecd3c9f3c970ee86e4ca5aa9ef1
diff --git a/kde-frameworks/kidletime/files/kidletime-5.92.0-crashfix.patch b/kde-frameworks/kidletime/files/kidletime-5.92.0-crashfix.patch
new file mode 100644
index 00000000000..93a016d76fd
--- /dev/null
+++ b/kde-frameworks/kidletime/files/kidletime-5.92.0-crashfix.patch
@@ -0,0 +1,41 @@
+From cd5040684723b87c7ba5b7cc1b1a63402902a641 Mon Sep 17 00:00:00 2001
+From: Ada Christine <adachristine18@gmail.com>
+Date: Sun, 27 Mar 2022 01:29:09 +0000
+Subject: [PATCH] Fixed crash during KIdleTime::timeoutReached()
+
+timeoutReached() will cause a crash if an item is removed from associations
+during signal dispatch due to iterator invalidation. iterate over a
+const container of the assoication keys only triggering ones matching
+the current timeout value to avoid the crash and unnecessary copying
+
+BUG: 451946
+---
+ src/kidletime.cpp | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/src/kidletime.cpp b/src/kidletime.cpp
+index a58eaa6..0929285 100644
+--- a/src/kidletime.cpp
++++ b/src/kidletime.cpp
+@@ -288,13 +288,13 @@ void KIdleTimePrivate::timeoutReached(int msec)
+ {
+ Q_Q(KIdleTime);
+
+- for (auto it = associations.cbegin(); it != associations.cend(); ++it) {
+- if (it.value() == msec) {
++ const auto listKeys = associations.keys(msec);
++
++ for (const auto key : listKeys) {
+ #if KIDLETIME_BUILD_DEPRECATED_SINCE(5, 76)
+- Q_EMIT q->timeoutReached(it.key());
++ Q_EMIT q->timeoutReached(key);
+ #endif
+- Q_EMIT q->timeoutReached(it.key(), msec);
+- }
++ Q_EMIT q->timeoutReached(key, msec);
+ }
+ }
+
+--
+GitLab
+
diff --git a/kde-frameworks/kidletime/kidletime-5.85.0.ebuild b/kde-frameworks/kidletime/kidletime-5.92.0-r1.ebuild
index 758bef477d9..df968499dec 100644
--- a/kde-frameworks/kidletime/kidletime-5.85.0.ebuild
+++ b/kde-frameworks/kidletime/kidletime-5.92.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -29,6 +29,8 @@ DEPEND="
"
RDEPEND="${DEPEND}"
+PATCHES=( "${FILESDIR}/${P}-crashfix.patch" ) # KDE-bug 451946
+
src_prepare() {
ecm_src_prepare
if ! use xscreensaver; then
diff --git a/kde-frameworks/kidletime/kidletime-5.88.0.ebuild b/kde-frameworks/kidletime/kidletime-5.94.0.ebuild
index a3ce5a27e93..bc446672bd4 100644
--- a/kde-frameworks/kidletime/kidletime-5.88.0.ebuild
+++ b/kde-frameworks/kidletime/kidletime-5.94.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
ECM_TEST="false"
-QTMIN=5.15.2
+QTMIN=5.15.3
inherit ecm kde.org
DESCRIPTION="Framework for detection and notification of device idle time"
diff --git a/kde-frameworks/kimageformats/Manifest b/kde-frameworks/kimageformats/Manifest
index caf4e4991b2..fbfe5fd0f9d 100644
--- a/kde-frameworks/kimageformats/Manifest
+++ b/kde-frameworks/kimageformats/Manifest
@@ -1,2 +1,2 @@
-DIST kimageformats-5.85.0.tar.xz 590844 BLAKE2B 39102bcb685a35146871201604d220a0f439531ab65b1d78b6045bb9c45651c7b54967c8c82a100dfb5da028fef1c845c8711a632dcfffa9fbd752a2884e42bd SHA512 7f72ee1d0d56638c1aa8ab0b61f18e69517921f25a64424ab848177da13506ed917eb17661f5a1069f5e56578f6a5271c9fbe665d8cfdbd284e28747e6bfc321
-DIST kimageformats-5.88.0.tar.xz 590940 BLAKE2B 53c1627e096ee88d0422bc0256ec696c713b911abb16959874b94c3bd4cb54bc81c1aa112e66741165bf74554d1f3e7fc216e319a81e0dfc227798efbe0eb7e5 SHA512 5702d9a5aba65d3d3a64ea7fa9cd64b48fb5a01666d6d31737e94f7bdde5a6d89c34930bb57ac8abc807f7f2e1cbafeadac3f786a48130225ad0c9ea97836ec5
+DIST kimageformats-5.92.0.tar.xz 1223892 BLAKE2B e7ac90e29715560237d0458946f1b135b84c9b8869ca3003e80b7655d7c5c9c872400e4e102015f054a26423babc7fa334b237012b88c4771f95bc7aeaa24f80 SHA512 e07521fa2b566df38baeaad2ab213c683c4fb36b5218dc63302d8e9b52ce7e0d4341b59339b3181d6b1157fda1060e645e0f043d2a187d0662f8f8a43a2e7447
+DIST kimageformats-5.94.0.tar.xz 2926996 BLAKE2B 20a1b5cc3717c00e810a3cdeee0fb40b35c338304a48d98a6e4b300d719896017a24a32ea196bb1d95f99edefe9954fef596da9e27b41169688416025bb05164 SHA512 864606a0cdf11edc19ff70835e7ce8556d91ee892137f48f3e568c42f1971e7161b83c89caa6a8a4719fe6796259061b4063dccea7c592eb906c51e2dec27bcf
diff --git a/kde-frameworks/kimageformats/kimageformats-5.85.0-r1.ebuild b/kde-frameworks/kimageformats/kimageformats-5.92.0-r2.ebuild
index cd2ec534707..4082b0b4bfc 100644
--- a/kde-frameworks/kimageformats/kimageformats-5.85.0-r1.ebuild
+++ b/kde-frameworks/kimageformats/kimageformats-5.92.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -11,8 +11,8 @@ inherit ecm kde.org
DESCRIPTION="Framework providing additional format plugins for Qt's image I/O system"
LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="avif eps heif openexr"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
+IUSE="avif eps heif jpegxl openexr"
DEPEND="
>=dev-qt/qtgui-${QTMIN}:5
@@ -20,10 +20,8 @@ DEPEND="
avif? ( >=media-libs/libavif-0.8.2:= )
eps? ( >=dev-qt/qtprintsupport-${QTMIN}:5 )
heif? ( >=media-libs/libheif-1.10.0:= )
- openexr? (
- media-libs/ilmbase:0=
- <media-libs/openexr-3.0.0:0=
- )
+ jpegxl? ( media-libs/libjxl )
+ openexr? ( >=media-libs/openexr-3:= )
"
RDEPEND="${DEPEND}"
@@ -31,6 +29,7 @@ DOCS=( src/imageformats/AUTHORS )
src_configure() {
local mycmakeargs=(
+ -DKIMAGEFORMATS_JXL=$(usex jpegxl)
$(cmake_use_find_package avif libavif)
$(cmake_use_find_package eps Qt5PrintSupport)
-DKIMAGEFORMATS_HEIF=$(usex heif)
diff --git a/kde-frameworks/kimageformats/kimageformats-5.88.0.ebuild b/kde-frameworks/kimageformats/kimageformats-5.94.0.ebuild
index 2053f22177e..49ed65ace9b 100644
--- a/kde-frameworks/kimageformats/kimageformats-5.88.0.ebuild
+++ b/kde-frameworks/kimageformats/kimageformats-5.94.0.ebuild
@@ -1,18 +1,18 @@
-# Copyright 1999-2021 Gentoo Authors
+# 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.2
+QTMIN=5.15.3
VIRTUALX_REQUIRED="test"
inherit ecm 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 openexr"
+IUSE="avif eps heif jpegxl openexr"
DEPEND="
>=dev-qt/qtgui-${QTMIN}:5
@@ -20,10 +20,8 @@ DEPEND="
avif? ( >=media-libs/libavif-0.8.2:= )
eps? ( >=dev-qt/qtprintsupport-${QTMIN}:5 )
heif? ( >=media-libs/libheif-1.10.0:= )
- openexr? (
- media-libs/ilmbase:=
- media-libs/openexr:=
- )
+ jpegxl? ( media-libs/libjxl )
+ openexr? ( >=media-libs/openexr-3:= )
"
RDEPEND="${DEPEND}"
@@ -31,6 +29,7 @@ DOCS=( src/imageformats/AUTHORS )
src_configure() {
local mycmakeargs=(
+ -DKIMAGEFORMATS_JXL=$(usex jpegxl)
$(cmake_use_find_package avif libavif)
$(cmake_use_find_package eps Qt5PrintSupport)
-DKIMAGEFORMATS_HEIF=$(usex heif)
diff --git a/kde-frameworks/kimageformats/metadata.xml b/kde-frameworks/kimageformats/metadata.xml
index 54a83368729..32a938a852f 100644
--- a/kde-frameworks/kimageformats/metadata.xml
+++ b/kde-frameworks/kimageformats/metadata.xml
@@ -12,6 +12,7 @@
<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 e4241d724d3..9e90fe6dcb3 100644
--- a/kde-frameworks/kinit/Manifest
+++ b/kde-frameworks/kinit/Manifest
@@ -1,2 +1,2 @@
-DIST kinit-5.85.0.tar.xz 121608 BLAKE2B e6d8f14dc6930ad058c35246dcb408d7249de800a27e2db07091cae93bfd3ad0b37cadb048ee95398a0330b571a71517d4e7d61d6b98edb40e73201786a5a532 SHA512 9968dc1381f236c843aa76bd3ede13b83607dd6e6a9fc5723e3ff23fa1d924536fd227ffbdc20a4c914dc76843f0b315b4247410dd5580ae1134db3b50ae679e
-DIST kinit-5.88.0.tar.xz 117128 BLAKE2B 8e1fd009edd926a79cf1a903a0d038ef4cb08e7d4f7193df5b377a377d60867999f15d6a86a8622ecd26ebfa13f90b00fa4747dc177e480558e720837d76ec93 SHA512 d54732fb8ad9274be22a8c699325bff66907f65d56199c9022aa5f471f154130863282e0773219ec00b54fcdc542b11703e570a51a5f94ee119ea6298ec50a8d
+DIST kinit-5.92.0.tar.xz 119244 BLAKE2B 0ed7937e1ce6b8a21e632708f5e3e02b3b1b6bf481d488902fe8033ed9d84c1a54a64243e59d77e4bd9ec4fffad6a549ca5b15aec71b1d70d3005f50984c7bb1 SHA512 3ab7e47e714c661bd375d36c5f64ec4fc2e445caa20d783e3affec314228096bde75ef8b9577590c72bfcbb2f6748525ad0593c2f4c3c1f0646173d58e225b37
+DIST kinit-5.94.0.tar.xz 119280 BLAKE2B 5c0311c33ed48e10f1ced3948412c499ab8dc0d634860ac33f385df23b59c5cde081117dfbe8f606e373f958098e1138a93ac72ba01c1d1f42b794074491fbc4 SHA512 82c4d6500ee7108348c91bdf5fcf34b1e5188ef26ec0a3063f761dfb196dbd01cc53223b5b7f0e7167587c56892f3cbfaa8aa63610404dfd771d4237cbe445e5
diff --git a/kde-frameworks/kinit/kinit-5.85.0.ebuild b/kde-frameworks/kinit/kinit-5.92.0.ebuild
index 68d6ef4555d..1c01dd6421e 100644
--- a/kde-frameworks/kinit/kinit-5.85.0.ebuild
+++ b/kde-frameworks/kinit/kinit-5.92.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
diff --git a/kde-frameworks/kinit/kinit-5.88.0.ebuild b/kde-frameworks/kinit/kinit-5.94.0.ebuild
index bf8dfd8761a..c5b8ff4ba1b 100644
--- a/kde-frameworks/kinit/kinit-5.88.0.ebuild
+++ b/kde-frameworks/kinit/kinit-5.94.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -6,7 +6,7 @@ EAPI=8
ECM_QTHELP="false"
ECM_TEST="false"
PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
+QTMIN=5.15.3
inherit ecm kde.org
DESCRIPTION="Helper library to speed up start of applications on KDE work spaces"
diff --git a/kde-frameworks/kio/Manifest b/kde-frameworks/kio/Manifest
index 936820b63da..b6987a76250 100644
--- a/kde-frameworks/kio/Manifest
+++ b/kde-frameworks/kio/Manifest
@@ -1,2 +1,2 @@
-DIST kio-5.85.0.tar.xz 3200300 BLAKE2B fd723dba761b81862bf503645a8526a246867e5a10441f3edf895e4107c189ead357615e17f3704325976ed29867c54f98bc11b4e977e21a78d429ee7efa2dde SHA512 73c69743f3d99671ced8176bf9806df54eb3afd04dbdd9dd92b79c9979428f980d3dbda9504c81aca4aa36249b3e43edcc38831497752e31a510a70ee98dc4e8
-DIST kio-5.88.0.tar.xz 3247924 BLAKE2B 3687e97b3c936c93e7ee87f314340f8e9889e2afae584d360eb44414994406a34678ea304fff081a65beb03fa98ec1f22870f3a3f86e124352bc96f51c142c1f SHA512 3d79bc90c2f6aa54080824c15da282f54d18530362ffd144f36754f1751f58c0c48c9fd12ffece49f0b455c524b8585ba6c2baa684b0992471b7ec0636350c19
+DIST kio-5.92.0.tar.xz 3304432 BLAKE2B 31b78c2cc5a543126d8494935e9956ce169f9bf6b863c0be562775ba3d5a30cf1fadc7bc48e818530eb51a5726bb528f15c51f89dfb9a7511bd6865d6f7092d9 SHA512 5064db660c5b6207eff2bb12261198118c89014f4d71a09531e72bc6185fd070fa262ef617cbbbacc1f334f69f65cc831fa91fd641d59d89303813ec5ef620b6
+DIST kio-5.94.0.tar.xz 3331696 BLAKE2B b2b86a2c470571b5e9e1c36d264efeeece335679f21da80756083af9737525407db828f7643ebe12b316fbf1a357ba8d02471c3330af9c9b0d886f343e4587e1 SHA512 acf7456ab0a3d122d8bbf6e7dbff51f958b1c6bf29f7295c21c78c5c707d5fee05b76d30e51832f35220cd08bf06a2e27c11153559b25f74b7c8f5f532f50955
diff --git a/kde-frameworks/kio/files/kio-5.85.0-KDirOperator-exp-to-url-only-in-detail-treeview.patch b/kde-frameworks/kio/files/kio-5.85.0-KDirOperator-exp-to-url-only-in-detail-treeview.patch
deleted file mode 100644
index 54365b694fa..00000000000
--- a/kde-frameworks/kio/files/kio-5.85.0-KDirOperator-exp-to-url-only-in-detail-treeview.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 51737430fcd963a04a4eddbb166114ae25430814 Mon Sep 17 00:00:00 2001
-From: Ahmad Samir <a.samirh78@gmail.com>
-Date: Wed, 4 Aug 2021 23:22:10 +0200
-Subject: [PATCH] KDirOperator: expand to url only in detail tree view
-
-When "allow expansion" is disabled in the menu, the view type is KFile::Tree,
-however when selecting an item from the location (Name:) combobox history,
-the item model would expand to show the file; that should only happen if
-"allow expansion" is enabled, i.e. when the view type is KFile::DetailTree.
-
-BUG: 440475
-FIXED-IN: 5.86
-
-asturm 2021-08-15: fixed by merge with 8039f8b399757001ffa919ef56ede283c287dcd4
----
- src/filewidgets/kdiroperator.cpp | 13 +++++++++++--
- 1 file changed, 11 insertions(+), 2 deletions(-)
-
-diff --git a/src/filewidgets/kdiroperator.cpp b/src/filewidgets/kdiroperator.cpp
-index bc80d93fe..7af20a057 100644
---- a/src/filewidgets/kdiroperator.cpp
-+++ b/src/filewidgets/kdiroperator.cpp
-@@ -1870,7 +1870,11 @@ void KDirOperator::setCurrentItem(const QUrl &url)
- KFileItem item = d->m_dirLister->findByUrl(url);
- if (d->m_shouldFetchForItems && item.isNull()) {
- d->m_itemsToBeSetAsCurrent << url;
-- d->m_dirModel->expandToUrl(url);
-+
-+ if (d->m_viewKind == KFile::DetailTree) {
-+ d->m_dirModel->expandToUrl(url);
-+ }
-+
- return;
- }
-
-@@ -1909,9 +1913,14 @@ void KDirOperator::setCurrentItems(const QList<QUrl> &urls)
- KFileItem item = d->m_dirLister->findByUrl(url);
- if (d->m_shouldFetchForItems && item.isNull()) {
- d->m_itemsToBeSetAsCurrent << url;
-- d->m_dirModel->expandToUrl(url);
-+
-+ if (d->m_viewKind == KFile::DetailTree) {
-+ d->m_dirModel->expandToUrl(url);
-+ }
-+
- continue;
- }
-+
- itemList << item;
- }
-
---
-GitLab
-
diff --git a/kde-frameworks/kio/files/kio-5.85.0-allow-edit-icons-for-root-owned-desktop-files.patch b/kde-frameworks/kio/files/kio-5.85.0-allow-edit-icons-for-root-owned-desktop-files.patch
deleted file mode 100644
index 34a70a827e0..00000000000
--- a/kde-frameworks/kio/files/kio-5.85.0-allow-edit-icons-for-root-owned-desktop-files.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 2187b62588b060bc27143dd326b5171aec930454 Mon Sep 17 00:00:00 2001
-From: Nicolas Fella <nicolas.fella@gmx.de>
-Date: Sat, 7 Aug 2021 19:38:43 +0000
-Subject: [PATCH] [kpropertiesdialog] Allow editing icons for root-owned
- desktop files
-
----
- src/widgets/kpropertiesdialog.cpp | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/src/widgets/kpropertiesdialog.cpp b/src/widgets/kpropertiesdialog.cpp
-index 76155338e..2288ccc08 100644
---- a/src/widgets/kpropertiesdialog.cpp
-+++ b/src/widgets/kpropertiesdialog.cpp
-@@ -1206,6 +1206,14 @@ KFilePropsPlugin::KFilePropsPlugin(KPropertiesDialog *_props)
- bool KFilePropsPlugin::enableIconButton() const
- {
- const KFileItem item = properties->item();
-+
-+ // desktop files are special, files in /usr/share/applications can be
-+ // edited by overlaying them in .local/share/applications
-+ // https://bugs.kde.org/show_bug.cgi?id=429613
-+ if (item.isDesktopFile()) {
-+ return true;
-+ }
-+
- // If the current item is a directory, check if it's writable,
- // so we can create/update a .directory
- // Current item is a file, same thing: check if it is writable
---
-GitLab
-
diff --git a/kde-frameworks/kio/files/kio-5.85.0-revert-to-pre-libblkid-parsing.patch b/kde-frameworks/kio/files/kio-5.85.0-revert-to-pre-libblkid-parsing.patch
deleted file mode 100644
index 1f4c7cf0615..00000000000
--- a/kde-frameworks/kio/files/kio-5.85.0-revert-to-pre-libblkid-parsing.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-From 221a94a66c4d2f6e4f2dc938ee8a63a6ca739477 Mon Sep 17 00:00:00 2001
-From: Ahmad Samir <a.samirh78@gmail.com>
-Date: Wed, 20 Oct 2021 20:01:40 +0200
-Subject: [PATCH] KMountPoint: revert to parsing /dev/disk/by-{uuid,label}/
- manually
-
-Apparently libblkid is causing some performance issues when resolving
-UUID/LABEL tags from fstab when the device that has that UUID/LABEL isn't
-present.
-
-Parsing /dev/disk/by-* is more basic, since it's a simple check resolving
-some symlinks.
-
-Thanks to the users in the bug report for the investigative work, because
-personally I couldn't reproduce the problem on my machine no matter what I
-tried.
-
-BUG: 442106
-FIXED-IN: 5.88
----
- CMakeLists.txt | 3 +--
- src/core/CMakeLists.txt | 5 ++---
- src/core/config-kmountpoint.h.cmake | 2 +-
- src/core/kmountpoint.cpp | 18 ++++--------------
- 4 files changed, 8 insertions(+), 20 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ca374a4cb..f1bb1a59b 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -130,8 +130,7 @@ set_package_properties(ACL PROPERTIES DESCRIPTION "LibACL"
- # Used by KMountPoint
- if (CMAKE_SYSTEM_NAME MATCHES "Linux")
- find_package(LibMount REQUIRED)
-- find_package(Blkid REQUIRED)
-- set(HAVE_LIBS_MOUNT_AND_BLKID ${LibMount_FOUND} AND ${Blkid_FOUND})
-+ set(HAVE_LIB_MOUNT ${LibMount_FOUND})
- endif()
-
- if (ANDROID)
-diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
-index be19e9b62..67a1b1cf7 100644
---- a/src/core/CMakeLists.txt
-+++ b/src/core/CMakeLists.txt
-@@ -236,9 +236,8 @@ if(ACL_FOUND)
- target_link_libraries(KF5KIOCore PRIVATE ${ACL_LIBS})
- endif()
-
--if(HAVE_LIBS_MOUNT_AND_BLKID)
-- # libmount links against blkid anyway
-- target_link_libraries(KF5KIOCore PRIVATE LibMount::LibMount Blkid::Blkid)
-+if(HAVE_LIB_MOUNT)
-+ target_link_libraries(KF5KIOCore PRIVATE LibMount::LibMount)
- endif()
-
- # this should be done by cmake, see bug 371721
-diff --git a/src/core/config-kmountpoint.h.cmake b/src/core/config-kmountpoint.h.cmake
-index f824d4042..3673eb141 100644
---- a/src/core/config-kmountpoint.h.cmake
-+++ b/src/core/config-kmountpoint.h.cmake
-@@ -1,7 +1,7 @@
- #cmakedefine01 HAVE_GETMNTINFO
- #cmakedefine01 GETMNTINFO_USES_STATVFS
-
--#cmakedefine01 HAVE_LIBS_MOUNT_AND_BLKID
-+#cmakedefine01 HAVE_LIB_MOUNT
-
- #cmakedefine01 HAVE_SYS_MOUNT_H
- #cmakedefine01 HAVE_FSTAB_H
-diff --git a/src/core/kmountpoint.cpp b/src/core/kmountpoint.cpp
-index e2d32055c..f41cff5ee 100644
---- a/src/core/kmountpoint.cpp
-+++ b/src/core/kmountpoint.cpp
-@@ -44,7 +44,7 @@ static const Qt::CaseSensitivity cs = Qt::CaseSensitive;
- #endif
-
- // Linux
--#if HAVE_LIBS_MOUNT_AND_BLKID
-+#if HAVE_LIB_MOUNT
- #include <libmount/libmount.h>
- #include <blkid/blkid.h>
- #endif
-@@ -176,7 +176,7 @@ KMountPoint::List KMountPoint::possibleMountPoints(DetailsNeededFlags infoNeeded
- #ifdef Q_OS_WIN
- result = KMountPoint::currentMountPoints(infoNeeded);
-
--#elif HAVE_LIBS_MOUNT_AND_BLKID
-+#elif HAVE_LIB_MOUNT
- if (struct libmnt_table *table = mnt_new_table()) {
- // By default parses "/etc/fstab"
- if (mnt_table_parse_fstab(table, nullptr) == 0) {
-@@ -202,23 +202,13 @@ KMountPoint::List KMountPoint::possibleMountPoints(DetailsNeededFlags infoNeeded
- // or some network mount
- if (const char *source = mnt_fs_get_source(fs)) {
- mp->d->m_mountedFrom = QFile::decodeName(source);
-- if (mp->d->m_mountedFrom.startsWith(QLatin1String("UUID")) || mp->d->m_mountedFrom.startsWith(QLatin1String("LABEL"))) {
-- // Use blkid to resolve UUID/LABEL to the device file
-- if (char *blkSource = blkid_evaluate_spec(source, nullptr)) {
-- mp->d->m_mountedFrom = QFile::decodeName(blkSource);
-- free(blkSource);
-- if ((infoNeeded & KMountPoint::NeedRealDeviceName) //
-- && mp->d->m_mountedFrom.startsWith(QLatin1String("/dev/"))) {
-- mp->d->m_device = mp->d->m_mountedFrom;
-- }
-- }
-- }
- }
-
- if (infoNeeded & NeedMountOptions) {
- mp->d->m_mountOptions = QFile::decodeName(mnt_fs_get_options(fs)).split(QLatin1Char(','));
- }
-
-+ mp->d->finalizePossibleMountPoint(infoNeeded);
- result.append(mp);
- }
- mnt_free_iter(itr);
-@@ -351,7 +341,7 @@ KMountPoint::List KMountPoint::currentMountPoints(DetailsNeededFlags infoNeeded)
- }
- }
-
--#elif HAVE_LIBS_MOUNT_AND_BLKID
-+#elif HAVE_LIB_MOUNT
- if (struct libmnt_table *table = mnt_new_table()) {
- // By default, parses "/proc/self/mountinfo"
- if (mnt_table_parse_mtab(table, nullptr) == 0) {
---
-GitLab
-
diff --git a/kde-frameworks/kio/files/kio-5.88.0-fix-copy-between-filesystems.patch b/kde-frameworks/kio/files/kio-5.88.0-fix-copy-between-filesystems.patch
deleted file mode 100644
index a6a4877cf0f..00000000000
--- a/kde-frameworks/kio/files/kio-5.88.0-fix-copy-between-filesystems.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From aef544ebbb11e842209f3b071eaa9d1c2f26fa40 Mon Sep 17 00:00:00 2001
-From: Albert Astals Cid <aacid@kde.org>
-Date: Wed, 17 Nov 2021 23:45:17 +0100
-Subject: [PATCH] Fix copying between different filesystems on Linux < 5.3
-
-From the copy_file_range manpage
-
-EXDEV The files referred to by fd_in and fd_out are not on the same mounted filesystem (pre Linux 5.3).
----
- src/ioslaves/file/file_unix.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/ioslaves/file/file_unix.cpp b/src/ioslaves/file/file_unix.cpp
-index b4eca2ae9..02b5dc14c 100644
---- a/src/ioslaves/file/file_unix.cpp
-+++ b/src/ioslaves/file/file_unix.cpp
-@@ -813,7 +813,7 @@ void FileProtocol::copy(const QUrl &srcUrl, const QUrl &destUrl, int _mode, JobF
- const ssize_t copiedBytes = ::copy_file_range(srcFile.handle(), nullptr, destFile.handle(), nullptr, s_maxIPCSize, 0);
-
- if (copiedBytes == -1) {
-- if (errno == EINVAL) {
-+ if (errno == EINVAL || errno == EXDEV) {
- break; // will continue with next copy mechanism
- }
-
---
-GitLab
-
diff --git a/kde-frameworks/kio/kio-5.85.0-r2.ebuild b/kde-frameworks/kio/kio-5.85.0-r2.ebuild
deleted file mode 100644
index 8eb655b8879..00000000000
--- a/kde-frameworks/kio/kio-5.85.0-r2.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2021 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.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org xdg-utils
-
-DESCRIPTION="Framework providing transparent file and data management"
-
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 ~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
- =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 )
- X? (
- x11-base/xorg-proto
- x11-libs/libX11
- x11-libs/libXrender
- )
-"
-PDEPEND=">=kde-frameworks/kded-${PVCUT}:5"
-
-PATCHES=(
- "${FILESDIR}"/${P}-KDirOperator-exp-to-url-only-in-detail-treeview.patch # KDE-bug 440475
- "${FILESDIR}"/${P}-allow-edit-icons-for-root-owned-desktop-files.patch # KDE-bug 429613
- "${FILESDIR}"/${P}-revert-to-pre-libblkid-parsing.patch # bug 821103, KDE-bug 442106
-)
-
-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)
- $(cmake_use_find_package X X11)
- )
-
- 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-5.85.0-r1.ebuild b/kde-frameworks/kio/kio-5.92.0.ebuild
index 92287327bcd..aca994a76c5 100644
--- a/kde-frameworks/kio/kio-5.85.0-r1.ebuild
+++ b/kde-frameworks/kio/kio-5.92.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -50,7 +50,6 @@ RDEPEND="
=kde-frameworks/kwindowsystem-${PVCUT}*:5
=kde-frameworks/kxmlgui-${PVCUT}*:5
=kde-frameworks/solid-${PVCUT}*:5
- sys-apps/util-linux
acl? (
sys-apps/attr
virtual/acl
@@ -71,11 +70,6 @@ DEPEND="${RDEPEND}
"
PDEPEND=">=kde-frameworks/kded-${PVCUT}:5"
-PATCHES=(
- "${FILESDIR}"/${P}-KDirOperator-exp-to-url-only-in-detail-treeview.patch # KDE-bug 440475
- "${FILESDIR}"/${P}-allow-edit-icons-for-root-owned-desktop-files.patch # KDE-bug 429613
-)
-
src_configure() {
local mycmakeargs=(
-DKIO_NO_PUBLIC_QTCONCURRENT=ON
diff --git a/kde-frameworks/kio/kio-5.88.0-r1.ebuild b/kde-frameworks/kio/kio-5.94.0.ebuild
index dcc6a8a9819..d279d7e8c4b 100644
--- a/kde-frameworks/kio/kio-5.88.0-r1.ebuild
+++ b/kde-frameworks/kio/kio-5.94.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -6,7 +6,7 @@ EAPI=8
ECM_DESIGNERPLUGIN="true"
ECM_TEST="forceoptional"
PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
+QTMIN=5.15.3
VIRTUALX_REQUIRED="test"
inherit ecm kde.org xdg-utils
@@ -70,8 +70,6 @@ DEPEND="${RDEPEND}
"
PDEPEND=">=kde-frameworks/kded-${PVCUT}:5"
-PATCHES=( "${FILESDIR}"/${P}-fix-copy-between-filesystems.patch )
-
src_configure() {
local mycmakeargs=(
-DKIO_NO_PUBLIC_QTCONCURRENT=ON
diff --git a/kde-frameworks/kirigami/Manifest b/kde-frameworks/kirigami/Manifest
index cdd855ec534..5734eb13b18 100644
--- a/kde-frameworks/kirigami/Manifest
+++ b/kde-frameworks/kirigami/Manifest
@@ -1,2 +1,2 @@
-DIST kirigami2-5.85.0.tar.xz 323312 BLAKE2B 4953b9d3f0114aa7f12b23c7c12092cc0de57ff67e73130a1428e7c334d34b5a87dc8c7b2095dbaa2f28f6a96cc8be67682a73b2785a19f39ac9396c20646213 SHA512 239a8f7e5e77ca19cd9b8e45a383959c0c5b07dda279862c3aa0474fd34d58d905ca947c7f19eec3bc2de53557e8ae7dd8cb5a4879a53c28436e6636931c2603
-DIST kirigami2-5.88.0.tar.xz 333324 BLAKE2B cac7a79d5d3fd75aab31f0c7d6fe51b6dd6bf8755822a85682db7742cafc88007012e541de09ef302e1b2208a055c9cb4cce208362323c558e547a256f3bd397 SHA512 adb20c007bd8d1206be87d936a9affe1f7e2203158ec5ee241bde8e60e2b6e1d701393c4d85841644321f70496de1e67cb4feb9009c2cd7d153eba2407c480fb
+DIST kirigami2-5.92.0.tar.xz 354848 BLAKE2B 7aab1579693f7cf57a61f45eb3d7bc7431bee01ed1ede918e0068d3b4d41abe2f5b5f97cae9538068ae6ebe27a5abce3797c7ade7ff225a40ac49cf46c61a742 SHA512 42d75b8931f28ce2fa200c19acfc9194518b856dd33d9bbeb490f24ddb0ae03ba7c01443a5bc2a07088de69a9300245434460ddcd28cb2b1caa2f2288e45405a
+DIST kirigami2-5.94.0.tar.xz 356500 BLAKE2B 56890b68fddf8bc4431cd75372de9a1bf4186c80e2c888114bd612449d1c163cc175f2b58e7d523e68e8a710ad774ce6fc1e7192278303d364fae68dd41ec335 SHA512 e836f45729f54a5c83c7dd5bb5def3e36f73cd6367456953bab8e3bdd87c6bf9845ff3f4f0458f289c0450a4ac02a8fe1984458a591172e9e87b782ac59f9a6f
diff --git a/kde-frameworks/kirigami/files/kirigami-5.88.0-PageRowGlobalToolBarUI-dont-animate-opacity.patch b/kde-frameworks/kirigami/files/kirigami-5.88.0-PageRowGlobalToolBarUI-dont-animate-opacity.patch
deleted file mode 100644
index 85b2a24f590..00000000000
--- a/kde-frameworks/kirigami/files/kirigami-5.88.0-PageRowGlobalToolBarUI-dont-animate-opacity.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 67ec2a1873e3d750529043b243043cfd2e2f9ec6 Mon Sep 17 00:00:00 2001
-From: Nate Graham <nate@kde.org>
-Date: Wed, 10 Nov 2021 20:44:53 -0700
-Subject: [PATCH] PageRowGlobalToolBarUI: don't animate opacity
-
-Doing so causes flickering in System Settings and KInfoCenter because of
-how the titles are rendered. It also doesn't make conceptual sense since
-the style of toolbar generally doesn't change so the user would never
-actually see the animated opacity change in the first place.
-
-BUG: 417636
-FIXED-IN: 5.89
----
- .../globaltoolbar/PageRowGlobalToolBarUI.qml | 13 +++----------
- 1 file changed, 3 insertions(+), 10 deletions(-)
-
-diff --git a/src/controls/private/globaltoolbar/PageRowGlobalToolBarUI.qml b/src/controls/private/globaltoolbar/PageRowGlobalToolBarUI.qml
-index 640ab51e..c536fed7 100644
---- a/src/controls/private/globaltoolbar/PageRowGlobalToolBarUI.qml
-+++ b/src/controls/private/globaltoolbar/PageRowGlobalToolBarUI.qml
-@@ -106,8 +106,8 @@ Kirigami.AbstractApplicationHeader {
- Layout.preferredHeight: -1
- property Kirigami.PageRow pageRow: root
-
-- opacity: layerIsMainRow && active
-- enabled: opacity > 0
-+ visible: layerIsMainRow && active
-+ enabled: visible
-
- asynchronous: true
-
-@@ -115,13 +115,6 @@ Kirigami.AbstractApplicationHeader {
-
- //TODO: different implementation?
- source: globalToolBar.actualStyle == Kirigami.ApplicationHeaderStyle.TabBar ? Qt.resolvedUrl("TabBarControl.qml") : Qt.resolvedUrl("BreadcrumbControl.qml")
--
-- Behavior on opacity {
-- OpacityAnimator {
-- duration: Kirigami.Units.longDuration
-- easing.type: Easing.InOutQuad
-- }
-- }
- }
-
- Item {
-@@ -137,6 +130,6 @@ Kirigami.AbstractApplicationHeader {
- Layout.preferredWidth: height
- }
- }
-- background.opacity: breadcrumbLoader.opacity
-+ background.visible: breadcrumbLoader.visible
- }
-
---
-GitLab
-
diff --git a/kde-frameworks/kirigami/files/kirigami-5.92.0-ListItemDragHandle-emit-moveRequest.patch b/kde-frameworks/kirigami/files/kirigami-5.92.0-ListItemDragHandle-emit-moveRequest.patch
new file mode 100644
index 00000000000..bf6f5c6a701
--- /dev/null
+++ b/kde-frameworks/kirigami/files/kirigami-5.92.0-ListItemDragHandle-emit-moveRequest.patch
@@ -0,0 +1,28 @@
+From a507a48e979c5881f65faac973a5b82b925e8642 Mon Sep 17 00:00:00 2001
+From: Tranter Madi <trmdi@yandex.com>
+Date: Tue, 29 Mar 2022 02:20:03 +0000
+Subject: [PATCH] ListItemDragHandle: Emit moveRequest when cursor enters a new
+ index
+
+BUG: 451014
+FIXED-IN: 5.93
+---
+ src/controls/ListItemDragHandle.qml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/controls/ListItemDragHandle.qml b/src/controls/ListItemDragHandle.qml
+index 1c2edb1b..20c527db 100644
+--- a/src/controls/ListItemDragHandle.qml
++++ b/src/controls/ListItemDragHandle.qml
+@@ -126,7 +126,7 @@ Item {
+ function arrangeItem() {
+ var newIndex = listView.indexAt(1, listView.contentItem.mapFromItem(listItem, 0, 0).y + internal.mouseDownY);
+
+- if (Math.abs(listItem.y - internal.startY) > height && newIndex > -1 && newIndex !== index) {
++ if (newIndex > -1 && newIndex !== index) {
+ root.moveRequested(index, newIndex);
+ }
+ }
+--
+GitLab
+
diff --git a/kde-frameworks/kirigami/kirigami-5.88.0-r1.ebuild b/kde-frameworks/kirigami/kirigami-5.92.0-r1.ebuild
index a161344b23b..3c2a42270e8 100644
--- a/kde-frameworks/kirigami/kirigami-5.88.0-r1.ebuild
+++ b/kde-frameworks/kirigami/kirigami-5.92.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -15,7 +15,7 @@ HOMEPAGE="https://techbase.kde.org/Kirigami"
EGIT_REPO_URI="${EGIT_REPO_URI/${PN}2/${PN}}"
LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
IUSE=""
# requires package to already be installed
@@ -37,7 +37,7 @@ RDEPEND="${DEPEND}
>=dev-qt/qtgraphicaleffects-${QTMIN}:5
"
-PATCHES=( "${FILESDIR}"/${P}-PageRowGlobalToolBarUI-dont-animate-opacity.patch )
+PATCHES=( "${FILESDIR}/${P}-ListItemDragHandle-emit-moveRequest.patch" ) # KDE-bug 451014
src_configure() {
local mycmakeargs=(
diff --git a/kde-frameworks/kirigami/kirigami-5.85.0.ebuild b/kde-frameworks/kirigami/kirigami-5.94.0.ebuild
index 0bf786edb73..0d3ced80050 100644
--- a/kde-frameworks/kirigami/kirigami-5.85.0.ebuild
+++ b/kde-frameworks/kirigami/kirigami-5.94.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -7,7 +7,7 @@ ECM_EXAMPLES="true"
ECM_QTHELP="false"
ECM_TEST="true"
KDE_ORG_NAME="${PN}2"
-QTMIN=5.15.2
+QTMIN=5.15.3
inherit ecm kde.org
DESCRIPTION="Lightweight user interface framework for mobile and convergent applications"
@@ -15,7 +15,7 @@ HOMEPAGE="https://techbase.kde.org/Kirigami"
EGIT_REPO_URI="${EGIT_REPO_URI/${PN}2/${PN}}"
LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
# requires package to already be installed
diff --git a/kde-frameworks/kitemmodels/Manifest b/kde-frameworks/kitemmodels/Manifest
index ec9147fec8e..df3d3336223 100644
--- a/kde-frameworks/kitemmodels/Manifest
+++ b/kde-frameworks/kitemmodels/Manifest
@@ -1,2 +1,2 @@
-DIST kitemmodels-5.85.0.tar.xz 403004 BLAKE2B 3d5ebb1ac85d56860dc141a055341f90111554158c5335d2f4cdb750a0904db75442c464e4d547d4ba5596ffafc0eded9ed3b5a966542ddebaecf038b72bc81d SHA512 e953a8145cfbae9ee3041ef12e1a8c2a3e8289be116893b6e0c89c32e0cc39207928732ef7930b9af1466672d429ecf7ab85f92ae83ffb75906e201455b5d85f
-DIST kitemmodels-5.88.0.tar.xz 403416 BLAKE2B 8e99cb46c0e8c8baf7eebbf2adff217d52f2db5f63a6fa71612111fc3bb65dca27723c1211a37669b80c374bbfccef56cac5c1799e01464845abdf0ae7d9fcf6 SHA512 6c25620aa4eed7da70ac5479101b74cbc30581cf30773f7ffcc25ba5cba5248c28ea95e4402b76c5c2171e978281d2a981418016e497efe4e1a957f8740de42f
+DIST kitemmodels-5.92.0.tar.xz 407008 BLAKE2B 5a5da7ad73b7eb63b64b1fa04032e85c300b936757d11fc2573d025db85007ec46083a98037f3eff193f4078c763ef53aec585cdd7f7018c71bee8e8f415b47b SHA512 cede4a959abc66aeb58902630f66c48fda7ffcffa6bd43682cb17699b58bc2a955a7b86d9e40cc627470fc52db33906c6ae74973fec440fcea5e862715afcda7
+DIST kitemmodels-5.94.0.tar.xz 407248 BLAKE2B 82488520d4c9479cdc22cd791fddf95c44f34db55bdfbc6162a3ddb3818ef4550bad979144bf43d437475dce3b3a717fa7d50da248e1d4c6b478b0bbba8e2561 SHA512 ae284ed3811044a13c4d2fcbfae36822e1eed012395eb1ab58758f084319411796a15ae99b65dd4ca25b6d8aba59c2af5a65179db524582a8388ce77e2edb955
diff --git a/kde-frameworks/kitemmodels/kitemmodels-5.85.0.ebuild b/kde-frameworks/kitemmodels/kitemmodels-5.92.0.ebuild
index ccd20da1a18..db0fc6754c9 100644
--- a/kde-frameworks/kitemmodels/kitemmodels-5.85.0.ebuild
+++ b/kde-frameworks/kitemmodels/kitemmodels-5.92.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -22,7 +22,6 @@ DEPEND="${RDEPEND}
src_configure() {
local mycmakeargs=(
- -DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON # bug 746866
$(cmake_use_find_package qml Qt5Qml)
)
ecm_src_configure
diff --git a/kde-frameworks/kitemmodels/kitemmodels-5.88.0.ebuild b/kde-frameworks/kitemmodels/kitemmodels-5.94.0.ebuild
index f0e41176ca8..70a95c34b11 100644
--- a/kde-frameworks/kitemmodels/kitemmodels-5.88.0.ebuild
+++ b/kde-frameworks/kitemmodels/kitemmodels-5.94.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-QTMIN=5.15.2
+QTMIN=5.15.3
VIRTUALX_REQUIRED="test"
inherit ecm kde.org
@@ -22,7 +22,6 @@ DEPEND="${RDEPEND}
src_configure() {
local mycmakeargs=(
- -DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON # bug 746866
$(cmake_use_find_package qml Qt5Qml)
)
ecm_src_configure
diff --git a/kde-frameworks/kitemviews/Manifest b/kde-frameworks/kitemviews/Manifest
index aabd4cd854b..c0b97a6ccd7 100644
--- a/kde-frameworks/kitemviews/Manifest
+++ b/kde-frameworks/kitemviews/Manifest
@@ -1,2 +1,2 @@
-DIST kitemviews-5.85.0.tar.xz 74868 BLAKE2B 96fe28e325e88eb713220f231ad9ec93eea8128ffebe5b67db16179e659e8880a7920f4637ccf5eaa273a3519da494bc97296a8a0e4f6ddeb9afd1445fc5cc4e SHA512 63e7b4ce92be46e631ddbccf1fac484626f236e215e2b314f9ca088be36af794527f903a1fe28d450b8b5fb2852891d1c7e298d299cc7fda203a072d8905fbf1
-DIST kitemviews-5.88.0.tar.xz 75260 BLAKE2B 46af0e2b8be3fcb398e41a3abea743a466d58d596182fee780ad6bc5f22ee387ffd6dfc131849ac636726577c4b94744e741f93fee51d97a7bfd1b42db03f5b8 SHA512 1a78c1d3758d3267fa99a7985695058fa9ef10af5bcc12846b85112634386ad0a56e7255f1b2d691222ac23f04d6fb827aa1517089da9ebfe1e02f9c3d789ceb
+DIST kitemviews-5.92.0.tar.xz 77260 BLAKE2B 85aee7a8ccadc939bde8eae618aa8ad26199e4f50f1e51c65bb4f1a87908587eba4ae553574153337ed24075f7043e2dd315566b4d11e12029bf157d83158611 SHA512 3eb1737285f560efcdca52ec8c02478cfd8151852ed9e4e931cd019617bb21dff61f2cb65642a278b1aff60afbecfed2edf867bb80d332de98394152bf072324
+DIST kitemviews-5.94.0.tar.xz 77360 BLAKE2B d844437525103bd829e71f8675f58a745fd34458addee68f4cf6da80834aa61a542177094c5a404ff794791e15c55175790c93daec4672ef1da55c8a3a031c6d SHA512 c94157fb034c1e8b3787b37d873808d9c19da520b5c85483149bfd47fa6d4b5d93429ee21a3d7b5cb5e27d759d01c009ab6c3a6cce8a55a490a063a728916003
diff --git a/kde-frameworks/kitemviews/kitemviews-5.85.0.ebuild b/kde-frameworks/kitemviews/kitemviews-5.92.0.ebuild
index d44f9f1c1a8..e184ebcffee 100644
--- a/kde-frameworks/kitemviews/kitemviews-5.85.0.ebuild
+++ b/kde-frameworks/kitemviews/kitemviews-5.92.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -9,22 +9,14 @@ VIRTUALX_REQUIRED="test"
inherit ecm kde.org
DESCRIPTION="Framework providing additional widgets for item models"
+
LICENSE="LGPL-2+"
KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
IUSE="nls"
-BDEPEND="
- nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
DEPEND="
>=dev-qt/qtgui-${QTMIN}:5
>=dev-qt/qtwidgets-${QTMIN}:5
"
RDEPEND="${DEPEND}"
-
-src_configure() {
- local mycmakeargs=(
- -DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON # bug 746866
- )
- ecm_src_configure
-}
+BDEPEND="nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )"
diff --git a/kde-frameworks/kitemviews/kitemviews-5.88.0.ebuild b/kde-frameworks/kitemviews/kitemviews-5.94.0.ebuild
index 0285b52bae8..34eacc03849 100644
--- a/kde-frameworks/kitemviews/kitemviews-5.88.0.ebuild
+++ b/kde-frameworks/kitemviews/kitemviews-5.94.0.ebuild
@@ -1,30 +1,22 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
ECM_DESIGNERPLUGIN="true"
-QTMIN=5.15.2
+QTMIN=5.15.3
VIRTUALX_REQUIRED="test"
inherit ecm kde.org
DESCRIPTION="Framework providing additional widgets for item models"
+
LICENSE="LGPL-2+"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
IUSE="nls"
-BDEPEND="
- nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
DEPEND="
>=dev-qt/qtgui-${QTMIN}:5
>=dev-qt/qtwidgets-${QTMIN}:5
"
RDEPEND="${DEPEND}"
-
-src_configure() {
- local mycmakeargs=(
- -DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON # bug 746866
- )
- ecm_src_configure
-}
+BDEPEND="nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )"
diff --git a/kde-frameworks/kjobwidgets/Manifest b/kde-frameworks/kjobwidgets/Manifest
index e15a26fa251..c2d1c299cfb 100644
--- a/kde-frameworks/kjobwidgets/Manifest
+++ b/kde-frameworks/kjobwidgets/Manifest
@@ -1,2 +1,2 @@
-DIST kjobwidgets-5.85.0.tar.xz 99076 BLAKE2B 77887b78e37644d3a6cbb7528532385956efe7c152d939f25a8d95e07be004973a2977e251ca67200f341af0c213b7483d1466d541adaadbbd161a2f6c7e50b5 SHA512 d3ee9f74f0aebccea1a939568793d3162d76bd2fc8dd8271d2b9b19836fe1f05bb1eb8fdf4c3456891587b8c6b6e91004d3b18374420aad8af0e9efaac64fae0
-DIST kjobwidgets-5.88.0.tar.xz 99404 BLAKE2B f28eb4e8e81489a3b72a79088be3f1fe5c4b9cce32ca8b769e7aafc2b95529d75a711ac95b2e83da33b58d030b9fd50bee7f034db977bda10538d6273ebec15e SHA512 6102b09b81aaa5b0a1b006dd1634b720a683f3f0457a63bfdb58f770eca5ea2f53bc9968108f6ac866e761a5fea82a2223f07118fd4988db295c0e28d20a563a
+DIST kjobwidgets-5.92.0.tar.xz 101620 BLAKE2B 29eb6b131ca2c858ee416afab137ed84b1f1e00039673794418bb352ed656df13e91e2b47a98d1b6dd933034e0fb5dad44fa021aaa6ac0c84913f8cd733cde1f SHA512 6bd21dc93146ded88981bf61c1365c333c9ba369ac358ef4b5b06c2d26f0e6cac7880ecad27cd7cd950cf1b502c9202ced6c66fcdb78b7cacec1da6a92558976
+DIST kjobwidgets-5.94.0.tar.xz 101632 BLAKE2B dc916757c23a637696da67846ec1900a5aea61c57be95f7d431e52d651c8f6cbbd059c09fc9c70b2db710e4c65016c28c4b3f0d4a10138dab576ad1235a305bf SHA512 9b038faed6c9174cdcdd21db85d078be6ae02e9091a3d30e3fcda290a130a6c3ec5ee2a9d96df895e6d5c123c979ca584cb487bc637f437cfa3fbe55bc9deb33
diff --git a/kde-frameworks/kjobwidgets/kjobwidgets-5.85.0.ebuild b/kde-frameworks/kjobwidgets/kjobwidgets-5.92.0.ebuild
index 367981e228a..bb1780db59c 100644
--- a/kde-frameworks/kjobwidgets/kjobwidgets-5.85.0.ebuild
+++ b/kde-frameworks/kjobwidgets/kjobwidgets-5.92.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -32,7 +32,6 @@ DEPEND="${RDEPEND}
src_configure() {
local mycmakeargs=(
- -DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON # bug 746866
$(cmake_use_find_package X X11)
)
diff --git a/kde-frameworks/kjobwidgets/kjobwidgets-5.88.0.ebuild b/kde-frameworks/kjobwidgets/kjobwidgets-5.94.0.ebuild
index 67c1618edbb..fe3225c78db 100644
--- a/kde-frameworks/kjobwidgets/kjobwidgets-5.88.0.ebuild
+++ b/kde-frameworks/kjobwidgets/kjobwidgets-5.94.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# 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.2
+QTMIN=5.15.3
inherit ecm kde.org
DESCRIPTION="Framework providing assorted widgets for showing the progress of jobs"
@@ -32,7 +32,6 @@ DEPEND="${RDEPEND}
src_configure() {
local mycmakeargs=(
- -DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON # bug 746866
$(cmake_use_find_package X X11)
)
diff --git a/kde-frameworks/kjs/Manifest b/kde-frameworks/kjs/Manifest
index 1c4aef2e56f..af4656f1896 100644
--- a/kde-frameworks/kjs/Manifest
+++ b/kde-frameworks/kjs/Manifest
@@ -1,2 +1,2 @@
-DIST kjs-5.85.0.tar.xz 337888 BLAKE2B 1ba61fa79ecc130744ba183fab25b8118bf4f3635f11ec50d73a64c83508941fe23c6eea92f688233d70c784e82bf460a6c4229c8f449076e6c2d12842cd08aa SHA512 80a873d7277efe053587bb9875f0958e26d5ad582a9c12377b187584f76e88f1ba64f4e071fa1329fe42690379a217a9f68d28cfb1a6724b615c01398840f324
-DIST kjs-5.88.0.tar.xz 338268 BLAKE2B 666faf3922e6ab5723c1686229e36cb9e593e9adb9984bf5285142f86586cc3de561a2f94230367dcde6550c9533506c7e2b9a4068addfa94e687c37635e24ce SHA512 bd98e6b243530ddefff4a60e47a5496c6704269ed9a3791cbb33a136f52cf42813816d0902e77dbfb584c4a77482c8356ffcb4b58e403174bff30dcc4a0df9f6
+DIST kjs-5.92.0.tar.xz 339164 BLAKE2B 6b62d94204d99edda3143dd13762deebb3322502bf5743b3464dc03c4881d77b813116c4dc5da8da0a98cab6058a35752c18499d67e68ac1ee8db2ca029dc164 SHA512 80cd1ef0ddc4fa1616ed992a1891603ae3588b4c09adebf2bd59609f6cfe203894f11eff8351aac679a27f3e98b370bbeff4e3155e0bd308e7af5f9e4bc757c2
+DIST kjs-5.94.0.tar.xz 339168 BLAKE2B 10b139a3a836aef994e7a1f86f0403a9c4bdd40b05c50ffd375354a951ab191da85572f7fc8763d29441741025db9d5f34dc0ab23cef5edbe23369518c0ea52e SHA512 38e1d4d73e6ccf48d01d7c48315b1a69f5a008c91f7fb4df9a4f0dc80447a022701cb90af19b8e18785016895186d6e035583424326017ab79d50bc5aab9fcea
diff --git a/kde-frameworks/kjs/kjs-5.85.0.ebuild b/kde-frameworks/kjs/kjs-5.92.0.ebuild
index e95421f69a9..6eafc0d00dd 100644
--- a/kde-frameworks/kjs/kjs-5.85.0.ebuild
+++ b/kde-frameworks/kjs/kjs-5.92.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
diff --git a/kde-frameworks/kjs/kjs-5.88.0.ebuild b/kde-frameworks/kjs/kjs-5.94.0.ebuild
index 0fedac96ed3..13a06718a47 100644
--- a/kde-frameworks/kjs/kjs-5.88.0.ebuild
+++ b/kde-frameworks/kjs/kjs-5.94.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
diff --git a/kde-frameworks/knewstuff/Manifest b/kde-frameworks/knewstuff/Manifest
index ba70ee56f28..0c07fc4bffc 100644
--- a/kde-frameworks/knewstuff/Manifest
+++ b/kde-frameworks/knewstuff/Manifest
@@ -1,2 +1,2 @@
-DIST knewstuff-5.85.0.tar.xz 1138788 BLAKE2B 6f037ddd3dd7d9499d19b8d10b2486ced1ab169180d69a004369158665eb098015c60fd657e9d84af7b15634a28abd13e761b2728861f3f88c02ac0510121c5c SHA512 2da81b520ecab1d43b79e75ec56cbba410bd0944b13ea53eeee5ca94c77f9c04ad91a35b0c1942516edc5101a365f2a91b774405183bc8bf82c6cd5fb53a0570
-DIST knewstuff-5.88.0.tar.xz 1146552 BLAKE2B 210322ac54eb1fc292b0b9a2a27940bead11b64e86f9c1f3f50150317f11dac87fbd0932aff9b5862c9acdaa654f0c4c2dc44a16a815889f5d63f6485784f9cc SHA512 253f2d5b5fb496a0d24674592b7f6d69866422ffb393bf1db738799f4846e109c8e30e55eff57c6b7c3c56f1e43fa126ba396b8680524a40eec018b84443e634
+DIST knewstuff-5.92.0.tar.xz 1155052 BLAKE2B ee3485c1e3371c139019bb1889aedb112f40c0bb0ee1c92c159b3a6b8a84208d53de10fb1d368852927b7a65e6e1cee3afcf99aa821e8468c67f8b0ac49db79d SHA512 689089724f53ecd59bc79e046bb0b3f64e7a3bd7c8d9a5cd8be15d13bdc045e0484e05a2e0a87ab0134744da829becf8fc669a9e17b7668dafec3fff8e62a2a8
+DIST knewstuff-5.94.0.tar.xz 1154916 BLAKE2B 668ed799cb34470e5f8132a49d47261b1e571c30106e7a4b623513f16c0ddcbeea5a7011bb637438326758b5b54019004c6a81ff66d1b7155eda4b47ad19888f SHA512 6269614a0df2616bd5bd1a8e9c3f8dc16920bbd4cf8fd18a5ccc1e818c292d90533de3dc77ce8fbbb183388ad6fed72a30b78177eddd87624499b3c75d55a226
diff --git a/kde-frameworks/knewstuff/files/knewstuff-5.92.0-KDEBUG-451165.patch b/kde-frameworks/knewstuff/files/knewstuff-5.92.0-KDEBUG-451165.patch
new file mode 100644
index 00000000000..07f4170ae0c
--- /dev/null
+++ b/kde-frameworks/knewstuff/files/knewstuff-5.92.0-KDEBUG-451165.patch
@@ -0,0 +1,53 @@
+From 693a2ea3926400b1482888a2df2c532852b8f971 Mon Sep 17 00:00:00 2001
+From: Alexander Lohnau <alexander.lohnau@gmx.de>
+Date: Sun, 20 Mar 2022 20:29:51 +0100
+Subject: [PATCH] Do not set user-visible name as additional agent information
+
+Instead we want the filename, which is more useful as an identifier anyways, because
+we would otherwise have to check which user-visible names originate from which knsrc file.
+
+BUG: 451165
+---
+ src/core/engine.cpp | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/src/core/engine.cpp b/src/core/engine.cpp
+index e7abfde8..72af9c83 100644
+--- a/src/core/engine.cpp
++++ b/src/core/engine.cpp
+@@ -145,6 +145,7 @@ public:
+ QString busyMessage;
+ QString useLabel;
+ bool uploadEnabled = false;
++ QString configFileName;
+ };
+
+ Engine::Engine(QObject *parent)
+@@ -224,6 +225,7 @@ bool Engine::init(const QString &configfile)
+ conf.reset(new KConfig(configfile));
+ qCWarning(KNEWSTUFFCORE) << "Using a deprecated location for the knsrc file" << configfile
+ << " - please contact the author of the software which provides this file to get it updated to use the new location";
++ configFileName = QFileInfo(configfile).baseName();
+ } else if (isRelativeConfig && actualConfig.isEmpty()) {
+ configFileName = QFileInfo(QStandardPaths::locate(QStandardPaths::GenericDataLocation, QStringLiteral("knsrcfiles/%1").arg(configfile))).baseName();
+ conf.reset(new KConfig(QStringLiteral("knsrcfiles/%1").arg(configfile), KConfig::FullConfig, QStandardPaths::GenericDataLocation));
+@@ -234,6 +236,7 @@ bool Engine::init(const QString &configfile)
+ configFileName = configFileInfo.baseName();
+ conf.reset(new KConfig(configfile));
+ }
++ d->configFileName = configFileName;
+
+ if (conf->accessMode() == KConfig::NoAccess) {
+ Q_EMIT signalErrorCode(KNSCore::ConfigFileError, i18n("Configuration file exists, but cannot be opened: \"%1\"", configfile), configfile);
+@@ -425,7 +428,7 @@ void Engine::slotProviderFileLoaded(const QDomDocument &doc)
+
+ QSharedPointer<KNSCore::Provider> provider;
+ if (isAtticaProviderFile || n.attribute(QStringLiteral("type")).toLower() == QLatin1String("rest")) {
+- provider.reset(new AtticaProvider(m_categories, d->name));
++ provider.reset(new AtticaProvider(m_categories, d->configFileName));
+ connect(provider.data(), &Provider::categoriesMetadataLoded, this, [this](const QList<Provider::CategoryMetadata> &categories) {
+ d->categoriesMetadata = categories;
+ Q_EMIT signalCategoriesMetadataLoded(categories);
+--
+GitLab
+
diff --git a/kde-frameworks/knewstuff/files/knewstuff-5.92.0-fix-valid-tar-recognition.patch b/kde-frameworks/knewstuff/files/knewstuff-5.92.0-fix-valid-tar-recognition.patch
new file mode 100644
index 00000000000..7926b3cee8f
--- /dev/null
+++ b/kde-frameworks/knewstuff/files/knewstuff-5.92.0-fix-valid-tar-recognition.patch
@@ -0,0 +1,27 @@
+From 82f04bff174a4bb307aa9b39aedf271c200b0545 Mon Sep 17 00:00:00 2001
+From: Alexander Lohnau <alexander.lohnau@gmx.de>
+Date: Mon, 7 Mar 2022 21:27:09 +0100
+Subject: [PATCH] Fix certain tars not being recognized as valid archives
+
+KArchive can handle those too.
+
+BUG: 450662
+---
+ src/core/installation.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/core/installation.cpp b/src/core/installation.cpp
+index c3ba0e15..45694465 100644
+--- a/src/core/installation.cpp
++++ b/src/core/installation.cpp
+@@ -566,6 +566,7 @@ QStringList Installation::installDownloadedFileAndUncompress(const KNSCore::Entr
+ archive.reset(new KZip(payloadfile));
+ // clang-format off
+ } else if (mimeType.inherits(QStringLiteral("application/tar"))
++ || mimeType.inherits(QStringLiteral("application/x-tar")) // BUG 450662
+ || mimeType.inherits(QStringLiteral("application/x-gzip"))
+ || mimeType.inherits(QStringLiteral("application/x-bzip"))
+ || mimeType.inherits(QStringLiteral("application/x-lzma"))
+--
+GitLab
+
diff --git a/kde-frameworks/knewstuff/knewstuff-5.85.0.ebuild b/kde-frameworks/knewstuff/knewstuff-5.92.0-r2.ebuild
index 845f3b37d0f..67c758ccd9d 100644
--- a/kde-frameworks/knewstuff/knewstuff-5.85.0.ebuild
+++ b/kde-frameworks/knewstuff/knewstuff-5.92.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -40,6 +40,11 @@ RDEPEND="${DEPEND}
>=kde-frameworks/kirigami-${PVCUT}:5
"
+PATCHES=(
+ "${FILESDIR}/${P}-KDEBUG-451165.patch"
+ "${FILESDIR}/${P}-fix-valid-tar-recognition.patch" # KDE-bug 450662
+)
+
src_configure() {
local mycmakeargs=(
$(cmake_use_find_package opds KF5Syndication)
diff --git a/kde-frameworks/knewstuff/knewstuff-5.88.0.ebuild b/kde-frameworks/knewstuff/knewstuff-5.94.0.ebuild
index 67d43e05a70..48c5aa614b6 100644
--- a/kde-frameworks/knewstuff/knewstuff-5.88.0.ebuild
+++ b/kde-frameworks/knewstuff/knewstuff-5.94.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# 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.2
+QTMIN=5.15.3
inherit ecm kde.org
DESCRIPTION="Framework for downloading and sharing additional application data"
diff --git a/kde-frameworks/knotifications/Manifest b/kde-frameworks/knotifications/Manifest
index e618ec6c90c..2027899775d 100644
--- a/kde-frameworks/knotifications/Manifest
+++ b/kde-frameworks/knotifications/Manifest
@@ -1,2 +1,2 @@
-DIST knotifications-5.85.0.tar.xz 124336 BLAKE2B c6f12695b30fa8bb6a183cf7a5a1be515e5e9ceae81c4c3278fce84e25f782eda589795f879c4dc50cd1303cc2b49f99dbb9e0aea3e8f9b1ed70b769cc333b65 SHA512 e95106af6a0dcd7695ca58d0146189925a6581991aaa151a3978686be88b5d6686e370fbe9a5736b824acbf4041316519dfed1c38abc2048bbc1626516ca5670
-DIST knotifications-5.88.0.tar.xz 129804 BLAKE2B 7d74fd81a13f4cd01f13a4305ddcd4b7a06a801074452ed30c6fe6254774b58fbcd7fbea0ed6400851ad56e0d01a357f3927bd6c88250997a48609bbb01695a0 SHA512 8a3670e9dcff696a65f495f41db1ce680fba4ca7d307b5aea4baa1626ad58132a630fe66f50d685578a9aa5cb8a9229155cc6f6c0cf414ac008de61a64cab7fd
+DIST knotifications-5.92.0.tar.xz 131784 BLAKE2B 9c31e8f3870e1ae440d813bdeefdc87b48ddb5fd5176664f49dd8d31c429c717a8b146fa00875cb2f2d218428339dcfbee883ddeb127647e5618d0aa89650ffc SHA512 7dd5f6b798ebe5741284a5334b9056ce47f0b2a8a44b7d7e8e13de674fe77ddac85447491ece9a0ad6924f1a4dd7be72d80c39225fa1e674715ca103b48d10fd
+DIST knotifications-5.94.0.tar.xz 131712 BLAKE2B 187ceb73bb83244b124a7b400af14b7d8718de2fd4d72413dd84c4c28b87bda3a61cdb19ce14ba8bb3e26d40f983e8ab6753bd13dc4b0590a5f97447a9552610 SHA512 e77886ae03b1a59d9da74a83b7945cb9e7a60992f31607d0ed545418cb384641fac8b8a6ce431c8ad5c0c57d939dab66a52a48febf2624602d4e3a6eaa3475cc
diff --git a/kde-frameworks/knotifications/knotifications-5.85.0.ebuild b/kde-frameworks/knotifications/knotifications-5.92.0.ebuild
index 0be2ea8cdbd..5b7893be1ab 100644
--- a/kde-frameworks/knotifications/knotifications-5.85.0.ebuild
+++ b/kde-frameworks/knotifications/knotifications-5.92.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -11,21 +11,19 @@ inherit ecm kde.org
DESCRIPTION="Framework for notifying the user of an event"
LICENSE="LGPL-2.1+"
KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-IUSE="dbus nls phonon speech X"
+IUSE="dbus nls phonon qml speech X"
-BDEPEND="
- nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
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
+ =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
@@ -36,11 +34,15 @@ RDEPEND="
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)
)
diff --git a/kde-frameworks/knotifications/knotifications-5.88.0.ebuild b/kde-frameworks/knotifications/knotifications-5.94.0.ebuild
index a1fc080754c..2b0b9cdb62d 100644
--- a/kde-frameworks/knotifications/knotifications-5.88.0.ebuild
+++ b/kde-frameworks/knotifications/knotifications-5.94.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# 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.2
+QTMIN=5.15.3
inherit ecm kde.org
DESCRIPTION="Framework for notifying the user of an event"
diff --git a/kde-frameworks/knotifyconfig/Manifest b/kde-frameworks/knotifyconfig/Manifest
index e7e0f76aa7b..5651a3f8b26 100644
--- a/kde-frameworks/knotifyconfig/Manifest
+++ b/kde-frameworks/knotifyconfig/Manifest
@@ -1,2 +1,2 @@
-DIST knotifyconfig-5.85.0.tar.xz 84852 BLAKE2B e8d8a9580241ec2f57fc32208aac536a0d86f00946a1c2c56fdab1bdc1461a0dd8ec4d4b3df33c68a8c46d30fa4c6c1db1253c7f1595e6fa37795b84cd7e3820 SHA512 0bada9636e8c97e85d1405054dc5def34c25ecc8ce49dade8407de2213830f3802e044a4cc8782ae8bd4c89fdd982624454b6b77c469981b1fbc811b40edb326
-DIST knotifyconfig-5.88.0.tar.xz 85188 BLAKE2B 7903da678ef5975b88c36fd7a87267faa77fc4f3eb8dda6e377c7cef57b54e5ecdf97219410badc05eb28df17fecc7fdd16b46cda74d9520b31fd3600a4a851f SHA512 ef518922fc2b189c0f94ef4bf814b3556db7ea563e9469ff63248f4835ed9ac053e3c1d60351b420e989b3f5569120db3d489a302502f3ba6684162cad553992
+DIST knotifyconfig-5.92.0.tar.xz 87380 BLAKE2B 835eddbe305e0a048dd1ebdf6f5419e23f3b1c6ca900a176df64da99de091c5f31586b4a3db54927670d41e11cd1e0dae84499147be304e0a4c9232aacec20b7 SHA512 1abfb1097dbeee31bb6ff9e6843002d020020196fce3b6cb1ab43e3fe4e3ddb9ca6565c9da9aa13ae8e205ec097b186f1c7d628870597b0f76f8a41dcaf1807e
+DIST knotifyconfig-5.94.0.tar.xz 87372 BLAKE2B 40b9569a5a1e56a2d96139fcd99ca881d67200d0b689cdc458bc5ab50f98ed587d8ff51e7436e7100d429c0401d435e422f3b59a6f5bd6823973d6055b83b887 SHA512 0a36b39f003ee89f8b041408bd54fa3ae95619367d19fe99e757176222dc6b1cf20f76092e24bb5dc0ff09862558c4a34e7e2a40c89af0795a0ead123e4825c1
diff --git a/kde-frameworks/knotifyconfig/knotifyconfig-5.85.0.ebuild b/kde-frameworks/knotifyconfig/knotifyconfig-5.92.0.ebuild
index a7024a4d27a..cbc3be0dc22 100644
--- a/kde-frameworks/knotifyconfig/knotifyconfig-5.85.0.ebuild
+++ b/kde-frameworks/knotifyconfig/knotifyconfig-5.92.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
diff --git a/kde-frameworks/knotifyconfig/knotifyconfig-5.88.0.ebuild b/kde-frameworks/knotifyconfig/knotifyconfig-5.94.0.ebuild
index 8dd2bf4f3b0..1bcc3816c26 100644
--- a/kde-frameworks/knotifyconfig/knotifyconfig-5.88.0.ebuild
+++ b/kde-frameworks/knotifyconfig/knotifyconfig-5.94.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# 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.2
+QTMIN=5.15.3
inherit ecm kde.org
DESCRIPTION="Framework for configuring desktop notifications"
diff --git a/kde-frameworks/kpackage/Manifest b/kde-frameworks/kpackage/Manifest
index 7e6b1d28ae2..d97b719e1a6 100644
--- a/kde-frameworks/kpackage/Manifest
+++ b/kde-frameworks/kpackage/Manifest
@@ -1,2 +1,2 @@
-DIST kpackage-5.85.0.tar.xz 138696 BLAKE2B 4c1122bc24c7914cd0bc8e6f390f637b4ce0d9bce692ae2a245fbc53adb86649c7db683d829427e6e728746ec6a78f8e2178b5d27a9c399f0e6e95a5e3448c67 SHA512 1209088a78e0ff2d3db1cbd8b0e154364febbac2941b064e196fed296b5ed963278fff4db21136dddb4f8d20e990b9d4773ea39edf1ef5a07528987b6fe8cf54
-DIST kpackage-5.88.0.tar.xz 139076 BLAKE2B 5ed72ea92966d61f6a7d17116523ec416c3b9d1f2fa525268f844fa9ebac27e1ea72b22cc627b7bcc72edbb041d8d8c352b0bece02c2239127f33afd513ba569 SHA512 a03b3762b3087404e878e3f7fe8c8169fcd511bc89a1d546f1d9ec340a2ecf72cfde5d2ce0daaa406d517a23c0d7366a27180a63c81b7d1f8dd91980d26da923
+DIST kpackage-5.92.0.tar.xz 141300 BLAKE2B ad7990fc56067e093aee2bc04bf42175bdd6fba5abeb513697f0114e751da33a310687a880f3690c05a557e9e1a340e01e04092907aa50e57b418fd346977920 SHA512 f0979289b94108708d21ad3a6bb574903d376d09f84d60d5cbaef10a315f9157fd750edecc8106ccb81297156965222455d82f70ad9a4f750d898e29f86d42b5
+DIST kpackage-5.94.0.tar.xz 141252 BLAKE2B 384b273d1d3c4a4617438d9877cb792f97b945b74d2c2b3cd184ef9a28ce87b63bb02578dcb90a98f9068a47e5904e2f6c26fdc8717753943f04454f310d171a SHA512 65c58a01c302e3f5ad89fab1bec3b9bf1f17a9a94408b565137a1cfb4f083436c39e41b57c11449d5f764252df86eb7e9b4a08b86d65492f0f7eb1899b8d2cc7
diff --git a/kde-frameworks/kpackage/kpackage-5.85.0.ebuild b/kde-frameworks/kpackage/kpackage-5.92.0.ebuild
index acc3be75a81..95aa5bffaea 100644
--- a/kde-frameworks/kpackage/kpackage-5.85.0.ebuild
+++ b/kde-frameworks/kpackage/kpackage-5.92.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -33,7 +33,8 @@ src_configure() {
}
src_test() {
- #bug 650214
- local myctestargs=( -E "(plasma-plasmoidpackagetest)" )
+ # 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.88.0.ebuild b/kde-frameworks/kpackage/kpackage-5.94.0.ebuild
index 6441dc5dc4c..f663f659644 100644
--- a/kde-frameworks/kpackage/kpackage-5.88.0.ebuild
+++ b/kde-frameworks/kpackage/kpackage-5.94.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# 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.2
+QTMIN=5.15.3
inherit ecm kde.org
DESCRIPTION="Framework to install and load packages of non binary content"
diff --git a/kde-frameworks/kparts/Manifest b/kde-frameworks/kparts/Manifest
index 58758a6ca21..054c250022c 100644
--- a/kde-frameworks/kparts/Manifest
+++ b/kde-frameworks/kparts/Manifest
@@ -1,2 +1,2 @@
-DIST kparts-5.85.0.tar.xz 192484 BLAKE2B 7a5bd8d306ba3fc12640996fbdd7493347ba4d1b8fa74588e96b985c788803c6c18445ced757a5d07186cca1f2da807033bedf673926b870471b7e695dfe490d SHA512 d255cff86a434a886c1466c9b84a9818f0e93c49c17af9351b324c89f7f2f807686718fcd50cd70bbfba0f8af8af01e5af9d60f3c361b0a196e48d591711444d
-DIST kparts-5.88.0.tar.xz 194420 BLAKE2B f8aff825507e72f29725d85344f7331077ed10ec54df2a66d5a7dddd397bf14243f367a40f6c9729dea5c1796b61b27271f181f34ca63292b542e7f888cfd54f SHA512 082b15d7b1bb51b84423f69df9691738f148ae8fb160c7298126c1e803443dff3578022be7078caaa61f99e7e3c3dd12039bd866e20152ccc7b2944cc99231b8
+DIST kparts-5.92.0.tar.xz 196644 BLAKE2B f6c19779b94c9d83eac72b7edaad9895e8027747c93aaf5a07f24ccf3af90538e4ede6204c0eb605579982f63e5dbb0ead8aef404c4de235d58468bac3ddfb97 SHA512 6c7db8d4975856d3c0822e86650c31a222b6b7ff8a660eeedbd3fc952eb2f94e36bd5f9b6ec844f9310603cf69bb333447a75ed7a2cefac66987ff5e5676d1ec
+DIST kparts-5.94.0.tar.xz 196720 BLAKE2B fe72f1bec690cb28200422d66c2ce6c6b87e18c00d87ea5d3bb7a4b4d2925ec4875f6dffd4c3bc903fda513bb79152e0c5ebbf3bdee902051a28c5c40696ccf4 SHA512 1046617d69c9e67c02a1924d5a20a7e64ee69cb93477d28a8686b4658bdcba8765d9ec7b5f27e4926feaab34db459bbaac9e8f25eb4ee674a7ff622882bec4e8
diff --git a/kde-frameworks/kparts/kparts-5.85.0.ebuild b/kde-frameworks/kparts/kparts-5.92.0.ebuild
index 3c6a1809720..33b1e200a1c 100644
--- a/kde-frameworks/kparts/kparts-5.85.0.ebuild
+++ b/kde-frameworks/kparts/kparts-5.92.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
diff --git a/kde-frameworks/kparts/kparts-5.88.0.ebuild b/kde-frameworks/kparts/kparts-5.94.0.ebuild
index 9d4cb3eb5ee..bbfe9dd2f85 100644
--- a/kde-frameworks/kparts/kparts-5.88.0.ebuild
+++ b/kde-frameworks/kparts/kparts-5.94.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# 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.2
+QTMIN=5.15.3
VIRTUALX_REQUIRED="test"
inherit ecm kde.org
diff --git a/kde-frameworks/kpeople/Manifest b/kde-frameworks/kpeople/Manifest
index e35dfa820e4..da4cc620e7a 100644
--- a/kde-frameworks/kpeople/Manifest
+++ b/kde-frameworks/kpeople/Manifest
@@ -1,2 +1,2 @@
-DIST kpeople-5.85.0.tar.xz 56732 BLAKE2B 2fd14a33ab2ea49234caeded7807f0d1efd642ab1003b0231c3389158a5b4365c1b2d0e994ea8bfe05663927e5225c27d168e6bfe06fb03fd10582a0361c848d SHA512 f93242008625fd3aec28e113d34ae7d3bfb919cbc0ffa897d12a3b782bf713803202cb21f81e6b66f7c49c80199be57f47e659d04587c63eac770629bfe88cdc
-DIST kpeople-5.88.0.tar.xz 57028 BLAKE2B 395c04c03f5e49a7b59c01b67f818d18504531d4bdec3215dac7184db93d39fb9bfd5baed7d95389a88dc3573dbe2b881e9742195d8da0824d9979f4ef6fb716 SHA512 e36b648c2ccb378526750eaf97552c6a168541324d4afe990087577e06586a0c03f4662e47619a602833fdcc6bc522347245945bd4bad0f598d45a33abac403d
+DIST kpeople-5.92.0.tar.xz 59164 BLAKE2B cf3da54a9380e4f05945f58e6c4d8cf8c38d50c7b6b951362ffcee7029558437918935a6657ad352a9bfa0980248027c876571eb0601ca5223412c5c0c908596 SHA512 63131e26ee0efaad30d5375677f7b5a323cc7e05f8b5d575534357fe2b848a1122f2e864621d2954c766cb7c6f9daadfb5da700c0e91afab703bd7864145dfb8
+DIST kpeople-5.94.0.tar.xz 60212 BLAKE2B 3b65f617af6b48fa4a51f35284f48363603d926b23ab118f8cf818caa02436ae977d25c646364f544c942f06c20a2df0d83dcbd1cea3d399a97bd8eec13257be SHA512 257765a7591759118a5b76e66c67e7eb5bd2b2eaef9dce1eb7694824081ea830a87cce90465d1920961dac969fc33a8763afe1ea6080ee9f4b907fb3000a8be3
diff --git a/kde-frameworks/kpeople/kpeople-5.85.0.ebuild b/kde-frameworks/kpeople/kpeople-5.92.0.ebuild
index 95135c35f99..0f18a70e975 100644
--- a/kde-frameworks/kpeople/kpeople-5.85.0.ebuild
+++ b/kde-frameworks/kpeople/kpeople-5.92.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
diff --git a/kde-frameworks/kpeople/kpeople-5.88.0.ebuild b/kde-frameworks/kpeople/kpeople-5.94.0.ebuild
index 8fb8ba0fc8f..2e5de765790 100644
--- a/kde-frameworks/kpeople/kpeople-5.88.0.ebuild
+++ b/kde-frameworks/kpeople/kpeople-5.94.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# 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.2
+QTMIN=5.15.3
VIRTUALX_REQUIRED="test"
inherit ecm kde.org
diff --git a/kde-frameworks/kplotting/Manifest b/kde-frameworks/kplotting/Manifest
index 11af84b5807..ca08640fd08 100644
--- a/kde-frameworks/kplotting/Manifest
+++ b/kde-frameworks/kplotting/Manifest
@@ -1,2 +1,2 @@
-DIST kplotting-5.85.0.tar.xz 31192 BLAKE2B 3b9edc82cef6cc76a514f9b91589f8d8690b3e9a4f373a12e0bbd027a072fca6651c84dc4eeebf968b646d8b30c558d97c05938ec0bfa9a95ca59f334f69ca16 SHA512 ee36730cbde0461e72ebf012f88fff0b57605eb3fbdb16dde3921f044f074f834038f79ec45d2c7b5b12b9ca3c69dc08a1db28fb17624e9d020b58f7739d266e
-DIST kplotting-5.88.0.tar.xz 31452 BLAKE2B 1d1108e68742daf7298bbec50807fd161bfd6e835d3995fcca3df09ad2bdd057b8c85adf6991ea5db1cccc2ece3ff1d097ce47311a715ce45538b156b226b6c7 SHA512 cdfdea535794acaa6714e9bd6f78a7b6cda42d5f8d401ae0f11a46ba4977e5953017b859f80cd822daceb796e1bdcb5f79b54d0229b5ea843076bcc9fda7c23d
+DIST kplotting-5.92.0.tar.xz 33684 BLAKE2B c71109a70dbd5a79bc5e0416d0677ee4de55fc51db4617ec0224bd65141fa0783c095a39847e16f95ae785d8792dc26067635e223cc27eef8c5121a85a0d26ad SHA512 e2f7507caef50f1227461fdb4be8a6ac9dcebe0f25d35357bb0c13f2dfb0f7cc33c885bbb7c143e4c61ee157570e907b9c51764c4c2d51d2831281d16b1603d7
+DIST kplotting-5.94.0.tar.xz 33704 BLAKE2B e6fdedc39981e619071d8c8677a1863249d60fc6a97c36b4d83966adc5fc97106ea21ad19f913498bb2bbe5afd06976690680f5dbd55681bd101530c2d95f809 SHA512 a4472b15bcdfc71f538193e95b8065f18717a85259b033823b31f48b2dcc73eddf5d380459b00ec27ae8922add16176bdaf78adf958be6226845a5cf5d72a653
diff --git a/kde-frameworks/kplotting/kplotting-5.85.0.ebuild b/kde-frameworks/kplotting/kplotting-5.92.0.ebuild
index 938c6f242f6..0368139619d 100644
--- a/kde-frameworks/kplotting/kplotting-5.85.0.ebuild
+++ b/kde-frameworks/kplotting/kplotting-5.92.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -11,7 +11,7 @@ inherit ecm kde.org
DESCRIPTION="Framework providing easy data-plotting functions"
LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
IUSE=""
DEPEND="
diff --git a/kde-frameworks/kplotting/kplotting-5.88.0.ebuild b/kde-frameworks/kplotting/kplotting-5.94.0.ebuild
index a1242ec38f8..f48799ad0c7 100644
--- a/kde-frameworks/kplotting/kplotting-5.88.0.ebuild
+++ b/kde-frameworks/kplotting/kplotting-5.94.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# 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.2
+QTMIN=5.15.3
VIRTUALX_REQUIRED="test"
inherit ecm kde.org
diff --git a/kde-frameworks/kpty/Manifest b/kde-frameworks/kpty/Manifest
index e2a3c827657..3c04e0dd9a1 100644
--- a/kde-frameworks/kpty/Manifest
+++ b/kde-frameworks/kpty/Manifest
@@ -1,2 +1,2 @@
-DIST kpty-5.85.0.tar.xz 56272 BLAKE2B 1fdf346b40b9200622670c58b7480ad01fdbde5b58f543f61e68fa291d0d76008213904a4118ba43d55c716593aa901e0bd7d9cb4a8c2e76308036c89d08ad7a SHA512 51d00091f23b5cf1d397d3055283a945803372e8b3c7f99cd18be0c23376d62156e9135488fd6788752233b3aeee827a5f9ecdeef838308f0289bdbc632d61c2
-DIST kpty-5.88.0.tar.xz 56504 BLAKE2B bc4095065990728e78773be41f333cfc3ee35b1aec7e89cbcc118105cf3b4e5f94314a6852abb26899e7d49456239264e7809827f30a47c7595de704ae1796e2 SHA512 bed4cf9cedf5568799dfe5f64dc2c491cadcdfa87e01c75596597100a46efda4e193a6cc81dd33db07126ae03a18808fe1414287c614caf40cc227ef891d3cd5
+DIST kpty-5.92.0.tar.xz 59040 BLAKE2B 3aacaa70e7b3c0afec1ce84120d48beb93dbe5f36ab3902a77a4138ffa4e0a95046b3cf3417eb28fab0e07dcfb1036ec25968a54b36a86b04082e14ef385a870 SHA512 b59826079f3bdbd6ca7d500c5dfe14fa8ef9841661763df5830134cdc729bc4568d0fa48910e5084d50c34cfa900ed409fbf9d5da0e6a35940c14a93fb1eb457
+DIST kpty-5.94.0.tar.xz 59392 BLAKE2B 74af3c118b8f4f7266936fe30740d94ce6f79049bfd8cd587c69a328aa95a4eff5851853926ddbe2342d8be1f56d61095eb79be09f4bb08afaa7d26cf0d8e444 SHA512 d3f5f2c1bf73fed79e1dc9735635b4241f4e3ef113bde76c997f26a0471ee483457fd694a2a2861838f6240ec9831c9c391aff8d69490a90a73b021a2c506562
diff --git a/kde-frameworks/kpty/kpty-5.85.0.ebuild b/kde-frameworks/kpty/kpty-5.92.0.ebuild
index 34ca0a18efe..2818c2e608e 100644
--- a/kde-frameworks/kpty/kpty-5.85.0.ebuild
+++ b/kde-frameworks/kpty/kpty-5.92.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
diff --git a/kde-frameworks/kpty/kpty-5.88.0.ebuild b/kde-frameworks/kpty/kpty-5.94.0.ebuild
index 124c8900dca..7287577f7e7 100644
--- a/kde-frameworks/kpty/kpty-5.88.0.ebuild
+++ b/kde-frameworks/kpty/kpty-5.94.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
diff --git a/kde-frameworks/kquickcharts/Manifest b/kde-frameworks/kquickcharts/Manifest
index e118e8f8be9..99654dc77fd 100644
--- a/kde-frameworks/kquickcharts/Manifest
+++ b/kde-frameworks/kquickcharts/Manifest
@@ -1,2 +1,2 @@
-DIST kquickcharts-5.85.0.tar.xz 105940 BLAKE2B a7b3b4b16602ab030102310e8a94ad3ea64d5e9fa3db60e12ddd947a9c2385976ad80755608896cc22c2fd3c884a3ec8b1969f95002b2c1313d64ed688cafce7 SHA512 ea5e7187a15e715d8e6359cfb08696030243c190fd70ccbf60e82ded22a24170dfe3eac3963ccc44782c5fc7beee6e398435d08fe1b5bc19c26386fa83645f30
-DIST kquickcharts-5.88.0.tar.xz 108376 BLAKE2B 1e82887a55b0567e3c8a06fa44453730a3ab8ab2a3b40a43cf53a02222e7dedda2496679401412b6f4cf7a4de203a0ce89157c21d8cbab7d46acc51586bcf59c SHA512 5ce19252b8ad5cf32146c178683f60b8be8e25db53675256e4d61ca5925f91935ddd81207f4a95a119aca3b9a3bf34379ab888793de3e175ea90532e9efcc430
+DIST kquickcharts-5.92.0.tar.xz 108900 BLAKE2B 36e2fef1a5a9d32a4680a2f4c8bba55508e6212050d4209be1589a962380ab03ec84d8688a61ae4dc5dbe75aca5e901f7e2fd42416e4c13bafdb369854d81135 SHA512 0e5ce7bd97e9654856066ce44068c7573370d4e33fc708d38a4350d15ec35d2a078b6891d6cfb22321e082b979301f5a03e82bb9268a5aab6b3958bb0a0a54af
+DIST kquickcharts-5.94.0.tar.xz 108824 BLAKE2B f5ae356b6715b8985618d1e638eccef8334bcb2a6c4b07327b2ec60717ea47b0dc696d98833dbaa39297f000adcc3b98630533c4120c2aeaa7ddf0dcb7998b96 SHA512 5877118f4d088a256eab6dbff6efcd88b25b7117d6be4f0debc6af5fe9244836fe683658a5593ee53e94d33ff08b48a31631605c5eae63827864432fd4c4d88b
diff --git a/kde-frameworks/kquickcharts/kquickcharts-5.85.0.ebuild b/kde-frameworks/kquickcharts/kquickcharts-5.92.0.ebuild
index 02a13ffd180..1d3714eb723 100644
--- a/kde-frameworks/kquickcharts/kquickcharts-5.85.0.ebuild
+++ b/kde-frameworks/kquickcharts/kquickcharts-5.92.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
diff --git a/kde-frameworks/kquickcharts/kquickcharts-5.88.0.ebuild b/kde-frameworks/kquickcharts/kquickcharts-5.94.0.ebuild
index d4f10a50a5b..991e00d3f54 100644
--- a/kde-frameworks/kquickcharts/kquickcharts-5.88.0.ebuild
+++ b/kde-frameworks/kquickcharts/kquickcharts-5.94.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -7,7 +7,7 @@ ECM_EXAMPLES="true"
ECM_QTHELP="false"
ECM_TEST="true"
PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
+QTMIN=5.15.3
VIRTUALX_REQUIRED="test"
inherit ecm kde.org
diff --git a/kde-frameworks/kross/Manifest b/kde-frameworks/kross/Manifest
index bb66e93aeca..0f11bcb8997 100644
--- a/kde-frameworks/kross/Manifest
+++ b/kde-frameworks/kross/Manifest
@@ -1,2 +1,2 @@
-DIST kross-5.85.0.tar.xz 128932 BLAKE2B 21029db192b6ce4432d28fbb3acd9d5411b33183b45f131e8dc4fc6db7cf19d09aa5e4deb6784d61b0c32256a0acabee0f599bb13a3f46c2de3614de8fbef71d SHA512 35d459e60edfe43df7064ba64c719dc0acb37b8cb75dfeb61d75a505e0791e90e23e3558944d94d146e521593c510e3d59fde4fd5c7197151f8e05aa1c79c0cf
-DIST kross-5.88.0.tar.xz 129432 BLAKE2B be418457e0317e479e274202019e99fa03de984da70df4c524419b23822bea6dfd7433a9467149451e179c625deef11e2b36e756c42288dede673825703a382b SHA512 4468a03cf0a298cad289b6f876024f143679f0602186716fbaa059210bc614c7327575c6c758b39003c5ac96ae80121fa44052fbf3436fd27a3de6c9e7e0285b
+DIST kross-5.92.0.tar.xz 129416 BLAKE2B d32c595cbaffdf93ccdfe0ad656b738ebdccecc4fefc559fd9dbf19837d2d9b659637e9dfde52e25634e3dea74f409fe7369b773fa964cfbfe4b07aa9eced6eb SHA512 f899ac754c8d75ac7b406d996ad5a5deb560cd6215b9e5038fab3d51229fb89409f5b09b6ecad1ede7c0a456c152e7fc9e58eefa6ce9109c8359a1bb30703e7d
+DIST kross-5.94.0.tar.xz 129388 BLAKE2B a6e2defc6d4920462516e6779c40dadc48ee13499f6d5d3ae3af70b28602b4c2cf6db35f0f5a25a77ef158fe93bd904de752567e55ef749218a79a435b0fdab2 SHA512 51000c2ff7f951230a32965e317865c583ecd174fac9a531c5503ed1aac713f309cb6b7472c2232b9d63de1d3a4e756c9b5483f2c45e71c86639318ae78c60d7
diff --git a/kde-frameworks/kross/kross-5.85.0.ebuild b/kde-frameworks/kross/kross-5.92.0.ebuild
index c696083737f..132836cf130 100644
--- a/kde-frameworks/kross/kross-5.85.0.ebuild
+++ b/kde-frameworks/kross/kross-5.92.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
diff --git a/kde-frameworks/kross/kross-5.88.0.ebuild b/kde-frameworks/kross/kross-5.94.0.ebuild
index 30bb4ec0d0a..151ad697e32 100644
--- a/kde-frameworks/kross/kross-5.88.0.ebuild
+++ b/kde-frameworks/kross/kross-5.94.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -6,7 +6,7 @@ EAPI=8
ECM_HANDBOOK="forceoptional"
ECM_QTHELP="false"
PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
+QTMIN=5.15.3
VIRTUALX_REQUIRED="test"
inherit ecm kde.org
diff --git a/kde-frameworks/krunner/Manifest b/kde-frameworks/krunner/Manifest
index 1b4e765b806..ad9dbd918f3 100644
--- a/kde-frameworks/krunner/Manifest
+++ b/kde-frameworks/krunner/Manifest
@@ -1,2 +1,2 @@
-DIST krunner-5.85.0.tar.xz 76940 BLAKE2B 889577cd2b889a7e1aaf8b6b7070c74480e0e17ab81a09fce4b5e4bf5624acc3b86c327fb7293474d18dfa0e369ee174a27432ee2ae2df1a6f08d99297ef5d1e SHA512 6af8f5a3208acb571346b487b2233ed5294f6358a1a3bf5dfb4f3a5a247da9c83b67a0a0942561682009e49d92d00d2b9d8181ce1e40ea312aeaac0bde727831
-DIST krunner-5.88.0.tar.xz 83760 BLAKE2B f23cd6d097821fc3fdacfeda49961d95243785a596ba847fbae49b4c86838490a9b42d2ded2c725c0ae625db5627f4682e83d813fd9dde52a9b126bf3660e589 SHA512 0dc525856a69148b7bc283afadc3d7b57f3e40a532606ded32541f29078cc92a01bd1e3247efc1ed22043c030717fc48145b0ba617ac4b3e185a67343a9b828b
+DIST krunner-5.92.0.tar.xz 86108 BLAKE2B 570e67bac19646d7107c55dd607fda359334e3fe4cb72c6c80235b03f91e238f814b93486d9d3668880a2aed9d3a8bc2b6e518ac71e29943b0fd476235360052 SHA512 7959d1a7f55b6c2d55f2e4e65aef11d5a5cdf5e7b7bf5b702d1da4ed02c8e05a3c36dc5e70bfa443303863d98dc0cc7c418ebc46cbf68fad5baed4f2389bce35
+DIST krunner-5.94.0.tar.xz 86244 BLAKE2B a2803701c2971304d3abcf842e24c271323118b771258343c7e68022768eba9277d2576fdc7b622161b80770e7786cb294be24f72ff44acd44a75e419c3cd263 SHA512 86f2d81e4dbb0d1c716b4d8fc4d0dbda8494fa81bfb305ddc19d7278250fca48c3bc441e7773a27330d8f9888b81e293b5f585921e99ce252541db3ac0467b30
diff --git a/kde-frameworks/krunner/files/krunner-5.92.0-drop-runnermanagertest-timeouts.patch b/kde-frameworks/krunner/files/krunner-5.92.0-drop-runnermanagertest-timeouts.patch
new file mode 100644
index 00000000000..1d6c654f631
--- /dev/null
+++ b/kde-frameworks/krunner/files/krunner-5.92.0-drop-runnermanagertest-timeouts.patch
@@ -0,0 +1,55 @@
+From f324dd5fc477888517db7b431bc291d0712969af Mon Sep 17 00:00:00 2001
+From: Eduardo de Souza Cruz <eduardo.cruz@kdemail.net>
+Date: Mon, 14 Mar 2022 14:12:17 -0300
+Subject: [PATCH] Remove upper-limits for RunnerManagerTest's timeouts
+
+Those upper-limits timeouts were not conservative enough for the Continuous Integration environment which can be slow and this test was failing sometimes.
+
+The upper-limits timing verifications were removed without too much prejudice to the overall test. It should still serve its purpose to guarantee there will be no regression on this functionality.
+---
+ autotests/runnermanagertest.cpp | 13 ++++++-------
+ 1 file changed, 6 insertions(+), 7 deletions(-)
+
+diff --git a/autotests/runnermanagertest.cpp b/autotests/runnermanagertest.cpp
+index 02c0985..82bd2a4 100644
+--- a/autotests/runnermanagertest.cpp
++++ b/autotests/runnermanagertest.cpp
+@@ -74,8 +74,9 @@ private Q_SLOTS:
+ // However not yet a matcheschanged, it should be stalled for 250ms
+ QCOMPARE(spyMatchesChanged.count(), 0);
+
+- // After 250ms it will emit with empty matches, we wait for that
+- QVERIFY(spyMatchesChanged.wait(265)); // 265ms as a margin of safety for 250ms
++ // After 250ms it will emit with empty matches, we wait for that.
++ // We can't put a low upper limit on these wait() calls because the CI environment can be slow.
++ QVERIFY(spyMatchesChanged.wait()); // This should take just a tad longer than 250ms.
+
+ // This should have taken no less than 250ms. It waits for 250s before "giving up" and emitting an empty matches list.
+ QVERIFY(timer.elapsed() >= 250);
+@@ -84,20 +85,18 @@ private Q_SLOTS:
+ QCOMPARE(spyQueryFinished.count(), 1); // Still the same, query is not done
+
+ // We programmed it to emit the result after 300ms, so we need to wait 50ms more for the next emission
+- QVERIFY(spyQueryFinished.wait(100)); // 100ms as a margin of safety for 50ms
++ QVERIFY(spyQueryFinished.wait());
+
+ // This should have taken at least 300ms total, as we requested via the special query string
+ QVERIFY(timer.elapsed() >= 300);
+
+- // RunnerManager::jobDone() should have anticipated the final emission, so it should not have waited the full 250+250 ms.
+- QVERIFY(timer.elapsed() <= 330); // This total should be just a tad bigger than 300ms, we put a 10% margin of safety
+-
++ // At this point RunnerManager::jobDone() should have anticipated the final emission.
+ QCOMPARE(spyMatchesChanged.count(), 2); // We had the second matchesChanged emission, now with the query result
+ QCOMPARE(manager->matches().count(), 1); // The result is here
+ QCOMPARE(spyQueryFinished.count(), 2); // Will have emited queryFinished, job is done
+
+ // Now we will make sure that RunnerManager::scheduleMatchesChanged() emits matchesChanged instantly
+- // if we start a query with an empty string. It will never produce results, stalling is meaninless
++ // if we start a query with an empty string. It will never produce results, stalling is meaningless
+ manager->launchQuery("");
+ QCOMPARE(spyMatchesChanged.count(), 3); // One more, instantly, without stall
+ QCOMPARE(manager->matches().count(), 0); // Empty results for empty query string
+--
+GitLab
+
diff --git a/kde-frameworks/krunner/files/krunner-5.92.0-increase-runnermanagertest-timeout.patch b/kde-frameworks/krunner/files/krunner-5.92.0-increase-runnermanagertest-timeout.patch
new file mode 100644
index 00000000000..7a586598c15
--- /dev/null
+++ b/kde-frameworks/krunner/files/krunner-5.92.0-increase-runnermanagertest-timeout.patch
@@ -0,0 +1,26 @@
+From c1f589a7cda3a5d47479ab1188716df533ceb8b1 Mon Sep 17 00:00:00 2001
+From: David Faure <faure@kde.org>
+Date: Sun, 13 Mar 2022 13:08:26 +0100
+Subject: [PATCH] autotests: urgh, this test is really timing dependent, and
+ fails if CI is slow
+
+---
+ autotests/runnermanagertest.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/autotests/runnermanagertest.cpp b/autotests/runnermanagertest.cpp
+index b9ccbc5..02c0985 100644
+--- a/autotests/runnermanagertest.cpp
++++ b/autotests/runnermanagertest.cpp
+@@ -84,7 +84,7 @@ private Q_SLOTS:
+ QCOMPARE(spyQueryFinished.count(), 1); // Still the same, query is not done
+
+ // We programmed it to emit the result after 300ms, so we need to wait 50ms more for the next emission
+- QVERIFY(spyQueryFinished.wait(65)); // 65ms as a margin of safety for 50ms
++ QVERIFY(spyQueryFinished.wait(100)); // 100ms as a margin of safety for 50ms
+
+ // This should have taken at least 300ms total, as we requested via the special query string
+ QVERIFY(timer.elapsed() >= 300);
+--
+GitLab
+
diff --git a/kde-frameworks/krunner/krunner-5.85.0.ebuild b/kde-frameworks/krunner/krunner-5.92.0.ebuild
index cc496e07b16..366bf81f307 100644
--- a/kde-frameworks/krunner/krunner-5.85.0.ebuild
+++ b/kde-frameworks/krunner/krunner-5.92.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -31,6 +31,11 @@ DEPEND="
"
RDEPEND="${DEPEND}"
+PATCHES=(
+ "${FILESDIR}/${P}-increase-runnermanagertest-timeout.patch"
+ "${FILESDIR}/${P}-drop-runnermanagertest-timeouts.patch"
+)
+
src_configure() {
local mycmakeargs=(
$(cmake_use_find_package activities KF5Activities)
@@ -39,9 +44,9 @@ src_configure() {
}
src_test() {
- # requires virtual dbus, otherwise hangs; bugs #630672, #789351
+ # requires virtual dbus, otherwise hangs; bugs #630672, #789351, #838502
local myctestargs=(
- -E "(dbusrunnertest|runnermanagersinglerunnermodetest)"
+ -E "(dbusrunnertest|runnermanagersinglerunnermodetest|runnermanagertest)"
)
ecm_src_test
}
diff --git a/kde-frameworks/krunner/krunner-5.88.0.ebuild b/kde-frameworks/krunner/krunner-5.94.0.ebuild
index 802ba9fe2c4..40103e8868b 100644
--- a/kde-frameworks/krunner/krunner-5.88.0.ebuild
+++ b/kde-frameworks/krunner/krunner-5.94.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# 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.2
+QTMIN=5.15.3
VIRTUALX_REQUIRED="test"
inherit ecm kde.org
diff --git a/kde-frameworks/kservice/Manifest b/kde-frameworks/kservice/Manifest
index 4a4e81fd30d..9a4672df478 100644
--- a/kde-frameworks/kservice/Manifest
+++ b/kde-frameworks/kservice/Manifest
@@ -1,2 +1,2 @@
-DIST kservice-5.85.0.tar.xz 263292 BLAKE2B 8f71484ce4f454a368491c7ed8f0624b49cf7059f8b74ec90efe368933ebefb73691764109a98e045f68684e85a35f1c4b50d1c07ef5b09463e2f4fa0710b0d9 SHA512 b6aa99578f676aa00527e91d09eaec48eda7e71b975015fc433842fa8f973198828172d9c63f9d72fd3a17b0c72e3f34a7f01657cdba796fbc1ddcd730b41010
-DIST kservice-5.88.0.tar.xz 264608 BLAKE2B 8ebb670cc831c908746ab142cd8fa7d5019eaeffaef9b133e29bb2780684264a9db988ac76470a22c012eb680bc913e163330f61fe0db59caf54bc5676a85224 SHA512 447967b3487eedf9e49c0c6339a68e1992114fe12d46895c3b7c6390de4445915e1ac6a2fe27c44e9efacc96fc93ce5ac475468440268cc01899d792f8700693
+DIST kservice-5.92.0.tar.xz 267336 BLAKE2B 9ab32695b8a32e8d56463cc0dd31d6f1c15380c75c502d9e5482ec6dcfa9ddb20b3dd795d327babb73186b47958fa10d9e5f25433456a9368210d90de5afd6d3 SHA512 e8673d2a3770557ef421f5ac37358066903f7c5624d1ced317b29e5cc34b759da4ae4bc1cc90f195427a0f0257283a804dc606afdcecb494946b2f3c8541ebc6
+DIST kservice-5.94.0.tar.xz 267700 BLAKE2B 05809bed20cfd13b15a5306c059e4a3011780b954cd145ab21b677b15111b577ff39574015f8b0765e9301f7dcbc58d7962a590eac803bc8cd7773ddbcbcb093 SHA512 d8c93e14821bc103a375e86f99fdf19f966596f7acb37eb5209ac0fbef045b5e56e3c725bfada4b47d00ea8119a00de3e8f246fcb4cb7b390578f48945ae1e15
diff --git a/kde-frameworks/kservice/kservice-5.85.0.ebuild b/kde-frameworks/kservice/kservice-5.92.0.ebuild
index 2182eaaf5c3..0c4d961f32c 100644
--- a/kde-frameworks/kservice/kservice-5.85.0.ebuild
+++ b/kde-frameworks/kservice/kservice-5.92.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -26,7 +26,6 @@ RDEPEND="
>=dev-qt/qtxml-${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
"
diff --git a/kde-frameworks/kservice/kservice-5.88.0.ebuild b/kde-frameworks/kservice/kservice-5.94.0.ebuild
index 5600016e6e2..d65ead95a89 100644
--- a/kde-frameworks/kservice/kservice-5.88.0.ebuild
+++ b/kde-frameworks/kservice/kservice-5.94.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# 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.2
+QTMIN=5.15.3
inherit ecm kde.org
DESCRIPTION="Advanced plugin and service introspection"
diff --git a/kde-frameworks/ktexteditor/Manifest b/kde-frameworks/ktexteditor/Manifest
index c0018ba7288..24f41fe8ba3 100644
--- a/kde-frameworks/ktexteditor/Manifest
+++ b/kde-frameworks/ktexteditor/Manifest
@@ -1,2 +1,2 @@
-DIST ktexteditor-5.85.0.tar.xz 2327328 BLAKE2B 528f0888a09453613f76ab3209090d8a8a3647e71617fca280adb5e828b4ba138a4f30361e60fa8bb96316edf543f49a62a31e14328410bf4d8771012f9b3b8b SHA512 90219189043fc04920a4462f67d5cd9ebab8ab720801e29c5d4ae4d7746413d7776f37204486245e21e1da47605d6ecef269acb48dfc1431255335fec6e0e8ea
-DIST ktexteditor-5.88.0.tar.xz 2335128 BLAKE2B 8d173dadd77ca4ba3980bc4c80908d194617afd59c00aefd2492dbf7411e7ad1cafeffcb00193cdb8fc3588084db6b71a57fd84c1b14129c1b3897f090c93dbb SHA512 e5e42b6bb46de07caa0594e2356273e590240a7a48913bd21ba162a3d993fa15208a34e6aae844ca6b1a6d15e3df7fa861ac4c0f6a1414a62332fff17304312b
+DIST ktexteditor-5.92.0.tar.xz 2347752 BLAKE2B c4e2356132f535dccbea1bae2355f3455b91d98c1cd99735db0ec39f0b2bc68f062e60e85f085e3614420d673487ea436243be485b321576022243736dec9f57 SHA512 5455fd579047db0010036afe0490620089687e206440ff77af270d9dcc25c1d48b3b8d763144f416cc539038c29e0e70703a1300b7ad78d0db59320a0712c402
+DIST ktexteditor-5.94.0.tar.xz 2388448 BLAKE2B 054114bafd06e041cc844ac3a579e475430a23bfa77efb97a74f6fbe2606336e42e137ac575b45de77be48d2dbe27d09a46743f6793a40505c84c4cef01e285e SHA512 cb42219ca4e2009c7df3adc85f45814e04da65e40490a37928b43623dd19c3567451c50b31d909fb08fa508c5e043016ec2f9789524ff248a27850c536fd9016
diff --git a/kde-frameworks/ktexteditor/files/ktexteditor-5.88.0-revert-invoke-always.patch b/kde-frameworks/ktexteditor/files/ktexteditor-5.88.0-revert-invoke-always.patch
deleted file mode 100644
index 543a2f8e0a6..00000000000
--- a/kde-frameworks/ktexteditor/files/ktexteditor-5.88.0-revert-invoke-always.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 3be743ebd34cfb1992d52ffe38ac5512e36aae12 Mon Sep 17 00:00:00 2001
-From: Waqar Ahmed <waqar.17a@gmail.com>
-Date: Thu, 11 Nov 2021 11:14:47 +0500
-Subject: [PATCH] Revert "completion: invoke always"
-
-This reverts commit d116503df2ca1b159c13ae77aac88cdb08408659.
----
- src/completion/katecompletionwidget.cpp | 5 +----
- 1 file changed, 1 insertion(+), 4 deletions(-)
-
-diff --git a/src/completion/katecompletionwidget.cpp b/src/completion/katecompletionwidget.cpp
-index 3af1f2b5..73a36423 100644
---- a/src/completion/katecompletionwidget.cpp
-+++ b/src/completion/katecompletionwidget.cpp
-@@ -35,7 +35,6 @@
- #include <QToolButton>
-
- const bool hideAutomaticCompletionOnExactMatch = true;
--const bool invokeCompletionAlways = true;
-
- // If this is true, the completion-list is navigated up/down when 'tab' is pressed, instead of doing partial completion
- const bool shellLikeTabCompletion = false;
-@@ -418,9 +417,7 @@ void KateCompletionWidget::startCompletion(const KTextEditor::Range &word,
- }
- if (m_completionRanges.contains(model)) {
- if (*m_completionRanges[model].range == range) {
-- if (!invokeCompletionAlways) {
-- continue; // Leave it running as it is
-- }
-+ continue; // Leave it running as it is
- } else { // delete the range that was used previously
- KTextEditor::MovingRange *oldRange = m_completionRanges[model].range;
- // qCDebug(LOG_KTE)<<"removing completion range 2";
---
-GitLab
-
diff --git a/kde-frameworks/ktexteditor/files/ktexteditor-5.92.0-fix-crash-w-stale-indexes.patch b/kde-frameworks/ktexteditor/files/ktexteditor-5.92.0-fix-crash-w-stale-indexes.patch
new file mode 100644
index 00000000000..b77a72a3e50
--- /dev/null
+++ b/kde-frameworks/ktexteditor/files/ktexteditor-5.92.0-fix-crash-w-stale-indexes.patch
@@ -0,0 +1,29 @@
+From ad82b876016367bd9765185dba84600985e5d0fd Mon Sep 17 00:00:00 2001
+From: Waqar Ahmed <waqar.17a@gmail.com>
+Date: Fri, 18 Mar 2022 10:14:28 +0500
+Subject: [PATCH] Fix crash with stale indexes
+
+BUG: 451593
+---
+ src/completion/katecompletionmodel.cpp | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/src/completion/katecompletionmodel.cpp b/src/completion/katecompletionmodel.cpp
+index 1e241f0d..d9bb8421 100644
+--- a/src/completion/katecompletionmodel.cpp
++++ b/src/completion/katecompletionmodel.cpp
+@@ -914,6 +914,11 @@ QModelIndex KateCompletionModel::mapToSource(const QModelIndex &proxyIndex) cons
+ }
+
+ if (Group *g = groupOfParent(proxyIndex)) {
++ if (!m_rowTable.contains(g)) {
++ qWarning() << Q_FUNC_INFO << "Stale proxy index for which there is no group";
++ return {};
++ }
++
+ if (proxyIndex.row() >= 0 && proxyIndex.row() < (int)g->filtered.size()) {
+ ModelRow source = g->filtered[proxyIndex.row()].sourceRow();
+ return source.second.sibling(source.second.row(), proxyIndex.column());
+--
+GitLab
+
diff --git a/kde-frameworks/ktexteditor/files/ktexteditor-5.92.0-fix-toggle-comment.patch b/kde-frameworks/ktexteditor/files/ktexteditor-5.92.0-fix-toggle-comment.patch
new file mode 100644
index 00000000000..bac8cd017e6
--- /dev/null
+++ b/kde-frameworks/ktexteditor/files/ktexteditor-5.92.0-fix-toggle-comment.patch
@@ -0,0 +1,112 @@
+From 1173d5184e8b073790556dbdba92a8b8abdd62dc Mon Sep 17 00:00:00 2001
+From: Waqar Ahmed <waqar.17a@gmail.com>
+Date: Mon, 14 Mar 2022 09:44:54 +0500
+Subject: [PATCH] Fix toggle comment with space at the start
+
+BUG: 451471
+---
+ autotests/src/katedocument_test.cpp | 48 +++++++++++++++++++++++++++++
+ autotests/src/katedocument_test.h | 1 +
+ src/document/katedocument.cpp | 10 +++++-
+ 3 files changed, 58 insertions(+), 1 deletion(-)
+
+diff --git a/autotests/src/katedocument_test.cpp b/autotests/src/katedocument_test.cpp
+index f0946829..a842f960 100644
+--- a/autotests/src/katedocument_test.cpp
++++ b/autotests/src/katedocument_test.cpp
+@@ -851,4 +851,52 @@ void KateDocumentTest::testKeepUndoOverReload()
+ QCOMPARE(doc.text(), insertedText + initialText);
+ }
+
++void KateDocumentTest::testToggleComment()
++{
++ { // BUG: 451471
++ KTextEditor::DocumentPrivate doc;
++ QVERIFY(doc.highlightingModes().contains(QStringLiteral("Python")));
++ doc.setHighlightingMode(QStringLiteral("Python"));
++ const QString original = QStringLiteral("import hello;\n def method():");
++ doc.setText(original);
++ QVERIFY(doc.lines() == 2);
++
++ doc.commentSelection(doc.documentRange(), {1, 2}, false, 0); // 0 == ToggleComment
++ QCOMPARE(doc.text(), QStringLiteral("#import hello;\n #def method():"));
++
++ doc.commentSelection(doc.documentRange(), {1, 2}, false, 0); // 0 == ToggleComment
++ QCOMPARE(doc.text(), original);
++ }
++
++ { // Comment C++;
++ KTextEditor::DocumentPrivate doc;
++ QVERIFY(doc.highlightingModes().contains(QStringLiteral("C++")));
++ doc.setHighlightingMode(QStringLiteral("C++"));
++ QString original = QStringLiteral("#include<iostream>\nint main()\n{\nreturn 0;\n}\n");
++ doc.setText(original);
++ QVERIFY(doc.lines() == 6);
++
++ doc.commentSelection(doc.documentRange(), {5, 0}, false, 0); // 0 == ToggleComment
++ QCOMPARE(doc.text(), QStringLiteral("// #include<iostream>\n// int main()\n// {\n// return 0;\n// }\n"));
++
++ doc.commentSelection(doc.documentRange(), {5, 0}, false, 0); // 0 == ToggleComment
++ QCOMPARE(doc.text(), original);
++
++ // Comment just a portion
++ doc.commentSelection(Range(1, 0, 1, 3), Cursor(1, 3), false, 0);
++ QCOMPARE(doc.text(), QStringLiteral("#include<iostream>\n/*int*/ main()\n{\nreturn 0;\n}\n"));
++ doc.commentSelection(Range(1, 0, 1, 7), Cursor(1, 3), false, 0);
++ QCOMPARE(doc.text(), original);
++
++ // mixed, one line commented, one not => both get commented
++ original = QStringLiteral(" // int main()\n{}");
++ doc.setText(original);
++ doc.commentSelection(doc.documentRange(), {1, 2}, false, 0);
++ QCOMPARE(doc.text(), QStringLiteral("// // int main()\n// {}"));
++ doc.commentSelection(doc.documentRange(), {1, 2}, false, 0);
++ // after uncommenting, we get original text back with one line commented
++ QCOMPARE(doc.text(), original);
++ }
++}
++
+ #include "katedocument_test.moc"
+diff --git a/autotests/src/katedocument_test.h b/autotests/src/katedocument_test.h
+index c3b24b4c..0076f879 100644
+--- a/autotests/src/katedocument_test.h
++++ b/autotests/src/katedocument_test.h
+@@ -46,6 +46,7 @@ private Q_SLOTS:
+ void testIndentOnPaste();
+ void testAboutToSave();
+ void testKeepUndoOverReload();
++ void testToggleComment();
+ };
+
+ #endif // KATE_DOCUMENT_TEST_H
+diff --git a/src/document/katedocument.cpp b/src/document/katedocument.cpp
+index 56e8fc7d..b72592b6 100644
+--- a/src/document/katedocument.cpp
++++ b/src/document/katedocument.cpp
+@@ -3995,7 +3995,11 @@ bool KTextEditor::DocumentPrivate::removeStartLineCommentFromSelection(KTextEdit
+ bool allLinesAreCommented = true;
+ for (int line = endLine; line >= startLine; line--) {
+ const auto ln = m_buffer->plainLine(line);
+- if (!ln->startsWith(shortCommentMark) && !ln->startsWith(longCommentMark)) {
++ const QString &text = ln->text();
++ QStringView textView(text.data(), text.size());
++ // Must trim any spaces at the beginning
++ textView = textView.trimmed();
++ if (!textView.startsWith(shortCommentMark) && !textView.startsWith(longCommentMark)) {
+ allLinesAreCommented = false;
+ break;
+ }
+@@ -4031,6 +4035,10 @@ void KTextEditor::DocumentPrivate::commentSelection(KTextEditor::Range selection
+
+ int startAttrib = 0;
+ Kate::TextLine ln = kateTextLine(line);
++ if (!ln) {
++ qWarning() << __FUNCTION__ << __LINE__ << "Unexpected null TextLine for " << line << " lineCount: " << lines();
++ return;
++ }
+
+ if (selectionCol < ln->length()) {
+ startAttrib = ln->attribute(selectionCol);
+--
+GitLab
+
diff --git a/kde-frameworks/ktexteditor/ktexteditor-5.85.0.ebuild b/kde-frameworks/ktexteditor/ktexteditor-5.92.0-r1.ebuild
index 599ed00f38a..6671981ff5f 100644
--- a/kde-frameworks/ktexteditor/ktexteditor-5.85.0.ebuild
+++ b/kde-frameworks/ktexteditor/ktexteditor-5.92.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -12,13 +12,10 @@ DESCRIPTION="Framework providing a full text editor component"
LICENSE="LGPL-2+"
KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-IUSE="+editorconfig git"
+IUSE="+editorconfig"
RESTRICT="test"
-BDEPEND="
- test? ( >=kde-frameworks/kservice-${PVCUT}:5 )
-"
DEPEND="
>=dev-qt/qtdeclarative-${QTMIN}:5
>=dev-qt/qtgui-${QTMIN}:5
@@ -45,14 +42,18 @@ DEPEND="
=kde-frameworks/sonnet-${PVCUT}*:5
=kde-frameworks/syntax-highlighting-${PVCUT}*:5
editorconfig? ( app-text/editorconfig-core-c )
- git? ( dev-libs/libgit2:= )
"
RDEPEND="${DEPEND}"
+BDEPEND="test? ( >=kde-frameworks/kservice-${PVCUT}:5 )"
+
+PATCHES=(
+ "${FILESDIR}/${P}-fix-crash-w-stale-indexes.patch" # KDE-bug 451593
+ "${FILESDIR}/${P}-fix-toggle-comment.patch" # KDE-bug 451471
+)
src_configure() {
local mycmakeargs=(
$(cmake_use_find_package editorconfig EditorConfig)
- $(cmake_use_find_package git LibGit2)
)
ecm_src_configure
diff --git a/kde-frameworks/ktexteditor/ktexteditor-5.88.0-r1.ebuild b/kde-frameworks/ktexteditor/ktexteditor-5.94.0.ebuild
index 65508f4a039..da79d7e161e 100644
--- a/kde-frameworks/ktexteditor/ktexteditor-5.88.0-r1.ebuild
+++ b/kde-frameworks/ktexteditor/ktexteditor-5.94.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# 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.2
+QTMIN=5.15.3
VIRTUALX_REQUIRED="test"
inherit ecm kde.org
@@ -12,7 +12,7 @@ DESCRIPTION="Framework providing a full text editor component"
LICENSE="LGPL-2+"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="+editorconfig git"
+IUSE="+editorconfig"
RESTRICT="test"
@@ -42,21 +42,13 @@ DEPEND="
=kde-frameworks/sonnet-${PVCUT}*:5
=kde-frameworks/syntax-highlighting-${PVCUT}*:5
editorconfig? ( app-text/editorconfig-core-c )
- git? ( dev-libs/libgit2:= )
"
RDEPEND="${DEPEND}"
-BDEPEND="
- test? ( >=kde-frameworks/kservice-${PVCUT}:5 )
-"
-
-PATCHES=(
- "${FILESDIR}/${P}-revert-invoke-always.patch" # KDE-bug 444883
-)
+BDEPEND="test? ( >=kde-frameworks/kservice-${PVCUT}:5 )"
src_configure() {
local mycmakeargs=(
$(cmake_use_find_package editorconfig EditorConfig)
- $(cmake_use_find_package git LibGit2)
)
ecm_src_configure
diff --git a/kde-frameworks/ktextwidgets/Manifest b/kde-frameworks/ktextwidgets/Manifest
index dc267bdaf71..7fb9569fcde 100644
--- a/kde-frameworks/ktextwidgets/Manifest
+++ b/kde-frameworks/ktextwidgets/Manifest
@@ -1,2 +1,2 @@
-DIST ktextwidgets-5.85.0.tar.xz 326548 BLAKE2B 23a584eec7a0a8d2ac713a824d64df98b80c39c809e17b366c78f5a2eca2e8e3010dad3fbcf49956f463ea7a554d918e6995678511f16de655ae8358ef19eaaa SHA512 c17b5fcebd03ee1852f461c406cfe0894264a8b9aaf7f86a6ad6b90a7c764222f511ec58db29765fa74dc82c8b9fa518d7613ed39e5eb837e62db3be17390737
-DIST ktextwidgets-5.88.0.tar.xz 326912 BLAKE2B 5b1fb0f334eae8c59a351c1e2151e4cd3f50b4dc7801d73a7fb7469e37ec4f25c671d8657c6231f8324e7d06db2d2744a9f5544479cd85024a138f7c90cd4af6 SHA512 f8d05f876e1fdbfdb51af0fcd12429d21154e463be15b422505c1ddfd0897cfd2b134f60268cadf709f256e4deed25dcc9e2ad2c6488bb482b8b44a6d415223e
+DIST ktextwidgets-5.92.0.tar.xz 329168 BLAKE2B ee0991f12d7e3a54b4e79b77327378e9c61544f5c5133f9bf838b3995ff828f2b35fa7489c6407efa08770911e47883587d519e78ef5d8e112483c744c9875d2 SHA512 7fd02eebb10b2929a6d82acdccba07a906692cdcc92f824b360e4be5643412b7bbb34772b8e6762e95c769d2528bdc873ce4fd03c8dbd5b5fd26b341ffce9e9d
+DIST ktextwidgets-5.94.0.tar.xz 329296 BLAKE2B 13bd0a3b1ccc232e85ab855617eca9dd186c523cdb641d2ed55afc8bfba250771942a57ccaee99ac54cf98551af8e9ded0eeacd848070794d1f12dc42e435f9a SHA512 8b25e0ac4a84fc0f763a3450fa520c551f83b4e2d26e99bc5e1830f4c36c1fe9de2bae7aa9608630a24b73239948cd6b4b22fa6b24e21c5ab218d99c0cce2cee
diff --git a/kde-frameworks/ktextwidgets/ktextwidgets-5.85.0.ebuild b/kde-frameworks/ktextwidgets/ktextwidgets-5.92.0.ebuild
index e33d8d37cf7..f85ac26c2bb 100644
--- a/kde-frameworks/ktextwidgets/ktextwidgets-5.85.0.ebuild
+++ b/kde-frameworks/ktextwidgets/ktextwidgets-5.92.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
diff --git a/kde-frameworks/ktextwidgets/ktextwidgets-5.88.0.ebuild b/kde-frameworks/ktextwidgets/ktextwidgets-5.94.0.ebuild
index e920db3935f..0513262164e 100644
--- a/kde-frameworks/ktextwidgets/ktextwidgets-5.88.0.ebuild
+++ b/kde-frameworks/ktextwidgets/ktextwidgets-5.94.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# 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.2
+QTMIN=5.15.3
VIRTUALX_REQUIRED="test"
inherit ecm kde.org
diff --git a/kde-frameworks/kunitconversion/Manifest b/kde-frameworks/kunitconversion/Manifest
index b9c67d234a4..4c166ea72c1 100644
--- a/kde-frameworks/kunitconversion/Manifest
+++ b/kde-frameworks/kunitconversion/Manifest
@@ -1,2 +1,2 @@
-DIST kunitconversion-5.85.0.tar.xz 888652 BLAKE2B 8e5a773f0f8acdd1c24b81a8946b7190e52a3dbe5a63c48027f423be9fb735508394ccd01b3caa4bb7c920dc873a73a08c78afb335a158b598f8793c53d194a7 SHA512 f053ba454f4a5a44801a1f5b8c6562a7db71f4aef1c3b253610d20d3bb1b634347f9bb1483f607cbe1746f0b80a8625dcfb05bee5cbda467b799c9d3d5ca6668
-DIST kunitconversion-5.88.0.tar.xz 889832 BLAKE2B 4917cc1223519ae19ee641c05af221d89400d8f05cf485b7f69c28e7b25c662a907c64f85e072740a88e8bc29171bacd28013373a2397680d1ec16c3de6c2072 SHA512 8ea6878c3f912d3dc71289425242a3e1db3266f5a8f5d06b89ddd5ba0e1dbf0c70e83c88b91ed6eff74d2e4aed7dec5b7a6e23ce89863f502be8adf89b307d62
+DIST kunitconversion-5.92.0.tar.xz 893192 BLAKE2B 7f6df447e8a61ab193bc14e56aef065106a55622f750f760b0b77b36f18f29677bd79e92536904d3d93511d69c13e8d46cd88840529b453f89241c37c427c7e6 SHA512 4d1d2028f392d35ca90bb79a2f1102e14807c28f87bc1031eb502122e9b9d7d69ba0bb2ab04581a2a378299cb3831b73b1457e4d25a49b29be55d25f48cb001f
+DIST kunitconversion-5.94.0.tar.xz 892292 BLAKE2B 62401211af40ef51415d508752906a0582efa808f2fdb8ac136c8abae4bfefeff347767fcb0e18c0ee0e0604c362e3eb2067988727ce874911aba9d7b5816d5c SHA512 28435650c81835728c3dd44b60ac21467b52595613413c9ebffc66b5f970dfec31af8a491893a6d699b323bd763f3d440a22540c59bfdbdd2a5dfb97dac89f04
diff --git a/kde-frameworks/kunitconversion/files/kunitconversion-5.85.0-fix-24h-currency-sync.patch b/kde-frameworks/kunitconversion/files/kunitconversion-5.85.0-fix-24h-currency-sync.patch
deleted file mode 100644
index 056a2e8b1e5..00000000000
--- a/kde-frameworks/kunitconversion/files/kunitconversion-5.85.0-fix-24h-currency-sync.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-From 6e41104426a3ae59bcb90be708abcc3092155436 Mon Sep 17 00:00:00 2001
-From: Andreas Cord-Landwehr <cordlandwehr@kde.org>
-Date: Tue, 24 Aug 2021 21:06:47 +0200
-Subject: [PATCH] Fix automatic currency file sync after 24h
-
-Conversion plugin in Krunner depends on automatic refresh of currency
-table. std::call_once does not work there, because process is never
-stopped.
-
-BUG: 441337
----
- autotests/convertertest.cpp | 16 ++++++++++++++++
- autotests/convertertest.h | 6 ++++++
- src/currency.cpp | 9 ++++++---
- 3 files changed, 28 insertions(+), 3 deletions(-)
-
-diff --git a/autotests/convertertest.cpp b/autotests/convertertest.cpp
-index aa0ccae..e36b7fe 100644
---- a/autotests/convertertest.cpp
-+++ b/autotests/convertertest.cpp
-@@ -8,9 +8,11 @@
- #include <QStandardPaths>
- #include <QThread>
- #include <QVector>
-+#include <currency_p.h>
- #include <kunitconversion/unitcategory.h>
-
- using namespace KUnitConversion;
-+using namespace std::chrono_literals;
-
- void ConverterTest::initTestCase()
- {
-@@ -113,4 +115,18 @@ void ConverterTest::testCurrency()
- qDeleteAll(threads);
- }
-
-+void ConverterTest::testCurrencyConversionTableUpdate()
-+{
-+ const QString cache = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + QStringLiteral("/libkunitconversion/currency.xml");
-+
-+ // Missing conversion table must lead to update of table
-+ // note that this is the same code path as for last modified updates
-+ QFile::remove(cache);
-+ QVERIFY(Currency::lastConversionTableUpdate().isNull());
-+ Converter c;
-+ Value input = Value(1000, Eur);
-+ Value v = c.convert(input, QStringLiteral("$"));
-+ QVERIFY(!Currency::lastConversionTableUpdate().isNull());
-+}
-+
- QTEST_MAIN(ConverterTest)
-diff --git a/autotests/convertertest.h b/autotests/convertertest.h
-index 21d5213..d3d6303 100644
---- a/autotests/convertertest.h
-+++ b/autotests/convertertest.h
-@@ -23,6 +23,12 @@ private Q_SLOTS:
- void testConvert();
- void testInvalid();
- void testCurrency();
-+ /**
-+ * Checks that conversion tables are updated after timeout
-+ *
-+ * Regression test for https://bugs.kde.org/show_bug.cgi?id=441337
-+ */
-+ void testCurrencyConversionTableUpdate();
- };
-
- #endif // CONVERTERTEST_H
-diff --git a/src/currency.cpp b/src/currency.cpp
-index 038e928..ead7ce5 100644
---- a/src/currency.cpp
-+++ b/src/currency.cpp
-@@ -745,9 +745,12 @@ void CurrencyCategoryPrivate::syncConversionTable(std::chrono::seconds updateSki
- Value CurrencyCategoryPrivate::convert(const Value &value, const Unit &to)
- {
- // TODO KF6 remove this blocking call and change behavior that explicit call to syncConversionTable is mandatory before
-- // right now, if a sync is performed at application start, then this call will not block anymore for 24 hours
-- static std::once_flag updateFlag;
-- std::call_once(updateFlag, &CurrencyCategoryPrivate::syncConversionTable, this, 24h);
-+ // first access to converted data, also to make syncs more explicit
-+ static QMutex updateFlag;
-+ {
-+ QMutexLocker locker(&updateFlag);
-+ CurrencyCategoryPrivate::syncConversionTable(24h);
-+ }
-
- Value v = UnitCategoryPrivate::convert(value, to);
- return v;
---
-GitLab
-
diff --git a/kde-frameworks/kunitconversion/files/kunitconversion-5.85.0-fix-currency-values-init.patch b/kde-frameworks/kunitconversion/files/kunitconversion-5.85.0-fix-currency-values-init.patch
deleted file mode 100644
index 01ee8a6fa57..00000000000
--- a/kde-frameworks/kunitconversion/files/kunitconversion-5.85.0-fix-currency-values-init.patch
+++ /dev/null
@@ -1,235 +0,0 @@
-From 2a57f9d1c6b2f8d9e2babcdaca66f1cf2a3c5849 Mon Sep 17 00:00:00 2001
-From: Andreas Cord-Landwehr <cordlandwehr@kde.org>
-Date: Sat, 28 Aug 2021 11:42:06 +0200
-Subject: [PATCH] Fix initialization of currency values
-
-If there is already a recent currency.xml file provided then use this to
-initialize the currency converter.
-
-BUG: 441337
----
- autotests/CMakeLists.txt | 8 ++++
- autotests/currencytableinittest.cpp | 33 +++++++++++++++
- autotests/currencytableinittest.h | 26 ++++++++++++
- autotests/currencytableinittest/currency.xml | 43 ++++++++++++++++++++
- autotests/currencytableinittest/data.qrc | 5 +++
- autotests/valuetest.cpp | 6 +++
- src/currency.cpp | 10 +++--
- 7 files changed, 128 insertions(+), 3 deletions(-)
- create mode 100644 autotests/currencytableinittest.cpp
- create mode 100644 autotests/currencytableinittest.h
- create mode 100644 autotests/currencytableinittest/currency.xml
- create mode 100644 autotests/currencytableinittest/data.qrc
-
-diff --git a/autotests/CMakeLists.txt b/autotests/CMakeLists.txt
-index ec457a5..8225bf2 100644
---- a/autotests/CMakeLists.txt
-+++ b/autotests/CMakeLists.txt
-@@ -8,3 +8,11 @@ ecm_add_tests(
- convertertest.cpp
- LINK_LIBRARIES KF5::UnitConversion KF5::I18n Qt5::Test
- )
-+
-+qt5_add_resources(CURRENCY_TEST_RESOURCES currencytableinittest/data.qrc)
-+ecm_add_test(
-+ currencytableinittest.cpp
-+ ${CURRENCY_TEST_RESOURCES}
-+ TEST_NAME currencytableinittest
-+ LINK_LIBRARIES KF5::UnitConversion KF5::I18n Qt5::Test
-+)
-diff --git a/autotests/currencytableinittest.cpp b/autotests/currencytableinittest.cpp
-new file mode 100644
-index 0000000..c83709a
---- /dev/null
-+++ b/autotests/currencytableinittest.cpp
-@@ -0,0 +1,33 @@
-+/*
-+ * SPDX-FileCopyrightText: 2021 Andreas Cord-Landwehr <cordlandwehr@kde.org>
-+ *
-+ * SPDX-License-Identifier: LGPL-2.0-or-later
-+ */
-+
-+#include "currencytableinittest.h"
-+#include <QStandardPaths>
-+#include <cmath>
-+
-+using namespace KUnitConversion;
-+
-+void CurrencyTableInitTest::testCategoryInit()
-+{
-+ QStandardPaths::setTestModeEnabled(true);
-+ const QString cache = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + QStringLiteral("/libkunitconversion/currency.xml");
-+
-+ QVERIFY(QFile::exists(QLatin1String(":/currency.xml")));
-+ if (QFile::exists(cache)) {
-+ QFile::remove(cache);
-+ }
-+ // note: copy of file updates the file's modified timestamp and thus file is seen as recently downloaded file
-+ QVERIFY(QFile::copy(QLatin1String(":/currency.xml"), cache));
-+
-+ Converter c;
-+ Value input = Value(1000, Eur);
-+ Value v = c.convert(input, QStringLiteral("$"));
-+ qDebug() << "converted value to:" << v.number();
-+ QVERIFY(v.isValid());
-+ QVERIFY(!std::isnan(v.number()));
-+}
-+
-+QTEST_MAIN(CurrencyTableInitTest)
-diff --git a/autotests/currencytableinittest.h b/autotests/currencytableinittest.h
-new file mode 100644
-index 0000000..0b835d0
---- /dev/null
-+++ b/autotests/currencytableinittest.h
-@@ -0,0 +1,26 @@
-+/*
-+ * SPDX-FileCopyrightText: 2021 Andreas Cord-Landwehr <cordlandwehr@kde.org>
-+ *
-+ * SPDX-License-Identifier: LGPL-2.0-or-later
-+ */
-+
-+#ifndef CURRENCYTABLEINIT_TEST_H
-+#define CURRENCYTABLEINIT_TEST_H
-+
-+#include <QObject>
-+#include <QTest>
-+#include <kunitconversion/converter.h>
-+
-+using namespace KUnitConversion;
-+
-+class CurrencyTableInitTest : public QObject
-+{
-+ Q_OBJECT
-+private Q_SLOTS:
-+ /**
-+ * Check that the currency converter is correctly initialized when currency.xml is recent and available
-+ */
-+ void testCategoryInit();
-+};
-+
-+#endif
-diff --git a/autotests/currencytableinittest/currency.xml b/autotests/currencytableinittest/currency.xml
-new file mode 100644
-index 0000000..dca42d5
---- /dev/null
-+++ b/autotests/currencytableinittest/currency.xml
-@@ -0,0 +1,43 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<gesmes:Envelope xmlns:gesmes="http://www.gesmes.org/xml/2002-08-01" xmlns="http://www.ecb.int/vocabulary/2002-08-01/eurofxref">
-+ <gesmes:subject>Reference rates</gesmes:subject>
-+ <gesmes:Sender>
-+ <gesmes:name>European Central Bank</gesmes:name>
-+ </gesmes:Sender>
-+ <Cube>
-+ <Cube time='2021-08-24'>
-+ <Cube currency='USD' rate='1.1740'/>
-+ <Cube currency='JPY' rate='128.74'/>
-+ <Cube currency='BGN' rate='1.9558'/>
-+ <Cube currency='CZK' rate='25.533'/>
-+ <Cube currency='DKK' rate='7.4370'/>
-+ <Cube currency='GBP' rate='0.85578'/>
-+ <Cube currency='HUF' rate='349.69'/>
-+ <Cube currency='PLN' rate='4.5792'/>
-+ <Cube currency='RON' rate='4.9280'/>
-+ <Cube currency='SEK' rate='10.2090'/>
-+ <Cube currency='CHF' rate='1.0711'/>
-+ <Cube currency='ISK' rate='150.00'/>
-+ <Cube currency='NOK' rate='10.4003'/>
-+ <Cube currency='HRK' rate='7.4938'/>
-+ <Cube currency='RUB' rate='86.7484'/>
-+ <Cube currency='TRY' rate='9.8836'/>
-+ <Cube currency='AUD' rate='1.6203'/>
-+ <Cube currency='BRL' rate='6.2681'/>
-+ <Cube currency='CAD' rate='1.4822'/>
-+ <Cube currency='CNY' rate='7.6042'/>
-+ <Cube currency='HKD' rate='9.1448'/>
-+ <Cube currency='IDR' rate='16897.00'/>
-+ <Cube currency='ILS' rate='3.7789'/>
-+ <Cube currency='INR' rate='87.0625'/>
-+ <Cube currency='KRW' rate='1369.00'/>
-+ <Cube currency='MXN' rate='23.8606'/>
-+ <Cube currency='MYR' rate='4.9525'/>
-+ <Cube currency='NZD' rate='1.6893'/>
-+ <Cube currency='PHP' rate='58.783'/>
-+ <Cube currency='SGD' rate='1.5918'/>
-+ <Cube currency='THB' rate='38.595'/>
-+ <Cube currency='ZAR' rate='17.6902'/>
-+ </Cube>
-+ </Cube>
-+</gesmes:Envelope>
-\ No newline at end of file
-diff --git a/autotests/currencytableinittest/data.qrc b/autotests/currencytableinittest/data.qrc
-new file mode 100644
-index 0000000..19f9d69
---- /dev/null
-+++ b/autotests/currencytableinittest/data.qrc
-@@ -0,0 +1,5 @@
-+<RCC>
-+ <qresource prefix="/">
-+ <file>currency.xml</file>
-+ </qresource>
-+</RCC>
-diff --git a/autotests/valuetest.cpp b/autotests/valuetest.cpp
-index 0b348d7..53be1b7 100644
---- a/autotests/valuetest.cpp
-+++ b/autotests/valuetest.cpp
-@@ -55,6 +55,12 @@ void ValueTest::testInvalid()
-
- void ValueTest::testCurrencyNotDownloaded()
- {
-+ // ensure that no local conversion table is available
-+ const QString cache = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + QStringLiteral("/libkunitconversion/currency.xml");
-+ if (!QFile::exists(cache)) {
-+ QFile::remove(cache);
-+ }
-+
- auto pounds = Value(100, Gbp);
- auto eur = pounds.convertTo(Eur);
- QVERIFY(!eur.isValid());
-diff --git a/src/currency.cpp b/src/currency.cpp
-index ead7ce5..43161e2 100644
---- a/src/currency.cpp
-+++ b/src/currency.cpp
-@@ -47,6 +47,7 @@ public:
- Value convert(const Value &value, const Unit &toUnit) override;
- bool hasOnlineConversionTable() const override;
- void syncConversionTable(std::chrono::seconds updateSkipSeconds) override;
-+ bool m_initialized{false}; //!< indicates if units are prepared from currency table
- };
-
- bool CurrencyCategoryPrivate::hasOnlineConversionTable() const
-@@ -668,12 +669,12 @@ QDateTime Currency::lastConversionTableUpdate()
- void CurrencyCategoryPrivate::syncConversionTable(std::chrono::seconds updateSkipPeriod)
- {
- // sync call is expected to be guarded as being called only once
-- auto updateCurrencyConversionTable = [this](const QString &cachePath) {
-+ auto updateCurrencyConversionTable = [this](const QString &cachePath, bool performNetworkSync) {
- qCDebug(LOG_KUNITCONVERSION) << "currency conversion table sync started";
- static QMutex mutex;
- QMutexLocker locker(&mutex);
- bool updateError{false};
-- if (isConnected()) {
-+ if (performNetworkSync && isConnected()) {
- // Bug 345750: QNetworkReply does not work without an event loop and doesn't implement waitForReadyRead()
- QEventLoop loop;
- QNetworkAccessManager manager;
-@@ -733,12 +734,15 @@ void CurrencyCategoryPrivate::syncConversionTable(std::chrono::seconds updateSki
- }
- }
- }
-+ m_initialized = !updateError;
- return !updateError;
- };
-
- QFileInfo info(cacheLocation());
- if (!info.exists() || info.lastModified().secsTo(QDateTime::currentDateTime()) > updateSkipPeriod.count()) {
-- updateCurrencyConversionTable(cacheLocation());
-+ updateCurrencyConversionTable(cacheLocation(), true);
-+ } else if (!m_initialized) {
-+ updateCurrencyConversionTable(cacheLocation(), false);
- }
- }
-
---
-GitLab
-
diff --git a/kde-frameworks/kunitconversion/kunitconversion-5.85.0-r1.ebuild b/kde-frameworks/kunitconversion/kunitconversion-5.92.0.ebuild
index 587ab06b341..4fd51f56e50 100644
--- a/kde-frameworks/kunitconversion/kunitconversion-5.85.0-r1.ebuild
+++ b/kde-frameworks/kunitconversion/kunitconversion-5.92.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -18,11 +18,6 @@ DEPEND="
"
RDEPEND="${DEPEND}"
-PATCHES=( # KDE-bug 441337
- "${FILESDIR}"/${P}-fix-24h-currency-sync.patch
- "${FILESDIR}"/${P}-fix-currency-values-init.patch
-)
-
src_test() {
local myctestargs=(
# convertertest: bug 623938 - needs internet connection
diff --git a/kde-frameworks/kunitconversion/kunitconversion-5.88.0.ebuild b/kde-frameworks/kunitconversion/kunitconversion-5.94.0.ebuild
index be8c7416761..3c95772ed6b 100644
--- a/kde-frameworks/kunitconversion/kunitconversion-5.88.0.ebuild
+++ b/kde-frameworks/kunitconversion/kunitconversion-5.94.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# 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.2
+QTMIN=5.15.3
inherit ecm kde.org
DESCRIPTION="Framework for converting units"
diff --git a/kde-frameworks/kwallet/Manifest b/kde-frameworks/kwallet/Manifest
index bcda8a77e74..c365e160c13 100644
--- a/kde-frameworks/kwallet/Manifest
+++ b/kde-frameworks/kwallet/Manifest
@@ -1,2 +1,2 @@
-DIST kwallet-5.85.0.tar.xz 302844 BLAKE2B f43bd9a0046cd18490961fa0d97e40c3fe0502306afc76416f045d7fb7f74c3a54cee90b2a0fcce1f847ce97e18c3b2b680c235bb899720643e2b22b9f968c0f SHA512 7cead5cac3856ad08a71778e44ba57cecdc97cbd2abe3ec33d461edd95a8fce742ec011b8773841cc5f24d8eb282a197d462e979829c62d477c87625c5107c10
-DIST kwallet-5.88.0.tar.xz 303216 BLAKE2B 8adbfd59dd1548fe4b603a1f9f05b02a0b5dc732e3773ef1659f27b37e79a23a1d6621080160481709408ce43ec7670167def2ef0db646373070fc09f2f127b9 SHA512 ad12f9d9162181962006b6f51fde52344de15e384bb69e9c48fc376625175a3a3aafd9093f3cdaa5d99735c9fc88954c16353b14c0d4499e488008307918b847
+DIST kwallet-5.92.0.tar.xz 305528 BLAKE2B adf94a05ad064a02c5c8cf291014e554f9e432aa07977b08c97b5b61babff53e2e973c16b10ad5ab48cbd7a48b4b3afecabd576070db8076a0cfa2608d7588f1 SHA512 db65cf0e40a758129122e8320b1971e35de5e7a9b65248937e5b3c65063515ce3520ea2f32eb363d138d9c53afae39e2f86618ac318fb19d099a5fa38ac18c6a
+DIST kwallet-5.94.0.tar.xz 307240 BLAKE2B 5a5e7a7b13583bcec24f2fbb18891c632e500bc07385a435674a995967593914e282b95644b1e349cb31e6ebb3e917cc8a2e6094bbd01e3670d45618250c2eeb SHA512 9cb0105413d983bf89819f60fc36182cbb59737be316ce52262fe68f388dc1262dfb404ef0703af48ec75bd869985829f67b58f433f6b366ef780ad553ee9638
diff --git a/kde-frameworks/kwallet/kwallet-5.85.0.ebuild b/kde-frameworks/kwallet/kwallet-5.92.0.ebuild
index bedaf9bc068..d9a23a4f82f 100644
--- a/kde-frameworks/kwallet/kwallet-5.85.0.ebuild
+++ b/kde-frameworks/kwallet/kwallet-5.92.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -30,7 +30,7 @@ DEPEND="
=kde-frameworks/kservice-${PVCUT}*:5
=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
=kde-frameworks/kwindowsystem-${PVCUT}*:5
- gpg? ( >=app-crypt/gpgme-1.7.1[cxx,qt5] )
+ gpg? ( >=app-crypt/gpgme-1.7.1:=[cxx,qt5] )
"
RDEPEND="${DEPEND}"
diff --git a/kde-frameworks/kwallet/kwallet-5.88.0.ebuild b/kde-frameworks/kwallet/kwallet-5.94.0.ebuild
index f985d0d7667..4f2b363ed35 100644
--- a/kde-frameworks/kwallet/kwallet-5.88.0.ebuild
+++ b/kde-frameworks/kwallet/kwallet-5.94.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# 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.2
+QTMIN=5.15.3
inherit ecm kde.org optfeature
DESCRIPTION="Framework providing desktop-wide storage for passwords"
@@ -30,7 +30,7 @@ DEPEND="
=kde-frameworks/kservice-${PVCUT}*:5
=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
=kde-frameworks/kwindowsystem-${PVCUT}*:5
- gpg? ( >=app-crypt/gpgme-1.7.1[cxx,qt5] )
+ gpg? ( >=app-crypt/gpgme-1.7.1:=[cxx,qt5] )
"
RDEPEND="${DEPEND}"
diff --git a/kde-frameworks/kwayland/Manifest b/kde-frameworks/kwayland/Manifest
index 3b68e3ac605..ae426a01881 100644
--- a/kde-frameworks/kwayland/Manifest
+++ b/kde-frameworks/kwayland/Manifest
@@ -1,2 +1,2 @@
-DIST kwayland-5.85.0.tar.xz 331208 BLAKE2B 87397c48534784dac0b7b864ec1fd6579308c34daa5ff613d6b39f50b5fa6f5c59b33f648479e694e4135460468df9196682e169fcc9aee22d9dbd1be70ffc38 SHA512 b45321c2846c2311c2e4b48aa5edb19a3a4cac889415d490a21202470ea27281d8b9cf69f1521109bd236eb48ca93702e461b54c49e38dcc50fb90f4cea0d063
-DIST kwayland-5.88.0.tar.xz 332708 BLAKE2B a216ba175b7f3a71758a0dc50e179612ab879356a0aab3f9b709668baa98ae4f18e8303bd4059fedd2ad20753ec64955cc1dea2f2a82a9cf9717cd5689c2efb0 SHA512 e040f75d1ee616a7080dd066ee4b30607f0186cc60016cad5bec239d297e2995794ac1b83246596943d10542b4190add114b915e18ad473377fefc924386d0da
+DIST kwayland-5.92.0.tar.xz 335360 BLAKE2B 57d42694c46b090fd62d1886f4818134f9d5e19f78665d4a8bf9f05572d5523c3580ce4c4f8da869371c2bf1de9bbac4d3a0d7fa40993b94291e12af2e4c9472 SHA512 982140987c5cb561c25afc2d8e573db37764fde1b87d395af0c21d8d63e9a6a70dd4fdac3b70881588acca28b4c45a2af470fd9ca260fbd9bd14ed4e299fa2ed
+DIST kwayland-5.94.0.tar.xz 335524 BLAKE2B ded4dba214b12872bb2d07861b051944eac409003b0268463c62c48f35420307495e2287ac502222d35ef893f1282765e48b824149ca951da0cc5fd494fe44d6 SHA512 56d10d1048967d0c54ba88339b31ddef4b5cf3a3aa743f8fac56f5c97292112d7fa998107a854e999a54ac4ab4659e7dbf6d6c496856de4e91c45df9fafdf399
diff --git a/kde-frameworks/kwayland/kwayland-5.85.0-r1.ebuild b/kde-frameworks/kwayland/kwayland-5.92.0.ebuild
index 37351f3bdd3..07ae8574a7a 100644
--- a/kde-frameworks/kwayland/kwayland-5.85.0-r1.ebuild
+++ b/kde-frameworks/kwayland/kwayland-5.92.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -27,9 +27,11 @@ RDEPEND="
media-libs/libglvnd
"
DEPEND="${RDEPEND}
- >=dev-libs/plasma-wayland-protocols-1.3.0
+ >=dev-libs/plasma-wayland-protocols-1.4.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.88.0.ebuild b/kde-frameworks/kwayland/kwayland-5.94.0.ebuild
index ad4ba6d75c5..f1c56c0d339 100644
--- a/kde-frameworks/kwayland/kwayland-5.88.0.ebuild
+++ b/kde-frameworks/kwayland/kwayland-5.94.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# 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.2
+QTMIN=5.15.3
inherit ecm kde.org
DESCRIPTION="Qt-style client and server library wrapper for Wayland libraries"
@@ -27,9 +27,11 @@ RDEPEND="
media-libs/libglvnd
"
DEPEND="${RDEPEND}
- >=dev-libs/plasma-wayland-protocols-1.4.0
+ >=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/kwidgetsaddons/Manifest b/kde-frameworks/kwidgetsaddons/Manifest
index 39674b6cc69..a67246c64f8 100644
--- a/kde-frameworks/kwidgetsaddons/Manifest
+++ b/kde-frameworks/kwidgetsaddons/Manifest
@@ -1,2 +1,2 @@
-DIST kwidgetsaddons-5.85.0.tar.xz 2306380 BLAKE2B c2fe7d9fc1680b90aa32fc3d5c9d88b1bb0b94094065f0c666da35bead3ff6dc76a6b943a0f814dbc322ce1493af414044b1a7fefc9d6d316db5a6fd9a61d974 SHA512 973ccc1f77f092384e0933972ecea8ed7fcc4f7891e7393f4ebf860ebd4155b7b7e6229b92d308844c8f3c31f720d150c3afc5573c85d9b6d34e1ac70ad3d315
-DIST kwidgetsaddons-5.88.0.tar.xz 2306968 BLAKE2B dd90673cac33f878186c003cc66fced723ed1d87845535da3ee87315fdbdae285b284cd52b776e354f104cd89640176aabe534fae9ecc310ae7dc447f66237e5 SHA512 722c55dad25fc3f7b516c7822ba2f0a2b87c6124435fc376f42bbba84aff28a0abf1791e8bb39c16a7708c91961c2fba4f6174ae704348a1a2058c65c4182bc8
+DIST kwidgetsaddons-5.92.0.tar.xz 2313060 BLAKE2B d48d1be09dc65d79eb5961394ac5bd1f26c0613128c10faab45f5011131f7a2233733aaa844705f7905f3aede240ef6734ad4a68eb044af7531203252e2e8ca9 SHA512 a983eb8c8b186c0fade674516b6a99a6455d512c0ee243af5cfcdfb5733adfd9ca2b2e674959312350dfcd4faae8bc62a57cc356bd30b0420f9ed54db7bafd9f
+DIST kwidgetsaddons-5.94.0.tar.xz 2317872 BLAKE2B 1662ccb820f66a778e4e77a3ce1d4c08505e1bccc70327e05a3d1b47ac75dd3b879e99e0f8471475ea4a6420ab621d71dc92636ec05646655522694f3ed37ea0 SHA512 321c742465d911fe7358e77aef6f73175387eb906b9247a2e81880efb5c4d335bb2045186eb73a6425869d1372792785cd1165077eaa7414acb10384ea45ee4d
diff --git a/kde-frameworks/kwidgetsaddons/files/kwidgetsaddons-5.88.0-kacceleratormanager-alt-x-shortcuts.patch b/kde-frameworks/kwidgetsaddons/files/kwidgetsaddons-5.88.0-kacceleratormanager-alt-x-shortcuts.patch
deleted file mode 100644
index 6e7ca9e4729..00000000000
--- a/kde-frameworks/kwidgetsaddons/files/kwidgetsaddons-5.88.0-kacceleratormanager-alt-x-shortcuts.patch
+++ /dev/null
@@ -1,149 +0,0 @@
-From 294fe8ddc2f10d0a783bf9b80769c31ecc5922b1 Mon Sep 17 00:00:00 2001
-From: Albert Astals Cid <aacid@kde.org>
-Date: Fri, 5 Nov 2021 23:23:59 +0100
-Subject: [PATCH] KAcceleratorManager: Take into account actions with Alt+X
- shortcuts
-
-We need to mark those X labels as used, otherwise the accelerator
-manager may decide to use X for an accelerator and when pressing Alt+X
-we will have a conflict
-
-BUGS: 444990
----
- autotests/kacceleratormanagertest.cpp | 21 +++++++++++++++++++
- src/kacceleratormanager.cpp | 30 ++++++++++++++++++++-------
- src/kacceleratormanager_p.h | 4 ++--
- 3 files changed, 46 insertions(+), 9 deletions(-)
-
-diff --git a/autotests/kacceleratormanagertest.cpp b/autotests/kacceleratormanagertest.cpp
-index 3fc07928..2bdc4f74 100644
---- a/autotests/kacceleratormanagertest.cpp
-+++ b/autotests/kacceleratormanagertest.cpp
-@@ -8,6 +8,7 @@
- #include <kacceleratormanager.h>
-
- #include <QMenu>
-+#include <QPushButton>
- #include <QTest>
-
- #define QSL QStringLiteral
-@@ -75,6 +76,26 @@ private Q_SLOTS:
- QCOMPARE(texts, expectedTexts);
- }
-
-+ void testExistingActionsShortcutsAreTakenIntoAccount()
-+ {
-+ std::unique_ptr<QWidget> w(new QWidget());
-+
-+ QPushButton *pb = new QPushButton(QSL("Open"), w.get());
-+
-+ KAcceleratorManager::manage(w.get());
-+ QCOMPARE(pb->text(), QSL("&Open"));
-+
-+ delete pb;
-+ pb = new QPushButton(QSL("Open"), w.get());
-+
-+ QAction *a = new QAction();
-+ a->setShortcut(QSL("Alt+O"));
-+ w->addAction(a);
-+
-+ KAcceleratorManager::manage(w.get());
-+ QCOMPARE(pb->text(), QSL("O&pen"));
-+ }
-+
- void testActionIconTexts_data()
- {
- QTest::addColumn<QStringList>("initialTexts");
-diff --git a/src/kacceleratormanager.cpp b/src/kacceleratormanager.cpp
-index 66d596d3..2f7b1879 100644
---- a/src/kacceleratormanager.cpp
-+++ b/src/kacceleratormanager.cpp
-@@ -94,9 +94,8 @@ void KAcceleratorManagerPrivate::manage(QWidget *widget)
-
- Item *root = new Item;
-
-- manageWidget(widget, root);
--
- QString used;
-+ manageWidget(widget, root, used);
- calculateAccelerators(root, used);
- delete root;
- }
-@@ -175,7 +174,7 @@ void KAcceleratorManagerPrivate::calculateAccelerators(Item *item, QString &used
- }
- }
-
--void KAcceleratorManagerPrivate::traverseChildren(QWidget *widget, Item *item)
-+void KAcceleratorManagerPrivate::traverseChildren(QWidget *widget, Item *item, QString &used)
- {
- const QList<QWidget *> childList = widget->findChildren<QWidget *>();
- for (QWidget *w : childList) {
-@@ -192,12 +191,29 @@ void KAcceleratorManagerPrivate::traverseChildren(QWidget *widget, Item *item)
- continue;
- }
-
-- manageWidget(w, item);
-+ manageWidget(w, item, used);
- }
- }
-
--void KAcceleratorManagerPrivate::manageWidget(QWidget *w, Item *item)
-+void KAcceleratorManagerPrivate::manageWidget(QWidget *w, Item *item, QString &used)
- {
-+ // If the widget has any action whose shortcuts contain keystrokes in the
-+ // form of Alt+X we need to mark X as used, otherwise we may assign it as accelerator
-+ // and there will be a conflict when trying to use it
-+ const QList<QAction *> widgetActions = w->actions();
-+ for (QAction *action : widgetActions) {
-+ const QList<QKeySequence> actionShortcuts = action->shortcuts();
-+ for (const QKeySequence &sequence : actionShortcuts) {
-+ const QString sequenceAsText = sequence.toString(QKeySequence::PortableText);
-+ const QStringList splitSequence = sequenceAsText.split(QStringLiteral(", "));
-+ for (const QString &shortcut : splitSequence) {
-+ if (shortcut.length() == 5 && shortcut.startsWith(QStringLiteral("Alt+"))) {
-+ used.append(shortcut.right(1));
-+ }
-+ }
-+ }
-+ }
-+
- // first treat the special cases
-
- QTabBar *tabBar = qobject_cast<QTabBar *>(w);
-@@ -247,7 +263,7 @@ void KAcceleratorManagerPrivate::manageWidget(QWidget *w, Item *item)
- }
-
- if (w->inherits("KUrlRequester")) {
-- traverseChildren(w, item);
-+ traverseChildren(w, item, used);
- return;
- }
-
-@@ -316,7 +332,7 @@ void KAcceleratorManagerPrivate::manageWidget(QWidget *w, Item *item)
- item->addChild(i);
- }
- }
-- traverseChildren(w, item);
-+ traverseChildren(w, item, used);
- }
-
- void KAcceleratorManagerPrivate::manageTabBar(QTabBar *bar, Item *item)
-diff --git a/src/kacceleratormanager_p.h b/src/kacceleratormanager_p.h
-index a92d04ab..04926476 100644
---- a/src/kacceleratormanager_p.h
-+++ b/src/kacceleratormanager_p.h
-@@ -227,9 +227,9 @@ public:
- typedef QList<Item *> ItemList;
-
- private:
-- static void traverseChildren(QWidget *widget, Item *item);
-+ static void traverseChildren(QWidget *widget, Item *item, QString &used);
-
-- static void manageWidget(QWidget *widget, Item *item);
-+ static void manageWidget(QWidget *widget, Item *item, QString &used);
- static void manageMenuBar(QMenuBar *mbar, Item *item);
- static void manageTabBar(QTabBar *bar, Item *item);
- static void manageDockWidget(QDockWidget *dock, Item *item);
---
-GitLab
-
diff --git a/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.85.0.ebuild b/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.92.0.ebuild
index 99ca1920ec1..93e0810fd6a 100644
--- a/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.85.0.ebuild
+++ b/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.92.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -9,25 +9,17 @@ VIRTUALX_REQUIRED="test"
inherit ecm kde.org
DESCRIPTION="An assortment of high-level widgets for common tasks"
+
LICENSE="LGPL-2.1+"
KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
IUSE="nls"
-BDEPEND="
- nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
DEPEND="
>=dev-qt/qtgui-${QTMIN}:5
>=dev-qt/qtwidgets-${QTMIN}:5
"
RDEPEND="${DEPEND}"
-
-src_configure() {
- local mycmakeargs=(
- -DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON # bug 746866
- )
- ecm_src_configure
-}
+BDEPEND="nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )"
src_test() {
# bug 650216, 653186, 697866, 808216
diff --git a/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.88.0-r1.ebuild b/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.94.0.ebuild
index cb0733f838d..a4f93caa581 100644
--- a/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.88.0-r1.ebuild
+++ b/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.94.0.ebuild
@@ -1,14 +1,15 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
ECM_DESIGNERPLUGIN="true"
-QTMIN=5.15.2
+QTMIN=5.15.3
VIRTUALX_REQUIRED="test"
inherit ecm kde.org
DESCRIPTION="An assortment of high-level widgets for common tasks"
+
LICENSE="LGPL-2.1+"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
IUSE="nls"
@@ -18,18 +19,7 @@ DEPEND="
>=dev-qt/qtwidgets-${QTMIN}:5
"
RDEPEND="${DEPEND}"
-BDEPEND="
- nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
-
-PATCHES=( "${FILESDIR}/${P}-kacceleratormanager-alt-x-shortcuts.patch" ) # KDE-bug 444990
-
-src_configure() {
- local mycmakeargs=(
- -DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON # bug 746866
- )
- ecm_src_configure
-}
+BDEPEND="nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )"
src_test() {
# bug 650216, 653186, 697866, 808216
diff --git a/kde-frameworks/kwindowsystem/Manifest b/kde-frameworks/kwindowsystem/Manifest
index 7ba450ed9f7..2dd9ddc6931 100644
--- a/kde-frameworks/kwindowsystem/Manifest
+++ b/kde-frameworks/kwindowsystem/Manifest
@@ -1,2 +1,2 @@
-DIST kwindowsystem-5.85.0.tar.xz 178256 BLAKE2B f18dbe1f56529f7500ede59bc3447d6dfd4439086dadbd59d137a21ddea01653cfdfe945f6120461f507e7007228ef2135687ba740981a37e2e9ffe1866e21d3 SHA512 517943febe93ec84d91792ece6a2ad4518c3976d4f9ae3ba631713bdb87cec72817d3231da0fa6318c93e7b6ccf4875ba1c079b3838d3d68ad28cb9c35211d43
-DIST kwindowsystem-5.88.0.tar.xz 179400 BLAKE2B f2798ae0fa85674ecaf7d5faa55460adffc180cde49cd00051480495ae8dd1a72e851d3138dfb97d097049fc68208bcd9a094b620ecd3eac3e2be5a271acfce7 SHA512 1863cf4185d2920e46511ec247165c1af8a6035a62a12db9c0a39ac3ebb0c701ab01072d919d115ce2288ecbccb5cdaf66d055cc372270dcf8979ca9e227bdf0
+DIST kwindowsystem-5.92.0.tar.xz 182136 BLAKE2B 0324dfbf0480bf91ab10cd35adf4b38a85decd463a7e14f94ef9b50ec34344c0119599c45c3148613caae22e5be6af6bf4d5cecf8d2674fad25a4d573d6c0146 SHA512 022f0a26ddd19b10d1f3365218030e148123ade4324c60f028a01f8ae96426a53de09d2eb60aa46534447da9125ef01b856d4efcd45d56ee5bb26ce784e927e7
+DIST kwindowsystem-5.94.0.tar.xz 182240 BLAKE2B 12570a98c2f140c8dd1c0f35e90a16285cd60ae0e58014ea2d967cc939e1ce62f3e83009b7f0633335135b01b393f1f094553ba0729f5ae3cadfbe1b761854e5 SHA512 908f8bffdfbcc17a605a3e46c652508859b34d2990a171509af8c3b886f62a0c9724697f82e08949625e407c4daa6b4bd5ed80d949b6365060c17bc01e8a5944
diff --git a/kde-frameworks/kwindowsystem/kwindowsystem-5.85.0.ebuild b/kde-frameworks/kwindowsystem/kwindowsystem-5.92.0.ebuild
index f01e4c32384..1332da3cf3a 100644
--- a/kde-frameworks/kwindowsystem/kwindowsystem-5.85.0.ebuild
+++ b/kde-frameworks/kwindowsystem/kwindowsystem-5.92.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
diff --git a/kde-frameworks/kwindowsystem/kwindowsystem-5.88.0.ebuild b/kde-frameworks/kwindowsystem/kwindowsystem-5.94.0.ebuild
index 18350d22806..4540fe4740c 100644
--- a/kde-frameworks/kwindowsystem/kwindowsystem-5.88.0.ebuild
+++ b/kde-frameworks/kwindowsystem/kwindowsystem-5.94.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-QTMIN=5.15.2
+QTMIN=5.15.3
VIRTUALX_REQUIRED="test"
inherit ecm kde.org
diff --git a/kde-frameworks/kxmlgui/Manifest b/kde-frameworks/kxmlgui/Manifest
index c5d7cb87c4e..2a37e9cd5c9 100644
--- a/kde-frameworks/kxmlgui/Manifest
+++ b/kde-frameworks/kxmlgui/Manifest
@@ -1,2 +1,2 @@
-DIST kxmlgui-5.85.0.tar.xz 870124 BLAKE2B d9f70d0cc936544f6370cc361bbab39e2b7cc2decd15d01946dd277e25f735924bf5feac552e78fd041ca4693520fe7ad4019140066b55aaad8394a755b0c3f8 SHA512 03e36478e07635ff0acbe86602f64fc9d7c1c334e396e3136fde56a3d4fc28ed0c5170aae43d1a586adcce17241da0ffdc0836a9dc94f204f93cbce32a03050a
-DIST kxmlgui-5.88.0.tar.xz 885308 BLAKE2B 6fce9652007fb5df094c028cdc51589f80d7a063f3dc0ecccbd3af272799d4fabc73740779978e9ff8cbdf16777b977e1074fd879159778baf14aac3c1c5d24f SHA512 c308595c0078cc7ab6dfa5cbc7c66699603409a8b19d2c345ea9c6465bce176e3dbb31557960cd3e9d36bdcc45e7559360e58ae9658643bdc9430006e3717c8b
+DIST kxmlgui-5.92.0.tar.xz 895672 BLAKE2B dc1e6e59d367b830447049a69b8b1d41d9b5e1bacb88c7e229a37c507dd4ad17b8888dd5f5456099a30076c95b6ed8bf8f0b44a333226c939bfc755410bd02f8 SHA512 5c8d68aa59259e4048f32224ef0672984d6edbffb38476d2bbe9466b72a14aaf318cdba4a1eebb4209879e9cf880e736b9647491eca8e3ec8f4c03d50cf222e9
+DIST kxmlgui-5.94.0.tar.xz 898380 BLAKE2B 60399835046d09c0373d64ed94db31d2cc0f0d93fb9395771c00c1888efcb849c709308b6ea4039044ef188abdd2320472a8fb31b38c9b8b24245168bab6a140 SHA512 6f220a270263a97d4e6965360d0e8c908a0a99ae29cced7fd8a971d1f2ed9a6b180697ebb6fc93012ac3ea3f7b22c25539cd35c70ddf840ab2c0f63cd21e6bc5
diff --git a/kde-frameworks/kxmlgui/kxmlgui-5.85.0.ebuild b/kde-frameworks/kxmlgui/kxmlgui-5.92.0.ebuild
index c7f8e85ca15..bddc0a6afe8 100644
--- a/kde-frameworks/kxmlgui/kxmlgui-5.85.0.ebuild
+++ b/kde-frameworks/kxmlgui/kxmlgui-5.92.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
diff --git a/kde-frameworks/kxmlgui/kxmlgui-5.88.0.ebuild b/kde-frameworks/kxmlgui/kxmlgui-5.94.0.ebuild
index d55c4f70b7c..f01e7038227 100644
--- a/kde-frameworks/kxmlgui/kxmlgui-5.88.0.ebuild
+++ b/kde-frameworks/kxmlgui/kxmlgui-5.94.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# 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.2
+QTMIN=5.15.3
VIRTUALX_REQUIRED="test"
inherit ecm kde.org
diff --git a/kde-frameworks/modemmanager-qt/Manifest b/kde-frameworks/modemmanager-qt/Manifest
index c962aa4ca35..357c6b0973c 100644
--- a/kde-frameworks/modemmanager-qt/Manifest
+++ b/kde-frameworks/modemmanager-qt/Manifest
@@ -1,2 +1,2 @@
-DIST modemmanager-qt-5.85.0.tar.xz 112436 BLAKE2B 8e86d6c330a048a6f2ac522f1b59d89e3b1951d21c3667254c2f8c6d3e01f0d2e53ac55d4bd6a4edfa6cf68413dac6afb71ee1c6ba59780a4d033614fcd24b06 SHA512 535cb520bb2102fc50ee884b50edd02689c59528ee9c9fdfe958d14dc1c57c1e3805256ad15c6ab8e0aae43441139ae659a850b5cef350011da4d2b554e3aec5
-DIST modemmanager-qt-5.88.0.tar.xz 118796 BLAKE2B ead5554efa62c733e8e84b7e690f5f6e166ebc9e789e7f3ec76f53edd2249d58cd52cc88d6846b88120b4c7d87bc22f5242099ead83ceaa95fbefee0a7b6975e SHA512 0b04971b96bd5b320f9fa294767042294dcb09f1daeadf18992105dcfa56e77b12fa60650514d50951c1331411aa684fcff730378eafb3047d82ce5680bb15de
+DIST modemmanager-qt-5.92.0.tar.xz 120976 BLAKE2B 7100a59fb6b281b81b9c1c168ba3fb31e163c2e4dc86b641160af3ee994e38686e4ac5d2933b723b31e3a9230735c56500b8b2e4338fd4c7ef13d2bd27a42505 SHA512 56dc47ecb0bf04fb9f7d99d067f10b9efb65a82dd8929f0aa2d6d3c9d708cdaea810a1ba7b1a708f00cefc513c23f6fc2fd25ec004bb071bf42ad0b17edc6ddc
+DIST modemmanager-qt-5.94.0.tar.xz 121056 BLAKE2B b1ba94992f3dffa614fc6131c6ddc84f8acf473bb280a1184406c79f7466aa3f241c4ae8cf1650e2179a0fab978e6b90aeac936088858b8877b53ae94e240383 SHA512 3867d8ed2b000e51a2782ad0300e2a49b89bad429409b4d36f9d1798f992980b4dc6c38edceb8e33456bb5fb0d11b3007f01ca8c3bbaae6f239b0260885fdf9e
diff --git a/kde-frameworks/modemmanager-qt/modemmanager-qt-5.85.0.ebuild b/kde-frameworks/modemmanager-qt/modemmanager-qt-5.92.0.ebuild
index 3a309e70c2b..d97b603d16e 100644
--- a/kde-frameworks/modemmanager-qt/modemmanager-qt-5.85.0.ebuild
+++ b/kde-frameworks/modemmanager-qt/modemmanager-qt-5.92.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
diff --git a/kde-frameworks/modemmanager-qt/modemmanager-qt-5.88.0.ebuild b/kde-frameworks/modemmanager-qt/modemmanager-qt-5.94.0.ebuild
index 5cec0e740d6..438f0357a75 100644
--- a/kde-frameworks/modemmanager-qt/modemmanager-qt-5.88.0.ebuild
+++ b/kde-frameworks/modemmanager-qt/modemmanager-qt-5.94.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# 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.2
+QTMIN=5.15.3
inherit ecm kde.org
DESCRIPTION="ModemManager bindings for Qt"
diff --git a/kde-frameworks/networkmanager-qt/Manifest b/kde-frameworks/networkmanager-qt/Manifest
index f3225d004cb..d74968a4e53 100644
--- a/kde-frameworks/networkmanager-qt/Manifest
+++ b/kde-frameworks/networkmanager-qt/Manifest
@@ -1,2 +1,2 @@
-DIST networkmanager-qt-5.85.0.tar.xz 195996 BLAKE2B bbd41b95ca8c9f676941240bdab40f2d9ac76ca6ccb3eb0cf133aaf4e8bd7bffaf13a91f0a3cae06ea617ee11dce2c198536f134f9e17246897a9afebc89348c SHA512 84bb0edecb6162834caa495d9fa34947ea25f69cd915ba7a516657077492fb7f6c0fedd7a127d7e2caa7d8c038520410505b829eadd19d3ef9daa445442b090f
-DIST networkmanager-qt-5.88.0.tar.xz 195676 BLAKE2B 75c6259c924f46bb66c405f08ac0eb10bef9c9d150bc65e6511c1dbd7d1ebb008de9ab6e75f4bdc857304cbb707c47ff09d4b967f9077f34dc3f49bd4cd0e6f7 SHA512 d6ba19faa8ab576c5c94918b379071debbd4bd7ea9c00639d569932ad5709989a8bea8e8953563f5ad7bb090d6bb19dfb796853caad20baf87c3bc1c0cf77932
+DIST networkmanager-qt-5.92.0.tar.xz 198060 BLAKE2B 04de04321f5fa41abf3bd5b521ebd06dcf70e3abd59091c78de6a9d99a104896276f61929ff55ed2ab5ea0eabd5e50dca7a15268706a58c34f3a9189ae00d9c8 SHA512 30a59f28eb28e6877fe9db162e2c3fc32ce1bd84e3e4091b10c63906a24ba6cb56955bff980320b55e6b883f4a1ac249bb11396f633834182f20726442518372
+DIST networkmanager-qt-5.94.0.tar.xz 197676 BLAKE2B 15465106e549de21aa67f7d77dc67b8ea8bb72dc67c4baf9ac12b222d03e70525567a4887348402111482c2b403047d8d78bcd8cd5e42d2e2e221e7de423e6d4 SHA512 0e97577e53b440df2c25d2afaa2171443b9c2806c8164a84db5053e071fb9ac27dda8952947efd0e9ad57f25625cf8447f45606278a61d45c45ec0a1db956d61
diff --git a/kde-frameworks/networkmanager-qt/networkmanager-qt-5.85.0.ebuild b/kde-frameworks/networkmanager-qt/networkmanager-qt-5.92.0.ebuild
index c2558049699..e562bdd30c1 100644
--- a/kde-frameworks/networkmanager-qt/networkmanager-qt-5.85.0.ebuild
+++ b/kde-frameworks/networkmanager-qt/networkmanager-qt-5.92.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -7,14 +7,13 @@ QTMIN=5.15.2
inherit ecm kde.org
DESCRIPTION="NetworkManager bindings for Qt"
+
LICENSE="LGPL-2"
KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
IUSE="teamd"
-BDEPEND="
- virtual/pkgconfig
-"
DEPEND="
+ dev-libs/glib:2
>=dev-qt/qtdbus-${QTMIN}:5
>=dev-qt/qtnetwork-${QTMIN}:5
>=net-misc/networkmanager-1.4.0-r1[teamd=]
@@ -25,6 +24,9 @@ RDEPEND="${DEPEND}
>=net-misc/networkmanager-1.4.0-r1[systemd]
)
"
+BDEPEND="
+ virtual/pkgconfig
+"
src_test() {
# bug: 625276
diff --git a/kde-frameworks/networkmanager-qt/networkmanager-qt-5.88.0.ebuild b/kde-frameworks/networkmanager-qt/networkmanager-qt-5.94.0.ebuild
index bbc64052d87..440afa260ef 100644
--- a/kde-frameworks/networkmanager-qt/networkmanager-qt-5.88.0.ebuild
+++ b/kde-frameworks/networkmanager-qt/networkmanager-qt-5.94.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-QTMIN=5.15.2
+QTMIN=5.15.3
inherit ecm kde.org
DESCRIPTION="NetworkManager bindings for Qt"
diff --git a/kde-frameworks/oxygen-icons/Manifest b/kde-frameworks/oxygen-icons/Manifest
index 271336b89cf..b319cdd4617 100644
--- a/kde-frameworks/oxygen-icons/Manifest
+++ b/kde-frameworks/oxygen-icons/Manifest
@@ -1,2 +1,2 @@
-DIST oxygen-icons5-5.85.0.tar.xz 238630636 BLAKE2B 7a6656d8474f2acd734da6bb673603d059afe76e2f2a8eb5e0270c4f72a2155486d985861582070c7dd8fe3cb154f310cd6662086ac45e867feae6e1da75190b SHA512 c3ebcdbbaa65177a5833cd51808dea4205a27f993de9a2aca4af37512a2b258863922be8389c3ba8090183a092f72754efea7521cd1cd7e1a2bc2266768daa4f
-DIST oxygen-icons5-5.88.0.tar.xz 238635844 BLAKE2B 063cfa28fcb5957900035c551c7cd98028f247b0fd25265dff811cf61618affa133c4bd486eb30a0cc89e2fe91057ada44d5f804e447492f4b14640f7560e64c SHA512 a7607a50a97978fd56e3b49563188d431064225af42285f8586f901aeca1be2f7ee93f5f85036d0fd65e6d70a4fd8b2223c5cb1a88d4fcfb83b62db7fb0632b2
+DIST oxygen-icons5-5.92.0.tar.xz 238636220 BLAKE2B ce9a843c7ac19c69504c92d3118488390a3adf1c25381d920e5ad096518c72089e1e99c08ff3dcba340a8ba9083b04505004fa3f76be53fd12a26e88f81a5395 SHA512 af336e9996abacf7f7c9f221caa4ada64d2b043a398f757fabd547ba311ed390eeecf621f1f3a7b38d67d688b8e1926a7c17de03d96cfca72158107a02d91834
+DIST oxygen-icons5-5.94.0.tar.xz 238635124 BLAKE2B 1d7d8d75d94d3129fca8d287b33a05df8bb627bb88fc7579e0b57cb93fe535027fd9a487bab1b2e4c2daa11f932a4fcad1f4d3886d8ca42a0f3c53293df86841 SHA512 b9906927ec15c422aefaa2e0f287121c51ec16386f60371a8e773c9c4f0530cc1bad99849079cbfff16d78432ac30867ad58d42e9fc6c0b1b07dff810481274d
diff --git a/kde-frameworks/oxygen-icons/oxygen-icons-5.85.0.ebuild b/kde-frameworks/oxygen-icons/oxygen-icons-5.92.0.ebuild
index 4de449d09ea..3734d92545f 100644
--- a/kde-frameworks/oxygen-icons/oxygen-icons-5.85.0.ebuild
+++ b/kde-frameworks/oxygen-icons/oxygen-icons-5.92.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
diff --git a/kde-frameworks/oxygen-icons/oxygen-icons-5.88.0.ebuild b/kde-frameworks/oxygen-icons/oxygen-icons-5.94.0.ebuild
index e71b5c0490b..b8e16dacc62 100644
--- a/kde-frameworks/oxygen-icons/oxygen-icons-5.88.0.ebuild
+++ b/kde-frameworks/oxygen-icons/oxygen-icons-5.94.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# 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.2
+QTMIN=5.15.3
inherit cmake kde.org xdg-utils
DESCRIPTION="Oxygen SVG icon theme"
diff --git a/kde-frameworks/plasma/Manifest b/kde-frameworks/plasma/Manifest
index f1e2b7e014f..10daabe647c 100644
--- a/kde-frameworks/plasma/Manifest
+++ b/kde-frameworks/plasma/Manifest
@@ -1,2 +1,2 @@
-DIST plasma-framework-5.85.0.tar.xz 3145156 BLAKE2B 8a9257e3613ecc20051064af8eaa94cd30d07fd9c6349f6dd2aa1169ab661dbede1ff424ac1f96a30230270cf8f957731465c0a655270862c104987576b614ed SHA512 aba7e62ff3d9eff7c28c1736bd1b25e14c19502f021ed7f78025f7129abb728a066de0fff327098f52b84e78f78fbe87743563b78a4c91e2065187fb443eeb77
-DIST plasma-framework-5.88.0.tar.xz 3142640 BLAKE2B cbd0cc61b6c39e56a1bceed44d7f04f0033c0daaa3073760f04536b22760147b1bb82f5b85d70d48301083e9ae13e3f6bbebafa75e264762157e2fcaf658123d SHA512 b99c8d5722198d7f2096734f62f913f74471810331980a2722f1864602f3facf796c17a494d16fca7dbbe4389fd5db64b9fe82fd34f148f4ff6230ffde0ded93
+DIST plasma-framework-5.92.0.tar.xz 3145504 BLAKE2B 4c9c4a6c585fae629d94666d312af9a2dc74242d59f93cf6b63e206f7b4656982e1969cee7e1543b5c32b4f0815d602cfa8d0b56c3416f92bd5d2d2048ee6ef4 SHA512 6efbb9f03ec11804b12cda209dc665468cf6f56ecf712a136a5cf1ea2cb1deb1d427896770b12c18094a2d7f0ef69da9dcbe52b16ae2126e8382ade74d8ce54c
+DIST plasma-framework-5.94.0.tar.xz 3137928 BLAKE2B c171e434db41d6b03d97db14aa5abb1ba11e5508a9428d0d16a25c223170f5310b30e36c5681bf67ac9b849c1df744c1c70914efbd664c7c8d4b5b9550b7bd7e SHA512 071e0ce261516e4a7ab1105f86304e5dae7c16a9663980222cf60922ae6bf785cd2b0447b7a2f2a57e2a2396c1de15655c8a7c02568d81652da946a6384b9eb7
diff --git a/kde-frameworks/plasma/files/plasma-5.85.0-fix-ExpandableListItem-overlapping.patch b/kde-frameworks/plasma/files/plasma-5.85.0-fix-ExpandableListItem-overlapping.patch
deleted file mode 100644
index 8063039b762..00000000000
--- a/kde-frameworks/plasma/files/plasma-5.85.0-fix-ExpandableListItem-overlapping.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From f393bace87e5fc8c0e68eff9faf0656df64715ed Mon Sep 17 00:00:00 2001
-From: Nate Graham <nate@kde.org>
-Date: Wed, 1 Sep 2021 12:30:01 -0600
-Subject: [PATCH] ExpandableListItem: Fix overlapping entries with many
- expanded items
-
-A previous hack was done wrong, and was not taking into account disabled
-items.
-
-BUG: 428102
-FIXED-IN: 5.86
----
- .../plasmaextracomponents/qml/ExpandableListItem.qml | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/src/declarativeimports/plasmaextracomponents/qml/ExpandableListItem.qml b/src/declarativeimports/plasmaextracomponents/qml/ExpandableListItem.qml
-index 47b3e3684..851961a4c 100644
---- a/src/declarativeimports/plasmaextracomponents/qml/ExpandableListItem.qml
-+++ b/src/declarativeimports/plasmaextracomponents/qml/ExpandableListItem.qml
-@@ -523,7 +523,7 @@ Item {
-
- // Container for actions list, so that we can add left and right margins to it
- Item {
-- height: actionsList.contentHeight
-+ height: actionsList.height
- width: mainRowLayout.width
-
- // TODO: Implement keyboard focus
-@@ -538,7 +538,8 @@ Item {
- anchors.leftMargin: listItemIcon.width + PlasmaCore.Units.smallSpacing
- anchors.rightMargin: listItemIcon.width + PlasmaCore.Units.smallSpacing * 2
-
-- height: PlasmaCore.Units.gridUnit * 2 * actionsList.count
-+ // Need to take into account disabled/invisible items
-+ height: PlasmaCore.Units.gridUnit * 2 * Array.from(contextualActionsModel).filter(item => item.enabled).length
-
- focus: true
- clip: true
---
-GitLab
-
diff --git a/kde-frameworks/plasma/files/plasma-5.85.0-fix-cmake.patch b/kde-frameworks/plasma/files/plasma-5.85.0-fix-cmake.patch
deleted file mode 100644
index 0eab0a772c0..00000000000
--- a/kde-frameworks/plasma/files/plasma-5.85.0-fix-cmake.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From e496ef0440c92e119da0b1088f1ab788cebeae33 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Thu, 26 Aug 2021 19:12:00 +0200
-Subject: [PATCH] CMake: do not expand variables beforehand
-
-Fixes build when FindOpenGL is disabled, producing a syntax error:
-"Function invoked with incorrect arguments for function named: ADD_FEATURE_INFO"
-
-See also: https://invent.kde.org/frameworks/plasma-framework/-/merge_requests/267
-
-Downstream report: https://bugs.gentoo.org/809815
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- CMakeLists.txt | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e27ebd914..25abbf921 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -110,20 +110,20 @@ set_package_properties(EGL PROPERTIES
- TYPE OPTIONAL
- )
-
--add_feature_info(GLX ${OpenGL_GLX_FOUND} "OpenGL GLX libraries.")
-+add_feature_info(GLX OpenGL_GLX_FOUND "OpenGL GLX libraries.")
- if(OpenGL_GLX_FOUND AND X11_FOUND AND (Qt5Gui_OPENGL_IMPLEMENTATION STREQUAL "GL"))
- set(HAVE_GLX 1)
- else()
- set(HAVE_GLX 0)
- endif()
-
--add_feature_info(EGL ${OpenGL_EGL_FOUND}
-+add_feature_info(EGL OpenGL_EGL_FOUND
- "A platform-agnostic mechanism for creating rendering surfaces for use with other graphics libraries, such as OpenGL|ES and OpenVG.")
- # OpenGL_EGL_FOUND is defined by FindOpenGL
- if(TARGET OpenGL::EGL)
- set(HAVE_EGL ${OpenGL_EGL_FOUND})
- set(EGL_TARGET OpenGL::EGL)
--elseif(${EGL_FOUND})
-+elseif(EGL_FOUND)
- set(HAVE_EGL ${EGL_FOUND})
- set(EGL_TARGET EGL::EGL)
- message(STATUS "Switch to EGL compatibility target EGL::EGL because OpenGL::EGL is not available")
---
-2.33.0
-
diff --git a/kde-frameworks/plasma/files/plasma-5.85.0-fix-pinned-calendar-dots.patch b/kde-frameworks/plasma/files/plasma-5.85.0-fix-pinned-calendar-dots.patch
deleted file mode 100644
index 0342024ca89..00000000000
--- a/kde-frameworks/plasma/files/plasma-5.85.0-fix-pinned-calendar-dots.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 19fe24ef9377178413438d7749630053995af229 Mon Sep 17 00:00:00 2001
-From: Eugene Popov <popov895@ukr.net>
-Date: Mon, 9 Aug 2021 15:56:02 +0000
-Subject: [PATCH] [Calendar] Fix pinned calendar displaying the wrong number of
- dots
-
-Use assignment instead of binding for the rootIndex property of the DelegateModel.
-
-BUG: 440627
-FIXED-IN: 5.86
----
- src/declarativeimports/calendar/qml/DayDelegate.qml | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/declarativeimports/calendar/qml/DayDelegate.qml b/src/declarativeimports/calendar/qml/DayDelegate.qml
-index af31991db..3f7fc681b 100644
---- a/src/declarativeimports/calendar/qml/DayDelegate.qml
-+++ b/src/declarativeimports/calendar/qml/DayDelegate.qml
-@@ -81,13 +81,14 @@ PlasmaComponents3.AbstractButton {
- Repeater {
- model: DelegateModel {
- model: dayStyle.dayModel
-- rootIndex: modelIndex(index)
- delegate: Rectangle {
- width: PlasmaCore.Units.smallSpacing * 1.5
- height: width
- radius: width / 2
- color: model.eventColor ? Kirigami.ColorUtils.linearInterpolation(model.eventColor, PlasmaCore.Theme.textColor, 0.2) : PlasmaCore.Theme.highlightColor
- }
-+
-+ Component.onCompleted: rootIndex = modelIndex(index)
- }
- }
- }
---
-GitLab
-
diff --git a/kde-frameworks/plasma/files/plasma-5.85.0-fix-plasma-scaling-w-int-scale-factors.patch b/kde-frameworks/plasma/files/plasma-5.85.0-fix-plasma-scaling-w-int-scale-factors.patch
deleted file mode 100644
index 9c0e9046496..00000000000
--- a/kde-frameworks/plasma/files/plasma-5.85.0-fix-plasma-scaling-w-int-scale-factors.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 837bb6975f6a0661d211107823b7587808fc3d4e Mon Sep 17 00:00:00 2001
-From: Nate Graham <nate@kde.org>
-Date: Sun, 15 Aug 2021 09:33:10 -0600
-Subject: [PATCH] Fix Plasma (non-Qt) icon scaling with integer scale factors
-
-An embarrassing error in 4edb830f53aac4833ece024df59441029b01fde6
-caused the function which returns an appropriate scale factor for icons
-to both take and return integer values rather than floating point
-values, preventing it from working properly with any scale factor other
-than an integer scale factor (e.g. 200%). This commit fixes that issue.
----
- src/declarativeimports/core/units.cpp | 2 +-
- src/declarativeimports/core/units.h | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/declarativeimports/core/units.cpp b/src/declarativeimports/core/units.cpp
-index 6788ed952..fbcc6d888 100644
---- a/src/declarativeimports/core/units.cpp
-+++ b/src/declarativeimports/core/units.cpp
-@@ -174,7 +174,7 @@ int Units::roundToIconSize(int size)
- }
- }
-
--int Units::bestIconScaleForDevicePixelRatio(const int ratio)
-+qreal Units::bestIconScaleForDevicePixelRatio(const qreal ratio)
- {
- if (ratio < 1.5) {
- return 1;
-diff --git a/src/declarativeimports/core/units.h b/src/declarativeimports/core/units.h
-index c19cf0dd8..855738e7d 100644
---- a/src/declarativeimports/core/units.h
-+++ b/src/declarativeimports/core/units.h
-@@ -271,7 +271,7 @@ private:
- * Note that this function is only relevant when using Plasma scaling and
- * when using Qt scaling, it always returns 1.
- */
-- static int bestIconScaleForDevicePixelRatio(const int ratio);
-+ static qreal bestIconScaleForDevicePixelRatio(const qreal ratio);
-
- /**
- * @return The dpi-adjusted size for a given icon size
---
-GitLab
-
diff --git a/kde-frameworks/plasma/files/plasma-5.85.0-fix-svgicon-memleak.patch b/kde-frameworks/plasma/files/plasma-5.85.0-fix-svgicon-memleak.patch
deleted file mode 100644
index 89896911d0a..00000000000
--- a/kde-frameworks/plasma/files/plasma-5.85.0-fix-svgicon-memleak.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 73782c8b39d1cc41fef003acca8df75ccdf384e4 Mon Sep 17 00:00:00 2001
-From: Matt Whitlock <kde@mattwhitlock.name>
-Date: Mon, 16 Aug 2021 19:37:28 -0400
-Subject: [PATCH] avoid holding onto old Svg object when changing source of an
- IconItem
-
-A long-lived IconItem instance can have its source changed many times
-over its lifetime. Because SvgSource parents its internal Plasma::Svg
-instance to the IconItem instance, this means that such Plasma::Svg
-instance was not being destroyed when its responsible SvgSource
-instance is destroyed and indeed would not be destroyed until the
-IconItem instance is eventually destroyed, which could be arbitrarily
-much later. This commit adds an explicit call in the SvgSource
-destructor to delete the Plasma::Svg instance so it does not hang
-around in memory until the IconItem instance is destroyed. This fixes
-one of the major memory "leaks" in plasmashell.
----
- src/declarativeimports/core/iconitem.cpp | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/src/declarativeimports/core/iconitem.cpp b/src/declarativeimports/core/iconitem.cpp
-index 0db750acd..3f06b8b0e 100644
---- a/src/declarativeimports/core/iconitem.cpp
-+++ b/src/declarativeimports/core/iconitem.cpp
-@@ -196,6 +196,9 @@ public:
- {
- if (m_svgIcon) {
- QObject::disconnect(m_iconItem, nullptr, m_svgIcon, nullptr);
-+ // the parent IconItem can outlive this IconItemSource, so delete our Plasma::Svg object
-+ // explicitly to avoid leaving unreferenced Plasma::Svg objects parented to the IconItem
-+ delete m_svgIcon;
- }
- }
-
---
-GitLab
-
diff --git a/kde-frameworks/plasma/files/plasma-5.85.0-fix-theme-memleak.patch b/kde-frameworks/plasma/files/plasma-5.85.0-fix-theme-memleak.patch
deleted file mode 100644
index 1d7dc596c20..00000000000
--- a/kde-frameworks/plasma/files/plasma-5.85.0-fix-theme-memleak.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-From 14b495f933dadace7832fa6cbc809c3abdb7c682 Mon Sep 17 00:00:00 2001
-From: Matt Whitlock <kde@mattwhitlock.name>
-Date: Mon, 28 Jun 2021 18:01:14 -0400
-Subject: [PATCH] don't make duplicate connections to
- ThemePrivate::onAppExitCleanup
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Plasma::Theme::Theme(…) and Plasma::Theme::setThemeName(…) were
-unconditionally connecting the QCoreApplication::aboutToQuit signal to
-the ThemePrivate::onAppExitCleanup slot, even though the ThemePrivate
-instances are cached and shared across multiple Theme instances. In
-long-running applications that make heavy use of the Svg class (such as
-plasmashell), a single ThemePrivate instance can be reused by huge
-numbers of Theme instances. If the reference count of that ThemePrivate
-instance never reaches zero, then the connections just keep piling up,
-contributing to excessive memory usage. This commit moves the relevant
-connect(…) call so that it only happens in the case that a new
-ThemePrivate instance is constructed. Thus, there will only ever be one
-connection from QCoreApplication::aboutToQuit to
-ThemePrivate::onAppExitCleanup per instance of ThemePrivate.
----
- src/plasma/theme.cpp | 18 +++++++++---------
- 1 file changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/src/plasma/theme.cpp b/src/plasma/theme.cpp
-index fabf98f4e..f403d393b 100644
---- a/src/plasma/theme.cpp
-+++ b/src/plasma/theme.cpp
-@@ -39,13 +39,13 @@ Theme::Theme(QObject *parent)
- if (!ThemePrivate::globalTheme) {
- ThemePrivate::globalTheme = new ThemePrivate;
- ThemePrivate::globalTheme->settingsChanged(false);
-+ if (QCoreApplication::instance()) {
-+ connect(QCoreApplication::instance(), &QCoreApplication::aboutToQuit, ThemePrivate::globalTheme, &ThemePrivate::onAppExitCleanup);
-+ }
- }
- ThemePrivate::globalTheme->ref.ref();
- d = ThemePrivate::globalTheme;
-
-- if (QCoreApplication::instance()) {
-- connect(QCoreApplication::instance(), &QCoreApplication::aboutToQuit, d, &ThemePrivate::onAppExitCleanup);
-- }
- connect(d, &ThemePrivate::themeChanged, this, &Theme::themeChanged);
- connect(d, &ThemePrivate::defaultFontChanged, this, &Theme::defaultFontChanged);
- connect(d, &ThemePrivate::smallestFontChanged, this, &Theme::smallestFontChanged);
-@@ -57,6 +57,9 @@ Theme::Theme(const QString &themeName, QObject *parent)
- auto &priv = ThemePrivate::themes[themeName];
- if (!priv) {
- priv = new ThemePrivate;
-+ if (QCoreApplication::instance()) {
-+ connect(QCoreApplication::instance(), &QCoreApplication::aboutToQuit, priv, &ThemePrivate::onAppExitCleanup);
-+ }
- }
-
- priv->ref.ref();
-@@ -68,9 +71,6 @@ Theme::Theme(const QString &themeName, QObject *parent)
- d->setThemeName(themeName, false, false);
- d->cacheTheme = useCache;
- d->fixedName = true;
-- if (QCoreApplication::instance()) {
-- connect(QCoreApplication::instance(), &QCoreApplication::aboutToQuit, d, &ThemePrivate::onAppExitCleanup);
-- }
- connect(d, &ThemePrivate::themeChanged, this, &Theme::themeChanged);
- }
-
-@@ -105,12 +105,12 @@ void Theme::setThemeName(const QString &themeName)
- auto &priv = ThemePrivate::themes[themeName];
- if (!priv) {
- priv = new ThemePrivate;
-+ if (QCoreApplication::instance()) {
-+ connect(QCoreApplication::instance(), &QCoreApplication::aboutToQuit, priv, &ThemePrivate::onAppExitCleanup);
-+ }
- }
- priv->ref.ref();
- d = priv;
-- if (QCoreApplication::instance()) {
-- connect(QCoreApplication::instance(), &QCoreApplication::aboutToQuit, d, &ThemePrivate::onAppExitCleanup);
-- }
- connect(d, &ThemePrivate::themeChanged, this, &Theme::themeChanged);
- }
-
---
-GitLab
-
diff --git a/kde-frameworks/plasma/files/plasma-5.88.0-fix-centered-text.patch b/kde-frameworks/plasma/files/plasma-5.88.0-fix-centered-text.patch
deleted file mode 100644
index 8fb393a568d..00000000000
--- a/kde-frameworks/plasma/files/plasma-5.88.0-fix-centered-text.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-From 92ac1038cff333d70a71331b2a5fa0b9d91bc39d Mon Sep 17 00:00:00 2001
-From: Eugene Popov <popov895@ukr.net>
-Date: Fri, 19 Nov 2021 11:13:03 +0000
-Subject: [PATCH] Fix IconLabel
-
----
- .../plasmacomponents3/private/IconLabel.qml | 97 +++++++++++--------
- 1 file changed, 55 insertions(+), 42 deletions(-)
-
-diff --git a/src/declarativeimports/plasmacomponents3/private/IconLabel.qml b/src/declarativeimports/plasmacomponents3/private/IconLabel.qml
-index 467c2f54b..74a8ff3a5 100644
---- a/src/declarativeimports/plasmacomponents3/private/IconLabel.qml
-+++ b/src/declarativeimports/plasmacomponents3/private/IconLabel.qml
-@@ -24,49 +24,62 @@ T.Control {
- PlasmaCore.ColorScope.inherit: true
- implicitWidth: implicitContentWidth + leftPadding + rightPadding
- implicitHeight: implicitContentHeight + topPadding + bottomPadding
-- contentItem: GridLayout {
-- rowSpacing: root.spacing
-- columnSpacing: root.spacing
-- flow: root.display === T.AbstractButton.TextUnderIcon ? GridLayout.TopToBottom : GridLayout.LeftToRight
-- PlasmaCore.IconItem {
-- id: iconItem
-- visible: valid && width > 0 && height > 0 && root.display !== T.AbstractButton.TextOnly
-- colorGroup: root.PlasmaCore.ColorScope.colorGroup
-- implicitWidth: PlasmaCore.Units.iconSizes.sizeForLabels
-- implicitHeight: PlasmaCore.Units.iconSizes.sizeForLabels
-- Layout.fillWidth: true
-- Layout.fillHeight: true
-- Layout.maximumWidth: implicitWidth > 0 ? implicitWidth : Number.POSITIVE_INFINITY
-- Layout.maximumHeight: implicitHeight > 0 ? implicitHeight : Number.POSITIVE_INFINITY
-- Layout.alignment: if (root.textBesideIcon) {
-- Qt.AlignRight | Qt.AlignVCenter
-- } else if (root.textUnderIcon) {
-- Qt.AlignHCenter | Qt.AlignBottom
-- } else {
-- Qt.AlignCenter
-+ contentItem: Item {
-+ implicitWidth: gridLayout.implicitWidth
-+ implicitHeight: gridLayout.implicitHeight
-+ GridLayout {
-+ id: gridLayout
-+ rowSpacing: root.spacing
-+ columnSpacing: root.spacing
-+ flow: root.display === T.AbstractButton.TextUnderIcon ? GridLayout.TopToBottom : GridLayout.LeftToRight
-+ x: {
-+ if (root.alignment & Qt.AlignLeft) {
-+ return 0;
-+ }
-+ if (root.alignment & Qt.AlignRight) {
-+ return parent.width - width;
-+ }
-+ return Math.round((parent.width - width) / 2);
- }
-- }
-- T.Label {
-- id: label
-- visible: text.length > 0 && root.display !== T.AbstractButton.IconOnly
-- palette: root.palette
-- font: root.font
-- horizontalAlignment: root.alignment & Qt.AlignHorizontal_Mask || Text.AlignHCenter
-- verticalAlignment: root.alignment & Qt.AlignVertical_Mask || Text.AlignVCenter
-- // Work around Qt bug where NativeRendering breaks for non-integer scale factors
-- // https://bugreports.qt.io/browse/QTBUG-70481
-- renderType: Screen.devicePixelRatio % 1 !== 0 ? Text.QtRendering : Text.NativeRendering
-- color: PlasmaCore.ColorScope.textColor
-- linkColor: PlasmaCore.Theme.linkColor
-- elide: Text.ElideRight
-- Layout.fillWidth: root.alignment & Qt.AlignHorizontal_Mask
-- Layout.fillHeight: root.alignment & Qt.AlignVertical_Mask
-- Layout.alignment: if (root.textBesideIcon) {
-- Qt.AlignLeft | Qt.AlignVCenter
-- } else if (root.textUnderIcon) {
-- Qt.AlignHCenter | Qt.AlignTop
-- } else {
-- Qt.AlignCenter
-+ y: {
-+ if (root.alignment & Qt.AlignTop) {
-+ return 0;
-+ }
-+ if (root.alignment & Qt.AlignBottom) {
-+ return parent.height - height;
-+ }
-+ return Math.round((parent.height - height) / 2);
-+ }
-+ width: Math.min(parent.width, implicitWidth)
-+ height: Math.min(parent.height, implicitHeight)
-+ PlasmaCore.IconItem {
-+ id: iconItem
-+ visible: valid && width > 0 && height > 0 && root.display !== T.AbstractButton.TextOnly
-+ colorGroup: root.PlasmaCore.ColorScope.colorGroup
-+ implicitWidth: PlasmaCore.Units.iconSizes.sizeForLabels
-+ implicitHeight: PlasmaCore.Units.iconSizes.sizeForLabels
-+ Layout.alignment: Qt.AlignCenter
-+ Layout.maximumWidth: implicitWidth > 0 ? implicitWidth : Number.POSITIVE_INFINITY
-+ Layout.maximumHeight: implicitHeight > 0 ? implicitHeight : Number.POSITIVE_INFINITY
-+ }
-+ T.Label {
-+ id: label
-+ visible: text.length > 0 && root.display !== T.AbstractButton.IconOnly
-+ palette: root.palette
-+ font: root.font
-+ // Work around Qt bug where NativeRendering breaks for non-integer scale factors
-+ // https://bugreports.qt.io/browse/QTBUG-70481
-+ renderType: Screen.devicePixelRatio % 1 !== 0 ? Text.QtRendering : Text.NativeRendering
-+ color: PlasmaCore.ColorScope.textColor
-+ linkColor: PlasmaCore.Theme.linkColor
-+ elide: Text.ElideRight
-+ Layout.alignment: Qt.AlignCenter
-+ Layout.fillWidth: {
-+ if (!iconItem.visible || parent.flow === GridLayout.TopToBottom) {
-+ return implicitWidth > parent.width;
-+ }
-+ return iconItem.implicitWidth + parent.columnSpacing + implicitWidth > parent.width;
-+ }
- }
- }
- }
---
-GitLab
-
diff --git a/kde-frameworks/plasma/files/plasma-5.88.0-fix-misrenderings-with-transparency.patch b/kde-frameworks/plasma/files/plasma-5.88.0-fix-misrenderings-with-transparency.patch
deleted file mode 100644
index d1e6f37d8a2..00000000000
--- a/kde-frameworks/plasma/files/plasma-5.88.0-fix-misrenderings-with-transparency.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 6176d8ef8f36290075c5bd8932d623e68468a1cd Mon Sep 17 00:00:00 2001
-From: Marco Martin <notmart@gmail.com>
-Date: Tue, 16 Nov 2021 11:05:17 +0100
-Subject: [PATCH] Do updateTheme after QQuickWindow::event
-
-doing updatetheme there will ensure that the window size is correct,
-so then when the surface commit will happen, we'll have the blur
-and contrast regions wit hthe proper geometry
-
-BUG:305247
----
- src/plasmaquick/dialog.cpp | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/plasmaquick/dialog.cpp b/src/plasmaquick/dialog.cpp
-index eac7d432a..343bfe4c0 100644
---- a/src/plasmaquick/dialog.cpp
-+++ b/src/plasmaquick/dialog.cpp
-@@ -1243,10 +1243,12 @@ bool Dialog::event(QEvent *event)
- // sometimes non null regions arrive even for non visible windows
- // for which surface creation would fail
- if (!d->shellSurface && isVisible()) {
-+ const bool ret = QQuickWindow::event(event);
- KWindowSystem::setState(winId(), NET::SkipTaskbar | NET::SkipPager | NET::SkipSwitcher);
- d->setupWaylandIntegration();
- d->updateVisibility(true);
- d->updateTheme();
-+ return ret;
- }
- #endif
- } else if (event->type() == QEvent::PlatformSurface) {
---
-GitLab
-
diff --git a/kde-frameworks/plasma/files/plasma-5.88.0-make-OSD-an-actual-wayland-OSD.patch b/kde-frameworks/plasma/files/plasma-5.88.0-make-OSD-an-actual-wayland-OSD.patch
deleted file mode 100644
index 0631155c89b..00000000000
--- a/kde-frameworks/plasma/files/plasma-5.88.0-make-OSD-an-actual-wayland-OSD.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 2ba1b0b642d540f74f0e21e7aaa272644ea4eda5 Mon Sep 17 00:00:00 2001
-From: Marco Martin <notmart@gmail.com>
-Date: Mon, 8 Nov 2021 16:12:38 +0000
-Subject: [PATCH] make the OSD an actual wayland OSD
-
-when the OnScreenDisplay type is set, set it on the plasma shell surface
-so KWin can actually treat it as such
-
-CCBUG:428859
----
- src/plasmaquick/dialog.cpp | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/src/plasmaquick/dialog.cpp b/src/plasmaquick/dialog.cpp
-index 4cea3a28e..3254b8320 100644
---- a/src/plasmaquick/dialog.cpp
-+++ b/src/plasmaquick/dialog.cpp
-@@ -736,6 +736,13 @@ void DialogPrivate::applyType()
- if (!wmType) {
- KWindowSystem::setType(q->winId(), static_cast<NET::WindowType>(type));
- }
-+#if HAVE_KWAYLAND
-+ if (type == Dialog::OnScreenDisplay) {
-+ if (shellSurface) {
-+ shellSurface->setRole(KWayland::Client::PlasmaShellSurface::Role::OnScreenDisplay);
-+ }
-+ }
-+#endif
- } else {
- q->setFlags(Qt::FramelessWindowHint | q->flags());
-
---
-GitLab
-
diff --git a/kde-frameworks/plasma/files/plasma-5.92.0-breeze-light-dark-visual-fix.patch b/kde-frameworks/plasma/files/plasma-5.92.0-breeze-light-dark-visual-fix.patch
new file mode 100644
index 00000000000..04992bcb129
--- /dev/null
+++ b/kde-frameworks/plasma/files/plasma-5.92.0-breeze-light-dark-visual-fix.patch
@@ -0,0 +1,40 @@
+From 7352045b388f4b0ef553706bd219457e5018ce4e Mon Sep 17 00:00:00 2001
+From: Marco Martin <notmart@gmail.com>
+Date: Mon, 28 Mar 2022 21:20:16 +0000
+Subject: [PATCH] Don't install the heading SVG in breeze-light and breeze-dark
+ Plasma themes
+
+Installing that file there was an acky workaround that got broken by 2cccf230.
+---
+ src/desktoptheme/breeze-dark/CMakeLists.txt | 5 +----
+ src/desktoptheme/breeze-light/CMakeLists.txt | 4 ----
+ 2 files changed, 1 insertion(+), 8 deletions(-)
+
+diff --git a/src/desktoptheme/breeze-dark/CMakeLists.txt b/src/desktoptheme/breeze-dark/CMakeLists.txt
+index 8f2078e4d..7f8f99062 100644
+--- a/src/desktoptheme/breeze-dark/CMakeLists.txt
++++ b/src/desktoptheme/breeze-dark/CMakeLists.txt
+@@ -8,7 +8,4 @@ install(
+ FILES colors "${CMAKE_CURRENT_BINARY_DIR}/metadata.desktop"
+ DESTINATION ${PLASMA_DATA_INSTALL_DIR}/desktoptheme/breeze-dark
+ )
+-install(
+- FILES ${PROJECT_BINARY_DIR}/src/desktoptheme/breeze/default.gzipped/widgets/plasmoidheading.svgz
+- DESTINATION ${PLASMA_DATA_INSTALL_DIR}/desktoptheme/breeze-dark/widgets
+-)
++
+diff --git a/src/desktoptheme/breeze-light/CMakeLists.txt b/src/desktoptheme/breeze-light/CMakeLists.txt
+index 678033cec..6688a603b 100644
+--- a/src/desktoptheme/breeze-light/CMakeLists.txt
++++ b/src/desktoptheme/breeze-light/CMakeLists.txt
+@@ -8,7 +8,3 @@ install(
+ FILES colors "${CMAKE_CURRENT_BINARY_DIR}/metadata.desktop"
+ DESTINATION ${PLASMA_DATA_INSTALL_DIR}/desktoptheme/breeze-light
+ )
+-install(
+- FILES ${PROJECT_BINARY_DIR}/src/desktoptheme/breeze/default.gzipped/widgets/plasmoidheading.svgz
+- DESTINATION ${PLASMA_DATA_INSTALL_DIR}/desktoptheme/breeze-light/widgets
+-)
+--
+GitLab
+
diff --git a/kde-frameworks/plasma/files/plasma-5.92.0-fix-blurry-buttons.patch b/kde-frameworks/plasma/files/plasma-5.92.0-fix-blurry-buttons.patch
new file mode 100644
index 00000000000..0286039ddb7
--- /dev/null
+++ b/kde-frameworks/plasma/files/plasma-5.92.0-fix-blurry-buttons.patch
@@ -0,0 +1,110 @@
+From bd1ba6e539a326585a24fc21d0e27ef2c59e8731 Mon Sep 17 00:00:00 2001
+From: Noah Davis <noahadvs@gmail.com>
+Date: Wed, 6 Apr 2022 15:08:53 -0400
+Subject: [PATCH] PC3 toggle controls: fix odd heights misaligning indicators
+
+BUG: 447977
+---
+ src/declarativeimports/plasmacomponents3/CheckBox.qml | 2 +-
+ src/declarativeimports/plasmacomponents3/CheckDelegate.qml | 2 +-
+ src/declarativeimports/plasmacomponents3/MenuItem.qml | 2 +-
+ src/declarativeimports/plasmacomponents3/RadioButton.qml | 2 +-
+ src/declarativeimports/plasmacomponents3/RadioDelegate.qml | 2 +-
+ src/declarativeimports/plasmacomponents3/Switch.qml | 2 +-
+ src/declarativeimports/plasmacomponents3/SwitchDelegate.qml | 2 +-
+ 7 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/src/declarativeimports/plasmacomponents3/CheckBox.qml b/src/declarativeimports/plasmacomponents3/CheckBox.qml
+index 1da39da24..fed972566 100644
+--- a/src/declarativeimports/plasmacomponents3/CheckBox.qml
++++ b/src/declarativeimports/plasmacomponents3/CheckBox.qml
+@@ -35,7 +35,7 @@ T.CheckBox {
+
+ indicator: CheckIndicator {
+ x: !control.mirrored ? control.leftPadding : control.width - width - control.rightPadding
+- y: control.topPadding + (control.availableHeight - height) / 2
++ y: control.topPadding + Math.round((control.availableHeight - height) / 2)
+ control: control
+ }
+
+diff --git a/src/declarativeimports/plasmacomponents3/CheckDelegate.qml b/src/declarativeimports/plasmacomponents3/CheckDelegate.qml
+index ef965becd..9d241467b 100644
+--- a/src/declarativeimports/plasmacomponents3/CheckDelegate.qml
++++ b/src/declarativeimports/plasmacomponents3/CheckDelegate.qml
+@@ -47,7 +47,7 @@ T.CheckDelegate {
+
+ indicator: CheckIndicator {
+ x: control.mirrored ? control.leftPadding : control.width - width - control.rightPadding
+- y: control.topPadding + (control.availableHeight - height) / 2
++ y: control.topPadding + Math.round((control.availableHeight - height) / 2)
+
+ control: control
+ }
+diff --git a/src/declarativeimports/plasmacomponents3/MenuItem.qml b/src/declarativeimports/plasmacomponents3/MenuItem.qml
+index 16f2a5e36..964c5930d 100644
+--- a/src/declarativeimports/plasmacomponents3/MenuItem.qml
++++ b/src/declarativeimports/plasmacomponents3/MenuItem.qml
+@@ -81,7 +81,7 @@ T.MenuItem {
+
+ indicator: Loader {
+ x: controlRoot.mirrored ? controlRoot.width - width - controlRoot.rightPadding : controlRoot.leftPadding
+- y: controlRoot.topPadding + (controlRoot.availableHeight - height) / 2
++ y: controlRoot.topPadding + Math.round((controlRoot.availableHeight - height) / 2)
+
+ visible: controlRoot.checkable
+ sourceComponent: controlRoot.autoExclusive ? radioComponent : checkComponent
+diff --git a/src/declarativeimports/plasmacomponents3/RadioButton.qml b/src/declarativeimports/plasmacomponents3/RadioButton.qml
+index 7eeee3f9b..0b7a19894 100644
+--- a/src/declarativeimports/plasmacomponents3/RadioButton.qml
++++ b/src/declarativeimports/plasmacomponents3/RadioButton.qml
+@@ -32,7 +32,7 @@ T.RadioButton {
+
+ indicator: RadioIndicator {
+ x: !control.mirrored ? control.leftPadding : control.width - width - control.rightPadding
+- y: control.topPadding + (control.availableHeight - height) / 2
++ y: control.topPadding + Math.round((control.availableHeight - height) / 2)
+ control: control
+ }
+
+diff --git a/src/declarativeimports/plasmacomponents3/RadioDelegate.qml b/src/declarativeimports/plasmacomponents3/RadioDelegate.qml
+index e25f28cc3..a915a4eac 100644
+--- a/src/declarativeimports/plasmacomponents3/RadioDelegate.qml
++++ b/src/declarativeimports/plasmacomponents3/RadioDelegate.qml
+@@ -47,7 +47,7 @@ T.RadioDelegate {
+
+ indicator: RadioIndicator {
+ x: control.mirrored ? control.leftPadding : control.width - width - control.rightPadding
+- y: control.topPadding + (control.availableHeight - height) / 2
++ y: control.topPadding + Math.round((control.availableHeight - height) / 2)
+
+ control: control
+ }
+diff --git a/src/declarativeimports/plasmacomponents3/Switch.qml b/src/declarativeimports/plasmacomponents3/Switch.qml
+index 32ef1274b..98de41388 100644
+--- a/src/declarativeimports/plasmacomponents3/Switch.qml
++++ b/src/declarativeimports/plasmacomponents3/Switch.qml
+@@ -32,7 +32,7 @@ T.Switch {
+
+ indicator: SwitchIndicator {
+ x: !control.mirrored ? control.leftPadding : control.width - width - control.rightPadding
+- y: control.topPadding + (control.availableHeight - height) / 2
++ y: control.topPadding + Math.round((control.availableHeight - height) / 2)
+ control: control
+ }
+
+diff --git a/src/declarativeimports/plasmacomponents3/SwitchDelegate.qml b/src/declarativeimports/plasmacomponents3/SwitchDelegate.qml
+index e6adf9a6e..0f3db70de 100644
+--- a/src/declarativeimports/plasmacomponents3/SwitchDelegate.qml
++++ b/src/declarativeimports/plasmacomponents3/SwitchDelegate.qml
+@@ -45,7 +45,7 @@ T.SwitchDelegate {
+
+ indicator: SwitchIndicator {
+ x: control.mirrored ? control.leftPadding : control.width - width - control.rightPadding
+- y: control.topPadding + (control.availableHeight - height) / 2
++ y: control.topPadding + Math.round((control.availableHeight - height) / 2)
+
+ control: control
+ }
+--
+GitLab
+
diff --git a/kde-frameworks/plasma/plasma-5.85.0-r3.ebuild b/kde-frameworks/plasma/plasma-5.92.0-r2.ebuild
index e5f077ebe25..f048636a97a 100644
--- a/kde-frameworks/plasma/plasma-5.85.0-r3.ebuild
+++ b/kde-frameworks/plasma/plasma-5.92.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -60,12 +60,8 @@ DEPEND="${RDEPEND}
BDEPEND="man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )"
PATCHES=(
- "${FILESDIR}"/${P}-fix-plasma-scaling-w-int-scale-factors.patch
- "${FILESDIR}"/${P}-fix-pinned-calendar-dots.patch # KDE-bug 440627
- "${FILESDIR}"/${P}-fix-cmake.patch # bug 809815
- "${FILESDIR}"/${P}-fix-ExpandableListItem-overlapping.patch # KDE-bug 428102
- "${FILESDIR}"/${P}-fix-theme-memleak.patch # in KF-5.86
- "${FILESDIR}"/${P}-fix-svgicon-memleak.patch # in KF-5.86
+ "${FILESDIR}/${P}-breeze-light-dark-visual-fix.patch"
+ "${FILESDIR}/${P}-fix-blurry-buttons.patch" # KDE-bug 447977
)
src_configure() {
diff --git a/kde-frameworks/plasma/plasma-5.88.0-r1.ebuild b/kde-frameworks/plasma/plasma-5.94.0.ebuild
index 5a0e6848003..143e61839c1 100644
--- a/kde-frameworks/plasma/plasma-5.88.0-r1.ebuild
+++ b/kde-frameworks/plasma/plasma-5.94.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# 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.2
+QTMIN=5.15.3
VIRTUALX_REQUIRED="test"
inherit ecm kde.org
@@ -59,12 +59,6 @@ DEPEND="${RDEPEND}
"
BDEPEND="man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )"
-PATCHES=(
- "${FILESDIR}"/${P}-make-OSD-an-actual-wayland-OSD.patch
- "${FILESDIR}"/${P}-fix-misrenderings-with-transparency.patch # KDE-bug 305247
- "${FILESDIR}"/${P}-fix-centered-text.patch # KDE-bug 442830
-)
-
src_configure() {
local mycmakeargs=(
$(cmake_use_find_package !gles2-only OpenGL)
diff --git a/kde-frameworks/prison/Manifest b/kde-frameworks/prison/Manifest
index dfc1f75bbec..d22961956fd 100644
--- a/kde-frameworks/prison/Manifest
+++ b/kde-frameworks/prison/Manifest
@@ -1,2 +1,2 @@
-DIST prison-5.85.0.tar.xz 47056 BLAKE2B 8cba0f739c93b759f3683eb1a5077656111aeeca13b367d5ca7689516517b56b1afb9ac255f486d2ad003a2b6b86bc7acf7be718badddddf042ed8bfa632da8f SHA512 29916598b8ce86ac84014f5b107012cd636965ae65a7071971155b898484e97e79e1cb78f67dbd77077e0ffaddf759cf0fab8b370ac1c0d92be0b9b9f06e406c
-DIST prison-5.88.0.tar.xz 47888 BLAKE2B 16c03071142c78a5def9d6800c85e2493725ea81bbba40f42d72351e3348a55c58a032cdac2c30e2f0c147d865a7f0301d881349352b1eb1e1ef96e76e871fa2 SHA512 f2340b85acef0934f44f1aa54022cb4971605295a9d9c7289df07046e43bceead2a9202301c522a87904f780ae644d00d9769f1ef2b1c572a06e210631029b4d
+DIST prison-5.92.0.tar.xz 47936 BLAKE2B 72b919e042d471dbcd87faa081b00abdcdb9b708b4cfdeba4ba09c0d013b3b8cbf35220768b821e198b2fefc916472117e50be320268707ff1a5e44ff31074dd SHA512 18bb9f5a804cc80cf3770c1d4149ef075650357e81642a230810a08b780c35c563a3c629839bf8a0ca39d9b1ea01d24862a6cf1992dc5577fd1d853c8ab87b5f
+DIST prison-5.94.0.tar.xz 55184 BLAKE2B 26ca6bcd0989b6669ef0f82d5ee2492599a1c65bb9b5b225eef31b8ab95058ab8fea33203954b18c3543b61b59e62091697bc5a21d38c37aa3af5f81183a4cae SHA512 7de7f528d686ddcf1ff987786ca06d431944deed49f89075a0438982408843249882fc931003f91b4646513ff4515df9104d97ba662a87eeee6394cc93bd3969
diff --git a/kde-frameworks/prison/prison-5.85.0.ebuild b/kde-frameworks/prison/prison-5.92.0.ebuild
index ff9dc727879..85d182986a7 100644
--- a/kde-frameworks/prison/prison-5.85.0.ebuild
+++ b/kde-frameworks/prison/prison-5.92.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -17,6 +17,7 @@ RDEPEND="
>=dev-qt/qtgui-${QTMIN}:5
media-gfx/qrencode:=
media-libs/libdmtx
+ media-libs/zxing-cpp
qml? ( >=dev-qt/qtdeclarative-${QTMIN}:5 )
"
DEPEND="${RDEPEND}
diff --git a/kde-frameworks/prison/prison-5.88.0.ebuild b/kde-frameworks/prison/prison-5.94.0.ebuild
index 95d751a9255..63948280e1a 100644
--- a/kde-frameworks/prison/prison-5.88.0.ebuild
+++ b/kde-frameworks/prison/prison-5.94.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-QTMIN=5.15.2
+QTMIN=5.15.3
inherit ecm kde.org
DESCRIPTION="QRCode and data matrix barcode library"
@@ -15,6 +15,7 @@ IUSE="qml"
RDEPEND="
>=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtmultimedia-${QTMIN}:5
media-gfx/qrencode:=
media-libs/libdmtx
media-libs/zxing-cpp
diff --git a/kde-frameworks/purpose/Manifest b/kde-frameworks/purpose/Manifest
index 8893e670cd1..db3eaad0dfa 100644
--- a/kde-frameworks/purpose/Manifest
+++ b/kde-frameworks/purpose/Manifest
@@ -1,2 +1,2 @@
-DIST purpose-5.85.0.tar.xz 161412 BLAKE2B c6d55396ebde4f8b3f08a71c429bce4f0bbfe1303907d06faf841ab53147a78b582bd63e4b731eb6c5d16b939dade6dab2ca30930a9fa31babb9c1b68c37e53e SHA512 30da8286d7eb8b0652656d0c52fe0f95dd4c3c1f86e468af5f9b546b0afc996dbf9f3a0e011376de5b58e34bf529faca9f3add7ee0e820ab693745c98e21b1ed
-DIST purpose-5.88.0.tar.xz 165852 BLAKE2B 67603932b1d092eda49e4011dd2ebf8feb6862e315dc8cc3ce12a14f26e3796bd05f39e1ee91a119629b3cf2c962c3e44c600b4200e9c1fe0ecaf96ba8476673 SHA512 b21e5f50fe463f58cb3be92039e45c4c88f775d6612f85f9711090926ae65798ed159b825196fa314191fbb08eb52ae4d35077b48a1b4d6987291c6380893fae
+DIST purpose-5.92.0.tar.xz 173280 BLAKE2B 4cbed1b8b9b8a443fdb9ecbaf6495918c1f21f641184827a5e6af4084b5b2beb5b5f4a0a8c4d8e593ac4a4222dfc702e5b2ac5330625a3d26962f986d0ff07f1 SHA512 e466b836d4628f8773247cb952621d9c33127c26ae73c27b9f8015239997b0f7241a0f556c8c683a2a580c3977f448b1e9742965d9133e2c569d42b2d6cf2009
+DIST purpose-5.94.0.tar.xz 172680 BLAKE2B 44564faf3656eec617f41fab17312733aa592fb0c6c8a194aabe4cf2b0c7dcfe634afc2b3037499e13f6d3cb776fb043e11d5f07d2862841e8f7383280220962 SHA512 04bb9c29b9084e2d13f5463874aec8dca5942d6f7f25a63766451e9e4141ce5dc314afda56ab24a9621861052973245a264ebea06d864c0714c3d9829593c522
diff --git a/kde-frameworks/purpose/purpose-5.85.0.ebuild b/kde-frameworks/purpose/purpose-5.92.0.ebuild
index 56f2d81e559..13e4232ba16 100644
--- a/kde-frameworks/purpose/purpose-5.85.0.ebuild
+++ b/kde-frameworks/purpose/purpose-5.92.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -27,6 +27,7 @@ DEPEND="
=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
diff --git a/kde-frameworks/purpose/purpose-5.88.0.ebuild b/kde-frameworks/purpose/purpose-5.94.0.ebuild
index 8f61c83816a..8751c96220d 100644
--- a/kde-frameworks/purpose/purpose-5.88.0.ebuild
+++ b/kde-frameworks/purpose/purpose-5.94.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -6,7 +6,7 @@ EAPI=8
ECM_QTHELP="false"
ECM_TEST="forceoptional"
PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
+QTMIN=5.15.3
inherit ecm kde.org optfeature xdg-utils
DESCRIPTION="Library for providing abstractions to get the developer's purposes fulfilled"
diff --git a/kde-frameworks/qqc2-desktop-style/Manifest b/kde-frameworks/qqc2-desktop-style/Manifest
index c049c6aaf29..0a0a9e8f3af 100644
--- a/kde-frameworks/qqc2-desktop-style/Manifest
+++ b/kde-frameworks/qqc2-desktop-style/Manifest
@@ -1,2 +1,2 @@
-DIST qqc2-desktop-style-5.85.0.tar.xz 60580 BLAKE2B 15cde2a32102e64db7b9f94d894d67d4f067febeec622231ed8bb78909453c7f3207568d2c9a3d84e0c655b54bf7367bd9c6db711ea70bd388fdda7d9bfbc445 SHA512 9129044781a3bdbed7af932d498cc87b9d6b65f95833502e934245afb31337a71a5c578f36a74fe5f5aa88b33dc56b8fa682a4d8b938c0d62025cad1ff3bd18d
-DIST qqc2-desktop-style-5.88.0.tar.xz 62656 BLAKE2B daf5c039728be40f8980edc05cab1f43f96ae987c9f1569fcb661fff9e1047f1e937f4d3d5a870ccf61825abe66bb6b637ba1d9d5d4abccc6e8b4a29a92ee6b5 SHA512 a0433c619b3978c5884e3fc8067f254f487fd22c5668fe683e35e7a8bb5ddea90c2d72bf6c0586cd03fdf4fa8238653fb37fe0c35f4cf96fe57e13d569816606
+DIST qqc2-desktop-style-5.92.0.tar.xz 65396 BLAKE2B 1cf4e6d27c7db8f518f5c9e46f77373a72b30a3060bac3e46d94473bcf6c6fa17c26a90d9589550bee2974b3c541963ed614a6422690b32d97a80b7dbfbc5434 SHA512 698675c526f8c1174c617045113c613a1eb4684db30bf6d88600b9863273c814c4ebe0bcf45b60f24023d7b3d8ef59dab4ab1b704add55131431cc3e701b3549
+DIST qqc2-desktop-style-5.94.0.tar.xz 65616 BLAKE2B 911244cc69eee30fe25298cd74bdbc772630e33119d5e22ca65418b384822d8c5622e9ab1e6dfb3cec64657528b4a8a4ec98fafcb43aca85282132872d7e81ce SHA512 8f68423603d7de0a286dbf78441b077fc48197d9bc6863e7b13be358f68697f1ad95559e0e0705edb034c54df75ff74ca41f5b2fe70ba94e55e7c30b13c6989f
diff --git a/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.85.0.ebuild b/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.92.0.ebuild
index dc76c72e8ca..284764a1485 100644
--- a/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.85.0.ebuild
+++ b/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.92.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -21,6 +21,7 @@ DEPEND="
=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
diff --git a/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.88.0.ebuild b/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.94.0.ebuild
index 25cd6813ccc..8590bb40288 100644
--- a/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.88.0.ebuild
+++ b/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.94.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# 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.2
+QTMIN=5.15.3
inherit ecm kde.org
DESCRIPTION="Style for QtQuickControls 2 that uses QWidget's QStyle for painting"
diff --git a/kde-frameworks/solid/Manifest b/kde-frameworks/solid/Manifest
index c25e9f5b105..ac35160129b 100644
--- a/kde-frameworks/solid/Manifest
+++ b/kde-frameworks/solid/Manifest
@@ -1,2 +1,2 @@
-DIST solid-5.85.0.tar.xz 251032 BLAKE2B 31fb2c180506ee52955753c9fdae262d940d8e21b626ba9ef3e41b43cc0a26fcc901d7991a5e7f174eb218109cf992dcfc2f05c7bbe3d96b8144634ec8443c48 SHA512 e84148cdc76d8f0c075f5e064c4e7b5a886fb1beb6f343f9ab450cd17db8aa5094f839dd0fc383bc4ef1764e75f1444841bd802093343544cea99ab9668ac4c5
-DIST solid-5.88.0.tar.xz 253504 BLAKE2B 8c8ecea29f16ac281ee417ff5223ef4a013860a3c9ac90d4db62badf35d0e230cbc3ffd383ac5ed05fe2956aaea2c403cc713c7efd3baed25c6a95379e5e3b89 SHA512 dbdd619402b036c7d6d4003b1d61ca82e68333a5afb0c424cc8a7236927ac7f42d97c14ad11bebb2729632cbee9681399da2d32dfd1566c400fee8f3a13dc4fa
+DIST solid-5.92.0.tar.xz 257716 BLAKE2B 3ea7f377a38ed982535d7de6c881b2758f7ac9abdaf581e6dfdada2594435fe2851b5dbb6b5fb88f7a8c6a5126589a602efc4009a07d8e90286506fff0aa65ad SHA512 14be0e88e261dde525a227129a371c63de1a173a4dddd403fc191864ecf83468c20bad43c3ac06a751234a1dfb09d4371c574293bf1de9fb719d52730ec3643b
+DIST solid-5.94.0.tar.xz 258160 BLAKE2B 67d24dac6fc7f35eb542a8344588cba956b3a234ff42a461cbc9cd07db0d4f5937822b74825acb018e844a9163173ee1323280edeab286de863e05ca95f33480 SHA512 c72da5c52512c97a4ff164e34d06d572a7747f9f434ad574bc3bd106574bef617db48a1b00b2cca6b944f9ab5bf74563e36d25fa7618fd56782506d61ebfea37
diff --git a/kde-frameworks/solid/solid-5.85.0.ebuild b/kde-frameworks/solid/solid-5.92.0.ebuild
index acd12582c4b..80bbdb3ed78 100644
--- a/kde-frameworks/solid/solid-5.85.0.ebuild
+++ b/kde-frameworks/solid/solid-5.92.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
diff --git a/kde-frameworks/solid/solid-5.88.0.ebuild b/kde-frameworks/solid/solid-5.94.0.ebuild
index 522552e6a6e..142785ccc42 100644
--- a/kde-frameworks/solid/solid-5.88.0.ebuild
+++ b/kde-frameworks/solid/solid-5.94.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-QTMIN=5.15.2
+QTMIN=5.15.3
VIRTUALX_REQUIRED="test"
inherit ecm kde.org optfeature
diff --git a/kde-frameworks/sonnet/Manifest b/kde-frameworks/sonnet/Manifest
index 206e491c088..cc30f9f5e21 100644
--- a/kde-frameworks/sonnet/Manifest
+++ b/kde-frameworks/sonnet/Manifest
@@ -1,2 +1,2 @@
-DIST sonnet-5.85.0.tar.xz 297068 BLAKE2B 7f5bad0ebe851443dd2150be3784442008ffd7ad7acdacb42d0f3495490477a1f570a0aec6dd1b600ca01a5f9fa13c87f56cceb50c98cc2ab399ce85bc04c369 SHA512 50ed8787a8c7378574376ef0539b211eafb349f139fabe6d22788af91d57e758c994ddfdf72d83d76009570dbc8dd4bcb3df3add5c9dc17347b9263e09969930
-DIST sonnet-5.88.0.tar.xz 305036 BLAKE2B 22923be6928540c0e46c3e9abd9452b2bf7595a25333a37b401d45bd3cc2d9c952b4c943781e9697bfe62b689d8e3e78e3df814e57192c0e31ef7d826752e1dc SHA512 3a4a7362794dc937d70f96e098c84530ef373f985e69b384922d0ba749cffaa760dabdc9a90a45a6b7cf413bcf20f7f10e2e6ba440c25bd0090d7aad42b77e41
+DIST sonnet-5.92.0.tar.xz 308336 BLAKE2B 7c75b962e3fec264a00bce96f8fd98641a8b5f4870daaf49ec77d204aaa2d977e097771e580bcc25ce3eb233d9e7b3e800ece698b9473e9acf6f3c676ff5cf33 SHA512 7e6fedd0c244daf6e1b94eba2dfa7124fc6496a89ca5ed8931c9527603d1fcaabd834207bcffc8abded1e9db53ee0a737eca2ba455de705f821a944d08e931b0
+DIST sonnet-5.94.0.tar.xz 308140 BLAKE2B ba2c824a4b3e6268ea1eb7ddea8bb8846f8ea244c93bb3c4d92153b348ae9c5a8f35509054a0ff8aff7b729ddf45df84b502c0f564844d936870d0eca559098f SHA512 4904361fa8b941181c1e18fc39fb614cd9b1177a4d49c6b16ae8c5941e6328f3b803d558d44500ce002a9da92597eecb1a295e956dada994934c4cfe89c62055
diff --git a/kde-frameworks/sonnet/sonnet-5.85.0.ebuild b/kde-frameworks/sonnet/sonnet-5.92.0.ebuild
index 9eeebacdcea..7bb9b508ce5 100644
--- a/kde-frameworks/sonnet/sonnet-5.85.0.ebuild
+++ b/kde-frameworks/sonnet/sonnet-5.92.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -9,25 +9,28 @@ VIRTUALX_REQUIRED="test"
inherit ecm kde.org
DESCRIPTION="Framework for providing spell-checking through abstraction of popular backends"
+
LICENSE="LGPL-2+ LGPL-2.1+"
KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86"
-IUSE="aspell +hunspell nls"
+IUSE="aspell +hunspell nls qml"
-BDEPEND="
- nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
DEPEND="
>=dev-qt/qtgui-${QTMIN}:5
>=dev-qt/qtwidgets-${QTMIN}:5
aspell? ( app-text/aspell )
hunspell? ( app-text/hunspell:= )
+ qml? ( >=dev-qt/qtdeclarative-${QTMIN}:5 )
"
RDEPEND="${DEPEND}"
+BDEPEND="
+ nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
+"
src_configure() {
local mycmakeargs=(
$(cmake_use_find_package aspell ASPELL)
$(cmake_use_find_package hunspell HUNSPELL)
+ -DSONNET_USE_QML=$(usex qml)
)
ecm_src_configure
diff --git a/kde-frameworks/sonnet/sonnet-5.88.0.ebuild b/kde-frameworks/sonnet/sonnet-5.94.0.ebuild
index 336d50b85f6..3a422a5c1e4 100644
--- a/kde-frameworks/sonnet/sonnet-5.88.0.ebuild
+++ b/kde-frameworks/sonnet/sonnet-5.94.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
ECM_DESIGNERPLUGIN="true"
-QTMIN=5.15.2
+QTMIN=5.15.3
VIRTUALX_REQUIRED="test"
inherit ecm kde.org
diff --git a/kde-frameworks/syndication/Manifest b/kde-frameworks/syndication/Manifest
index cf323923564..f0579542ee6 100644
--- a/kde-frameworks/syndication/Manifest
+++ b/kde-frameworks/syndication/Manifest
@@ -1,2 +1,2 @@
-DIST syndication-5.85.0.tar.xz 508288 BLAKE2B c7c90e7a8735ec3cadf9e290644e87dbc1a18996150a779146a2a0bc4a8e838b0bade9d4f486901ddeaf4eaeae1a9f9c883e4ac589a53cb591f8faeef465a8d8 SHA512 d0f57e7fcd02efaaf69b90c921767c7f053e8dbe43c63963a56329e1fc9da46ee14980580f44e0015a49482ea2848887f1e92b4151973c5a60cbd7ccb4365f64
-DIST syndication-5.88.0.tar.xz 508512 BLAKE2B ade7d9303bacfef5a63df0724869578241556048e80abf67ff5f1f5894d9cbec5761c8f1a33dc20d3eef064bc234add6ec42daa6d237312080c44b40061fe63a SHA512 191ffb738b391d5ba5a2c7b7573cb9b5bf6ab89e2051423078f6e443ad5506e45745a8541af001c386ecca79195fc0a1a036d3d9ac70b7f5c77c2cde3c1b79f4
+DIST syndication-5.92.0.tar.xz 510388 BLAKE2B a7272d08610ba30f2f2249d2ecafe1dbe54c232cdc5f851d6c6acf33cf60103d08b18a666b2e570b10644e9f8a205121a6bd2df6b6c024c4b7478b2208c41ad6 SHA512 4b83c4d5d3cebc362fdbf2e5041887c713c680ddf5e5294e393de96259322399c4745c1ad87ee0aeb3fa8aa17514e2f2c98e204b43f1ae8df9ba2447a64e87b9
+DIST syndication-5.94.0.tar.xz 510540 BLAKE2B 079fdcfa871ecf8f5bf0e9904300c8ca5b91cfbe8cef4bee193ffef4663d5a517b0401bb69995d7be3927f9af69fd950dd58b7b62c39789d0802b531e1aa9a8a SHA512 8b33ca8eddd59d4461822b51a536fce53b86ec2e6b9a26d3c7e66b0317d13b2a6a271e2c011e5e9298d8d328abc961f58566caa5f1a2caf6f825b6eb5fdc1a7c
diff --git a/kde-frameworks/syndication/syndication-5.85.0.ebuild b/kde-frameworks/syndication/syndication-5.92.0.ebuild
index a5958714881..2c106230377 100644
--- a/kde-frameworks/syndication/syndication-5.85.0.ebuild
+++ b/kde-frameworks/syndication/syndication-5.92.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
diff --git a/kde-frameworks/syndication/syndication-5.88.0.ebuild b/kde-frameworks/syndication/syndication-5.94.0.ebuild
index c36c2a59b68..5153327615f 100644
--- a/kde-frameworks/syndication/syndication-5.88.0.ebuild
+++ b/kde-frameworks/syndication/syndication-5.94.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# 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.2
+QTMIN=5.15.3
inherit ecm kde.org
DESCRIPTION="Library for parsing RSS and Atom feeds"
diff --git a/kde-frameworks/syntax-highlighting/Manifest b/kde-frameworks/syntax-highlighting/Manifest
index 8b3cc31525b..9c890eec708 100644
--- a/kde-frameworks/syntax-highlighting/Manifest
+++ b/kde-frameworks/syntax-highlighting/Manifest
@@ -1,2 +1,3 @@
-DIST syntax-highlighting-5.85.0.tar.xz 2334784 BLAKE2B faaa2e57b4f5acc6b090e0ffebbeb70715dc164f634683b2d442017087aed630581ab5d91e04fd4591d28c3a6d7bbfff395a36af6ed3911de79a512c00fe1f3a SHA512 d01ef96ba4fc2c281918850adbc72239f60875a6c9f1c589286eaa4cb7a18be96e8b184f77e1a056ed17ece7d70338e4b6fd7cadf69a307e4a8bdc0ce6dc3d38
-DIST syntax-highlighting-5.88.0.tar.xz 2372812 BLAKE2B 260622a6ae7faf007e103d06570761d08c23eb6df11fe1d4241e4773b703ac87452f96bb9794e89df53e3c654761cafe2c4502342937fb3880a4bd2f5c2d1186 SHA512 1e1a294b382c7697bc89a27a32911770b4a4fce222e5bb2520cdd42a2792521df9592bd71b87918ed967b225d95cb95832e5325e721dc68cf3fa9b2d8edb396f
+DIST syntax-highlighting-5.92.0-fix-bash.patch.xz 3048 BLAKE2B c342f0e01930d9a8577a2d36588deeab767e6730a721e5462af202284ba0d96837479b6e880401749390ecadb877d379c1b1ce38588198178e7e22e2f133ee0d SHA512 9bace711c744c0041fadb3bffc530ff3f8c2d0739792999e0de48b66fd4802943c77b24342489f2db26b0f92f9eafab96edb0170083eb95c7c26e62e2e44beb4
+DIST syntax-highlighting-5.92.0.tar.xz 2394744 BLAKE2B b445efecf6c5be17efac2c8247a901f3be1ce576fdb1100fe5da22aceb67ee1161c798de222f08ed611c82a35cba34b6167fd2ad3b150d91a9c46ab8fb299cc1 SHA512 bec8064f041fa6b57e57eb33eeed457ccf4e329f9b9b2ae494e000c26e54d4e966d1368b9772a638e7c8318192e701dfa06f5b3b508e13f32a8ff130582e5d96
+DIST syntax-highlighting-5.94.0.tar.xz 2397668 BLAKE2B 29a1694c8c0f0a6735266ac08c720861994d7f6b3a67124384f4b5e71bf681ebb5eb9ea1e989c766fb5c3d2dd454dd5ef3e128ad4a90adf8943fdb0cad1927da SHA512 34e3ec926ae576e0366216c67ee73ef62c538e38369d664ca104951cf08a52848fd7b4d75e29ef23650259b113af727bf71837b6b6ced0f63d4264c0c903acb2
diff --git a/kde-frameworks/syntax-highlighting/files/syntax-highlighting-5.85.0-python-add-yield-from-keyword.patch b/kde-frameworks/syntax-highlighting/files/syntax-highlighting-5.85.0-python-add-yield-from-keyword.patch
deleted file mode 100644
index ba1ae38355e..00000000000
--- a/kde-frameworks/syntax-highlighting/files/syntax-highlighting-5.85.0-python-add-yield-from-keyword.patch
+++ /dev/null
@@ -1,170 +0,0 @@
-From 439f8cbfe0b5d1f931c2233d1790e1280170c24c Mon Sep 17 00:00:00 2001
-From: Jan Paul Batrina <jpmbatrina01@gmail.com>
-Date: Sat, 28 Aug 2021 21:27:41 +0800
-Subject: [PATCH] Python: Add "yield from" keyword
-
-BUG: 441540
----
- autotests/folding/test.py.fold | 9 +++++++++
- autotests/html/test.py.dark.html | 9 +++++++++
- autotests/html/test.py.html | 9 +++++++++
- autotests/input/test.py | 9 +++++++++
- autotests/reference/test.py.ref | 9 +++++++++
- data/syntax/python.xml | 17 +++++++++++++++--
- 6 files changed, 60 insertions(+), 2 deletions(-)
-
-diff --git a/autotests/folding/test.py.fold b/autotests/folding/test.py.fold
-index 7bbf054c..5e7a3ba8 100644
---- a/autotests/folding/test.py.fold
-+++ b/autotests/folding/test.py.fold
-@@ -118,6 +118,15 @@ match<beginfold id='2'>(</beginfold id='2'>command.split<beginfold id='2'>(</beg
- case <beginfold id='5'>[</beginfold id='5'>"quit"<endfold id='5'>]</endfold id='5'>:
- print<beginfold id='2'>(</beginfold id='2'>"Goodbye!"<endfold id='2'>)</endfold id='2'>
-
-+def func1<beginfold id='2'>(</beginfold id='2'><endfold id='2'>)</endfold id='2'>:
-+ yield 1
-+ yield from <beginfold id='5'>[</beginfold id='5'>func<beginfold id='2'>(</beginfold id='2'><endfold id='2'>)</endfold id='2'>, 1, 2, "3"<endfold id='5'>]</endfold id='5'>
-+ # invalid, "from" no longer part of "yield from"
-+ yield, from 1
-+
-+async def func2<beginfold id='2'>(</beginfold id='2'><endfold id='2'>)</endfold id='2'>:
-+ await asyncio.sleep<beginfold id='2'>(</beginfold id='2'>1<endfold id='2'>)</endfold id='2'>
-+
- "\\\\\\\\\\ENSURE THAT THIS AND THE FOLLOWING LINES ARE AT THE <endfold id='6'>END</endfold id='6'> OF THE FILE\\\\\\\\\\ \
- "
- </indentfold>a = 'otherwise all succeeding lines will be
-diff --git a/autotests/html/test.py.dark.html b/autotests/html/test.py.dark.html
-index 23718b11..1d6c1dd2 100644
---- a/autotests/html/test.py.dark.html
-+++ b/autotests/html/test.py.dark.html
-@@ -124,6 +124,15 @@ match(command.split())
- <span style="color:#fdbc4b;font-weight:bold;">case</span> [<span style="color:#f44f4f;">&quot;quit&quot;</span>]:
- <span style="color:#7f8c8d;">print</span>(<span style="color:#f44f4f;">&quot;Goodbye!&quot;</span>)
-
-+<span style="font-weight:bold;">def</span> func1():
-+ <span style="color:#fdbc4b;font-weight:bold;">yield</span> <span style="color:#f67400;">1</span>
-+ <span style="color:#fdbc4b;font-weight:bold;">yield</span> <span style="color:#fdbc4b;font-weight:bold;">from</span> [func(), <span style="color:#f67400;">1</span>, <span style="color:#f67400;">2</span>, <span style="color:#f44f4f;">&quot;3&quot;</span>]
-+ <span style="color:#7a7c7d;"># invalid, &quot;from&quot; no longer part of &quot;yield from&quot;</span>
-+ <span style="color:#fdbc4b;font-weight:bold;">yield</span>, <span style="color:#27ae60;">from</span> <span style="color:#f67400;">1</span>
-+
-+<span style="color:#fdbc4b;font-weight:bold;">async</span> <span style="font-weight:bold;">def</span> func2():
-+ <span style="color:#fdbc4b;font-weight:bold;">await</span> asyncio.sleep(<span style="color:#f67400;">1</span>)
-+
- <span style="color:#7a7c7d;">&quot;</span><span style="color:#3daee9;">\\\\\\\\\\</span><span style="color:#7a7c7d;">ENSURE THAT THIS AND THE FOLLOWING LINES ARE AT THE </span><span style="color:#2980b9;background-color:#153042;">END</span><span style="color:#7a7c7d;"> OF THE FILE</span><span style="color:#3daee9;">\\\\\\\\\\</span><span style="color:#7a7c7d;"> </span><span style="color:#3daee9;">\</span>
- <span style="color:#7a7c7d;">&quot;</span>
- a <span style="color:#3f8058;">=</span> <span style="color:#f44f4f;">'otherwise all succeeding lines will be</span>
-diff --git a/autotests/html/test.py.html b/autotests/html/test.py.html
-index 55cfefb0..4d7a2709 100644
---- a/autotests/html/test.py.html
-+++ b/autotests/html/test.py.html
-@@ -124,6 +124,15 @@ match(command.split())
- <span style="font-weight:bold;">case</span> [<span style="color:#bf0303;">&quot;quit&quot;</span>]:
- <span style="color:#644a9b;font-weight:bold;">print</span>(<span style="color:#bf0303;">&quot;Goodbye!&quot;</span>)
-
-+<span style="font-weight:bold;">def</span> func1():
-+ <span style="font-weight:bold;">yield</span> <span style="color:#b08000;">1</span>
-+ <span style="font-weight:bold;">yield</span> <span style="font-weight:bold;">from</span> [func(), <span style="color:#b08000;">1</span>, <span style="color:#b08000;">2</span>, <span style="color:#bf0303;">&quot;3&quot;</span>]
-+ <span style="color:#898887;"># invalid, &quot;from&quot; no longer part of &quot;yield from&quot;</span>
-+ <span style="font-weight:bold;">yield</span>, <span style="color:#ff5500;">from</span> <span style="color:#b08000;">1</span>
-+
-+<span style="font-weight:bold;">async</span> <span style="font-weight:bold;">def</span> func2():
-+ <span style="font-weight:bold;">await</span> asyncio.sleep(<span style="color:#b08000;">1</span>)
-+
- <span style="color:#898887;">&quot;</span><span style="color:#924c9d;">\\\\\\\\\\</span><span style="color:#898887;">ENSURE THAT THIS AND THE FOLLOWING LINES ARE AT THE </span><span style="color:#0057ae;background-color:#e0e9f8;">END</span><span style="color:#898887;"> OF THE FILE</span><span style="color:#924c9d;">\\\\\\\\\\</span><span style="color:#898887;"> </span><span style="color:#924c9d;">\</span>
- <span style="color:#898887;">&quot;</span>
- a <span style="color:#ca60ca;">=</span> <span style="color:#bf0303;">'otherwise all succeeding lines will be</span>
-diff --git a/autotests/input/test.py b/autotests/input/test.py
-index 3eb8378d..d91db578 100644
---- a/autotests/input/test.py
-+++ b/autotests/input/test.py
-@@ -118,6 +118,15 @@ match(command.split()):
- case ["quit"]:
- print("Goodbye!")
-
-+def func1():
-+ yield 1
-+ yield from [func(), 1, 2, "3"]
-+ # invalid, "from" no longer part of "yield from"
-+ yield, from 1
-+
-+async def func2():
-+ await asyncio.sleep(1)
-+
- "\\\\\\\\\\ENSURE THAT THIS AND THE FOLLOWING LINES ARE AT THE END OF THE FILE\\\\\\\\\\ \
- "
- a = 'otherwise all succeeding lines will be
-diff --git a/autotests/reference/test.py.ref b/autotests/reference/test.py.ref
-index 9c5bdb54..1742da2b 100644
---- a/autotests/reference/test.py.ref
-+++ b/autotests/reference/test.py.ref
-@@ -118,6 +118,15 @@
- <Normal Text> </Normal Text><Flow Control Keyword>case</Flow Control Keyword><Normal Text> [</Normal Text><String>"quit"</String><Normal Text>]:</Normal Text><br/>
- <Normal Text> </Normal Text><Builtin Function>print</Builtin Function><Normal Text>(</Normal Text><String>"Goodbye!"</String><Normal Text>)</Normal Text><br/>
- <Normal Text></Normal Text><br/>
-+<Definition Keyword>def</Definition Keyword><Normal Text> func1():</Normal Text><br/>
-+<Normal Text> </Normal Text><Flow Control Keyword>yield</Flow Control Keyword><Normal Text> </Normal Text><Int>1</Int><br/>
-+<Normal Text> </Normal Text><Flow Control Keyword>yield</Flow Control Keyword><Normal Text> </Normal Text><Flow Control Keyword>from</Flow Control Keyword><Normal Text> [func(), </Normal Text><Int>1</Int><Normal Text>, </Normal Text><Int>2</Int><Normal Text>, </Normal Text><String>"3"</String><Normal Text>]</Normal Text><br/>
-+<Normal Text> </Normal Text><Comment># invalid, "from" no longer part of "yield from"</Comment><br/>
-+<Normal Text> </Normal Text><Flow Control Keyword>yield</Flow Control Keyword><Normal Text>, </Normal Text><Import>from</Import><Normal Text> </Normal Text><Int>1</Int><br/>
-+<Normal Text></Normal Text><br/>
-+<Flow Control Keyword>async</Flow Control Keyword><Normal Text> </Normal Text><Definition Keyword>def</Definition Keyword><Normal Text> func2():</Normal Text><br/>
-+<Normal Text> </Normal Text><Flow Control Keyword>await</Flow Control Keyword><Normal Text> asyncio.sleep(</Normal Text><Int>1</Int><Normal Text>)</Normal Text><br/>
-+<Normal Text></Normal Text><br/>
- <Comment>"</Comment><String Char>\\\\\\\\\\</String Char><Comment>ENSURE THAT THIS AND THE FOLLOWING LINES ARE AT THE </Comment><Region Marker>END</Region Marker><Comment> OF THE FILE</Comment><String Char>\\\\\\\\\\</String Char><Comment> </Comment><String Char>\</String Char><br/>
- <Comment>"</Comment><br/>
- <Normal Text>a </Normal Text><Operator>=</Operator><Normal Text> </Normal Text><String>'otherwise all succeeding lines will be</String><br/>
-diff --git a/data/syntax/python.xml b/data/syntax/python.xml
-index 7143bf30..676872f0 100644
---- a/data/syntax/python.xml
-+++ b/data/syntax/python.xml
-@@ -52,7 +52,7 @@
- <!-- v2.07 add support for %prog and co, see bug 142832 -->
- <!-- v2.08 add missing overloaders, new Python 3 statements, builtins, and keywords -->
- <!-- v2.29 recognize escape sequenzes correctly -->
--<language name="Python" version="21" style="python" indenter="python" kateversion="5.0" section="Scripts" extensions="*.py;*.pyw;SConstruct;SConscript;*.FCMacro" mimetype="application/x-python;text/x-python;text/x-python3" casesensitive="1" author="Michael Bueker" license="">
-+<language name="Python" version="22" style="python" indenter="python" kateversion="5.0" section="Scripts" extensions="*.py;*.pyw;SConstruct;SConscript;*.FCMacro" mimetype="application/x-python;text/x-python;text/x-python3" casesensitive="1" author="Michael Bueker" license="">
- <highlighting>
- <list name="import">
- <item>import</item>
-@@ -90,10 +90,17 @@
- <item>try</item>
- <item>while</item>
- <item>with</item>
-- <item>yield</item>
- <item>async</item>
- <item>await</item>
- </list>
-+ <list name="flow_yield">
-+ <item>yield</item>
-+ <!--
-+ "yield from" added here as a keyword for autocompletion. The actual handling
-+ is in context="yield" so that we won't need to add space as a weakDeliminator.
-+ -->
-+ <item>yield from</item>
-+ </list>
- <list name="patternmatching">
- <item>match</item>
- <item>case</item>
-@@ -380,6 +387,7 @@
- <keyword attribute="Definition Keyword" String="defs" context="#stay"/>
- <keyword attribute="Operator Keyword" String="operators" context="#stay"/>
- <keyword attribute="Flow Control Keyword" String="flow" context="#stay"/>
-+ <keyword attribute="Flow Control Keyword" String="flow_yield" context="yield"/>
- <keyword attribute="Flow Control Keyword" String="patternmatching" context="Pattern Matching" lookAhead="1" firstNonSpace="1"/>
- <keyword attribute="Builtin Function" String="builtinfuncs" context="#stay"/>
- <keyword attribute="Special Variable" String="specialvars" context="#stay"/>
-@@ -428,6 +436,11 @@
- <RegExpr attribute="Error" String="[\w\d]+" context="#pop#pop"/>
- </context>
-
-+ <context name="yield" attribute="Flow Control Keyword" lineEndContext="#pop" fallthrough="1" fallthroughContext="#pop">
-+ <DetectSpaces attribute="Normal Text" context="#stay"/>
-+ <WordDetect attribute="Flow Control Keyword" context="#pop" String="from"/>
-+ </context>
-+
- <context name="Pattern Matching" attribute="Flow Control Keyword" lineEndContext="#pop">
- <!--
- Python 3.10: https://docs.python.org/3.10/reference/compound_stmts.html#the-match-statement
---
-GitLab
-
diff --git a/kde-frameworks/syntax-highlighting/syntax-highlighting-5.85.0-r1.ebuild b/kde-frameworks/syntax-highlighting/syntax-highlighting-5.92.0-r1.ebuild
index d9a1de132dd..8541f25a18e 100644
--- a/kde-frameworks/syntax-highlighting/syntax-highlighting-5.85.0-r1.ebuild
+++ b/kde-frameworks/syntax-highlighting/syntax-highlighting-5.92.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -8,24 +8,25 @@ QTMIN=5.15.2
inherit ecm kde.org
DESCRIPTION="Framework for syntax highlighting"
+SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${P}-fix-bash.patch.xz"
+
LICENSE="MIT"
KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
IUSE="nls"
-BDEPEND="
- dev-lang/perl
- nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
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 )
+"
-PATCHES=(
- "${FILESDIR}"/${P}-python-add-yield-from-keyword.patch # KDE-bug 441540
-)
+PATCHES=( "${WORKDIR}/${P}-fix-bash.patch" ) # KDE-bugs 450478
src_install() {
ecm_src_install
diff --git a/kde-frameworks/syntax-highlighting/syntax-highlighting-5.88.0.ebuild b/kde-frameworks/syntax-highlighting/syntax-highlighting-5.94.0.ebuild
index 094222310b9..751d494339f 100644
--- a/kde-frameworks/syntax-highlighting/syntax-highlighting-5.88.0.ebuild
+++ b/kde-frameworks/syntax-highlighting/syntax-highlighting-5.94.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
ECM_TEST="forceoptional"
-QTMIN=5.15.2
+QTMIN=5.15.3
inherit ecm kde.org
DESCRIPTION="Framework for syntax highlighting"
diff --git a/kde-frameworks/threadweaver/Manifest b/kde-frameworks/threadweaver/Manifest
index 3d1625bd9c7..145f19e9069 100644
--- a/kde-frameworks/threadweaver/Manifest
+++ b/kde-frameworks/threadweaver/Manifest
@@ -1,2 +1,2 @@
-DIST threadweaver-5.85.0.tar.xz 1410060 BLAKE2B 06c388dc224926482092903159d168348da2289808157517529c9180dad5bc8782dd5d171bbe28645fe6aadd59aadf7c14802a4ce6a7eba37634c4507ce25859 SHA512 4c2de589f9648dc56a05789349dcd45a5e7a75fd5804e82f9e4f418330404e66028450f3c713f184ebec1c8c53d46df7f3d4264f3f3284acad3e4dc7812ed199
-DIST threadweaver-5.88.0.tar.xz 1410684 BLAKE2B 6d09c365fe31fa6c59db69a46e4ad3e783487da6aa364409b0e7da9cd789f4f79288283afe30ed4c0374fd78debd1eed1cd791c8ccf5f445c30a47128a3972ed SHA512 2161f8009ddb8fdf88dc2b33d1a3455d0e35a93d0b96c67698f6ef8db61dcb1752f277545d4f1c278c1de186cd895f9fd8823bce815145cfe479b5d7bbd4b210
+DIST threadweaver-5.92.0.tar.xz 1413000 BLAKE2B 2659e54bbdfe559f52288d71cc2f43aa41e3773c88a8b2d3ffce21def930c4dc615da89ffa0a15a77bce280bbdfc6430bb5a862dcdb25b071522afd79630d7d0 SHA512 7262e9c88e4a7eaa9d53e70f572e906d48340afcf63c057b92fea8c648755b48683a570d7745efc8f13134ad061fbdaad1c919764d96e804d60a659a5c28e340
+DIST threadweaver-5.94.0.tar.xz 1412996 BLAKE2B 8d827e507a6d521e3ff962593cb37d13497651ecf6c35076fb657ecc13845844bc271670d9f138f8370f8af68fa48cf2820f6fccd3744204aa75b61ec89cdfd8 SHA512 3ca7c63ec47a6c11182304bec96b9de6ca2e5a370de1e93350d00861a5d8d842e55e8e32390befa77d880e69ba763a0d576e17856bae650326dd9f1cb48a0fdc
diff --git a/kde-frameworks/threadweaver/threadweaver-5.85.0.ebuild b/kde-frameworks/threadweaver/threadweaver-5.92.0.ebuild
index 221e1dc9a42..473beaaf69a 100644
--- a/kde-frameworks/threadweaver/threadweaver-5.85.0.ebuild
+++ b/kde-frameworks/threadweaver/threadweaver-5.92.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
diff --git a/kde-frameworks/threadweaver/threadweaver-5.88.0.ebuild b/kde-frameworks/threadweaver/threadweaver-5.94.0.ebuild
index 5b5690a5e3b..a1a62f1f539 100644
--- a/kde-frameworks/threadweaver/threadweaver-5.88.0.ebuild
+++ b/kde-frameworks/threadweaver/threadweaver-5.94.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8