From 1db00cc6e94b90c08090bb5b8c406622946c4ae5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 31 Jan 2019 16:00:27 +0000 Subject: gentoo resync 31.01.2019 --- kde-frameworks/kwidgetsaddons/Manifest | 2 + ...addons-5.54.0-no-light-fontstyle-headings.patch | 88 ++++++++++++++++++++++ .../kwidgetsaddons/kwidgetsaddons-5.54.0-r1.ebuild | 28 +++++++ 3 files changed, 118 insertions(+) create mode 100644 kde-frameworks/kwidgetsaddons/files/kwidgetsaddons-5.54.0-no-light-fontstyle-headings.patch create mode 100644 kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.54.0-r1.ebuild (limited to 'kde-frameworks/kwidgetsaddons') diff --git a/kde-frameworks/kwidgetsaddons/Manifest b/kde-frameworks/kwidgetsaddons/Manifest index 0bda9322a14b..d68c798ec9b1 100644 --- a/kde-frameworks/kwidgetsaddons/Manifest +++ b/kde-frameworks/kwidgetsaddons/Manifest @@ -1,5 +1,7 @@ +AUX kwidgetsaddons-5.54.0-no-light-fontstyle-headings.patch 2896 BLAKE2B 0e19645ee2543003f1e6d6f68461695451e37986abc3f68fc518c69622fed24232461f2cf8ddbae6f84e3112619482f340e0e0addc863448ad3d65f8810cede3 SHA512 3e33aca5dddbdefee8d048d1413955eeaf93137192ddabb21f933c7971ad919beaa3ebc6dc00c11fa47cac19de9a552ce097f2cf308796c2ade7b2329a4984aa DIST kwidgetsaddons-5.52.0.tar.xz 2185380 BLAKE2B 6307774cc9d6c41d45b9c5fc97a2c72d52065970dee54f6871df49f5f8ce9ffcb62277eef031466ed7ced83ad6941de61f424d03affff00111dcbada24a7ceb0 SHA512 86f2f32ab3071358c6d2887fcf0105a3d84d60e2e58898a48857776cc42e0a2c45d53d786879449fed79fd86dd58b2a9ae2053b7b254fb3590222e915e533cd3 DIST kwidgetsaddons-5.54.0.tar.xz 2187048 BLAKE2B fba80432f00154ed4811d70b693d13d3dfee5c5dcebd3a3c8b3403ed5119e0289f10efdb8579be302ae2c2b6bb17853f20ac4c337fe78dbe042ee2cace00f8a4 SHA512 e52375a10af10bd1134d33e793511fa91c135079d2479686ce0f559e31e2e6a71de311773c6c6353343b8ebd3c29e35aa604402cf6cc0b53169775c3babc6bc8 EBUILD kwidgetsaddons-5.52.0.ebuild 522 BLAKE2B 0875eb8feea99bfe3e18fc121d3fa3b457ef62351959926c50cd16cf0f9629087c89e7940f56e6c1ed4d446d66db434b37797c76a2992994bd34c81157d0c579 SHA512 d1abbc7350ed8ed8523e14f758bb714d88b83b84d56aa552e02c123c611a9d5a65149420442b80240513dcb9118bc903140eb2179ff884a659bc967dba71710e +EBUILD kwidgetsaddons-5.54.0-r1.ebuild 590 BLAKE2B 61547b76e1be127fb6a1182d506364e0516c9db02065ebb988eb3ebdf7041ec05fe8561b318fbbbc70c09451eeea2f166665da598f721f8a01395d3b1758af5f SHA512 9a57345c5d58b0bbdf11e227bfe04fd25cc26e42ed1a0875f6da29292a7f5db15434710bb53f71333560c6fa26c8f02ad2390866d1d5b2b0e2d4e034271e6f5d EBUILD kwidgetsaddons-5.54.0.ebuild 524 BLAKE2B 84db784a57f04cbd14d04a502ac416314dfa8e42996e2c111d0ab450cda4c00bd5c2be770f3413733b8b15c556bafb2167922f8df03ed171fbaff8628c5525f8 SHA512 2036f8a1d36b67a09e1b882cf34ec3fb4e2a46a5eff3d6588adcd2d37c9bdf2d2dae548109d417fbbe4017d7ba93f2ab9c9d004eba1ff32cc4c8ae8173f49ba6 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 diff --git a/kde-frameworks/kwidgetsaddons/files/kwidgetsaddons-5.54.0-no-light-fontstyle-headings.patch b/kde-frameworks/kwidgetsaddons/files/kwidgetsaddons-5.54.0-no-light-fontstyle-headings.patch new file mode 100644 index 000000000000..38c89728b52e --- /dev/null +++ b/kde-frameworks/kwidgetsaddons/files/kwidgetsaddons-5.54.0-no-light-fontstyle-headings.patch @@ -0,0 +1,88 @@ +From dc901a1f0b5f6621bfa1c23e33dcfdf6246e7cb1 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Kre=C5=A1imir=20=C4=8Cohar?= +Date: Thu, 10 Jan 2019 09:19:33 -0700 +Subject: [KWidgetsAddons] Do not use light font styles for headings (3/3) + +Summary: +This patch brings back regular font styles for headings to KTitleWidget for the sake of consistency with QML and Kirigami, where they were also reintroduced in favor of better legibility. + +CCBUG: 402730 + +FIXED-IN: 5.54 + +Test Plan: +Before: +{F6520054} +After: +{F6520058} + +Reviewers: ngraham, #frameworks, #vdg, #plasma + +Reviewed By: ngraham, #vdg + +Subscribers: cfeck, filipf, kde-frameworks-devel + +Tags: #frameworks + +Differential Revision: https://phabricator.kde.org/D17907 +--- + src/ktitlewidget.cpp | 29 ----------------------------- + 1 file changed, 29 deletions(-) + +diff --git a/src/ktitlewidget.cpp b/src/ktitlewidget.cpp +index 7a34bc2..d8b0517 100644 +--- a/src/ktitlewidget.cpp ++++ b/src/ktitlewidget.cpp +@@ -213,16 +213,6 @@ void KTitleWidget::changeEvent(QEvent *e) + if (e->type() == QEvent::PaletteChange || e->type() == QEvent::FontChange + || e->type() == QEvent::ApplicationFontChange) { + d->textLabel->setStyleSheet(d->textStyleSheet()); +- //Qt stylesheet doesn't support lighter font-weight +- QFont font(d->textLabel->font()); +- if (d->level <= 4) { +- font.setWeight(QFont::Light); +- font.setStyleName(QStringLiteral("Light")); +- } else { +- font.setWeight(QFont::Normal); +- font.setStyleName(QStringLiteral("Regular")); +- } +- d->textLabel->setFont(font); + d->commentLabel->setStyleSheet(d->commentStyleSheet()); + } + } +@@ -233,16 +223,6 @@ void KTitleWidget::setText(const QString &text, Qt::Alignment alignment) + + if (!Qt::mightBeRichText(text)) { + d->textLabel->setStyleSheet(d->textStyleSheet()); +- //Qt stylesheet doesn't support lighter font-weight +- QFont font(d->textLabel->font()); +- if (d->level <= 4) { +- font.setWeight(QFont::Light); +- font.setStyleName(QStringLiteral("Light")); +- } else { +- font.setWeight(QFont::Normal); +- font.setStyleName(QStringLiteral("Regular")); +- } +- d->textLabel->setFont(font); + } + + d->textLabel->setText(text); +@@ -259,15 +239,6 @@ void KTitleWidget::setLevel(int level) + d->level = level; + + d->textLabel->setStyleSheet(d->textStyleSheet()); +- //Qt stylesheet doesn't support lighter font-weight +- QFont font(d->textLabel->font()); +- if (d->level <= 4) { +- font.setWeight(QFont::Light); +- font.setStyleName(QStringLiteral("Light")); +- } else { +- font.setWeight(QFont::Normal); +- font.setStyleName(QStringLiteral("Regular")); +- } + } + + int KTitleWidget::level() +-- +cgit v1.1 + diff --git a/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.54.0-r1.ebuild b/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.54.0-r1.ebuild new file mode 100644 index 000000000000..274e1794131f --- /dev/null +++ b/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.54.0-r1.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +VIRTUALX_REQUIRED="test" +inherit kde5 + +DESCRIPTION="An assortment of high-level widgets for common tasks" +LICENSE="LGPL-2.1+" +KEYWORDS="~amd64 ~arm ~arm64 ~x86" +IUSE="nls" + +RDEPEND=" + $(add_qt_dep qtgui) + $(add_qt_dep qtwidgets) +" +DEPEND="${RDEPEND} + nls? ( $(add_qt_dep linguist-tools) ) +" + +PATCHES=( "${FILESDIR}/${P}-no-light-fontstyle-headings.patch" ) + +src_test() { + # bug 650216, 653186 + local myctestargs=( -E "(kdatecomboboxtest|ktooltipwidgettest)" ) + kde5_src_test +} -- cgit v1.2.3