diff options
Diffstat (limited to 'kde-plasma/plasma-desktop')
| -rw-r--r-- | kde-plasma/plasma-desktop/Manifest | 10 | ||||
| -rw-r--r-- | kde-plasma/plasma-desktop/files/plasma-desktop-5.17.4-pager-regression.patch | 25 | ||||
| -rw-r--r-- | kde-plasma/plasma-desktop/files/plasma-desktop-5.17.5-revert-activities-jagginess.patch | 32 | ||||
| -rw-r--r-- | kde-plasma/plasma-desktop/metadata.xml | 1 | ||||
| -rw-r--r-- | kde-plasma/plasma-desktop/plasma-desktop-5.16.5.ebuild | 139 | ||||
| -rw-r--r-- | kde-plasma/plasma-desktop/plasma-desktop-5.17.4-r2.ebuild | 143 | ||||
| -rw-r--r-- | kde-plasma/plasma-desktop/plasma-desktop-5.17.5-r1.ebuild (renamed from kde-plasma/plasma-desktop/plasma-desktop-5.17.4.ebuild) | 4 |
7 files changed, 209 insertions, 145 deletions
diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest index d7914152f8a0..78b27aee3fcf 100644 --- a/kde-plasma/plasma-desktop/Manifest +++ b/kde-plasma/plasma-desktop/Manifest @@ -1,5 +1,7 @@ -DIST plasma-desktop-5.16.5.tar.xz 9556104 BLAKE2B 8e825692dc09897daa9eb6977991ae9d559284b066a662b4bd40faae575068866c6f82a7fab899e5b06312ae3910aea7ccd50ce895ea0371b2346f2fd69c4786 SHA512 7a4678928ccfd511746ceea53a4c31d15dfddafdeef3d9b169088a186ea1f5787eb3589ad5dbd3892b4669a7a833311da41795562fc94a58ac7aa2f02a741192 +AUX plasma-desktop-5.17.4-pager-regression.patch 1062 BLAKE2B 6c5a321cfff23f48c79e8c5d0d72fc71d6cfafc8b76441789dcf1b377c3cd54b48b6050e4649d88bdd747ff5de72337bb0f048ac4be1757748e78c57159f03e0 SHA512 e0919291ae335f717ca029460f78337ed72ae4a88c8c3c0185b3f0fb74544681d446463c21b6a8337c72ae4dce58b5581a6b7faa04d95c4eed9481a8bac61898 +AUX plasma-desktop-5.17.5-revert-activities-jagginess.patch 1214 BLAKE2B 3d6517a6020639a5f0f7720d22e45c985a95553bb62a2d365d219ff05d18eed5c105c17c54b21eb114e85b2012dead46f1e928d1082b7b1387d813e75144f775 SHA512 c7910def604e6a6cf23d11d50c33f585d67a7e539cdfc2d4a81449e46eb4e823fe63e484f5cdb535f4fdec0fcc6be805ede703b74b22b88f4dc941593b6f4fa3 DIST plasma-desktop-5.17.4.tar.xz 9452532 BLAKE2B 1e93c30194d1a745a45eae6eaae515f83b5ae97c40c3ce5fabbedb6f00c0228085983767711a5537358bca0fd394fc8d82666092a394692b56683ff447107b9c SHA512 b3d4ad7ccffb911dd0bea9c33d1e814ffb8ddb53379cc26a543ed19a61d9d0cb36ae856151e187354e2af50c47c330fd54bea06602afe5336b885b611d70962c -EBUILD plasma-desktop-5.16.5.ebuild 3730 BLAKE2B b2a889089af1ea98341e34d4a538d992b5461d539daf99e06abe429900217b99ba4e345c8f00d4258bab1c67dfe3dc613723e225a7d1c5050aea042a31fed031 SHA512 81daca50d1874014535d0b618c30e445c8ef154a6c06ca20a00754ee303df77f1911b7383c49f6038ade105e163beb272331cd9974a5437bf4398981da5ec9cb -EBUILD plasma-desktop-5.17.4.ebuild 4001 BLAKE2B f518504a30087d13d074076a43b03027bbc889a5815ade5a4290faa1736df14b2c75347f37ce7fc7c0a6bcdcaad59cf117f95aafd522a78daf64a47aea54e3c7 SHA512 40151cb48e5f43c041c5d3bc4dfb6fecb49c99e8c90fdcda3b1b42d39d14a73eef3b760c38cfc1daa84d609a7400e58c6f57ae13b253526797bea8245b04844d -MISC metadata.xml 589 BLAKE2B 1638c90163cf31addbeb1f6f58ed68cf7e97da259bc22d4df7123a704bd66b3e628d9cbf1c2b20d67d44539f4d27588d348724510aeb3310e5baea63db79be8d SHA512 e6aece50e632897b8fca637028419eadb6d6fea24388314b5be7f3e915d0ee3c46d7ac09c354ffcc04a50b31d4998033fe21919d19a40368e26ec43987f4d18f +DIST plasma-desktop-5.17.5.tar.xz 9448300 BLAKE2B 2599c77527d4210f442c51b7bc8465fd35be83c711f1fcd9a31a6206475319035aac7962320bb47f74bd89d7a70e0ab46b866dfd5424d23d9934806a2b03d3f5 SHA512 c910be6bf63091f14f190e8fbfbd0039aa175d30f7a6870dbd99ffc3ff49a0f77e63e2d3fc9319dab1c650b15108cdaefee470eddab1213afe8d3a149ac64dd4 +EBUILD plasma-desktop-5.17.4-r2.ebuild 4053 BLAKE2B 92d7a1c6707fc4bdd96f61282273220820a0465af58135793a9cf625e2d988211126ccb64019055cd422b44ecd308cac5e9420d6aadad72d2082a99870a434a4 SHA512 d988d4f7a542cbe1ad40323bb91c615c0244587b738f45b513f1ae5af014c33d05f3ac1028a159dfead0d0fa99abd7c93b6febc7575518d88c6ff1ae28ce92d9 +EBUILD plasma-desktop-5.17.5-r1.ebuild 4067 BLAKE2B 70ec5527acd10dc445960a1e3414795f931188aee281725da63de0b605a91cb9183ef8bbc9bd6b4b8e06dcb6ed071b1c997b0194f0d7d48f6c3929176f8bf648 SHA512 f9dc0711cb707b7b95eccce6b38135a72e0c937d6f5197651225baf1e8c4abd75650a78b7a4fef8b5bc94426c53088c5832b05dace2149ce00fec539fbb622bd +MISC metadata.xml 514 BLAKE2B 31b846e6675005788e3041e22365385edcb4ac253db87f15a048b7d3a0cbe61494ce7a3e495444ef9c9bd3455e566d7a89664a8969041b22a3474eb4e99d1397 SHA512 a14dbd159795a2982ba81c0856f2f058664b807a3c26afe9371e4be3ccb5bb0b8a48c086fd580549c35006821304df4c22ad3a1c7e43d5fda4a37688044fb99d diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.17.4-pager-regression.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.17.4-pager-regression.patch new file mode 100644 index 000000000000..d8057f22a4c2 --- /dev/null +++ b/kde-plasma/plasma-desktop/files/plasma-desktop-5.17.4-pager-regression.patch @@ -0,0 +1,25 @@ +From 2b5e86323f180f0c51ef9af898a69a522bc379ad Mon Sep 17 00:00:00 2001 +From: David Faure <faure@kde.org> +Date: Sat, 14 Dec 2019 00:29:32 +0100 +Subject: Fix regression in "Port the pager applet away from QtWidgets" + +BUG: 414849 +--- + applets/pager/plugin/windowmodel.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/applets/pager/plugin/windowmodel.cpp b/applets/pager/plugin/windowmodel.cpp +index 93273bb..bcda333 100644 +--- a/applets/pager/plugin/windowmodel.cpp ++++ b/applets/pager/plugin/windowmodel.cpp +@@ -77,7 +77,7 @@ QVariant WindowModel::data(const QModelIndex &index, int role) const + if (role == AbstractTasksModel::Geometry) { + QRect windowGeo = TaskFilterProxyModel::data(index, role).toRect(); + QList<QScreen *> screens = QGuiApplication::screens(); +- const QRect desktopGeo = screens.at(0)->geometry(); ++ const QRect desktopGeo = screens.at(0)->virtualGeometry(); + + if (KWindowSystem::mapViewport()) { + int x = windowGeo.center().x() % desktopGeo.width(); +-- +cgit v1.1 diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.17.5-revert-activities-jagginess.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.17.5-revert-activities-jagginess.patch new file mode 100644 index 000000000000..fac8bab91b6b --- /dev/null +++ b/kde-plasma/plasma-desktop/files/plasma-desktop-5.17.5-revert-activities-jagginess.patch @@ -0,0 +1,32 @@ +From 1db4d07bb78858da7676720d13ee7c4f3bd8e6e0 Mon Sep 17 00:00:00 2001 +From: Nate Graham <nate@kde.org> +Date: Sun, 12 Jan 2020 08:39:29 -0700 +Subject: Revert "[KCMs/Activities] Fix jagginess for activities list icons on + high DPI systems" + +This reverts commit 567f71714faac305947573e307f486a9960cf1d1. + +The commit in question was pushed without review and should not have +been. It worked fine for me in local testing but somehow was broken +anyway. Sorry. :( + +BUG: 416158 +--- + kcms/activities/qml/activitiesTab/ActivitiesView.qml | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/kcms/activities/qml/activitiesTab/ActivitiesView.qml b/kcms/activities/qml/activitiesTab/ActivitiesView.qml +index 531ef9f..aac13a2 100644 +--- a/kcms/activities/qml/activitiesTab/ActivitiesView.qml ++++ b/kcms/activities/qml/activitiesTab/ActivitiesView.qml +@@ -52,8 +52,6 @@ ColumnLayout { + height: Kirigami.Units.iconSizes.medium + width: height + source: model.icon +- sourceSize.width: model.icon.width +- sourceSize.height: model.icon.height + } + + QQC2.Label { +-- +cgit v1.1 diff --git a/kde-plasma/plasma-desktop/metadata.xml b/kde-plasma/plasma-desktop/metadata.xml index 65b6478522ce..cf13ed12c3b9 100644 --- a/kde-plasma/plasma-desktop/metadata.xml +++ b/kde-plasma/plasma-desktop/metadata.xml @@ -6,7 +6,6 @@ <name>Gentoo KDE Project</name> </maintainer> <use> - <flag name="appstream">Enable AppStream software metadata support</flag> <flag name="ibus">Use ibus input method via <pkg>app-i18n/ibus</pkg></flag> <flag name="mouse">Enable mouse KCM</flag> <flag name="scim">Enable applets that use <pkg>app-i18n/scim</pkg></flag> diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.16.5.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.16.5.ebuild deleted file mode 100644 index a05cd5ec7d32..000000000000 --- a/kde-plasma/plasma-desktop/plasma-desktop-5.16.5.ebuild +++ /dev/null @@ -1,139 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -KDE_HANDBOOK="forceoptional" -KDE_TEST="true" -VIRTUALX_REQUIRED="test" -inherit kde5 - -DESCRIPTION="KDE Plasma desktop" -KEYWORDS="amd64 ~arm arm64 x86" -IUSE="appstream +fontconfig ibus +mouse scim +semantic-desktop touchpad" - -COMMON_DEPEND=" - $(add_frameworks_dep attica) - $(add_frameworks_dep kactivities) - $(add_frameworks_dep kactivities-stats) - $(add_frameworks_dep karchive) - $(add_frameworks_dep kauth) - $(add_frameworks_dep kbookmarks) - $(add_frameworks_dep kcmutils) - $(add_frameworks_dep kcodecs) - $(add_frameworks_dep kcompletion) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kdbusaddons) - $(add_frameworks_dep kdeclarative) - $(add_frameworks_dep kded) - $(add_frameworks_dep kdelibs4support) - $(add_frameworks_dep kemoticons) - $(add_frameworks_dep kglobalaccel) - $(add_frameworks_dep kguiaddons) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kiconthemes) - $(add_frameworks_dep kio) - $(add_frameworks_dep kitemmodels) - $(add_frameworks_dep kitemviews) - $(add_frameworks_dep kjobwidgets) - $(add_frameworks_dep knewstuff) - $(add_frameworks_dep knotifications) - $(add_frameworks_dep knotifyconfig) - $(add_frameworks_dep kparts) - $(add_frameworks_dep kpeople) - $(add_frameworks_dep krunner) - $(add_frameworks_dep kservice) - $(add_frameworks_dep kwallet) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kwindowsystem) - $(add_frameworks_dep kxmlgui) - $(add_frameworks_dep plasma) - $(add_frameworks_dep solid) - $(add_frameworks_dep sonnet) - $(add_plasma_dep kwin) - $(add_plasma_dep plasma-workspace) - $(add_qt_dep qtconcurrent) - $(add_qt_dep qtdbus) - $(add_qt_dep qtdeclarative) - $(add_qt_dep qtgui) - $(add_qt_dep qtnetwork) - $(add_qt_dep qtprintsupport) - $(add_qt_dep qtsql) - $(add_qt_dep qtsvg) - $(add_qt_dep qtwidgets) - $(add_qt_dep qtx11extras) - $(add_qt_dep qtxml) - media-libs/phonon[qt5(+)] - x11-libs/libX11 - x11-libs/libXcursor - x11-libs/libXfixes - x11-libs/libXi - x11-libs/libxcb - x11-libs/libxkbfile - appstream? ( >=dev-libs/appstream-0.12.2[qt5] ) - fontconfig? ( - media-libs/fontconfig - media-libs/freetype - x11-libs/libXft - x11-libs/xcb-util-image - ) - ibus? ( - $(add_qt_dep qtx11extras) - app-i18n/ibus - dev-libs/glib:2 - x11-libs/libxcb - x11-libs/xcb-util-keysyms - ) - scim? ( app-i18n/scim ) - semantic-desktop? ( $(add_frameworks_dep baloo) ) - touchpad? ( x11-drivers/xf86-input-synaptics ) -" -DEPEND="${COMMON_DEPEND} - dev-libs/boost - x11-base/xorg-proto - fontconfig? ( x11-libs/libXrender ) - mouse? ( - x11-drivers/xf86-input-evdev - x11-drivers/xf86-input-libinput - ) -" -RDEPEND="${COMMON_DEPEND} - $(add_frameworks_dep kirigami) - $(add_frameworks_dep qqc2-desktop-style) - $(add_plasma_dep breeze) - $(add_plasma_dep kde-cli-tools) - $(add_plasma_dep oxygen) - $(add_qt_dep qtgraphicaleffects) - $(add_qt_dep qtquickcontrols2) - sys-apps/util-linux - x11-apps/setxkbmap - !<kde-plasma/kdeplasma-addons-5.15.80 -" - -src_configure() { - local mycmakeargs=( - $(cmake-utils_use_find_package appstream AppStreamQt) - $(cmake-utils_use_find_package fontconfig Fontconfig) - $(cmake-utils_use_find_package ibus IBus) - $(cmake-utils_use_find_package mouse Evdev) - $(cmake-utils_use_find_package mouse XorgLibinput) - $(cmake-utils_use_find_package scim SCIM) - $(cmake-utils_use_find_package semantic-desktop KF5Baloo) - $(cmake-utils_use_find_package touchpad Synaptics) - ) - - kde5_src_configure -} - -src_test() { - # parallel tests fail, foldermodeltest,positionertest hang, bug #646890 - # needs D-Bus, bug #634166 - local myctestargs=( - -j1 - -E "(foldermodeltest|positionertest|test_kio_fonts)" - ) - - kde5_src_test -} diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.17.4-r2.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.17.4-r2.ebuild new file mode 100644 index 000000000000..eb00ab2ef8ab --- /dev/null +++ b/kde-plasma/plasma-desktop/plasma-desktop-5.17.4-r2.ebuild @@ -0,0 +1,143 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +ECM_HANDBOOK="forceoptional" +ECM_TEST="true" +VIRTUALX_REQUIRED="test" +KFMIN=5.64.0 +PVCUT=$(ver_cut 1-3) +QTMIN=5.12.3 +inherit ecm kde.org + +DESCRIPTION="KDE Plasma desktop" +LICENSE="GPL-2" # TODO: CHECK +SLOT="5" +KEYWORDS="amd64 ~arm arm64 x86" +IUSE="+fontconfig ibus +mouse scim +semantic-desktop touchpad" + +COMMON_DEPEND=" + >=kde-frameworks/attica-${KFMIN}:5 + >=kde-frameworks/kactivities-${KFMIN}:5 + >=kde-frameworks/kactivities-stats-${KFMIN}:5 + >=kde-frameworks/karchive-${KFMIN}:5 + >=kde-frameworks/kauth-${KFMIN}:5 + >=kde-frameworks/kbookmarks-${KFMIN}:5 + >=kde-frameworks/kcmutils-${KFMIN}:5 + >=kde-frameworks/kcodecs-${KFMIN}:5 + >=kde-frameworks/kcompletion-${KFMIN}:5 + >=kde-frameworks/kconfig-${KFMIN}:5 + >=kde-frameworks/kconfigwidgets-${KFMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/kdbusaddons-${KFMIN}:5 + >=kde-frameworks/kdeclarative-${KFMIN}:5 + >=kde-frameworks/kded-${KFMIN}:5 + >=kde-frameworks/kdelibs4support-${KFMIN}:5 + >=kde-frameworks/kemoticons-${KFMIN}:5 + >=kde-frameworks/kglobalaccel-${KFMIN}:5 + >=kde-frameworks/kguiaddons-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kiconthemes-${KFMIN}:5 + >=kde-frameworks/kio-${KFMIN}:5 + >=kde-frameworks/kitemmodels-${KFMIN}:5 + >=kde-frameworks/kitemviews-${KFMIN}:5 + >=kde-frameworks/kjobwidgets-${KFMIN}:5 + >=kde-frameworks/knewstuff-${KFMIN}:5 + >=kde-frameworks/knotifications-${KFMIN}:5 + >=kde-frameworks/knotifyconfig-${KFMIN}:5 + >=kde-frameworks/kparts-${KFMIN}:5 + >=kde-frameworks/krunner-${KFMIN}:5 + >=kde-frameworks/kservice-${KFMIN}:5 + >=kde-frameworks/kwallet-${KFMIN}:5 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 + >=kde-frameworks/kwindowsystem-${KFMIN}:5 + >=kde-frameworks/kxmlgui-${KFMIN}:5 + >=kde-frameworks/plasma-${KFMIN}:5 + >=kde-frameworks/solid-${KFMIN}:5 + >=kde-frameworks/sonnet-${KFMIN}:5 + >=kde-plasma/kwin-${PVCUT}:5 + >=kde-plasma/plasma-workspace-${PVCUT}:5 + >=dev-qt/qtconcurrent-${QTMIN}:5 + >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtdeclarative-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtnetwork-${QTMIN}:5 + >=dev-qt/qtprintsupport-${QTMIN}:5 + >=dev-qt/qtsql-${QTMIN}:5 + >=dev-qt/qtsvg-${QTMIN}:5 + >=dev-qt/qtwidgets-${QTMIN}:5 + >=dev-qt/qtx11extras-${QTMIN}:5 + >=dev-qt/qtxml-${QTMIN}:5 + media-libs/phonon[qt5(+)] + x11-libs/libX11 + x11-libs/libXcursor + x11-libs/libXfixes + x11-libs/libXi + x11-libs/libxcb[xkb] + x11-libs/libxkbfile + fontconfig? ( + media-libs/fontconfig + media-libs/freetype + x11-libs/libXft + x11-libs/xcb-util-image + ) + ibus? ( + >=dev-qt/qtx11extras-${QTMIN}:5 + app-i18n/ibus + dev-libs/glib:2 + x11-libs/libxcb + x11-libs/xcb-util-keysyms + ) + scim? ( app-i18n/scim ) + semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 ) + touchpad? ( x11-drivers/xf86-input-synaptics ) +" +DEPEND="${COMMON_DEPEND} + dev-libs/boost + x11-base/xorg-proto + fontconfig? ( x11-libs/libXrender ) + mouse? ( + x11-drivers/xf86-input-evdev + x11-drivers/xf86-input-libinput + ) +" +RDEPEND="${COMMON_DEPEND} + >=kde-frameworks/kirigami-${KFMIN}:5 + >=kde-frameworks/qqc2-desktop-style-${KFMIN}:5 + >=kde-plasma/breeze-${PVCUT}:5 + >=kde-plasma/kde-cli-tools-${PVCUT}:5 + >=kde-plasma/oxygen-${PVCUT}:5 + >=dev-qt/qtgraphicaleffects-${QTMIN}:5 + >=dev-qt/qtquickcontrols2-${QTMIN}:5 + sys-apps/util-linux + x11-apps/setxkbmap + !<kde-plasma/kdeplasma-addons-5.15.80 +" + +PATCHES=( "${FILESDIR}"/${P}-pager-regression.patch ) + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package fontconfig Fontconfig) + $(cmake_use_find_package ibus IBus) + $(cmake_use_find_package mouse Evdev) + $(cmake_use_find_package mouse XorgLibinput) + $(cmake_use_find_package scim SCIM) + $(cmake_use_find_package semantic-desktop KF5Baloo) + $(cmake_use_find_package touchpad Synaptics) + ) + + ecm_src_configure +} + +src_test() { + # parallel tests fail, foldermodeltest,positionertest hang, bug #646890 + # needs D-Bus, bug #634166 + local myctestargs=( + -j1 + -E "(foldermodeltest|positionertest|test_kio_fonts)" + ) + + ecm_src_test +} diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.17.4.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.17.5-r1.ebuild index 5b462420fb94..7ca44857dd80 100644 --- a/kde-plasma/plasma-desktop/plasma-desktop-5.17.4.ebuild +++ b/kde-plasma/plasma-desktop/plasma-desktop-5.17.5-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -115,6 +115,8 @@ RDEPEND="${COMMON_DEPEND} !<kde-plasma/kdeplasma-addons-5.15.80 " +PATCHES=( "${FILESDIR}"/${P}-revert-activities-jagginess.patch ) + src_configure() { local mycmakeargs=( $(cmake_use_find_package fontconfig Fontconfig) |