svn commit: r442453 - in head/x11/kde4-workspace: . files

[Tobias C. Berner]

Author: tcberner
Date: Fri Jun  2 19:14:43 2017
New Revision: 442453
URL: https://svnweb.freebsd.org/changeset/ports/442453

Log:
  Fix ambiguity of qFuzzyCompare on armv6
  
  PR:		217078
  Submitted by:	Mikaël Urankar <mikael.urankar at gmail.com>

Added:
  head/x11/kde4-workspace/files/patch-kwin_effects_blur_blur.cpp   (contents, props changed)
  head/x11/kde4-workspace/files/patch-kwin_scene__xrender.cpp   (contents, props changed)
Modified:
  head/x11/kde4-workspace/Makefile

Modified: head/x11/kde4-workspace/Makefile
==============================================================================
--- head/x11/kde4-workspace/Makefile	Fri Jun  2 19:05:03 2017	(r442452)
+++ head/x11/kde4-workspace/Makefile	Fri Jun  2 19:14:43 2017	(r442453)
@@ -2,7 +2,7 @@
 
 PORTNAME=	kde-workspace
 PORTVERSION=	${KDE4_WORKSPACE_VERSION}
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	x11 kde kde-applications
 
 MAINTAINER=	kde at FreeBSD.org

Added: head/x11/kde4-workspace/files/patch-kwin_effects_blur_blur.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/x11/kde4-workspace/files/patch-kwin_effects_blur_blur.cpp	Fri Jun  2 19:14:43 2017	(r442453)
@@ -0,0 +1,13 @@
+Fix ambiguous call on armv6.
+
+--- kwin/effects/blur/blur.cpp.orig	2017-01-11 16:01:39 UTC
++++ kwin/effects/blur/blur.cpp
+@@ -387,7 +387,7 @@ bool BlurEffect::shouldBlur(const Effect
+     if (w->isDesktop())
+         return false;
+ 
+-    bool scaled = !qFuzzyCompare(data.xScale(), 1.0) && !qFuzzyCompare(data.yScale(), 1.0);
++    bool scaled = !qFuzzyCompare(data.xScale(), qreal(1.0)) && !qFuzzyCompare(data.yScale(), qreal(1.0));
+     bool translated = data.xTranslation() || data.yTranslation();
+ 
+     if (scaled || ((translated || (mask & PAINT_WINDOW_TRANSFORMED)) && !w->data(WindowForceBlurRole).toBool()))

Added: head/x11/kde4-workspace/files/patch-kwin_scene__xrender.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/x11/kde4-workspace/files/patch-kwin_scene__xrender.cpp	Fri Jun  2 19:14:43 2017	(r442453)
@@ -0,0 +1,22 @@
+Fix ambiguous call on armv6.
+
+--- kwin/scene_xrender.cpp.orig	2017-01-11 16:04:04 UTC
++++ kwin/scene_xrender.cpp
+@@ -392,7 +392,7 @@ void SceneXrender::Window::performPaint(
+ {
+     setTransformedShape(QRegion());  // maybe nothing will be painted
+     // check if there is something to paint
+-    bool opaque = isOpaque() && qFuzzyCompare(data.opacity(), 1.0);
++    bool opaque = isOpaque() && qFuzzyCompare(data.opacity(), qreal(1.0));
+     /* HACK: It seems this causes painting glitches, disable temporarily
+     if (( mask & PAINT_WINDOW_OPAQUE ) ^ ( mask & PAINT_WINDOW_TRANSLUCENT ))
+         { // We are only painting either opaque OR translucent windows, not both
+@@ -469,7 +469,7 @@ void SceneXrender::Window::performPaint(
+         xscale *= screen_paint.xScale();
+         yscale *= screen_paint.yScale();
+     }
+-    if (!qFuzzyCompare(xscale, 1.0) || !qFuzzyCompare(yscale, 1.0)) {
++    if (!qFuzzyCompare(xscale, qreal(1.0)) || !qFuzzyCompare(yscale, qreal(1.0))) {
+         scaled = true;
+         xform.matrix11 = DOUBLE_TO_FIXED(1.0 / xscale);
+         xform.matrix22 = DOUBLE_TO_FIXED(1.0 / yscale);