diff options
Diffstat (limited to 'kde-plasma')
| -rw-r--r-- | kde-plasma/Manifest.gz | bin | 8256 -> 8253 bytes | |||
| -rw-r--r-- | kde-plasma/plasma-workspace/Manifest | 2 | ||||
| -rw-r--r-- | kde-plasma/plasma-workspace/files/plasma-workspace-5.17.5-disable-autoscaling-on-qt-5.14.patch | 47 | ||||
| -rw-r--r-- | kde-plasma/plasma-workspace/plasma-workspace-5.17.5-r1.ebuild | 220 |
4 files changed, 269 insertions, 0 deletions
diff --git a/kde-plasma/Manifest.gz b/kde-plasma/Manifest.gz Binary files differindex 233ce94a88b0..1048ae72ea80 100644 --- a/kde-plasma/Manifest.gz +++ b/kde-plasma/Manifest.gz diff --git a/kde-plasma/plasma-workspace/Manifest b/kde-plasma/plasma-workspace/Manifest index 0815802aa462..53e9b42b8219 100644 --- a/kde-plasma/plasma-workspace/Manifest +++ b/kde-plasma/plasma-workspace/Manifest @@ -3,8 +3,10 @@ AUX 10-agent-startup.sh 2139 BLAKE2B 7ea9ee0e6d949eecbdfbc41bd0286919094b6d6837e AUX plasma-workspace-5.14.2-split-libkworkspace.patch 1100 BLAKE2B 7583bed4a71867de37c9741416d9a9711e2e8a9a26f5f50e826ec74a1b8efc03d4a592b06ca24df525381d7f98870329082cbafd86e1b29797ca68e78c928d81 SHA512 07a80880960719106ddb65d3b55fba5af7a71829dcb91bd9ae6bc1531ad019aeece968e01f243625f7fea2b34081590d317528797833fd9485b95cb1fd3f001d AUX plasma-workspace-5.17.2-waylandsessionrename.patch 2568 BLAKE2B 45be5b7221f60e6e1f2d449887f348f0462458ea25cc0559b4a48ca9e3726cd241ea6d32d23f61cc0ee755e1e7d42bda1ac8dfd454bf55bb69b53f3d60c6df7e SHA512 f36882781987e85b76bc2d2ebabae355f26d9579fe194fa32c3425c0fb8d4cabb6f7f34e8596026e0cedba5f65fc0036f432d91f6a20bf689938717db1e4f235 AUX plasma-workspace-5.17.4-fix-disable-mime-based-actions.patch 1136 BLAKE2B 8e10813738c6018e60d33566172fb23be4f4ae198633aeb8b5d596724d30a30c98ec491a967880b0146ce39c06af9640e711ea0fdfae4d6a67cf351f798d66e7 SHA512 024b9c7c82547890401142691669068455141145d77032830b713d2b8cf839b30fb200c0935d1c42e91cdf3cf51743a4219751ccad618f51043acd80e882191d +AUX plasma-workspace-5.17.5-disable-autoscaling-on-qt-5.14.patch 1806 BLAKE2B f1c6d815035b55c7084d047b08837ee6769935a6c5def8225da3ded9ea988a228b033453399b5a51ce4203338751d1fc81380efc5d5b75df04521aa988a93bce SHA512 bc4939198fbbb0ccee339e7558805c49991cf66784d87d04a4cbc4d80ddccd05bffb00bb5d1bb9a6d6b57ed5961884e2c2bfd6c9a26fd5a32d33f6f776292663 DIST plasma-workspace-5.17.4.tar.xz 4962200 BLAKE2B 2050dbf77dbdf144017e0ddf4b827b9dbe27b8f475eedaed969a442e036f162cabad5d6b47fd650491ed5989cade48ebafbd5f599dbc790c14515ce01ebfd626 SHA512 3f5aa07ccd19604bc399bb1d30dd16ac82e1405613c1f4a939e3c2cba3b4a478213095617052440dda222f1712608533e5806939117752d31b0616a6009cf45b DIST plasma-workspace-5.17.5.tar.xz 4962336 BLAKE2B d7c91130d303b612cae09627947547919d44ce91f31340bea4b8987ecc688728e0d937364c76710e0989554282688765bba58308cbb36c889e6729a6fbb7043a SHA512 b8a3f3a1a79d7254deecfb5228749abf15bc6f58ab17eb6d19e9010c74930491439aefa6589980dc0ae53858e4bef6be7edb66a15d3f227c5dfff458c1ca5d1a EBUILD plasma-workspace-5.17.4-r1.ebuild 6844 BLAKE2B 86929dad901ee5d5b8d8e965b463f9ae3352f6ba9e24742969e011f48e5d5aa4738fc478aa28f185f7dd7205b45a5e1f2706d7b06c17e7a5a10b187579fd5a3e SHA512 99c6ed1d9b66e1a1ae0d6813c316306dae4cfda6e491a9d61d04196e87f391ea888f2711f20591dea0c419645c97416da96c7192e26f3f67c4b603f0ed4c6752 +EBUILD plasma-workspace-5.17.5-r1.ebuild 6847 BLAKE2B bb11043dd5d751512bc3f45eff1b1d478b7d7e192510bf977c6410f41da8f958a5e46b984df49da584de29cc79f5da26b8b9ec9c4a892bfbeca482ea48917eef SHA512 41b692002b08676495c1b7303fe21129611a0eb174bc1c61feea41ddfd2ac5c4c4f5c969d7bb3c1ae3d8414b320b18c2ac1577e71d7c0773ea306f0225389522 EBUILD plasma-workspace-5.17.5.ebuild 6790 BLAKE2B c7bbbe3436c7f7f317ec5bd4f88a4f1842df931188afeac79fb03ab17a9c6613918ad9f69152ca8d92df6276030d00837c5546537cf136413c4f9a80430b1b40 SHA512 4103bae272daa63ca0d41a39c3dab4ae1388e7585e9754ab44745e9053702dec23069e8cf717a22ce2375a38d13fcd85a763ec9350f6e7daea8dc27aeeb65af1 MISC metadata.xml 643 BLAKE2B 28c9374aff890daac8a279eee05792f453a1e15b81d4e8182c3ff1bfb352e00859ede5792580b171615bc0af866fd8f5060486fb2fc3013d408a36343f78c2ba SHA512 eb5d1e325403d3f22422642b6d32a250f4450b06bf0f1275bc88b5dcae004ccb0f12bab318d36a24991bf2bffc590fcf7d43419d58e3d2bf9a396ed7e3f8778c diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.17.5-disable-autoscaling-on-qt-5.14.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.17.5-disable-autoscaling-on-qt-5.14.patch new file mode 100644 index 000000000000..114e653df8e1 --- /dev/null +++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.17.5-disable-autoscaling-on-qt-5.14.patch @@ -0,0 +1,47 @@ +From ea66bff2af8466f2bb5acafcc43ac8f79b1f447f Mon Sep 17 00:00:00 2001 +From: Fabian Vogt <fabian@ritter-vogt.de> +Date: Tue, 21 Jan 2020 11:55:49 +0100 +Subject: Also disable automatic scaling on Qt >= 5.14 + +Summary: +Applications which set `Qt::AA_EnableHighDpiScaling` use the DPI of the monitor the window is on to calculate an additional scaling factor. +Plasma sets `QT_SCREEN_SCALE_FACTORS` in the environment for manual specification of per-monitor scale, which combined with the automatic scaling may result in double scaling. +To disable the automatic scaling, `QT_AUTO_SCREEN_SCALE_FACTOR=0` has to be set, even on Qt 5.14. + +As a side effect, this works around QTBUG-80967 as well. + +BUG: 415421 + +Test Plan: On X11, with a >144dpi monitor and a scaling factor of 2 set manually, scaling was doubled previously. Now it works as expected. + +Reviewers: #plasma, apol, davidedmundson, fvogt + +Reviewed By: #plasma, davidedmundson, fvogt + +Subscribers: acooligan, fvogt, asturmlechner, dfaure, davidedmundson, anthonyfieroni, plasma-devel + +Tags: #plasma + +Differential Revision: https://phabricator.kde.org/D26185 +--- + startkde/startplasma.cpp | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/startkde/startplasma.cpp b/startkde/startplasma.cpp +index 8d88587..4a89878 100644 +--- a/startkde/startplasma.cpp ++++ b/startkde/startplasma.cpp +@@ -222,11 +222,9 @@ void runEnvironmentScripts() + + void setupPlasmaEnvironment() + { +-#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0) + //Manually disable auto scaling because we are scaling above + //otherwise apps that manually opt in for high DPI get auto scaled by the developer AND manually scaled by us + qputenv("QT_AUTO_SCREEN_SCALE_FACTOR", "0"); +-#endif + + qputenv("KDE_FULL_SESSION", "true"); + qputenv("KDE_SESSION_VERSION", "5"); +-- +cgit v1.1 diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.17.5-r1.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.17.5-r1.ebuild new file mode 100644 index 000000000000..157832caae90 --- /dev/null +++ b/kde-plasma/plasma-workspace/plasma-workspace-5.17.5-r1.ebuild @@ -0,0 +1,220 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +ECM_HANDBOOK="forceoptional" +ECM_TEST="forceoptional" +KFMIN=5.64.0 +PVCUT=$(ver_cut 1-3) +QTMIN=5.12.3 +VIRTUALX_REQUIRED="test" +inherit ecm kde.org + +DESCRIPTION="KDE Plasma workspace" + +LICENSE="GPL-2" # TODO: CHECK +SLOT="5" +KEYWORDS="~amd64 ~arm ~arm64 ~x86" +IUSE="appstream +calendar geolocation gps qalculate qrcode +semantic-desktop systemd" + +REQUIRED_USE="gps? ( geolocation )" + +# drop qtgui subslot operator when QT_MINIMAL >= 5.14.0 +COMMON_DEPEND=" + >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtdeclarative-${QTMIN}:5[widgets] + >=dev-qt/qtgui-${QTMIN}:5=[jpeg] + >=dev-qt/qtnetwork-${QTMIN}:5 + >=dev-qt/qtsql-${QTMIN}:5 + >=dev-qt/qtwidgets-${QTMIN}:5 + >=dev-qt/qtx11extras-${QTMIN}:5 + >=dev-qt/qtxml-${QTMIN}:5 + >=kde-frameworks/kactivities-${KFMIN}:5 + >=kde-frameworks/kactivities-stats-${KFMIN}:5 + >=kde-frameworks/kauth-${KFMIN}:5 + >=kde-frameworks/kbookmarks-${KFMIN}:5 + >=kde-frameworks/kcompletion-${KFMIN}:5 + >=kde-frameworks/kconfig-${KFMIN}:5 + >=kde-frameworks/kconfigwidgets-${KFMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/kcrash-${KFMIN}:5 + >=kde-frameworks/kdbusaddons-${KFMIN}:5 + >=kde-frameworks/kdeclarative-${KFMIN}:5 + >=kde-frameworks/kded-${KFMIN}:5 + >=kde-frameworks/kdelibs4support-${KFMIN}:5 + >=kde-frameworks/kglobalaccel-${KFMIN}:5 + >=kde-frameworks/kguiaddons-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kiconthemes-${KFMIN}:5 + >=kde-frameworks/kidletime-${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/kpackage-${KFMIN}:5 + >=kde-frameworks/kpeople-${KFMIN}:5 + >=kde-frameworks/krunner-${KFMIN}:5 + >=kde-frameworks/kservice-${KFMIN}:5 + >=kde-frameworks/ktexteditor-${KFMIN}:5 + >=kde-frameworks/ktextwidgets-${KFMIN}:5 + >=kde-frameworks/kwallet-${KFMIN}:5 + >=kde-frameworks/kwayland-${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-plasma/kscreenlocker-${PVCUT}:5 + >=kde-plasma/kwin-${PVCUT}:5 + >=kde-plasma/libkscreen-${PVCUT}:5 + >=kde-plasma/libksysguard-${PVCUT}:5 + >=kde-plasma/libkworkspace-${PVCUT}:5 + media-libs/phonon[qt5(+)] + sys-libs/zlib + x11-libs/libICE + x11-libs/libSM + x11-libs/libX11 + x11-libs/libXau + x11-libs/libxcb + x11-libs/libXfixes + x11-libs/libXrender + x11-libs/libXtst + x11-libs/xcb-util + x11-libs/xcb-util-image + appstream? ( dev-libs/appstream[qt5] ) + calendar? ( >=kde-frameworks/kholidays-${KFMIN}:5 ) + geolocation? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:5 ) + gps? ( sci-geosciences/gpsd ) + qalculate? ( sci-libs/libqalculate:= ) + qrcode? ( >=kde-frameworks/prison-${KFMIN}:5 ) + semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 ) +" +DEPEND="${COMMON_DEPEND} + >=dev-qt/qtconcurrent-${QTMIN}:5 + x11-base/xorg-proto +" +RDEPEND="${COMMON_DEPEND} + app-text/iso-codes + >=dev-qt/qdbus-${QTMIN}:5 + >=dev-qt/qtgraphicaleffects-${QTMIN}:5 + >=dev-qt/qtpaths-${QTMIN}:5 + >=dev-qt/qtquickcontrols-${QTMIN}:5[widgets] + >=dev-qt/qtquickcontrols2-${QTMIN}:5 + >=kde-apps/kio-extras-19.04.3:5 + >=kde-frameworks/kdesu-${KFMIN}:5 + >=kde-frameworks/kirigami-${KFMIN}:5 + >=kde-plasma/ksysguard-${PVCUT}:5 + >=kde-plasma/milou-${PVCUT}:5 + >=kde-plasma/plasma-integration-${PVCUT}:5 + x11-apps/xmessage + x11-apps/xprop + x11-apps/xrdb + x11-apps/xsetroot + systemd? ( sys-apps/dbus[user-session] ) + !systemd? ( sys-apps/dbus ) + !<kde-plasma/plasma-desktop-5.16.80:5 +" +PDEPEND=" + >=kde-plasma/kde-cli-tools-${PVCUT}:5 +" + +PATCHES=( + "${FILESDIR}/${PN}-5.14.2-split-libkworkspace.patch" + "${FILESDIR}/${PN}-5.17.2-waylandsessionrename.patch" + "${FILESDIR}/${P}-disable-autoscaling-on-qt-5.14.patch" +) + +RESTRICT+=" test" + +pkg_setup() { + ecm_pkg_setup + + local md5 + local srcfile=/etc/plasma/XX/10-agent-XX.sh + local newdir="${EPREFIX}"/etc/xdg/plasma-workspace + + if [[ -f "${EROOT}"${srcfile//XX/startup} ]]; then + md5=$(md5sum "${EROOT}"${srcfile//XX/startup}) + if [[ ${md5%% *} != 90caaabb40b56bfbe65388841a6dd6ca ]]; then + elog "Existing modified ${EPREFIX}${srcfile//XX/startup} detected." + elog "Copying to ${newdir}/env/10-agent-startup.sh..." + cp -v "${EROOT}"${srcfile//XX/startup} "${T}"/ || die + fi + fi + + if [[ -f "${EROOT}"${srcfile//XX/shutdown} ]]; then + md5=$(md5sum "${EROOT}"${srcfile//XX/shutdown}) + if [[ ${md5%% *} != d7bffa0273f92abd999c7c3c43dbc23d ]]; then + elog "Existing modified ${EPREFIX}${srcfile//XX/shutdown} detected." + elog "Copying to ${newdir}/shutdown/10-agent-shutdown.sh..." + cp -v "${EROOT}"${srcfile//XX/shutdown} "${T}"/ || die + fi + fi +} + +src_prepare() { + ecm_src_prepare + + if [[ ! -f "${T}"/10-agent-startup.sh ]]; then + cp "${FILESDIR}"/10-agent-startup.sh "${T}"/ || die + fi + if [[ ! -f "${T}"/10-agent-shutdown.sh ]]; then + cp "${FILESDIR}"/10-agent-shutdown.sh "${T}"/ || die + fi + + cmake_comment_add_subdirectory libkworkspace + # delete colliding libkworkspace translations + if [[ ${KDE_BUILD_TYPE} = release ]]; then + find po -type f -name "*po" -and -name "libkworkspace*" -delete || die + fi +} + +src_configure() { + local mycmakeargs=( + -DBUILD_xembed-sni-proxy=OFF + $(cmake_use_find_package appstream AppStreamQt) + $(cmake_use_find_package calendar KF5Holidays) + $(cmake_use_find_package geolocation KF5NetworkManagerQt) + $(cmake_use_find_package qalculate Qalculate) + $(cmake_use_find_package qrcode KF5Prison) + $(cmake_use_find_package semantic-desktop KF5Baloo) + ) + + use gps && mycmakeargs+=( $(cmake_use_find_package gps libgps) ) + + ecm_src_configure +} + +src_install() { + ecm_src_install + + # default startup and shutdown scripts + insinto /etc/xdg/plasma-workspace/env + doins "${T}"/10-agent-startup.sh + + insinto /etc/xdg/plasma-workspace/shutdown + doins "${T}"/10-agent-shutdown.sh + fperms +x /etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh +} + +pkg_postinst () { + ecm_pkg_postinst + + # Clean up pre-5.17.4 scripts + if [[ -e "${EROOT}"/etc/plasma/startup/10-agent-startup.sh ]]; then + rm "${EROOT}"/etc/plasma/startup/10-agent-startup.sh || die + elog "Removed obsolete ${EPREFIX}/etc/plasma/startup/10-agent-startup.sh" + fi + if [[ -e "${EROOT}"/etc/plasma/shutdown/10-agent-shutdown.sh ]]; then + rm "${EROOT}"/etc/plasma/shutdown/10-agent-shutdown.sh || die + elog "Removed obsolete ${EPREFIX}/etc/plasma/shutdown/10-agent-shutdown.sh" + fi + + elog "To enable gpg-agent and/or ssh-agent in Plasma sessions," + elog "edit ${EPREFIX}/etc/xdg/plasma-workspace/env/10-agent-startup.sh" + elog "and ${EPREFIX}/etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh" +} |