From patchwork Wed Aug 16 12:10:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 52891 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 6898E27BBE9; Wed, 16 Aug 2023 13:14:12 +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=unavailable 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 42AA427BBE2 for ; Wed, 16 Aug 2023 13:14:07 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qWFP1-0007K3-M2; Wed, 16 Aug 2023 08:13:31 -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 1qWFOu-00078d-N1 for guix-patches@gnu.org; Wed, 16 Aug 2023 08:13:25 -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 1qWFOc-0002Lm-7F for guix-patches@gnu.org; Wed, 16 Aug 2023 08:13:15 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qWFOb-0005RV-Fl; Wed, 16 Aug 2023 08:13:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65280] [PATCH v2 04/59] 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: Wed, 16 Aug 2023 12:13:05 +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.169218796220494 (code B ref 65280); Wed, 16 Aug 2023 12:13:05 +0000 Received: (at 65280) by debbugs.gnu.org; 16 Aug 2023 12:12:42 +0000 Received: from localhost ([127.0.0.1]:39027 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qWFOD-0005KG-9a for submit@debbugs.gnu.org; Wed, 16 Aug 2023 08:12:42 -0400 Received: from mail-qv1-xf36.google.com ([2607:f8b0:4864:20::f36]:55425) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qWFO4-0005Hr-M5 for 65280@debbugs.gnu.org; Wed, 16 Aug 2023 08:12:33 -0400 Received: by mail-qv1-xf36.google.com with SMTP id 6a1803df08f44-6418dd60676so34583936d6.2 for <65280@debbugs.gnu.org>; Wed, 16 Aug 2023 05:12:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1692187947; x=1692792747; 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=HklwsOu+rYO47bWiozoNyslRJ/NRgUWQkuGMJVhKVqQ=; b=VxObCsnlq4JqqxSvvffFUVrU3kApz/s9VbxoD4YoOj02Qp7zKFtU9Z7ig3fs6ntzbh kU2kroCIDN+9Wm3VPWJNtXpbPV74E+geOa8hTkh8z3RQ8n+VUCuuVWZyQqugX1tLuVnj 3MrDY0vRk6CfKiBoc7C3YWdoY1xJaFfBNIaWsu3jDjQcWH4247Rwzx/2ZwB0KIgEpC0u 6KaOJSWxYU4hvOVpdM0+ADuUfxDj6ENPrilw8iRgWpygpCmbOX5EVubvVzoxan7FKMdd mMuTgxa5w3ZuCNUcTteOLONn1Sr6jPkXdS244h8bgAAu3JLcpKJcLa+nPqQC4bG20iC3 +r2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692187947; x=1692792747; 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=HklwsOu+rYO47bWiozoNyslRJ/NRgUWQkuGMJVhKVqQ=; b=ZQcitCYDT9nVHuvAJnMU7TqZ0LlELzK/0kJJU0G3T+FvB9k/6Ru6mYHchCKhWkbueE ZaaYNqxeMigUbN9y3nAmRoHOWJdLwMhPDUcg1rVL+qZCn9j2Nh12VeKJSwGobUNo6zaW ppRhrnbRDfITGVzV5r3VU7+0gOPvOuR1KN8+DVs9vIWlN2J3NiGmZGbLQs7OYJk8+Hlw jVH173vE7/B2U0WTrdwZDuvS5/fRb6H+9UGHsw5W0jR7UCyeeyOwMhNyn0LwkM++lgvE yNgzsjMuLr8ADSvJ38sqex88PQD1POaTN/7xNwRfj1tMszMCEASMva2Ibi2KpG1RCvD9 5jMQ== X-Gm-Message-State: AOJu0Yzo6SaD9ipQoGhKAm7zbRmj/dKt4tMbloK05lUfYxmzJK/LXR07 HhvP+VoiwQybgoFTM6Oi9iD7R9XDSxg= X-Google-Smtp-Source: AGHT+IHDz9e1E+KSvbPXHWIa0hzeGTc9x7TJKpO1NK6nmju7JtACLgxpJbMq6u38y5AZJx2upsnhXA== X-Received: by 2002:a0c:da82:0:b0:63d:3eb5:4d80 with SMTP id z2-20020a0cda82000000b0063d3eb54d80mr1556556qvj.42.1692187947050; Wed, 16 Aug 2023 05:12:27 -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.12.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Aug 2023 05:12:26 -0700 (PDT) From: Maxim Cournoyer Date: Wed, 16 Aug 2023 08:10:20 -0400 Message-ID: <1176b1ea6a93417dbbca2638145e0f74e5e1da47.1692187578.git.maxim.cournoyer@gmail.com> 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 (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. --- Changes in v2: - Fix xcb backend by adding missing inputs 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")