all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
To: 65280@debbugs.gnu.org
Cc: "Maxim Cournoyer" <maxim.cournoyer@gmail.com>,
	"Andreas Enge" <andreas@enge.fr>,
	"Maxim Cournoyer" <maxim.cournoyer@gmail.com>,
	宋文武 <iyzsong@envs.net>
Subject: [bug#65280] [PATCH v2 40/59] gnu: qtwayland-5: Update to 5.15.10.
Date: Wed, 16 Aug 2023 08:10:56 -0400	[thread overview]
Message-ID: <ff4e44fba291606f478917d06a50fae5a33967b6.1692187579.git.maxim.cournoyer@gmail.com> (raw)
In-Reply-To: <cover.1692187578.git.maxim.cournoyer@gmail.com>

* 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.
---

(no changes since v1)

 gnu/local.mk                                |  1 -
 gnu/packages/patches/qtwayland-gcc-11.patch | 18 ------------------
 gnu/packages/qt.scm                         |  7 +++----
 3 files changed, 3 insertions(+), 23 deletions(-)
 delete mode 100644 gnu/packages/patches/qtwayland-gcc-11.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index f10fe292dc..87a9af894d 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1878,7 +1878,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 c1cee17542..b71077e075 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1703,16 +1703,15 @@ (define-public qtwayland-5
   (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)
-- 
2.41.0





  parent reply	other threads:[~2023-08-16 12:14 UTC|newest]

Thread overview: 66+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-08-14  4:21 [bug#65280] [PATCH 00/26] Refresh Qt 6 packages Maxim Cournoyer
2023-08-16 10:56 ` 宋文武 via Guix-patches via
2023-08-16 12:19   ` [bug#65280] [PATCH v2 00/59] Refresh Qt 5 and " Maxim Cournoyer
2023-08-17 11:56     ` 宋文武 via Guix-patches via
2023-08-17 13:47       ` Maxim Cournoyer
2023-08-16 12:10 ` Maxim Cournoyer
2023-08-16 12:10   ` [bug#65280] [PATCH v2 01/59] gnu: qt: Revert to use individual versions instead of %qt5-version Maxim Cournoyer
2023-08-16 12:10   ` [bug#65280] [PATCH v2 02/59] gnu: qtdeclarative: Disable QML cache to avoid stale cache issues Maxim Cournoyer
2023-08-16 12:10   ` [bug#65280] [PATCH v2 03/59] etc: Add Qt manifests for Qt maintenance Maxim Cournoyer
2023-08-16 12:10   ` [bug#65280] [PATCH v2 04/59] gnu: qtbase: Update to 6.5.2 Maxim Cournoyer
2023-08-16 12:10   ` [bug#65280] [PATCH v2 05/59] gnu: qtbase: Enable zstd support Maxim Cournoyer
2023-08-16 12:10   ` [bug#65280] [PATCH v2 06/59] gnu: qt5compat: Update to 6.5.2 Maxim Cournoyer
2023-08-16 12:10   ` [bug#65280] [PATCH v2 07/59] gnu: qtsvg: " Maxim Cournoyer
2023-08-16 12:10   ` [bug#65280] [PATCH v2 08/59] gnu: qtimageformats: Rename variable to qtimageformats-5 Maxim Cournoyer
2023-08-16 12:10   ` [bug#65280] [PATCH v2 09/59] gnu: qtimageformats-5: Fix indentation Maxim Cournoyer
2023-08-16 12:10   ` [bug#65280] [PATCH v2 10/59] gnu: Add qtimageformats Maxim Cournoyer
2023-08-16 12:10   ` [bug#65280] [PATCH v2 11/59] gnu: Add qtlanguageserver Maxim Cournoyer
2023-08-16 12:10   ` [bug#65280] [PATCH v2 12/59] gnu: qtdeclarative: Update to 6.5.2 Maxim Cournoyer
2023-08-16 12:10   ` [bug#65280] [PATCH v2 13/59] gnu: qtwebsockets: " Maxim Cournoyer
2023-08-16 12:10   ` [bug#65280] [PATCH v2 14/59] gnu: qtshadertools: " Maxim Cournoyer
2023-08-16 12:10   ` [bug#65280] [PATCH v2 15/59] gnu: qtmultimedia: " Maxim Cournoyer
2023-08-16 12:10   ` [bug#65280] [PATCH v2 16/59] gnu: qtwayland: " Maxim Cournoyer
2023-08-16 12:10   ` [bug#65280] [PATCH v2 17/59] gnu: qtwebchannel: " Maxim Cournoyer
2023-08-16 12:10   ` [bug#65280] [PATCH v2 18/59] gnu: qtlottie: " Maxim Cournoyer
2023-08-16 12:10   ` [bug#65280] [PATCH v2 19/59] gnu: qttools: " Maxim Cournoyer
2023-08-16 12:10   ` [bug#65280] [PATCH v2 20/59] gnu: qttranslations: " Maxim Cournoyer
2023-08-16 12:10   ` [bug#65280] [PATCH v2 21/59] gnu: qtpositioning: " Maxim Cournoyer
2023-08-16 12:10   ` [bug#65280] [PATCH v2 22/59] gnu: qtnetworkauth: " Maxim Cournoyer
2023-08-16 12:10   ` [bug#65280] [PATCH v2 23/59] gnu: qtremoteobjects: " Maxim Cournoyer
2023-08-16 12:10   ` [bug#65280] [PATCH v2 24/59] gnu: qtwebengine: " Maxim Cournoyer
2023-08-16 12:10   ` [bug#65280] [PATCH v2 25/59] gnu: Remove qtquickcontrols2 Maxim Cournoyer
2023-08-16 12:10   ` [bug#65280] [PATCH v2 26/59] gnu: qt-creator: Update to 11.0.1 Maxim Cournoyer
2023-08-16 12:10   ` [bug#65280] [PATCH v2 27/59] gnu: qtbase-5: Update to 5.15.10 Maxim Cournoyer
2023-08-16 12:10   ` [bug#65280] [PATCH v2 28/59] gnu: qt3d-5: " Maxim Cournoyer
2023-08-16 12:10   ` [bug#65280] [PATCH v2 29/59] gnu: qtsvg-5: " Maxim Cournoyer
2023-08-16 12:10   ` [bug#65280] [PATCH v2 30/59] gnu: qtimageformats-5: " Maxim Cournoyer
2023-08-16 12:10   ` [bug#65280] [PATCH v2 31/59] gnu: qtx11extras: " Maxim Cournoyer
2023-08-16 12:10   ` [bug#65280] [PATCH v2 32/59] gnu: qtxmlpatterns: " Maxim Cournoyer
2023-08-16 12:10   ` [bug#65280] [PATCH v2 33/59] gnu: qtdeclarative-5: " Maxim Cournoyer
2023-08-16 12:10   ` [bug#65280] [PATCH v2 34/59] gnu: qtconnectivity: " Maxim Cournoyer
2023-08-16 12:10   ` [bug#65280] [PATCH v2 35/59] gnu: qtwebsockets-5: " Maxim Cournoyer
2023-08-16 12:10   ` [bug#65280] [PATCH v2 36/59] gnu: qtsensors: " Maxim Cournoyer
2023-08-16 12:10   ` [bug#65280] [PATCH v2 37/59] gnu: qtmultimedia-5: " Maxim Cournoyer
2023-08-16 12:10   ` [bug#65280] [PATCH v2 38/59] gnu: qtsensors: Shorten line width Maxim Cournoyer
2023-08-16 12:10   ` [bug#65280] [PATCH v2 39/59] gnu: qtmultimedia-5: Shorten maximum " Maxim Cournoyer
2023-08-16 12:10   ` Maxim Cournoyer [this message]
2023-08-16 12:10   ` [bug#65280] [PATCH v2 41/59] gnu: qtserialport: Update to 5.15.10 Maxim Cournoyer
2023-08-16 12:10   ` [bug#65280] [PATCH v2 42/59] gnu: qtserialbus: " Maxim Cournoyer
2023-08-16 12:10   ` [bug#65280] [PATCH v2 43/59] gnu: qtwebchannel-5: " Maxim Cournoyer
2023-08-16 12:11   ` [bug#65280] [PATCH v2 44/59] gnu: qtwebglplugin: " Maxim Cournoyer
2023-08-16 12:11   ` [bug#65280] [PATCH v2 45/59] gnu: qtwebview: " Maxim Cournoyer
2023-08-16 12:11   ` [bug#65280] [PATCH v2 46/59] gnu: qtlocation: " Maxim Cournoyer
2023-08-16 12:11   ` [bug#65280] [PATCH v2 47/59] gnu: qttools-5: " Maxim Cournoyer
2023-08-16 12:11   ` [bug#65280] [PATCH v2 48/59] gnu: qtscript: " Maxim Cournoyer
2023-08-16 12:11   ` [bug#65280] [PATCH v2 49/59] gnu: qtquickcontrols-5: " Maxim Cournoyer
2023-08-16 12:11   ` [bug#65280] [PATCH v2 50/59] gnu: qtquickcontrols2-5: " Maxim Cournoyer
2023-08-16 12:11   ` [bug#65280] [PATCH v2 51/59] gnu: qtgraphicaleffects: " Maxim Cournoyer
2023-08-16 12:11   ` [bug#65280] [PATCH v2 52/59] gnu: qtgamepad: " Maxim Cournoyer
2023-08-16 12:11   ` [bug#65280] [PATCH v2 53/59] gnu: qtscxml: " Maxim Cournoyer
2023-08-16 12:11   ` [bug#65280] [PATCH v2 54/59] gnu: qtpurchasing: " Maxim Cournoyer
2023-08-16 12:11   ` [bug#65280] [PATCH v2 55/59] gnu: qtcharts: " Maxim Cournoyer
2023-08-16 12:11   ` [bug#65280] [PATCH v2 56/59] gnu: qtdatavis3d: " Maxim Cournoyer
2023-08-16 12:11   ` [bug#65280] [PATCH v2 57/59] gnu: qtnetworkauth-5: " Maxim Cournoyer
2023-08-16 12:11   ` [bug#65280] [PATCH v2 58/59] gnu: qtspeech: " Maxim Cournoyer
2023-08-16 12:11   ` [bug#65280] [PATCH v2 59/59] gnu: qtwebengine-5: " Maxim Cournoyer
2023-08-22 16:36 ` bug#65280: [PATCH 00/26] Refresh Qt 6 packages Maxim Cournoyer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=ff4e44fba291606f478917d06a50fae5a33967b6.1692187579.git.maxim.cournoyer@gmail.com \
    --to=maxim.cournoyer@gmail.com \
    --cc=65280@debbugs.gnu.org \
    --cc=andreas@enge.fr \
    --cc=iyzsong@envs.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.