[SCM] kwin packaging branch, master, updated. debian/5.8.7-1-2-g50e199e

Dmitry Shachnev mitya57 at moszumanska.debian.org
Fri Aug 25 11:04:38 UTC 2017


Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/kwin.git;a=commitdiff;h=50e199e

The following commit has been merged in the master branch:
commit 50e199e40277b6b89093f14389ec417a34fc8c7d
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Fri Aug 25 14:03:41 2017 +0300

    Backport upstream patch to fix ‘undefined reference to qCompare’ error.
---
 debian/patches/fix_undefined_reference_to_qCompare.diff | 15 +++++++++++++++
 debian/patches/series                                   |  1 +
 2 files changed, 16 insertions(+)

diff --git a/debian/patches/fix_undefined_reference_to_qCompare.diff b/debian/patches/fix_undefined_reference_to_qCompare.diff
new file mode 100644
index 0000000..1b6f9cf
--- /dev/null
+++ b/debian/patches/fix_undefined_reference_to_qCompare.diff
@@ -0,0 +1,15 @@
+Description: fix “undefined reference to `bool QTest::qCompare<int, unsigned int>(...)'”
+Origin: upstream, https://cgit.kde.org/kwin.git/commit/?id=404f2675f8ca5496
+Last-Update: 2017-08-25
+
+--- a/kcmkwin/kwincompositing/test/modeltest.cpp
++++ b/kcmkwin/kwincompositing/test/modeltest.cpp
+@@ -453,7 +453,7 @@
+     // Check that the alignment is one we know about
+     QVariant textAlignmentVariant = model->data ( model->index ( 0, 0 ), Qt::TextAlignmentRole );
+     if ( textAlignmentVariant.isValid() ) {
+-        int alignment = textAlignmentVariant.toInt();
++        unsigned int alignment = textAlignmentVariant.toUInt();
+         QCOMPARE( alignment, ( alignment & ( Qt::AlignHorizontal_Mask | Qt::AlignVertical_Mask ) ) );
+     }
+ 
diff --git a/debian/patches/series b/debian/patches/series
index dddf570..c336628 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 modularized_platformsupport.diff
+fix_undefined_reference_to_qCompare.diff

-- 
kwin packaging



More information about the pkg-kde-commits mailing list