diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2019-02-20 17:19:00 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2019-02-20 17:19:00 +0100 |
| commit | 901236474a9523595c0bdefd5ac22366e78b9e61 (patch) | |
| tree | 667efe648d584b0c960b0da0d577b8a71b6b941c /gnu/packages/patches/qtbase-old-kernel.patch | |
| parent | 63d4ef52ebad4157817d56ccbe974da8fff81929 (diff) | |
| parent | 64766d5cafd5cf19189ed274eb7e29ef784f90de (diff) | |
Merge branch 'staging' into core-updates
Diffstat (limited to 'gnu/packages/patches/qtbase-old-kernel.patch')
| -rw-r--r-- | gnu/packages/patches/qtbase-old-kernel.patch | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/gnu/packages/patches/qtbase-old-kernel.patch b/gnu/packages/patches/qtbase-old-kernel.patch new file mode 100644 index 0000000000..aa26fb6c4f --- /dev/null +++ b/gnu/packages/patches/qtbase-old-kernel.patch @@ -0,0 +1,25 @@ +https://672856.bugs.gentoo.org/attachment.cgi?id=557978 +https://bugs.gentoo.org/672856 + +The patch fixes building qtbase with linux kernels < 4.11. +See bug #34431. + +diff -Naurp a/src/corelib/global/minimum-linux_p.h b/src/corelib/global/minimum-linux_p.h +--- a/src/corelib/global/minimum-linux_p.h 2018-11-25 15:51:11.000000000 +0300 ++++ b/src/corelib/global/minimum-linux_p.h 2018-12-17 13:25:38.176823753 +0300 +@@ -75,14 +75,9 @@ QT_BEGIN_NAMESPACE + * - accept4 2.6.28 + * - renameat2 3.16 QT_CONFIG(renameat2) + * - getrandom 3.17 QT_CONFIG(getentropy) +- * - statx 4.11 QT_CONFIG(statx) + */ + +-#if QT_CONFIG(statx) +-# define MINLINUX_MAJOR 4 +-# define MINLINUX_MINOR 11 +-# define MINLINUX_PATCH 0 +-#elif QT_CONFIG(getentropy) ++#if QT_CONFIG(getentropy) + # define MINLINUX_MAJOR 3 + # define MINLINUX_MINOR 17 + # define MINLINUX_PATCH 0 |