[SCM] QtCurve packaging branch, master, updated. debian/1.8.18+git20160320-3d8622c-3-1-g784e65e
Dmitry Shachnev
mitya57 at moszumanska.debian.org
Wed Jul 19 13:36:14 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/qtcurve.git;a=commitdiff;h=784e65e
The following commit has been merged in the master branch:
commit 784e65e9dc406d7c319148d8550bbb4ced13f014
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date: Wed Jul 19 16:34:07 2017 +0300
Backport upstream patch to fix build with Qt 5.9.
Closes: #867576.
---
debian/changelog | 6 ++++++
debian/patches/fix-build-with-qt-5.9.patch | 24 ++++++++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 31 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 179cbef..b3e5036 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+qtcurve (1.8.18+git20160320-3d8622c-4) UNRELEASED; urgency=medium
+
+ * Backport upstream patch to fix build with Qt 5.9. (Closes: #867576)
+
+ -- Dmitry Shachnev <mitya57 at debian.org> Wed, 19 Jul 2017 16:32:56 +0300
+
qtcurve (1.8.18+git20160320-3d8622c-3) unstable; urgency=medium
* Add workaround-for-kwin-x11-crashes.patch. (Closes: #823674)
diff --git a/debian/patches/fix-build-with-qt-5.9.patch b/debian/patches/fix-build-with-qt-5.9.patch
new file mode 100644
index 0000000..a114fae
--- /dev/null
+++ b/debian/patches/fix-build-with-qt-5.9.patch
@@ -0,0 +1,24 @@
+Description: fix build against Qt 5.9
+Origin: upstream, https://cgit.kde.org/qtcurve.git/commit/?id=7ddd3782ea5635cc
+Last-Update: 2017-07-19
+
+--- a/qt5/style/qtcurve.h
++++ b/qt5/style/qtcurve.h
+@@ -369,7 +369,7 @@
+ void emitMenuSize(QWidget *w, unsigned short size, bool force=false);
+ void emitStatusBarState(QStatusBar *sb);
+ const QColor&
+- MOArrow(QFlags<State> state, const QPalette &palette, bool mo,
++ MOArrow(State state, const QPalette &palette, bool mo,
+ QPalette::ColorRole rol) const
+ {
+ if (!(state & State_Enabled)) {
+@@ -381,7 +381,7 @@
+ }
+ }
+ const QColor&
+- MOArrow(QFlags<State> state, const QPalette &palette,
++ MOArrow(State state, const QPalette &palette,
+ QPalette::ColorRole rol) const
+ {
+ return MOArrow(state, palette, state & State_MouseOver, rol);
diff --git a/debian/patches/series b/debian/patches/series
index 02dc5d0..10ca6b4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
enable-translations.patch
fix-segfault-in-qt4-style-on-mouse-move-to-window-title.patch
workaround-for-kwin-x11-crashes.patch
+fix-build-with-qt-5.9.patch
--
QtCurve packaging
More information about the pkg-kde-commits
mailing list