From patchwork Wed Aug 16 12:10:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 52907 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 9BB3D27BBEA; Wed, 16 Aug 2023 13:14:54 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id B764C27BBE2 for ; Wed, 16 Aug 2023 13:14:53 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qWFPd-0008EV-J2; Wed, 16 Aug 2023 08:14:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qWFPc-0008Ac-1q for guix-patches@gnu.org; Wed, 16 Aug 2023 08:14:08 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qWFPb-0002gk-O4 for guix-patches@gnu.org; Wed, 16 Aug 2023 08:14:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qWFPb-0005gz-JS; Wed, 16 Aug 2023 08:14:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65280] [PATCH v2 40/59] gnu: qtwayland-5: Update to 5.15.10. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, maxim.cournoyer@gmail.com, iyzsong@envs.net, guix-patches@gnu.org Resent-Date: Wed, 16 Aug 2023 12:14:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65280 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65280@debbugs.gnu.org Cc: Maxim Cournoyer , Andreas Enge , Maxim Cournoyer , =?utf-8?b?5a6L5paH5q2m?= X-Debbugs-Original-Xcc: Andreas Enge , Maxim Cournoyer , =?utf-8?b?5a6L5paH5q2m?= Received: via spool by 65280-submit@debbugs.gnu.org id=B65280.169218802721573 (code B ref 65280); Wed, 16 Aug 2023 12:14:07 +0000 Received: (at 65280) by debbugs.gnu.org; 16 Aug 2023 12:13:47 +0000 Received: from localhost ([127.0.0.1]:39267 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qWFPH-0005bm-6p for submit@debbugs.gnu.org; Wed, 16 Aug 2023 08:13:47 -0400 Received: from mail-qv1-xf2e.google.com ([2607:f8b0:4864:20::f2e]:44120) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qWFOo-0005Up-D8 for 65280@debbugs.gnu.org; Wed, 16 Aug 2023 08:13:19 -0400 Received: by mail-qv1-xf2e.google.com with SMTP id 6a1803df08f44-6471e071996so16203996d6.0 for <65280@debbugs.gnu.org>; Wed, 16 Aug 2023 05:13:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1692187993; x=1692792793; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Q9kMaotVFiSQvkJ0FOLd+PpZ9VQSmEu/bwPIR94cOZQ=; b=Yt25Erxu2iwi3QVW5ROBywyz5wv2ET+KR71BLuYilVkT/wNutYmAK/IA/5qXvAnmqE m70mE3Dw3MV3CdlNX2Pva2VmgPjb24lYPPq0oDta6Ioc7RkAjlLIywAQ4SjKmjvsQX1e 7S4GuCkR/CNLXLEji7WkV3Kmf3+ZarwDyW7IgAWfsJJW5pEU94FcYP9isfCBtcHvkhhe JEQN5ErPQSy2a3mGe6qlHroRcpljxzKRrDgkYTxWTl8XI88NkddTU4+xZVlgZGzNbXu0 NI6/HPS6yfKjYUUpnqVhVrJQWnOrTPl9lzVgWNhMiePe2aXEAaYoQ266O4V8eaGVFzRq UXeA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692187993; x=1692792793; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Q9kMaotVFiSQvkJ0FOLd+PpZ9VQSmEu/bwPIR94cOZQ=; b=euby3EFuZtN8tPxi1GP08frAiK0JSiMvQxLLlVlMVF2mn0+fVj34RWF3SA0yaLMZTC jG5lqfK8/D9I0GvTVgXNB7n84kVAf5rrqId23ETHNoASkrX+uOoWkkTAiUIVIBPI5Ax6 y0HtiWXXcGGDxPrqALKiGtJ103BrIWv/Gm1XHgQ/Ngj0WuHbjI1AvxqIbfpT0oGeVV3V caTIB87xOqsN5B7ENAtekp0en0R1/4NMvAx6c+Zf016i2nArRKRvRT2CarGSSfIQKKSj n3N+h4tB53Em9UAyj+7xTxm8yZMA/Kl1MP1rUUSEPfK3vzrCE58gqZkYMr9a8Yvq1G1V gLew== X-Gm-Message-State: AOJu0Yx83UqB5VKwzU4W7+JLAYdI4d5ZGIc3xWkODsUtlwqD0HVU6wgN np8jAwUlxu2S3FwJnx7FX5MAdxc28+k= X-Google-Smtp-Source: AGHT+IFKzu/jjrpnTWFZ2shixrr3jJIEnSYY8IPBatmSr5jGKDDb0QLjNuIK0A7X5yGP0bxS/+fJcg== X-Received: by 2002:a0c:f5c6:0:b0:647:374d:761a with SMTP id q6-20020a0cf5c6000000b00647374d761amr1584810qvm.63.1692187992766; Wed, 16 Aug 2023 05:13:12 -0700 (PDT) Received: from localhost.localdomain (dsl-152-182.b2b2c.ca. [66.158.152.182]) by smtp.gmail.com with ESMTPSA id c17-20020a0ce151000000b00641899958efsm4468320qvl.130.2023.08.16.05.13.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Aug 2023 05:13:12 -0700 (PDT) From: Maxim Cournoyer Date: Wed, 16 Aug 2023 08:10:56 -0400 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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 - - 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)