diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2019-08-29 11:35:39 +0300 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2019-08-29 11:35:39 +0300 |
| commit | 3e93b2bdeb449063f9c00aaeba23ec7c4499b138 (patch) | |
| tree | 8c0802bd60cf6bd09ccaa8a4dfdc8be0b848c22f /gnu/packages/patches | |
| parent | 23cbc6b61ef6611a915adb400e04fc6d961ae609 (diff) | |
| download | guix-patches-3e93b2bdeb449063f9c00aaeba23ec7c4499b138.tar guix-patches-3e93b2bdeb449063f9c00aaeba23ec7c4499b138.tar.gz | |
gnu: qt: Update to 5.12.4.
* gnu/packages/qt.scm (qt, qtbase, qtsvg, qtimageformats, qtx11extras,
qtxmlpatterns, qtdeclarative, qtconnectivity, qtwebsockets, qtsensors,
qtmultimedia, qtwayland, qtserialport, qtserialbus, qtwebchannel,
qtwebglplugin, qtwebview, qtlocation, qttools, qtscript,
qtquickcontrols, qtquickcontrols2, qtgraphicaleffects, qtgamepad,
qtscxml, qtpurchasing, qtcanvas3d, qtcharts, qtdatavis3d, qtnetworkauth,
qtremoteobjects, qtspeech): Update to 5.12.4.
(qt, qtbase)[source]: Remove xkbcommon from list of directories to remove.
(qtbase)[source]: Remove upstreamed patch.
(python-sip): Update to 4.19.18.
[source]: Update to new source uri.
(python-pyqt): Update to 5.12.3.
[source]: Update to new source uri.
* gnu/packages/patches/qtbase-old-kernel.patch: Remove patch.
* gnu/local.mk (dist_patch_DATA): Remove it.
Diffstat (limited to 'gnu/packages/patches')
| -rw-r--r-- | gnu/packages/patches/qtbase-old-kernel.patch | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/gnu/packages/patches/qtbase-old-kernel.patch b/gnu/packages/patches/qtbase-old-kernel.patch deleted file mode 100644 index aa26fb6c4f..0000000000 --- a/gnu/packages/patches/qtbase-old-kernel.patch +++ /dev/null @@ -1,25 +0,0 @@ -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 |