From 3cf7c3ef441822c889356fd1812ebf2944a59851 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 25 Aug 2020 10:45:55 +0100 Subject: gentoo resync : 25.08.2020 --- kde-plasma/plasma-desktop/Manifest | 6 +- ...ma-desktop-5.18.5-fix-fonts-kcm-w-kf-5.68.patch | 166 +++++++++++++++++++++ .../plasma-desktop/plasma-desktop-5.18.5-r2.ebuild | 157 +++++++++++++++++++ .../plasma-desktop/plasma-desktop-5.19.2.ebuild | 157 ------------------- .../plasma-desktop/plasma-desktop-5.19.4.ebuild | 157 +++++++++++++++++++ 5 files changed, 484 insertions(+), 159 deletions(-) create mode 100644 kde-plasma/plasma-desktop/files/plasma-desktop-5.18.5-fix-fonts-kcm-w-kf-5.68.patch create mode 100644 kde-plasma/plasma-desktop/plasma-desktop-5.18.5-r2.ebuild delete mode 100644 kde-plasma/plasma-desktop/plasma-desktop-5.19.2.ebuild create mode 100644 kde-plasma/plasma-desktop/plasma-desktop-5.19.4.ebuild (limited to 'kde-plasma/plasma-desktop') diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest index 2f5d7a739942..bcb9f17c522d 100644 --- a/kde-plasma/plasma-desktop/Manifest +++ b/kde-plasma/plasma-desktop/Manifest @@ -3,10 +3,12 @@ AUX plasma-desktop-5.18.5-KColorSchemeEditor-blurry-icons.patch 1058 BLAKE2B 668 AUX plasma-desktop-5.18.5-animate-column-moves.patch 1133 BLAKE2B 20ae4b0e2188483a8a391ef58865b25c0d6d45019c3a3cfd9f93264b8713a9165a1316f4634909964c7348e1fe6c22ace385a7a74d33aa455fe61209d9276959 SHA512 dcedab90dd0e6cebef4a87a8a8aab3163ed268dd3d5c3223b2bba09edafc184ea8dfd04de202458c1f9789f78580b949976a51fd75e37bfb2e4097968be26703 AUX plasma-desktop-5.18.5-findxorgserver.patch 5195 BLAKE2B b8ebbe59a5a2ef80a6cf5158c33ad58e275a926ea441a90008f8e2a7fc1c175e2b38e72f06d754b131a47f1cf5ef3d2268630816b1a60090c9bab44198ff37b0 SHA512 f81e84c56ddd5591ba59beb1d12654403bef5fd1bb6c51f8d6c404e36ca47cc7fa82a575892627be8aed465253830d3e76c2c89ed6db8ea858b9d705df08184b AUX plasma-desktop-5.18.5-fix-animate-in-animation.patch 1434 BLAKE2B a84e839180ca1aeb5eddfd07e504d88d8fbfe52ca210d4f976955d753770b5572a5e55c7773368241fa3ff61c38ef7699879b829c19a54e6665d4dbf3fd2570e SHA512 7496b34f1243070160e9875998d1ab5ef5227acb68b4b3545c32f5e4be041459e3234fb56b186c2578cf573dd50251e8be751546bba68b11f6c2d170bb3b7fac +AUX plasma-desktop-5.18.5-fix-fonts-kcm-w-kf-5.68.patch 6390 BLAKE2B fb0f4c70c94dc583745f92d14f4cb479d71da7c115f58d187ae6931c2dd3435abcfe9c2b773fc851f44fe605f47e2242d801da18a23f7943c025a901da8f28ee SHA512 d5f3820ee21422d46112bd9635bd65ce11068f9cf3bb14cd23c0050f35256b09344d934534794685997e8daeaae709c81e53b5b6ad54e7ecd709c6e5624be040 AUX plasma-desktop-5.18.5-stop-multiplying-duration-values.patch 5184 BLAKE2B 35f25bc8a325b947a44cf64f81e42c53746220329a35335e997a4a6ef8f87834be03f68fff951641e78d322804e08aa4f9e0c76556d41b00335ddf44da4dd643 SHA512 9e604ba5b99bf5e48b2cf1ed5afd7a5a8b413348fbc0c4e7f663660ac27aed8f1f3d268ba2a2b376afe86fee0165e3a27c5c35471ffa7acfae9956a47a50b82f DIST plasma-desktop-5.18.5.tar.xz 9412644 BLAKE2B cc4ba658e42cf8956f07ef6cdf7e34191d14d922958155ed19a9c5224f6a8dcfc7f1ea0c605066c28eb0d08b714f2f19e321e499bed78055ad2592aa0176d10c SHA512 14f86d1158f976e8f0fbf80fb7f5bea74393febc35592bd95806548883b3bc2e77ee55cc300119275ad322f6b8bcfbed84bb6b78a3a19868ce4695a1fb57a029 -DIST plasma-desktop-5.19.2.tar.xz 9357048 BLAKE2B 0928465086aa466c2dacbefdc387306c99ab2bc7f3e8ee3047302ebeb18dcf8b52804e2f5c05f54006002fc5cc010adfdff443d17c8b4ddd3ee8d21370a45934 SHA512 4ef19056060ec6084a4ee127dc27c6e2cea4d84791053271efa3b58fe97577c9852c5274af51d05f06a81497ac1c02de55a1b3bbfb213f6d4f526858867e9428 +DIST plasma-desktop-5.19.4.tar.xz 9423380 BLAKE2B c195d803bf35d928d264e61c7b6e3adb74d5c59c354dd7106c70cb653deaff4792d866786f769ef54363dcfea336021e4be41c8fe952749e10ca0751637c16de SHA512 3885814588dd855ee41246dc26963c9a0718e8737c1bacaaf8b09e0825dc78dd1ab0dafdeb82ab6802a4d4364ab7bce64c2fd6b2a00a537aaf784fe6242f43d1 DIST plasma-desktop-override-include-dirs-0.tar.xz 7504 BLAKE2B 781a2f0f7ca5a45b966edfc79012e80c6826262a211d95b725590191a8828e0002fd924a49cc63c12090535077a24f3e719ca3277aac89aba3092e86f73d7f61 SHA512 d23dc203b8b645472c9c192a3d73ef9b46c66d9c64df1c90efa05c9968ec125e0a256bc9b654f05a1f22bce4b1d8aad436f581b42d579f4195a44f062fd444bb EBUILD plasma-desktop-5.18.5-r1.ebuild 4865 BLAKE2B 87cf5b0e69bda73c0241cb0059e92b2344a87e625479201b683f20edc96f295dc5e80dfc46b234b5a513721d368c53d26d7df56425a434ee41adad44dc46dec5 SHA512 3290f48cf99c6810874e8c152d171770e57ee8d1400a2acb8d67046dab374c33c2ef2d454464e642b0a1f372742f8d79c9f26af2c4f49be31aab7640386edf46 -EBUILD plasma-desktop-5.19.2.ebuild 4550 BLAKE2B 2fe4d5325c54410e8079adf93bf1eec11127b724204332ee532dd42f4f136e30d82eda069b999c9eb66dc303e3ae991e0821b2f2c087bec96a56a3155979d14d SHA512 4abc938bf62d3874cce1011e6311d03cd683425f938089c7a9c5bfcb57f8333ba37bef4335f4e22b0834ddfee44f795d3afa7a2b833e196a1ce76b71511304d9 +EBUILD plasma-desktop-5.18.5-r2.ebuild 4935 BLAKE2B 1334ac02567ae7992a6a8b7f7b94cf54348df407dbe4ef5130dd76bf2df43bcf66949105dfd23ac49aecfd55d63fbdea1026edf43d48d9fc5966fc0ead46ed89 SHA512 a5686e7f768aa87e67b6abbcb20478954027e63d5cea5cd9d545e9ac5699ec1be029d8badad7250b00aab12621b005c196a0b8d64c43b15252e13caaa4c51534 +EBUILD plasma-desktop-5.19.4.ebuild 4555 BLAKE2B d47979be2aa2ca62e9c63143719e40135b0966480ea41b323d9f5e351a5651eeae76bfdee4aa964564c7e0b35bf29c5a98aee94ecef02c195fd40a0851b536e8 SHA512 214904acfe78f5438aa6780ef0cb61de8190114616c619a4fb2567ee1bad2d0645a6aae2fcafffaccbe8a4a83f1de450474d250ab8912dd34a01dbec9ea8a2d6 MISC metadata.xml 418 BLAKE2B f68267099811af01f47317ec163041980f834d34a61f6eb5584969e1172b9fa819a635664a1ec8ec49496a42fe0b27ed0cb0de34485e866836719aa185e2d37e SHA512 537579f9f3c1fe8b457826637da7b8fb5ea46986f2a71d28fb2de29fe010d5b08596059bb59160e36f346ba2fea4df18ad16896c27561528e2e9fef139e64ec5 diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.5-fix-fonts-kcm-w-kf-5.68.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.5-fix-fonts-kcm-w-kf-5.68.patch new file mode 100644 index 000000000000..bae49609e52f --- /dev/null +++ b/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.5-fix-fonts-kcm-w-kf-5.68.patch @@ -0,0 +1,166 @@ +From e5e5f5ed51aadfac99bfbdf3d2db5be16a12443b Mon Sep 17 00:00:00 2001 +From: Ahmad Samir +Date: Mon, 10 Aug 2020 13:50:36 +0200 +Subject: [PATCH] kcm_fonts: Make the font selection dialog select the correct + "Regular"-like style + +Due to KConfig dropping QFont styleName property (for "Regular"-like font +styles, see [1] for more details), the font selection dialog invoked by the +KCM could end up selecting the wrong style; this change sets the appropriate +"Regular" style on the QFont object before invoking the font selection dialog +to fix/workaround the issue. + +Note that in Plasma master branch the issue is handled differently, since +we switched from QFontDialog to KFontChooserDialog (the latter has that +logic built-in). + +[1] https://phabricator.kde.org/D27735 + +CCBUG: 420287 +--- + kcms/fonts/fonts.cpp | 61 +++++++++++++++++-- + kcms/fonts/fonts.h | 1 + + kcms/fonts/package/contents/ui/FontWidget.qml | 7 +-- + kcms/fonts/package/contents/ui/main.qml | 4 +- + 4 files changed, 61 insertions(+), 12 deletions(-) + +diff --git a/kcms/fonts/fonts.cpp b/kcms/fonts/fonts.cpp +index f771f6e51..c2ccdf777 100644 +--- a/kcms/fonts/fonts.cpp ++++ b/kcms/fonts/fonts.cpp +@@ -53,23 +53,50 @@ + /**** DLL Interface ****/ + K_PLUGIN_FACTORY_WITH_JSON(KFontsFactory, "kcm_fonts.json", registerPlugin();) + ++// If the styleName property is empty, then we want to set it to ++// the "Regular"-like style provided by the font, so that the font ++// selection dialog selects the correct style from the available styles ++// list; for more details see: ++// https://phabricator.kde.org/D27735 and https://phabricator.kde.org/D27785 ++static QFont setRegularFontStyle(const QFont &font) ++{ ++ if (!(font.styleName().isEmpty() && font.weight() == QFont::Normal)) { ++ return font; ++ } ++ ++ QFont f(font); ++ QFontDatabase fdb; ++ const QStringList styles = fdb.styles(f.family()); ++ for (const QString &s : styles) { ++ if (s == QLatin1String("Regular") ++ || s == QLatin1String("Normal") ++ || s == QLatin1String("Book") ++ || s == QLatin1String("Roman")) { ++ f.setStyleName(s); ++ return f; ++ } ++ } ++ return font; ++} ++ + //from KFontRequester + // Determine if the font with given properties is available on the system, + // otherwise find and return the best fitting combination. + static QFont nearestExistingFont(const QFont &font) + { +- QFontDatabase dbase; ++ QFont _font = setRegularFontStyle(font); + ++ QFontDatabase dbase; + // Initialize font data according to given font object. +- QString family = font.family(); +- QString style = dbase.styleString(font); +- qreal size = font.pointSizeF(); ++ QString family = _font.family(); ++ QString style = dbase.styleString(_font); ++ qreal size = _font.pointSizeF(); + + // Check if the family exists. + const QStringList families = dbase.families(); + if (!families.contains(family)) { + // Chose another family. +- family = QFontInfo(font).family(); // the nearest match ++ family = QFontInfo(_font).family(); // the nearest match + if (!families.contains(family)) { + family = families.count() ? families.at(0) : QStringLiteral("fixed"); + } +@@ -614,6 +641,30 @@ bool KFonts::isDefaults() const + return m_fontAASettings->isDefaults(); + } + ++void KFonts::adjustFont(const QFont &font, const QString &category) ++{ ++ QFont _font = setRegularFontStyle(font); ++ ++ bool ok = false; ++ QFont selFont = QFontDialog::getFont(&ok, _font, nullptr, i18n("Select Font")); ++ ++ if (ok && !m_settings->isImmutable(category)) { ++ if (category == QLatin1String("font")) { ++ m_settings->setFont(selFont); ++ } else if (category == QLatin1String("menuFont")) { ++ m_settings->setMenuFont(selFont); ++ } else if (category == QLatin1String("toolBarFont")) { ++ m_settings->setToolBarFont(selFont); ++ } else if (category == QLatin1String("activeFont")) { ++ m_settings->setActiveFont(selFont); ++ } else if (category == QLatin1String("smallestReadableFont")) { ++ m_settings->setSmallestReadableFont(selFont); ++ } else if (category == QLatin1String("fixed")) { ++ m_settings->setFixed(selFont); ++ } ++ } ++} ++ + void KFonts::adjustAllFonts() + { + QFont font = m_settings->font(); +diff --git a/kcms/fonts/fonts.h b/kcms/fonts/fonts.h +index 51ed2ab60..5959e1995 100644 +--- a/kcms/fonts/fonts.h ++++ b/kcms/fonts/fonts.h +@@ -153,6 +153,7 @@ public Q_SLOTS: + void save() override; + void defaults() override; + Q_INVOKABLE void adjustAllFonts(); ++ Q_INVOKABLE void adjustFont(const QFont &font, const QString &category); + + Q_SIGNALS: + void fontsHaveChanged(); +diff --git a/kcms/fonts/package/contents/ui/FontWidget.qml b/kcms/fonts/package/contents/ui/FontWidget.qml +index b62dd3bf4..5a6be5128 100644 +--- a/kcms/fonts/package/contents/ui/FontWidget.qml ++++ b/kcms/fonts/package/contents/ui/FontWidget.qml +@@ -57,11 +57,8 @@ FocusScope { + Kirigami.MnemonicData.enabled: false + focus: true + onClicked: { +- fontDialog.adjustAllFonts = false; +- fontDialog.currentCategory = root.category +- fontDialog.font = root.font; +- fontDialog.currentFont = root.font; +- fontDialog.open() ++ fontDialog.adjustAllFonts = false ++ kcm.adjustFont(root.font, root.category) + } + QtControls.ToolTip { + visible: parent.hovered +diff --git a/kcms/fonts/package/contents/ui/main.qml b/kcms/fonts/package/contents/ui/main.qml +index 4a99c043a..e51fb21ba 100644 +--- a/kcms/fonts/package/contents/ui/main.qml ++++ b/kcms/fonts/package/contents/ui/main.qml +@@ -264,9 +264,9 @@ KCM.SimpleKCM { + property bool adjustAllFonts: false + onAccepted: { + if (adjustAllFonts) { +- kcm.adjustAllFonts(font); ++ kcm.adjustAllFonts() + } else { +- kcm.fontsSettings[currentCategory] = font; ++ kcm.adjustFont(font, currentCategory) + } + } + } +-- +GitLab + diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.18.5-r2.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.18.5-r2.ebuild new file mode 100644 index 000000000000..5fa672f9e019 --- /dev/null +++ b/kde-plasma/plasma-desktop/plasma-desktop-5.18.5-r2.ebuild @@ -0,0 +1,157 @@ +# 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" +XORGHDRS="${PN}-override-include-dirs-0" +SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${XORGHDRS}.tar.xz" + +LICENSE="GPL-2" # TODO: CHECK +SLOT="5" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +IUSE="+fontconfig ibus scim +semantic-desktop" + +COMMON_DEPEND=" + >=dev-qt/qtconcurrent-${QTMIN}:5 + >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtdeclarative-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtnetwork-${QTMIN}:5 + >=dev-qt/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 + >=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 + 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? ( + app-i18n/ibus + dev-libs/glib:2 + >=dev-qt/qtx11extras-${QTMIN}:5 + x11-libs/libxcb + x11-libs/xcb-util-keysyms + ) + scim? ( app-i18n/scim ) + semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 ) +" +DEPEND="${COMMON_DEPEND} + dev-libs/boost + x11-base/xorg-proto + fontconfig? ( x11-libs/libXrender ) +" +RDEPEND="${COMMON_DEPEND} + >=dev-qt/qtgraphicaleffects-${QTMIN}:5 + >=dev-qt/qtquickcontrols2-${QTMIN}:5 + >=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 + sys-apps/util-linux + x11-apps/setxkbmap + !