Hello community,

here is the log from the commit of package synergy for openSUSE:Factory checked 
in at 2017-02-08 11:04:53
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/synergy (Old)
 and      /work/SRC/openSUSE:Factory/.synergy.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "synergy"

Changes:
--------
--- /work/SRC/openSUSE:Factory/synergy/synergy.changes  2017-02-03 
20:02:43.054545005 +0100
+++ /work/SRC/openSUSE:Factory/.synergy.new/synergy.changes     2017-02-08 
11:04:54.354745758 +0100
@@ -1,0 +2,6 @@
+Mon Feb  6 12:15:54 UTC 2017 - martin.wi...@suse.com
+
+* Fix screen size calculation with XRandR enabled (boo#1023635)
+  - Added 0001-XRandR-fix-screen-size-calculation.patch
+
+-------------------------------------------------------------------

New:
----
  0001-XRandR-fix-screen-size-calculation.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ synergy.spec ++++++
--- /var/tmp/diff_new_pack.OzoMFy/_old  2017-02-08 11:04:55.286615838 +0100
+++ /var/tmp/diff_new_pack.OzoMFy/_new  2017-02-08 11:04:55.290615281 +0100
@@ -32,6 +32,7 @@
 # patches from Gentoo (taken from Mageia)
 Patch11:        synergy-1.5.0-pthread.patch
 Patch14:        synergy-1.5.0-disable-version-check.patch
+Patch20:        0001-XRandR-fix-screen-size-calculation.patch
 BuildRequires:  avahi-devel
 BuildRequires:  cmake
 BuildRequires:  curl-devel
@@ -81,6 +82,7 @@
 %setup -q -n %{name}-%{version}-stable
 %patch11 -p1
 %patch14 -p1
+%patch20 -p1
 cp %{SOURCE2} .
 
 # extract bundled gtest and gmock to enable building tests

++++++ 0001-XRandR-fix-screen-size-calculation.patch ++++++
>From 2d682bec060ac6454509e20cba1a14758dca5006 Mon Sep 17 00:00:00 2001
From: Martin Wilck <mwi...@suse.com>
Date: Mon, 6 Feb 2017 12:37:43 +0100
Subject: [PATCH] XRandR: fix screen size calculation
References: boo#1023635

XWindowsScreen::saveShape() using XRRSizes / XRRRotations to
calculate screen dimensions when XRandR and a rotated screen
was detected. This is wrong. The screen dimensions in the
display properties already reflect rotation.

Moreover, on servers supporting XRandR >= 1.2, the XRRSizes()
and XRRRotations calls from XRandR 1.1 will return the
properties of the "primary output" in XRandR 1.2 terms rather than
the properties of the entire screen.

Upstream: https://github.com/symless/synergy/pull/5832

Signed-off-by: Martin Wilck <mwi...@suse.com>
---
 src/lib/platform/XWindowsScreen.cpp | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/src/lib/platform/XWindowsScreen.cpp 
b/src/lib/platform/XWindowsScreen.cpp
index c7032470..cf3cddbf 100644
--- a/src/lib/platform/XWindowsScreen.cpp
+++ b/src/lib/platform/XWindowsScreen.cpp
@@ -977,22 +977,6 @@ XWindowsScreen::saveShape()
        m_w = WidthOfScreen(DefaultScreenOfDisplay(m_display));
        m_h = HeightOfScreen(DefaultScreenOfDisplay(m_display));
 
-#if HAVE_X11_EXTENSIONS_XRANDR_H
-       if (m_xrandr){
-         int numSizes;
-         XRRScreenSize* xrrs;
-         Rotation rotation;
-         xrrs = XRRSizes(m_display, DefaultScreen(m_display), &numSizes);
-         XRRRotations(m_display, DefaultScreen(m_display), &rotation);
-         if (xrrs != NULL) {
-           if (rotation & (RR_Rotate_90|RR_Rotate_270) ){
-             m_w = xrrs->height;
-             m_h = xrrs->width;
-           }
-         }
-       }
-#endif
-
        // get center of default screen
        m_xCenter = m_x + (m_w >> 1);
        m_yCenter = m_y + (m_h >> 1);
-- 
2.11.0



Reply via email to