Hello community, here is the log from the commit of package plasma5-desktop for openSUSE:Factory checked in at 2016-01-20 09:53:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/plasma5-desktop (Old) and /work/SRC/openSUSE:Factory/.plasma5-desktop.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "plasma5-desktop" Changes: -------- --- /work/SRC/openSUSE:Factory/plasma5-desktop/plasma5-desktop.changes 2016-01-05 09:41:42.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.plasma5-desktop.new/plasma5-desktop.changes 2016-01-20 09:53:22.000000000 +0100 @@ -1,0 +2,13 @@ +Thu Jan 14 16:07:21 UTC 2016 - [email protected] + +- Add 0001-fix-font-preview-colors.patch (kde#336089) + +------------------------------------------------------------------- +Wed Jan 6 14:12:16 UTC 2016 - [email protected] + +- Update to 5.5.3: + * Bugfix release + * For more details please see: + https://www.kde.org/announcements/plasma-5.5.3.php + +------------------------------------------------------------------- Old: ---- plasma-desktop-5.5.2.tar.xz New: ---- 0001-fix-font-preview-colors.patch plasma-desktop-5.5.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ plasma5-desktop.spec ++++++ --- /var/tmp/diff_new_pack.8MUI7D/_old 2016-01-20 09:53:24.000000000 +0100 +++ /var/tmp/diff_new_pack.8MUI7D/_new 2016-01-20 09:53:24.000000000 +0100 @@ -18,7 +18,7 @@ %bcond_without lang Name: plasma5-desktop -Version: 5.5.2 +Version: 5.5.3 Release: 0 Summary: The KDE Plasma Workspace Components License: GPL-2.0 @@ -28,6 +28,7 @@ Source99: %{name}-rpmlintrc Patch0: 0001-Require-xorg-evdev-2.8.99.1.patch # PATCHES 100-200 and above are from upstream 5.5 branch +Patch100: 0001-fix-font-preview-colors.patch # PATCHES 201-300 and above are from upstream master/5.6 branch BuildRequires: boost-devel BuildRequires: extra-cmake-modules >= 1.8.0 @@ -158,6 +159,7 @@ %if 0%{?suse_version} > 1314 && "%{suse_version}" != "1320" %patch0 -Rp1 %endif +%patch100 -p1 %build %cmake_kf5 -d build -- -DCMAKE_INSTALL_LOCALEDIR=share/locale/kf5 ++++++ 0001-fix-font-preview-colors.patch ++++++ >From 57a0c624c37e3266503c3ef70bcf1397d7105e76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20L=C3=BCbking?= <[email protected]> Date: Sat, 9 Jan 2016 23:45:44 +0100 Subject: [PATCH] fix font preview colors the image format was hardcoded to ARGB32_Premultiplied, but that's not generally correct, notably not on 24bit servers BUG: 336089 FIXED-IN: 5.6 --- kcms/kfontinst/lib/FcEngine.cpp | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/kcms/kfontinst/lib/FcEngine.cpp b/kcms/kfontinst/lib/FcEngine.cpp index 19b7206..3a0f7d1 100644 --- a/kcms/kfontinst/lib/FcEngine.cpp +++ b/kcms/kfontinst/lib/FcEngine.cpp @@ -537,7 +537,16 @@ QImage CFcEngine::Xft::toImage(int w, int h) const if (!xImage) { return QImage(); } - return QImage(xImage->data, xImage->width, xImage->height, xImage->stride, QImage::Format_ARGB32_Premultiplied, &cleanupXImage, xImage); + QImage::Format format = QImage::Format_RGB32; + switch (DefaultDepth(QX11Info::display(), 0)) { + case 32: format = QImage::Format_ARGB32_Premultiplied; break; + // NOTICE: below are guesses, might be wrong + case 30: format = QImage::Format_RGB30; break; + case 16: format = QImage::Format_RGB16; break; + case 8: format = QImage::Format_Grayscale8; break; + default: break; + } + return QImage(xImage->data, xImage->width, xImage->height, xImage->stride, format, &cleanupXImage, xImage); } inline int point2Pixel(int point) -- 2.6.3 ++++++ plasma-desktop-5.5.2.tar.xz -> plasma-desktop-5.5.3.tar.xz ++++++ /work/SRC/openSUSE:Factory/plasma5-desktop/plasma-desktop-5.5.2.tar.xz /work/SRC/openSUSE:Factory/.plasma5-desktop.new/plasma-desktop-5.5.3.tar.xz differ: char 27, line 1
