diff options
| author | Dmitry Shachnev <mitya57@gmail.com> | 2016-11-15 14:37:02 +0300 |
|---|---|---|
| committer | Dmitry Shachnev <mitya57@gmail.com> | 2016-11-15 14:37:02 +0300 |
| commit | 310cd40b5edf8a014bdd81f3b808f654953eb06c (patch) | |
| tree | 2aaea6a2d2fb1302e26eaef416a0b31392ba06d4 /debian | |
| parent | 83c19ef276dab723580bbf2d57e74d551ded6a1f (diff) | |
| download | qtbase-310cd40b5edf8a014bdd81f3b808f654953eb06c.tar.gz | |
Backport upstream patch to fix build on x32 (fix_build_on_x32.diff).
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | debian/patches/fix_build_on_x32.diff | 15 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 17 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index edb33bb..c498806 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ qtbase-opensource-src (5.7.1~20161021+dfsg-6) UNRELEASED; urgency=medium [ Dmitry Shachnev ] * Make libqt5network5 depend on libssl1.0.2. It will crash when only newer libssl versions are installed. + * Backport upstream patch to fix build on x32 (fix_build_on_x32.diff). -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Fri, 04 Nov 2016 20:29:15 +0300 diff --git a/debian/patches/fix_build_on_x32.diff b/debian/patches/fix_build_on_x32.diff new file mode 100644 index 0000000..e42d952 --- /dev/null +++ b/debian/patches/fix_build_on_x32.diff @@ -0,0 +1,15 @@ +Description: fix EGL break on Debian X32 +Origin: upstream, https://code.qt.io/cgit/qt/qtbase.git/commit/?id=92805a0e9c488e47 +Last-Update: 2016-11-15 + +--- a/src/platformsupport/eglconvenience/qt_egl_p.h ++++ b/src/platformsupport/eglconvenience/qt_egl_p.h +@@ -83,7 +83,7 @@ + { return v; } + }; + +-#if Q_PROCESSOR_WORDSIZE > 4 ++#if QT_POINTER_SIZE > 4 + template <> + struct QtEglConverter<uintptr_t, uint32_t> + { diff --git a/debian/patches/series b/debian/patches/series index 9d04087..22dc365 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,6 +1,7 @@ # Backported from upstream qsettings_simplify_logic.diff qsettings_XDG_CONFIG_DIRS.diff +fix_build_on_x32.diff # Debian specific. no_dbus_dependency.diff |