[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
43/66: gnu: qtwayland-5: Update to 5.15.10.
From: |
guix-commits |
Subject: |
43/66: gnu: qtwayland-5: Update to 5.15.10. |
Date: |
Tue, 22 Aug 2023 12:34:04 -0400 (EDT) |
apteryx pushed a commit to branch master
in repository guix.
commit e89704d84ac30c739e780a5869bf8add50f407cc
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Tue Aug 15 16:20:05 2023 -0400
gnu: qtwayland-5: Update to 5.15.10.
* gnu/packages/qt.scm (qtwayland-5): Update to 5.15.10.
[source]: Remove qtwayland-gcc-11.patch patch.
* gnu/packages/patches/qtwayland-gcc-11.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): De-register it.
---
gnu/local.mk | 1 -
gnu/packages/patches/qtwayland-gcc-11.patch | 18 ------------------
gnu/packages/qt.scm | 7 +++----
3 files changed, 3 insertions(+), 23 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index 6e2f70cdaa..eb6f622349 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1880,7 +1880,6 @@ dist_patch_DATA =
\
%D%/packages/patches/quagga-reproducible-build.patch \
%D%/packages/patches/quickswitch-fix-dmenu-check.patch \
%D%/packages/patches/quilt-grep-compat.patch \
- %D%/packages/patches/qtwayland-gcc-11.patch \
%D%/packages/patches/qtwayland-dont-recreate-callbacks.patch \
%D%/packages/patches/qtwayland-cleanup-callbacks.patch \
%D%/packages/patches/ragel-char-signedness.patch \
diff --git a/gnu/packages/patches/qtwayland-gcc-11.patch
b/gnu/packages/patches/qtwayland-gcc-11.patch
deleted file mode 100644
index 06983ff2f3..0000000000
--- a/gnu/packages/patches/qtwayland-gcc-11.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Add missing import for newer libstdc++.
-
-Taken from upstream:
-
-
https://github.com/qt/qtwayland/commit/1aa6ec2c778504d96543f6cdc2b9199a7b066fc1
-
-diff --git a/tests/auto/client/shared/corecompositor.cpp
b/tests/auto/client/shared/corecompositor.cpp
-index 5c6c83baa..fa9b7662a 100644
---- a/tests/auto/client/shared/corecompositor.cpp
-+++ b/tests/auto/client/shared/corecompositor.cpp
-@@ -27,6 +27,7 @@
- ****************************************************************************/
-
- #include "corecompositor.h"
-+#include <thread>
-
- namespace MockCompositor {
-
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 9194895c2f..54b138c0d0 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1729,16 +1729,15 @@ set of plugins for interacting with pulseaudio and
GStreamer.")
(package
(inherit qtsvg-5)
(name "qtwayland")
- (version "5.15.8")
+ (version "5.15.10")
(source (origin
(method url-fetch)
(uri (qt-url name version))
- (patches (search-patches "qtwayland-gcc-11.patch"
-
"qtwayland-dont-recreate-callbacks.patch"
+ (patches (search-patches
"qtwayland-dont-recreate-callbacks.patch"
"qtwayland-cleanup-callbacks.patch"))
(sha256
(base32
- "0aa5jcvvap6qca6imdkhs1mhv5bnaxn466mmpl7x78jx1za7n3ps"))))
+ "1w9nclz1lfg5haq3m6ihils0kl2n1pqagdyh71ry1m281w8gvly8"))))
(arguments
(substitute-keyword-arguments (package-arguments qtsvg-5)
((#:phases phases)
- 58/66: gnu: qtcharts: Update to 5.15.10., (continued)
- 58/66: gnu: qtcharts: Update to 5.15.10., guix-commits, 2023/08/22
- 62/66: gnu: qtwebengine-5: Update to 5.15.10., guix-commits, 2023/08/22
- 05/66: gnu: qtdeclarative: Disable QML cache to avoid stale cache issues., guix-commits, 2023/08/22
- 12/66: gnu: qtimageformats-5: Fix indentation., guix-commits, 2023/08/22
- 18/66: gnu: qtmultimedia: Update to 6.5.2., guix-commits, 2023/08/22
- 21/66: gnu: qtlottie: Update to 6.5.2., guix-commits, 2023/08/22
- 29/66: gnu: qt-creator: Update to 11.0.1., guix-commits, 2023/08/22
- 30/66: gnu: qtbase-5: Update to 5.15.10., guix-commits, 2023/08/22
- 33/66: gnu: qtimageformats-5: Update to 5.15.10., guix-commits, 2023/08/22
- 42/66: gnu: qtmultimedia-5: Shorten maximum line width., guix-commits, 2023/08/22
- 43/66: gnu: qtwayland-5: Update to 5.15.10.,
guix-commits <=
- 47/66: gnu: qtwebglplugin: Update to 5.15.10., guix-commits, 2023/08/22
- 48/66: gnu: qtwebview: Update to 5.15.10., guix-commits, 2023/08/22
- 52/66: gnu: qtquickcontrols-5: Update to 5.15.10., guix-commits, 2023/08/22
- 51/66: gnu: qtscript: Update to 5.15.10., guix-commits, 2023/08/22
- 44/66: gnu: qtserialport: Update to 5.15.10., guix-commits, 2023/08/22
- 49/66: gnu: qtlocation: Update to 5.15.10., guix-commits, 2023/08/22
- 53/66: gnu: qtquickcontrols2-5: Update to 5.15.10., guix-commits, 2023/08/22
- 59/66: gnu: qtdatavis3d: Update to 5.15.10., guix-commits, 2023/08/22
- 60/66: gnu: qtnetworkauth-5: Update to 5.15.10., guix-commits, 2023/08/22
- 63/66: gnu: qtvirtualkeyboard: Update to 5.15.10., guix-commits, 2023/08/22