[SCM] libkscreen packaging branch, master, updated. debian/1.0.3-1-9-g8e73932

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/libkscreen.git;a=commitdiff;h=82b4258

The following commit has been merged in the master branch:
commit 82b42588beec57cfe3e760576cb711344f292350
Author: Maximiliano Curia <maxy at debian.org>
Date:   Sat Jul 12 12:16:41 2014 +0200

    New patch: randr_documented_interface
---
 debian/changelog                          |  1 +
 debian/patches/randr_documented_interface | 28 ++++++++++++++++++++++++++++
 debian/patches/series                     |  1 +
 3 files changed, 30 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 531b7b1..a3aeb9a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ libkscreen (1.0.4-1) UNRELEASED; urgency=medium
   * Remove upstream patch: upstream_01_Fix-crash.patch
   * Remove upstream patch: upstream_02_Don-t-crash-when-printing-a-null-
     KScreen-Output-from.patch
+  * New patch: randr_documented_interface
 
  -- Maximiliano Curia <maxy at debian.org>  Tue, 01 Jul 2014 16:59:26 +0200
 
diff --git a/debian/patches/randr_documented_interface b/debian/patches/randr_documented_interface
new file mode 100644
index 0000000..a7a1225
--- /dev/null
+++ b/debian/patches/randr_documented_interface
@@ -0,0 +1,28 @@
+Index: libkscreen/backends/xrandr1.1/xrandr11.cpp
+===================================================================
+--- libkscreen.orig/backends/xrandr1.1/xrandr11.cpp	2014-07-12 12:08:27.774476050 +0200
++++ libkscreen/backends/xrandr1.1/xrandr11.cpp	2014-07-12 12:15:44.817283597 +0200
+@@ -42,17 +42,15 @@
+  , m_currentConfig(0)
+  , m_currentTimestamp(0)
+ {
+-    xcb_generic_error_t *error = 0;
+-    xcb_randr_query_version_reply_t* version;
+-    version = xcb_randr_query_version_reply(connection(), xcb_randr_query_version(connection(), XCB_RANDR_MAJOR_VERSION, XCB_RANDR_MINOR_VERSION), &error);
+-
+-    if (!version || error) {
+-        free(error);
++    Display *display = QX11Info::display();
++    int major_version, minor_version;
++    Status status = XRRQueryVersion(display, &major_version, &minor_version);
++    if (! status) {
+         qDebug() << "Can't get XRandR version";
+         return;
+     }
+-    if (version->minor_version > 1) {
+-        qDebug() << "This backend is only for XRandR 1.1, your version is: " << version->major_version << "." << version->minor_version;
++    if ((major_version != 1) || (minor_version != 1)) {
++        qDebug() << "This backend is only for XRandR 1.1, your version is: " << major_version << "." << minor_version;
+         return;
+     }
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 8920961..6c8d85e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 libdir.diff
 plugins_in_ma_paths.diff
+randr_documented_interface

-- 
libkscreen packaging