Hello community, here is the log from the commit of package ktexteditor for openSUSE:Factory checked in at 2018-04-19 15:20:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ktexteditor (Old) and /work/SRC/openSUSE:Factory/.ktexteditor.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ktexteditor" Thu Apr 19 15:20:34 2018 rev:52 rq:597691 version:5.45.0 Changes: -------- --- /work/SRC/openSUSE:Factory/ktexteditor/ktexteditor.changes 2018-03-20 21:47:39.893109851 +0100 +++ /work/SRC/openSUSE:Factory/.ktexteditor.new/ktexteditor.changes 2018-04-19 15:20:35.388714592 +0200 @@ -1,0 +2,25 @@ +Wed Apr 18 05:57:19 UTC 2018 - wba...@tmo.at + +- Add Fix-font-attributes.patch to fix missing bold/italic/... + markup with modern Qt versions (>= 5.9) + +------------------------------------------------------------------- +Sat Apr 14 13:19:06 CEST 2018 - lbeltr...@kde.org + +- Update to 5.45.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.45.0.php +- Changes since 5.44.0: + * Make it possible for KTextEditor to build on Android NDK's gcc 4.9 + * avoid Asan runtime error: shift exponent -1 is negative + * We depend against 5.8.0 + * optimization of TextLineData::attribute + * Don't calculate attribute() twice. + * Revert Fix: View jumps when Scroll past end of document is enabled (kde#391838) + * don't pollute the clipboard history with dupes + * Revert "[KateCompletionWidget] Create configuration interface on demand" (kde#391955) + * [KateCompletionWidget] Create configuration interface on demand + * Remove not necessary QtCore and co + +------------------------------------------------------------------- Old: ---- ktexteditor-5.44.0.tar.xz New: ---- Fix-font-attributes.patch ktexteditor-5.45.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ktexteditor.spec ++++++ --- /var/tmp/diff_new_pack.hEGkTf/_old 2018-04-19 15:20:36.740660285 +0200 +++ /var/tmp/diff_new_pack.hEGkTf/_new 2018-04-19 15:20:36.748659963 +0200 @@ -21,9 +21,9 @@ %{!?_kf5_version: %global _kf5_version %{version}} # Last major and minor KF5 version (e.g. 5.33) %{!?_kf5_bugfix_version: %global _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')} -%define _tar_path 5.44 +%define _tar_path 5.45 Name: ktexteditor -Version: 5.44.0 +Version: 5.45.0 Release: 0 %define kf5_version %{version} BuildRequires: cmake >= 3.0 @@ -65,6 +65,8 @@ Source1: baselibs.conf # PATCH-MISFEATURE-OPENSUSE - Disliked by the security team (boo#1033055) Patch1: 0001-Disable-KAuth-integration.patch +# PATCH-FIX-UPSTREAM +Patch2: Fix-font-attributes.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -87,6 +89,7 @@ %prep %setup -q %patch1 -p1 +%patch2 -p1 %build %cmake_kf5 -d build -- -DSYSCONF_INSTALL_DIR=%{_kf5_sysconfdir} ++++++ Fix-font-attributes.patch ++++++ >From 4d91fa7e918d983e6569798dfe20c7c9faf4bb9e Mon Sep 17 00:00:00 2001 From: Christoph Cullmann <cullm...@kde.org> Date: Sun, 15 Apr 2018 13:36:52 +0200 Subject: Fix problem that font/italic/... attributes no longer work with e.g. >= Qt 5.9 CHANGELOG: Fix missing bold/italic/... markup with modern Qt versions (>= 5.9) Differential Revision: https://phabricator.kde.org/D12221 --- src/utils/kateconfig.cpp | 19 +++++++++++-------- src/utils/kateconfig.h | 6 ++++++ 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/src/utils/kateconfig.cpp b/src/utils/kateconfig.cpp index 02a856e..49bf5ae 100644 --- a/src/utils/kateconfig.cpp +++ b/src/utils/kateconfig.cpp @@ -2494,11 +2494,7 @@ void KateRendererConfig::setSchemaInternal(const QString &schema) m_lineMarkerColor[i] = col; } - QFont f(QFontDatabase::systemFont(QFontDatabase::FixedFont)); - - m_font = config.readEntry("Font", f); - m_fontMetrics = QFontMetricsF(m_font); - m_fontSet = true; + setFontWithDroppedStyleName(config.readEntry("Font", QFontDatabase::systemFont(QFontDatabase::FixedFont))); m_templateBackgroundColor = config.readEntry(QStringLiteral("Color Template Background"), colors.color(Kate::TemplateBackground)); @@ -2539,12 +2535,19 @@ void KateRendererConfig::setFont(const QFont &font) } configStart(); + setFontWithDroppedStyleName(font); + configEnd(); +} - m_fontSet = true; +void KateRendererConfig::setFontWithDroppedStyleName(const QFont &font) +{ + /** + * Drop styleName, otherwise stuff like bold/italic/... won't work as style! + */ m_font = font; + m_font.setStyleName(QString()); m_fontMetrics = QFontMetricsF(m_font); - - configEnd(); + m_fontSet = true; } bool KateRendererConfig::wordWrapMarker() const diff --git a/src/utils/kateconfig.h b/src/utils/kateconfig.h index 78120fe..5a47a85 100644 --- a/src/utils/kateconfig.h +++ b/src/utils/kateconfig.h @@ -791,6 +791,12 @@ private: */ void setSchemaInternal(const QString &schema); + /** + * Set the font but drop style name before that. + * Otherwise e.g. styles like bold/italic/... will not work + */ + void setFontWithDroppedStyleName(const QFont &font); + QString m_schema; QFont m_font; QFontMetricsF m_fontMetrics; -- cgit v0.11.2 ++++++ ktexteditor-5.44.0.tar.xz -> ktexteditor-5.45.0.tar.xz ++++++ ++++ 26188 lines of diff (skipped)
