commit: c16e008e12aaba591023d126d9b37eb3db802201 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Thu Feb 13 22:09:40 2020 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Thu Feb 13 22:09:40 2020 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=c16e008e
kde-plasma/plasma-desktop: Fix Fonts KCM, unlock widgets See also: https://mail.kde.org/pipermail/plasma-devel/2020-February/111114.html Can't apply changes in Fonts KCM KDE-Bug: https://bugs.kde.org/show_bug.cgi?id=416358 Unlock Widgets KDE-Bug: https://bugs.kde.org/show_bug.cgi?id=417424 Package-Manager: Portage-2.3.88, Repoman-2.3.20 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> .../files/plasma-desktop-5.18.0-kcm_fonts.patch | 14 ++ .../plasma-desktop-5.18.0-unlock-widgets.patch | 23 ++++ .../plasma-desktop/plasma-desktop-5.18.0-r1.ebuild | 148 +++++++++++++++++++++ 3 files changed, 185 insertions(+) diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.0-kcm_fonts.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.0-kcm_fonts.patch new file mode 100644 index 0000000000..ec05442bef --- /dev/null +++ b/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.0-kcm_fonts.patch @@ -0,0 +1,14 @@ +diff --git a/kcms/fonts/fonts.cpp b/kcms/fonts/fonts.cpp +--- a/kcms/fonts/fonts.cpp ++++ b/kcms/fonts/fonts.cpp +@@ -572,8 +572,8 @@ + // previews + engine()->addImageProvider("preview", new PreviewImageProvider(m_settings->font())); + +- // reload state after loading by emiting a settings signal +- emit m_settings->activeFontChanged(); ++ // KCM expect save state to be false at this point (can be true because of setNearestExistingFonts ++ setNeedsSave(false); + } + + void KFonts::save() diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.0-unlock-widgets.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.0-unlock-widgets.patch new file mode 100644 index 0000000000..9ea643b865 --- /dev/null +++ b/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.0-unlock-widgets.patch @@ -0,0 +1,23 @@ +From 2bc3c5e92d4789146548e8de4d520cd191994e1c Mon Sep 17 00:00:00 2001 +From: Marco Martin <notm...@gmail.com> +Date: Tue, 11 Feb 2020 16:41:26 +0100 +Subject: unlock widgets + +5.18 doesn't offer a way anymore from the gui +so unlock them if they're locked +BUG:417424 +--- + desktoppackage/contents/updates/unlock_widgets.js | 2 ++ + 1 file changed, 2 insertions(+) + create mode 100644 desktoppackage/contents/updates/unlock_widgets.js + +diff --git a/desktoppackage/contents/updates/unlock_widgets.js b/desktoppackage/contents/updates/unlock_widgets.js +new file mode 100644 +index 0000000..c332270 +--- /dev/null ++++ b/desktoppackage/contents/updates/unlock_widgets.js +@@ -0,0 +1,2 @@ ++ ++__AppInterface.locked = false; +-- +cgit v1.1 diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.18.0-r1.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.18.0-r1.ebuild new file mode 100644 index 0000000000..1ade6819cc --- /dev/null +++ b/kde-plasma/plasma-desktop/plasma-desktop-5.18.0-r1.ebuild @@ -0,0 +1,148 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +ECM_HANDBOOK="forceoptional" +ECM_TEST="true" +KFMIN=5.66.0 +PVCUT=$(ver_cut 1-3) +QTMIN=5.12.3 +VIRTUALX_REQUIRED="test" +inherit ecm kde.org + +DESCRIPTION="KDE Plasma desktop" + +LICENSE="GPL-2" # TODO: CHECK +SLOT="5" +KEYWORDS="~amd64 ~ppc64" +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/libksysguard-${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}-kcm_fonts.patch" # KDE-Bug #416358 + "${FILESDIR}/${P}-unlock-widgets.patch" # KDE-Bug #417424 +) + +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 +}
