[SCM] qtbase packaging branch, experimental, updated. debian/5.8.0+dfsg-1-3-g3ae772d
Dmitry Shachnev
mitya57 at moszumanska.debian.org
Fri Feb 10 15:03:31 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtbase.git;a=commitdiff;h=eec3263
The following commit has been merged in the experimental branch:
commit eec3263db3be3b1554c5e5f3551db938c5de6248
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date: Fri Feb 10 17:53:57 2017 +0300
Add a patch to fix compilation error on big endian systems.
---
debian/changelog | 3 +++
debian/patches/qvnc_semicolon.diff | 16 ++++++++++++++++
debian/patches/series | 3 +++
3 files changed, 22 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 2c19d0a..eac34b7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
qtbase-opensource-src (5.8.0+dfsg-2) UNRELEASED; urgency=medium
+ [ Dmitry Shachnev ]
+ * Add a patch to fix compilation error on big endian systems because of
+ missing semicolon (qvnc_semicolon.diff).
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Fri, 10 Feb 2017 16:46:27 +0300
diff --git a/debian/patches/qvnc_semicolon.diff b/debian/patches/qvnc_semicolon.diff
new file mode 100644
index 0000000..794d85a
--- /dev/null
+++ b/debian/patches/qvnc_semicolon.diff
@@ -0,0 +1,16 @@
+Description: add missing semicolon after member function declaration
+Author: Dmitry Shachnev <mitya57 at debian.org>
+Forwarded: https://codereview.qt-project.org/185207
+Last-Update: 2017-02-10
+
+--- a/src/plugins/platforms/vnc/qvncscreen.h
++++ b/src/plugins/platforms/vnc/qvncscreen.h
+@@ -73,7 +73,7 @@
+ void clearDirty() { dirtyRegion = QRegion(); }
+
+ #if Q_BYTE_ORDER == Q_BIG_ENDIAN
+- bool swapBytes() const
++ bool swapBytes() const;
+ #endif
+
+ QStringList mArgs;
diff --git a/debian/patches/series b/debian/patches/series
index 9d04087..647c5a4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,6 +2,9 @@
qsettings_simplify_logic.diff
qsettings_XDG_CONFIG_DIRS.diff
+# Forwarded upstream
+qvncscreen_semicolon.diff
+
# Debian specific.
no_dbus_dependency.diff
gnukfreebsd.diff
--
qtbase packaging
More information about the pkg-kde-commits
mailing list