diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | debian/patches/hurd_tilde.diff | 18 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 20 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index eac34b7..b61189c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ 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). + * Add a patch to fix compilation error on Hurd (hurd_tilde.diff). -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Fri, 10 Feb 2017 16:46:27 +0300 diff --git a/debian/patches/hurd_tilde.diff b/debian/patches/hurd_tilde.diff new file mode 100644 index 0000000..062098e --- /dev/null +++ b/debian/patches/hurd_tilde.diff @@ -0,0 +1,18 @@ +Description: undef TILDE to fix compilation on Hurd +Author: Dmitry Shachnev <mitya57@debian.org> +Forwarded: https://codereview.qt-project.org/185255 +Last-Update: 2017-02-10 + +--- a/src/gui/text/qcssparser_p.h ++++ b/src/gui/text/qcssparser_p.h +@@ -75,6 +75,10 @@ + #if defined(Q_OS_INTEGRITY) + # undef Value + #endif ++// Hurd has #define TILDE 0x00080000 from <sys/ioctl.h> ++#if defined(TILDE) ++# undef TILDE ++#endif + + #define QT_CSS_DECLARE_TYPEINFO(Class, Type) \ + } /* namespace QCss */ \ diff --git a/debian/patches/series b/debian/patches/series index 647c5a4..bb59fda 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -4,6 +4,7 @@ qsettings_XDG_CONFIG_DIRS.diff # Forwarded upstream qvncscreen_semicolon.diff +hurd_tilde.diff # Debian specific. no_dbus_dependency.diff |