diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2019-01-02 09:39:17 +0200 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2019-01-21 10:03:05 +0200 |
| commit | c82cd3a7bd5d7a85fb48a37c3a5e37fbe3ed6738 (patch) | |
| tree | 5c06f7e553f328b45f9efcd3ddb0e2239322a1eb /gnu/packages/patches | |
| parent | 3e2d4e69c340c3520f546f8c7e21e52383058d1c (diff) | |
| download | guix-c82cd3a7bd5d7a85fb48a37c3a5e37fbe3ed6738.tar guix-c82cd3a7bd5d7a85fb48a37c3a5e37fbe3ed6738.tar.gz | |
gnu: qt: Update to 5.11.3.
* 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, qtscxml,
qtgamepad, qtpurchasing, qtcanvas3d, qtcharts, qtdatavis3d,
qtnetworkauth, qtremoteobjects, qtspeech): Update to 5.11.3.
(qt)[source]: Remove patch.
* gnu/packages/patches/qt-5-renameat2.patch: Remove file.
* gnu/local.mk (dist_patch_DATA): Remove it.
Diffstat (limited to 'gnu/packages/patches')
| -rw-r--r-- | gnu/packages/patches/qt-5-renameat2.patch | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/gnu/packages/patches/qt-5-renameat2.patch b/gnu/packages/patches/qt-5-renameat2.patch deleted file mode 100644 index 036070c7ff..0000000000 --- a/gnu/packages/patches/qt-5-renameat2.patch +++ /dev/null @@ -1,35 +0,0 @@ -Avoid conflicting declaration of 'renameat2' on glibc 2.28 -(see <https://github.com/meta-qt5/meta-qt5/issues/94>.) - -Patch from <https://github.com/meta-qt5/meta-qt5/pull/95> -by Andreas Müller <schnitzeltony@gmail.com>. - ---- - src/corelib/io/qfilesystemengine_unix.cpp | 11 ++++++++++++ - 1 file changed, 11 insertions(+) - -diff --git a/src/corelib/io/qfilesystemengine_unix.cpp b/src/corelib/io/qfilesystemengine_unix.cpp -index be6ce48d0cb..1bf1bebc7f1 100644 ---- a/qtbase/src/corelib/io/qfilesystemengine_unix.cpp -+++ b/qtbase/src/corelib/io/qfilesystemengine_unix.cpp -@@ -98,6 +98,17 @@ extern "C" NSString *NSTemporaryDirectory(); - # define FICLONE _IOW(0x94, 9, int) - #endif - -+// renameat2/statx features for non bootstrapped build -+#ifndef QT_BOOTSTRAPPED -+#ifdef __GLIBC_PREREQ -+# define QT_FEATURE_renameat2 (__GLIBC_PREREQ(2, 28) ? 1 : -1) -+# define QT_FEATURE_statx (__GLIBC_PREREQ(2, 28) ? 1 : -1) -+#else -+# define QT_FEATURE_renameat2 -1 -+# define QT_FEATURE_statx -1 -+#endif -+#endif -+ - # if defined(Q_OS_ANDROID) - // renameat2() and statx() are disabled on Android because quite a few systems - // come with sandboxes that kill applications that make system calls outside a --- -2.14.4 - |