From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:306:2d92::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id gH76Giqv2WTRoQAASxT56A (envelope-from ) for ; Mon, 14 Aug 2023 06:35:54 +0200 Received: from aspmx1.migadu.com ([2001:41d0:306:2d92::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id WIHKGiqv2WQttwAAauVa8A (envelope-from ) for ; Mon, 14 Aug 2023 06:35:54 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id E70E53FBDE for ; Mon, 14 Aug 2023 06:35:53 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20221208 header.b=LEW59ruq; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1691987754; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=9nkNFt3zxqEsfS7Ftf2twZtAUKXvpPZ50QPB9aRqhtw=; b=EqY2Q/SltYLGfy1k1tOPv8SHwKt0oRR/Kni+F5lu/SYr6hDnjRgZ7K5P4FU12D3GNcg3wn yAksKEiqWEP1w+2teaQ981bhupA0B6rjZnRbuD5QANRpGApVfckvlycROHOu2pWTVGn96S N6ufvmBR10VYznBGlJCqGhpc0NhKbJNu3P6GrDeqRmlleNFt7y9WFvoOq8IoeOXUmPo2nx JSG3zXFR8oDSh90KBgv27Vl5GuDuOdEjogfFtbOcs057DZrrVPgq5jNNeBLVZ6Ynrk2xJO ZEu/arnu9lobM3QIReLz2JtMv2JLucaYdK22VdG8REY5UZrJebsbBuPKyQtzbQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20221208 header.b=LEW59ruq; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1691987754; a=rsa-sha256; cv=none; b=LxzMs1vElfSxEh4kvz/ZFsYdQUYz1PNGam//v6j7lNEnXHihKGs74LpA4lfpzvPdXCR2il q8ZrJw5U1AyyCCCVEzq9+tRcz77aEq4tPCB6WYxw/F8HXExykw8hXkyVD/icGqJb77Q8jk nAAgiKJz3qTsWKWoacb6uLFdLy6oItPzDaaes/bhvtXuZ+feJ6dROP0uQWqeuI19H/F0Sp jndlLSUVpU4U8WUV0gvYTbGjo7NY3mKY53k7mdnMcSMNAVe6e8PpwnZLg3KzVIHlmFUsZW MWiWo+drQXda3OryNj+xlXVASi2h9+VMaeNZLM3m8Ntz6BGXcEiiZDzv/070hw== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qVPIG-0006my-VJ; Mon, 14 Aug 2023 00:35:04 -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 1qVPIE-0006m7-Iq for guix-patches@gnu.org; Mon, 14 Aug 2023 00:35:02 -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 1qVPIE-0003ty-97 for guix-patches@gnu.org; Mon, 14 Aug 2023 00:35:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qVPIE-00030Y-3n; Mon, 14 Aug 2023 00:35:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65280] [PATCH 04/26] gnu: qtbase: Update to 6.5.2. 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: Mon, 14 Aug 2023 04:35:02 +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?Q?=E5=AE=8B=E6=96=87=E6=AD=A6?= X-Debbugs-Original-Xcc: Andreas Enge , Maxim Cournoyer , =?UTF-8?Q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Received: via spool by 65280-submit@debbugs.gnu.org id=B65280.169198764611229 (code B ref 65280); Mon, 14 Aug 2023 04:35:02 +0000 Received: (at 65280) by debbugs.gnu.org; 14 Aug 2023 04:34:06 +0000 Received: from localhost ([127.0.0.1]:60671 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qVPHJ-0002ur-FY for submit@debbugs.gnu.org; Mon, 14 Aug 2023 00:34:06 -0400 Received: from mail-qk1-x72c.google.com ([2607:f8b0:4864:20::72c]:44235) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qVPHA-0002sw-Ge for 65280@debbugs.gnu.org; Mon, 14 Aug 2023 00:33:58 -0400 Received: by mail-qk1-x72c.google.com with SMTP id af79cd13be357-76af2cb7404so261751085a.0 for <65280@debbugs.gnu.org>; Sun, 13 Aug 2023 21:33:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1691987630; x=1692592430; 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=9nkNFt3zxqEsfS7Ftf2twZtAUKXvpPZ50QPB9aRqhtw=; b=LEW59ruq0LH6rqUmWqOW6UCdQsBCQ6xFrWxWBnJI1e96RO1YIzBe7OyKKNMQlVC1Dm 2wHiHfEYiZP1R9/fOD13bj6RsMCv45NjSGjiIiMMGmkNteyKRLXlkkjJEwv3P1BLcOjy Y4KUMlb3pnFipdlVWWoOMtnbj68oNvTNXl+fglVXt0l/cLZKl3CPjQofg4hpz5YHQo/d SH/OFEuP/keEyWettzclacSzC8jMsb5Zlkm2LTEMLzVmR9HTEyYWaijRNAH8JdLxfQZj MggbNNT3Se0vElOFro05sn+SV2JGnWEXY9RsGBzq1w6jh/Y/SRXhKipw7Jct3/3iCp3S +o2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691987630; x=1692592430; 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=9nkNFt3zxqEsfS7Ftf2twZtAUKXvpPZ50QPB9aRqhtw=; b=hU6F4wwM2EgTNfSjX+4uALwjWR/PhppgSJBrfOb2u1GzNlzpvrqcufZT8z3FFS8/RV VMhY2XErtl7C0avNwzz5O8onWfqkHWaoGSoc/c6WS105PQu+/gXtJ8rQXtnHGXugBZC3 1WLp/ypvV+ROyxeaQMKiSVsbwJcKlTYHVMa5X4dsCT3WPnSn3CKt+2tJYgeqU4Ink+A9 06D2yb3drcvzRCutrmkp82PMAbumXzdxLmuCrrtjwSt8iVs8Q26bmt5z2z+buQ+dO/Uk RojzsfSp0mVYxB5NKyLUcVMMZxYE/+HwiaP8foO9/6CHhmjgGcpW8+ng0iCl5yby3lVX D8xA== X-Gm-Message-State: AOJu0YxYqDBf7T5tUm78eigiCgdtZABgWxTGjMWI8iiaerICRfEl16cc ytE26LhjjQghrh852aRiAiix6NSLXjSHVg== X-Google-Smtp-Source: AGHT+IFK1vwttkBAQZz1mU8VYh5+0wKX/0VUrN7NwH2dUN3amZdQrjqJGJ7p6UXnFJM6s8u3zEI7yA== X-Received: by 2002:a05:622a:1356:b0:406:95b8:6535 with SMTP id w22-20020a05622a135600b0040695b86535mr10812842qtk.48.1691987630662; Sun, 13 Aug 2023 21:33:50 -0700 (PDT) Received: from localhost.localdomain (dsl-205-233-124-111.b2b2c.ca. [205.233.124.111]) by smtp.gmail.com with ESMTPSA id f23-20020ac80157000000b0040541a8bd66sm2844492qtg.60.2023.08.13.21.33.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 13 Aug 2023 21:33:50 -0700 (PDT) From: Maxim Cournoyer Date: Mon, 14 Aug 2023 00:29:14 -0400 Message-ID: <20e48e84f2a08aa6a139a6f206fb45fdb1a46669.1691987375.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -3.08 X-Spam-Score: -3.08 X-Migadu-Queue-Id: E70E53FBDE X-Migadu-Scanner: mx2.migadu.com X-TUID: 94nlMJifJi2k * gnu/packages/qt.scm (qtbase): Update to 6.5.2. Use normal inheritance, not package/inherit, as the package is distinct and not a variant (it does not use the same source). [arguments]: Disable a few newly failing tests in the check phase. Adjust the patch-mkspecs phase. [inputs]: Remove extraneous postgresql replacement. Add at-spi2-core, libice, libsm, libxext and xcb-util-cursor. --- gnu/packages/qt.scm | 33 ++++++++++++++++++++++++++------- 1 file changed, 26 insertions(+), 7 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index a4de003647..03c9256a48 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -581,15 +581,16 @@ (define-public qtbase-5 (license (list license:lgpl2.1 license:lgpl3)))) (define-public qtbase - (package/inherit qtbase-5 + (package + (inherit qtbase-5) (name "qtbase") - (version "6.3.2") + (version "6.5.2") (source (origin (inherit (package-source qtbase-5)) (uri (qt-url name version)) (sha256 (base32 - "19m9r8sf9mvyrwipn44if3nhding4ljys2mwf04b7dkhz16vlabr")) + "0s8jwzdcv97dfy8n3jjm8zzvllv380l73mwdva7rs2nqnhlwgd1x")) (modules '((guix build utils))) (snippet ;; corelib uses bundled harfbuzz, md4, md5, sha3 @@ -742,6 +743,18 @@ (define-public qtbase (list ;; The 'tst_moc' test fails with "'fi.exists()' returned FALSE". "tst_moc" + + ;; The 'tst_qdate' test fails because the current time + ;; is reported as an invalid date (see: + ;; https://bugreports.qt.io/browse/QTBUG-116017). + "tst_qdate" + + ;; The qgraphicsview and qopenglwidget tests fail with a + ;; segfault for unknown reasons (see: + ;; https://bugreports.qt.io/browse/QTBUG-116018). + "tst_qgraphicsview" + "tst_qopenglwidget" + ;; The 'test_rcc' test fails on a comparison: ;; <<<<<< actual ;; 0x0,0x0,0x0,0x0,0x0,0x0,0x3,0xe8, @@ -853,8 +866,7 @@ (define-public qtbase (search-input-file outputs (string-append "lib/qt6/mkspecs/features/" file))) - '("device_config.prf" "moc.prf" "qt_build_config.prf" - "qt_config.prf")) + '("device_config.prf" "moc.prf" "qt_config.prf")) (("\\$\\$\\[QT_HOST_DATA/get\\]") archdata) (("\\$\\$\\[QT_HOST_DATA/src\\]") archdata))))))))) (native-inputs @@ -863,8 +875,15 @@ (define-public qtbase xvfb-run))) (inputs (modify-inputs (package-inputs qtbase-5) - (prepend bash-minimal coreutils-minimal libxcb md4c) - (replace "postgresql" postgresql))) ;use latest postgresql + (prepend at-spi2-core + bash-minimal + coreutils-minimal + md4c + libice + libsm + libxcb + libxext + xcb-util-cursor))) (native-search-paths (list (search-path-specification (variable "QMAKEPATH") -- 2.41.0