From patchwork Sun Sep 17 17:26:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 53994 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 86A7427BBE2; Sun, 17 Sep 2023 18:28:28 +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 156F027BBEC for ; Sun, 17 Sep 2023 18:28:26 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qhvYv-0004fC-SE; Sun, 17 Sep 2023 13:28:03 -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 1qhvYq-0004eI-T3 for guix-patches@gnu.org; Sun, 17 Sep 2023 13:27:57 -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 1qhvYq-0007X6-FF for guix-patches@gnu.org; Sun, 17 Sep 2023 13:27:56 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qhvYw-0006aH-QC; Sun, 17 Sep 2023 13:28:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65922] [qt-team PATCH v3 1/5] gnu: qtbase: Do not capture Python (again). Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: maxim.cournoyer@gmail.com, andreas@enge.fr, iyzsong@envs.net, guix-patches@gnu.org Resent-Date: Sun, 17 Sep 2023 17:28:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65922 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65922@debbugs.gnu.org Cc: Maxim Cournoyer , Maxim Cournoyer , Andreas Enge , =?utf-8?b?5a6L5paH5q2m?= X-Debbugs-Original-Xcc: Maxim Cournoyer , Andreas Enge , =?utf-8?b?5a6L5paH5q2m?= Received: via spool by 65922-submit@debbugs.gnu.org id=B65922.169497163925191 (code B ref 65922); Sun, 17 Sep 2023 17:28:02 +0000 Received: (at 65922) by debbugs.gnu.org; 17 Sep 2023 17:27:19 +0000 Received: from localhost ([127.0.0.1]:51328 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qhvYF-0006Y9-0O for submit@debbugs.gnu.org; Sun, 17 Sep 2023 13:27:19 -0400 Received: from mail-qv1-xf2f.google.com ([2607:f8b0:4864:20::f2f]:56616) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qhvYB-0006Xm-Sx for 65922@debbugs.gnu.org; Sun, 17 Sep 2023 13:27:17 -0400 Received: by mail-qv1-xf2f.google.com with SMTP id 6a1803df08f44-656307a52e8so14693476d6.1 for <65922@debbugs.gnu.org>; Sun, 17 Sep 2023 10:27:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1694971622; x=1695576422; darn=debbugs.gnu.org; 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=szRhqIY7GU9Kvyu33izFUWxTrCXBLF7VOUD3PPk+BeM=; b=FdXz4Mu0CIW5Z74oYWoy6Sckq3xctSCDcRiYx0WuLQFDpfkuVeNxzXE9F83N/H6epC KiFh1aBbXqZECgB/7r6v/4OBfS/trPQmATLT4qLs6MnyC0yYJoc7+V2g0IO+CfhNEIC3 IJP8Q1TiOF9IqJ50Mj3MSdXRGtHqtIsxFmveKs172b2bKmz9AP7gH/lsZWkijk3s20T8 rE7mFD24tyPA/fiLXLI+/a04mQqkhzlqDLcBUhlIIKSUwBParTtkeROFgZVvunY+Rbri HDWOkmFHaDRXniDjIUP6Alz5v9FG8gIn9qWIgbh6Z3jl/iL2TO/fBSpjiYiXIXQKIs9W MQAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694971622; x=1695576422; 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=szRhqIY7GU9Kvyu33izFUWxTrCXBLF7VOUD3PPk+BeM=; b=NUISYM1OpiI+xUMvUx0tga59Oa9T3T2P5Tq3KmgSyOSNSXN5Z6oPplGUNqzbrWa6Lx P5lzl4LQwPPATKxyWN/8TsVUiUkXxcXIxk4veABKtefdR+bPgXnBj5N/HTYYlZCl2ulw sHbQYyg387xtK0zAsTh6/IEDkTtr10iLe0c6SebxiDuwHPDpPnZMcdpjKPZMlCltWAXV OWtcg7+JVeD6QeomqiWmFFif5EbV5K7BcoMctSx30lGm2DEEyHgU+kCF/lctM/Y6mZvw m5nK8Ayt7QtjPlAASGYNDsjdgtwCbWgsXSLy7qwP7DqPT2YWXr3ExsVk2mLOcw14vXbB jD4g== X-Gm-Message-State: AOJu0YwobC27BYUdSju/4AcbtSfSpvy/16Q8KS8PY7dCa3C1VyEk1w8d 8lziBWQwBWsbWnx6yi/zPbEf+wK50Lg= X-Google-Smtp-Source: AGHT+IFZF0vfDF8HDRtuVyE8p0jrurjo6lH8PCaVPn3nH5zEFcdjkAdbEupDCpZA8FkpfNJOoQBkFg== X-Received: by 2002:a0c:f2d2:0:b0:656:2c01:2c20 with SMTP id c18-20020a0cf2d2000000b006562c012c20mr7391236qvm.26.1694971622358; Sun, 17 Sep 2023 10:27:02 -0700 (PDT) Received: from localhost.localdomain (dsl-10-149-131.b2b2c.ca. [72.10.149.131]) by smtp.gmail.com with ESMTPSA id fc14-20020ad44f2e000000b0064d0fb1a8c5sm2762468qvb.98.2023.09.17.10.27.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Sep 2023 10:27:01 -0700 (PDT) From: Maxim Cournoyer Date: Sun, 17 Sep 2023 13:26:13 -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 Fixes . * gnu/packages/qt.scm (qtbase-5) [arguments]: Add #:disallowed-references argument to guard against the problem reoccurring in the future. Add do-not-capture-python phase. (qtbase) [arguments]: Update do-not-capture-python phase. --- (no changes since v1) gnu/packages/qt.scm | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index b7e394d663c..a158f8114fe 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -392,7 +392,7 @@ (define-public qtbase-5 fontconfig freetype glib - gtk+ ;for GTK theme support + gtk+ ;for GTK theme support harfbuzz icu4c libinput-minimal @@ -437,7 +437,8 @@ (define-public qtbase-5 vulkan-headers ruby-2.7)) (arguments - `(#:configure-flags + `(#:disallowed-references ,(list python) + #:configure-flags (let ((out (assoc-ref %outputs "out"))) (list "-verbose" "-prefix" out @@ -583,7 +584,16 @@ (define-public qtbase-5 (("^\\s*(QLibrary xcursorLib\\(QLatin1String\\(\")(Xcursor\"\\), 1\\);)" _ a b) (string-append a (assoc-ref inputs "libxcursor") "/lib/lib" b)) (("^\\s*(xcursorLib.setFileName\\(QLatin1String\\(\")(Xcursor\"\\)\\);)" _ a b) - (string-append a (assoc-ref inputs "libxcursor") "/lib/lib" b)))))))) + (string-append a (assoc-ref inputs "libxcursor") "/lib/lib" b))))) + (add-after 'install 'do-not-capture-python + (lambda* (#:key outputs #:allow-other-keys) + ;; For some reason, patching the file after the + ;; patch-source-shebangs phase doesn't work for Qt 5. + (substitute* + (search-input-file + outputs "lib/qt5/mkspecs/features/uikit/devices.py") + (((which "python3")) + "/usr/bin/env python3"))))))) (native-search-paths (list (search-path-specification (variable "QMAKEPATH") @@ -724,10 +734,12 @@ (define-public qtbase (substitute* "src/corelib/CMakeLists.txt" (("/bin/ls") (search-input-file inputs "bin/ls"))))) + (delete 'do-not-capture-python) ;move after patch-source-shebangs (add-after 'patch-source-shebangs 'do-not-capture-python (lambda _ (substitute* '("mkspecs/features/uikit/devices.py" - "util/testrunner/qt-testrunner.py") + "util/testrunner/qt-testrunner.py" + "util/testrunner/sanitizer-testrunner.py") (((which "python3")) "/usr/bin/env python3")))) (replace 'configure From patchwork Sun Sep 17 17:26:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 53996 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 8202127BBE9; Sun, 17 Sep 2023 18:28:40 +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 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 7E7AA27BBEA for ; Sun, 17 Sep 2023 18:28:39 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qhvZ1-0004gI-Fv; Sun, 17 Sep 2023 13:28:07 -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 1qhvYq-0004eG-Q3 for guix-patches@gnu.org; Sun, 17 Sep 2023 13:27:57 -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 1qhvYq-0007X0-0T for guix-patches@gnu.org; Sun, 17 Sep 2023 13:27:56 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qhvYx-0006aO-5X; Sun, 17 Sep 2023 13:28:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65922] [qt-team PATCH v3 2/5] gnu: qtbase: Add $TZDIR to native search paths. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: maxim.cournoyer@gmail.com, andreas@enge.fr, iyzsong@envs.net, guix-patches@gnu.org Resent-Date: Sun, 17 Sep 2023 17:28:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65922 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65922@debbugs.gnu.org Cc: Maxim Cournoyer , Maxim Cournoyer , Andreas Enge , =?utf-8?b?5a6L5paH5q2m?= X-Debbugs-Original-Xcc: Maxim Cournoyer , Andreas Enge , =?utf-8?b?5a6L5paH5q2m?= Received: via spool by 65922-submit@debbugs.gnu.org id=B65922.169497164525217 (code B ref 65922); Sun, 17 Sep 2023 17:28:03 +0000 Received: (at 65922) by debbugs.gnu.org; 17 Sep 2023 17:27:25 +0000 Received: from localhost ([127.0.0.1]:51332 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qhvYK-0006YY-Fe for submit@debbugs.gnu.org; Sun, 17 Sep 2023 13:27:25 -0400 Received: from mail-qv1-xf34.google.com ([2607:f8b0:4864:20::f34]:58789) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qhvYE-0006Xv-FU for 65922@debbugs.gnu.org; Sun, 17 Sep 2023 13:27:18 -0400 Received: by mail-qv1-xf34.google.com with SMTP id 6a1803df08f44-65628b1181cso15137486d6.1 for <65922@debbugs.gnu.org>; Sun, 17 Sep 2023 10:27:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1694971625; x=1695576425; darn=debbugs.gnu.org; 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=Zii8QilSo2TxBVScScqudQYjGgYh0kOQFlpR02HO3oA=; b=HQcdOB9cdsNXkWWVXof7JV2lOnXafam0SGGJNrP8ZQer4qn3NvtaxjctXz+ogJQ2bE EcI0YU3fwXnZJBYzEfyDarocuWWiDOGyqTJRSpORH6bCQHRXI9TYBuDTcJoE42XK4K46 UkOQbQHDsZTSuZ79iyzfmk78es945DLhWJ939XbuukeFed/35V0Jj04jjZUTsjgtmxQZ x4DzDgxLMx3gyasPlVNwFi9P3hQxZJSJmuLLfbu3ahY4WivW96/YRzHys+Usv5hDmcX7 ih6YuNqn8mlrvc5kgDzKhKOTGTWsi3I8bM2ouMrzDJ78y2F0CV5gO4wlHbvdGUo0OmrZ ZdoA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694971625; x=1695576425; 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=Zii8QilSo2TxBVScScqudQYjGgYh0kOQFlpR02HO3oA=; b=NENvltUd11IomXM9EdxsuLpOZFoVbGHEoBjvF82CifurJZ3RwZoMLGjnj3+Vdwju9Q jJqRmi9p2y9xxHSZkbIyd34TPwbmHIHvormXd7L2gqM+MNV21+GrKPzCABjnEjXbGgKM gRiJ8MXVoG+Y6VMGY8DFVl9xwPGRz6Crxo4KVWbvXpGrV5A3RCxto6tqYebkMh2VEBox btO/3XTA7M23I4nNZ6MuOiTTgK/69aejclqvSWWtADx+icTRsjiij4qA1ZNe5J2ZkLa6 GkslsL8jzwot48DQl/2bT0HFdERENInhZvEcbtJqPMtoSnzcWyNNnxtemlucuqtd4moi ktgw== X-Gm-Message-State: AOJu0YxF74xnWauXlEhvn2AERBfXVMbP6YP6hd7Q/Bl0TvxlBIXPnO/Z DOm2PdgW4Y7R2ICMiEn/x4w6rDIJUtQ= X-Google-Smtp-Source: AGHT+IFTKX2kHOprt3LAHY6fp2LIiNlDJH9LVxCrudVI6vivFVGXJ1gFhEsIc6z+iGn47Uf3lAxCkQ== X-Received: by 2002:a0c:aa07:0:b0:641:8ba9:68ab with SMTP id d7-20020a0caa07000000b006418ba968abmr5764355qvb.42.1694971625022; Sun, 17 Sep 2023 10:27:05 -0700 (PDT) Received: from localhost.localdomain (dsl-10-149-131.b2b2c.ca. [72.10.149.131]) by smtp.gmail.com with ESMTPSA id fc14-20020ad44f2e000000b0064d0fb1a8c5sm2762468qvb.98.2023.09.17.10.27.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Sep 2023 10:27:04 -0700 (PDT) From: Maxim Cournoyer Date: Sun, 17 Sep 2023 13:26:14 -0400 Message-ID: <0e56555b7b6826b81d721836d5312b01f6e3525c.1694971566.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) [native-search-paths]: Add $TZDIR. --- (no changes since v1) gnu/packages/qt.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index a158f8114fe..8324beef6fc 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -60,6 +60,7 @@ (define-module (gnu packages qt) #:use-module (guix gexp) #:use-module (guix packages) #:use-module (guix deprecation) + #:use-module (guix search-paths) #:use-module (guix utils) #:use-module (gnu packages) #:use-module (gnu packages bash) @@ -933,6 +934,7 @@ (define-public qtbase (search-path-specification (variable "QT_PLUGIN_PATH") (files '("lib/qt6/plugins"))) + $TZDIR (search-path-specification (variable "XDG_DATA_DIRS") (files '("share"))) From patchwork Sun Sep 17 17:26:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 53992 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 AEDA227BBE9; Sun, 17 Sep 2023 18:28:26 +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 0DB7427BBE2 for ; Sun, 17 Sep 2023 18:28:23 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qhvYy-0004gD-Uy; Sun, 17 Sep 2023 13:28: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 1qhvYq-0004eH-T1 for guix-patches@gnu.org; Sun, 17 Sep 2023 13:27:57 -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 1qhvYq-0007X1-11 for guix-patches@gnu.org; Sun, 17 Sep 2023 13:27:56 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qhvYx-0006aU-HU; Sun, 17 Sep 2023 13:28:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65922] [qt-team PATCH v3 3/5] gnu: qtbase: Reinstate date related tests. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: maxim.cournoyer@gmail.com, andreas@enge.fr, iyzsong@envs.net, guix-patches@gnu.org Resent-Date: Sun, 17 Sep 2023 17:28:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65922 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65922@debbugs.gnu.org Cc: Maxim Cournoyer , Maxim Cournoyer , Andreas Enge , =?utf-8?b?5a6L5paH5q2m?= X-Debbugs-Original-Xcc: Maxim Cournoyer , Andreas Enge , =?utf-8?b?5a6L5paH5q2m?= Received: via spool by 65922-submit@debbugs.gnu.org id=B65922.169497164625224 (code B ref 65922); Sun, 17 Sep 2023 17:28:03 +0000 Received: (at 65922) by debbugs.gnu.org; 17 Sep 2023 17:27:26 +0000 Received: from localhost ([127.0.0.1]:51334 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qhvYL-0006Yg-J6 for submit@debbugs.gnu.org; Sun, 17 Sep 2023 13:27:26 -0400 Received: from mail-qv1-xf2a.google.com ([2607:f8b0:4864:20::f2a]:60847) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qhvYH-0006Xz-Ny for 65922@debbugs.gnu.org; Sun, 17 Sep 2023 13:27:23 -0400 Received: by mail-qv1-xf2a.google.com with SMTP id 6a1803df08f44-656340e666eso14205626d6.1 for <65922@debbugs.gnu.org>; Sun, 17 Sep 2023 10:27:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1694971628; x=1695576428; darn=debbugs.gnu.org; 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=rvq7G+x8NqE+Hp6Tih/k3eyqrW2mtrfMTrYXKJc1D8M=; b=dDm6SDfe4mzAE314vJXeIrijciqThDl8e4UF5jqA+laEPsLNM5hC+D9wlVxf4Ub8gg z5v0BbRNQO3DL7cJtRr+uqATDcEfFvIoAQZTZSxBwpC6lUCMGXCxFpV787sV4nVHWpD1 S1LSbJNQZDSERsD2hp2ga8O9eKpzYFtCq2D+eNgam8RFM6WmT6MwTgvsMc5KvcKk5/Zu 87J9WhMnLj9JVjuGLwU7EC13QXzyBc1+FCbfbGxS+iXWx2Nt0aM2ULI5MrJb9F3Ipv/j 5eY/04MPrmJ7IRPERo9U85CHqFP7GgL+s0o2zgvtIowx9RLbqgEtxt5M6Cu4+AUmfucv lNaw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694971628; x=1695576428; 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=rvq7G+x8NqE+Hp6Tih/k3eyqrW2mtrfMTrYXKJc1D8M=; b=mOH+iXK1n1alm3dHRnEjsl628205XDkgikt0bOTVPVfoDp84bSGKpAirkU1CC+QM9r 4+pbfxjSfYmD9CPNfGZ5EKsYHy/lEE1seaUXexD8uVCsuG3+h1U8m+xdjR/V+tMF32jS cweVsljoPgcd5Ny8+j5kI/8mdp0snkpopNR8PX78j8DBwEnaSeEd/D1MoIk1mUPV2EzQ fnmY/VGES7F18E0wTkwjgUtx4UcNORFtd+XLZOrvLZ76gDvWoz2mFs26DkgiBWNZ6mYU TPJg2TN3XwbROiMXDpa1iDw8rGWN+a1ERlMnduQmPXMRqYWggQ/G2xiT8cpjAOCIUJ6A WnGQ== X-Gm-Message-State: AOJu0Yz8J21yeaH10dFEfHPhcziXP1wuhgIhDz41KA8kYS3/g8Vwq47H yvjKNhcSziur3NqjckrJNj9LxYSAh1w= X-Google-Smtp-Source: AGHT+IF+4tiIC2ItP7FmIyDrQaBygmZvqTqt8c5jD3Bp2pIehBSsh1G87sAR6ecKe5qN6cs3Iy/aPA== X-Received: by 2002:a0c:e153:0:b0:63d:2567:f255 with SMTP id c19-20020a0ce153000000b0063d2567f255mr6964647qvl.24.1694971627974; Sun, 17 Sep 2023 10:27:07 -0700 (PDT) Received: from localhost.localdomain (dsl-10-149-131.b2b2c.ca. [72.10.149.131]) by smtp.gmail.com with ESMTPSA id fc14-20020ad44f2e000000b0064d0fb1a8c5sm2762468qvb.98.2023.09.17.10.27.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Sep 2023 10:27:07 -0700 (PDT) From: Maxim Cournoyer Date: Sun, 17 Sep 2023 13:26:15 -0400 Message-ID: <931555dfc97a20c94e7ca50d61373a4d10548a17.1694971566.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) [native-inputs]: Add tzdata-for-tests. [arguments]: Set the TZDIR and TZ environment variables, and reinstate the tst_qdate, tst_qtimezone and tst_qdatetime tests in the check phase. (qtbase-5) [source]: Replace qtbase-use-TZDIR.patch with qtbase-5-use-TZDIR.patch. * gnu/packages/patches/qtbase-use-TZDIR.patch: Refresh patch with upstream version, and preserve the old one for qtbase@5 as... * gnu/packages/patches/qtbase-5-use-TZDIR.patch: ... this. * gnu/local.mk (dist_patch_DATA): Register new patch. --- (no changes since v2) Changes in v2: - Use old TZDIR patch for qtbase@5 (the new one doesn't apply) gnu/local.mk | 1 + gnu/packages/patches/qtbase-5-use-TZDIR.patch | 39 +++++ gnu/packages/patches/qtbase-use-TZDIR.patch | 162 ++++++++++++++---- gnu/packages/qt.scm | 33 ++-- 4 files changed, 189 insertions(+), 46 deletions(-) create mode 100644 gnu/packages/patches/qtbase-5-use-TZDIR.patch diff --git a/gnu/local.mk b/gnu/local.mk index 4f8637418ad..2d8ddf5716c 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1878,6 +1878,7 @@ dist_patch_DATA = \ %D%/packages/patches/qtbase-absolute-runpath.patch \ %D%/packages/patches/qtbase-moc-ignore-gcc-macro.patch \ %D%/packages/patches/qtbase-qmake-use-libname.patch \ + %D%/packages/patches/qtbase-5-use-TZDIR.patch \ %D%/packages/patches/qtbase-use-TZDIR.patch \ %D%/packages/patches/qtscript-disable-tests.patch \ %D%/packages/patches/quagga-reproducible-build.patch \ diff --git a/gnu/packages/patches/qtbase-5-use-TZDIR.patch b/gnu/packages/patches/qtbase-5-use-TZDIR.patch new file mode 100644 index 00000000000..b6c377b133c --- /dev/null +++ b/gnu/packages/patches/qtbase-5-use-TZDIR.patch @@ -0,0 +1,39 @@ +Use $TZDIR to search for time-zone data. Thus avoid depending on package +"tzdata", which often introduces changes with near-immediate effects, so it's +important to be able to update it fast. + +Based on a patch fron NixOS. +=================================================================== +--- qtbase-opensource-src-5.14.2.orig/src/corelib/time/qtimezoneprivate_tz.cpp ++++ qtbase-opensource-src-5.15.2/src/corelib/time/qtimezoneprivate_tz.cpp +@@ -70,7 +70,11 @@ + // Parse zone.tab table, assume lists all installed zones, if not will need to read directories + static QTzTimeZoneHash loadTzTimeZones() + { +- QString path = QStringLiteral("/usr/share/zoneinfo/zone.tab"); ++ // Try TZDIR first, in case we're running on GuixSD. ++ QString path = QFile::decodeName(qgetenv("TZDIR")) + QStringLiteral("/zone.tab"); ++ // Fallback to traditional paths in case we are not on GuixSD. ++ if (!QFile::exists(path)) ++ path = QStringLiteral("/usr/share/zoneinfo/zone.tab"); + if (!QFile::exists(path)) + path = QStringLiteral("/usr/lib/zoneinfo/zone.tab"); + +@@ -645,6 +649,9 @@ + if (!tzif.open(QIODevice::ReadOnly)) + return; + } else { ++ // Try TZDIR first, in case we're running on GuixSD. ++ tzif.setFileName(QFile::decodeName(qgetenv("TZDIR")) + QStringLiteral("/") + QString::fromLocal8Bit(ianaId)); ++ if (!tzif.open(QIODevice::ReadOnly)) { + // Open named tz, try modern path first, if fails try legacy path + tzif.setFileName(QLatin1String("/usr/share/zoneinfo/") + QString::fromLocal8Bit(ianaId)); + if (!tzif.open(QIODevice::ReadOnly)) { +@@ -652,6 +659,7 @@ + if (!tzif.open(QIODevice::ReadOnly)) + return; + } ++ } + } + + QDataStream ds(&tzif); diff --git a/gnu/packages/patches/qtbase-use-TZDIR.patch b/gnu/packages/patches/qtbase-use-TZDIR.patch index b6c377b133c..98bf7493e9f 100644 --- a/gnu/packages/patches/qtbase-use-TZDIR.patch +++ b/gnu/packages/patches/qtbase-use-TZDIR.patch @@ -1,39 +1,141 @@ -Use $TZDIR to search for time-zone data. Thus avoid depending on package -"tzdata", which often introduces changes with near-immediate effects, so it's -important to be able to update it fast. +From 1075606f8b2f9e153c82f8e50cbd69cea9c72e87 Mon Sep 17 00:00:00 2001 +From: Edward Welbourne +Date: Mon, 11 Sep 2023 11:41:39 +0200 +Subject: [PATCH] Support the TZDIR environment variable -Based on a patch fron NixOS. -=================================================================== ---- qtbase-opensource-src-5.14.2.orig/src/corelib/time/qtimezoneprivate_tz.cpp -+++ qtbase-opensource-src-5.15.2/src/corelib/time/qtimezoneprivate_tz.cpp -@@ -70,7 +70,11 @@ - // Parse zone.tab table, assume lists all installed zones, if not will need to read directories +On Linux / glibc, this overrides the default system location for the +zone info. So check for files there first. Break out a function to +manage the trying of (now three) zoneinfo directories when opening a +file by name relative to there. + +Pick-to: 6.6 6.5 +Task-number: QTBUG-116017 +Change-Id: I1f97107aabd9015c0a5543639870f1d70654ca67 +--- +* Rebased on top of v6.5.2. + + src/corelib/time/qtimezoneprivate_tz.cpp | 73 ++++++++++++++++-------- + 1 file changed, 49 insertions(+), 24 deletions(-) + +diff --git a/src/corelib/time/qtimezoneprivate_tz.cpp b/src/corelib/time/qtimezoneprivate_tz.cpp +index 067191d816..a8b2fc894e 100644 +--- a/src/corelib/time/qtimezoneprivate_tz.cpp ++++ b/src/corelib/time/qtimezoneprivate_tz.cpp +@@ -51,17 +51,41 @@ typedef QHash QTzTimeZoneHash; + + static bool isTzFile(const QString &name); + ++// Open a named file under the zone info directory: ++static bool openZoneInfo(QString name, QFile *file) ++{ ++ // At least on Linux / glibc (see man 3 tzset), $TZDIR overrides the system ++ // default location for zone info: ++ const QString tzdir = qEnvironmentVariable("TZDIR"); ++ if (!tzdir.isEmpty()) { ++ file->setFileName(QDir(tzdir).filePath(name)); ++ if (file->open(QIODevice::ReadOnly)) ++ return true; ++ } ++ // Try modern system path first: ++ constexpr auto zoneShare = "/usr/share/zoneinfo/"_L1; ++ if (tzdir != zoneShare && tzdir != zoneShare.chopped(1)) { ++ file->setFileName(zoneShare + name); ++ if (file->open(QIODevice::ReadOnly)) ++ return true; ++ } ++ // Fall back to legacy system path: ++ constexpr auto zoneLib = "/usr/lib/zoneinfo/"_L1; ++ if (tzdir != zoneLib && tzdir != zoneLib.chopped(1)) { ++ file->setFileName(zoneShare + name); ++ if (file->open(QIODevice::ReadOnly)) ++ return true; ++ } ++ return false; ++} ++ + // Parse zone.tab table for territory information, read directories to ensure we + // find all installed zones (many are omitted from zone.tab; even more from + // zone1970.tab). static QTzTimeZoneHash loadTzTimeZones() { - QString path = QStringLiteral("/usr/share/zoneinfo/zone.tab"); -+ // Try TZDIR first, in case we're running on GuixSD. -+ QString path = QFile::decodeName(qgetenv("TZDIR")) + QStringLiteral("/zone.tab"); -+ // Fallback to traditional paths in case we are not on GuixSD. -+ if (!QFile::exists(path)) -+ path = QStringLiteral("/usr/share/zoneinfo/zone.tab"); - if (!QFile::exists(path)) - path = QStringLiteral("/usr/lib/zoneinfo/zone.tab"); +- if (!QFile::exists(path)) +- path = QStringLiteral("/usr/lib/zoneinfo/zone.tab"); +- +- QFile tzif(path); +- if (!tzif.open(QIODevice::ReadOnly)) ++ QFile tzif; ++ if (!openZoneInfo("zone.tab"_L1, &tzif)) + return QTzTimeZoneHash(); -@@ -645,6 +649,9 @@ + QTzTimeZoneHash zonesHash; +@@ -91,6 +115,7 @@ static QTzTimeZoneHash loadTzTimeZones() + } + } + ++ const QString path = tzif.fileName(); + const qsizetype cut = path.lastIndexOf(u'/'); + Q_ASSERT(cut > 0); + const QDir zoneDir = QDir(path.first(cut)); +@@ -761,20 +786,13 @@ QTzTimeZoneCacheEntry QTzTimeZoneCache::findEntry(const QByteArray &ianaId) + tzif.setFileName(QStringLiteral("/etc/localtime")); if (!tzif.open(QIODevice::ReadOnly)) - return; - } else { -+ // Try TZDIR first, in case we're running on GuixSD. -+ tzif.setFileName(QFile::decodeName(qgetenv("TZDIR")) + QStringLiteral("/") + QString::fromLocal8Bit(ianaId)); -+ if (!tzif.open(QIODevice::ReadOnly)) { - // Open named tz, try modern path first, if fails try legacy path - tzif.setFileName(QLatin1String("/usr/share/zoneinfo/") + QString::fromLocal8Bit(ianaId)); - if (!tzif.open(QIODevice::ReadOnly)) { -@@ -652,6 +659,7 @@ - if (!tzif.open(QIODevice::ReadOnly)) - return; + return ret; +- } else { +- // Open named tz, try modern path first, if fails try legacy path +- tzif.setFileName("/usr/share/zoneinfo/"_L1 + QString::fromLocal8Bit(ianaId)); +- if (!tzif.open(QIODevice::ReadOnly)) { +- tzif.setFileName("/usr/lib/zoneinfo/"_L1 + QString::fromLocal8Bit(ianaId)); +- if (!tzif.open(QIODevice::ReadOnly)) { +- // ianaId may be a POSIX rule, taken from $TZ or /etc/TZ +- auto check = validatePosixRule(ianaId); +- if (check.isValid) { +- ret.m_hasDst = check.hasDst; +- ret.m_posixRule = ianaId; +- } +- return ret; +- } ++ } else if (!openZoneInfo(QString::fromLocal8Bit(ianaId), &tzif)) { ++ // ianaId may be a POSIX rule, taken from $TZ or /etc/TZ ++ auto check = validatePosixRule(ianaId); ++ if (check.isValid) { ++ ret.m_hasDst = check.hasDst; ++ ret.m_posixRule = ianaId; ++ return ret; } -+ } } - QDataStream ds(&tzif); +@@ -1317,7 +1335,8 @@ private: + { + // On most distros /etc/localtime is a symlink to a real file so extract + // name from the path +- const auto zoneinfo = "/zoneinfo/"_L1; ++ const QString tzdir = qEnvironmentVariable("TZDIR"); ++ constexpr auto zoneinfo = "/zoneinfo/"_L1; + QString path = QStringLiteral("/etc/localtime"); + long iteration = getSymloopMax(); + // Symlink may point to another symlink etc. before being under zoneinfo/ +@@ -1325,9 +1344,15 @@ private: + // symlink, like America/Montreal pointing to America/Toronto + do { + path = QFile::symLinkTarget(path); +- int index = path.indexOf(zoneinfo); +- if (index >= 0) // Found zoneinfo file; extract zone name from path: +- return QStringView{ path }.mid(index + zoneinfo.size()).toUtf8(); ++ // If it's a zoneinfo file, extract the zone name from its path: ++ int index = tzdir.isEmpty() ? -1 : path.indexOf(tzdir); ++ if (index >= 0) { ++ const auto tail = QStringView{ path }.sliced(index + tzdir.size()).toUtf8(); ++ return tail.startsWith(u'/') ? tail.sliced(1) : tail; ++ } ++ index = path.indexOf(zoneinfo); ++ if (index >= 0) ++ return QStringView{ path }.sliced(index + zoneinfo.size()).toUtf8(); + } while (!path.isEmpty() && --iteration > 0); + + return QByteArray(); + +base-commit: af457a9f0f7eb1a2a7d11f495da508faab91a442 +-- +2.41.0 + diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 8324beef6fc..c06f27c03e2 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -365,7 +365,7 @@ (define-public qtbase-5 (base32 "1fcg3kx5akvj0kqxd99h5lv3kv4pw2cj0makmpvhpw90inqnrl60")) ;; Use TZDIR to avoid depending on package "tzdata". - (patches (search-patches "qtbase-use-TZDIR.patch" + (patches (search-patches "qtbase-5-use-TZDIR.patch" "qtbase-moc-ignore-gcc-macro.patch" "qtbase-absolute-runpath.patch")) (modules '((guix build utils))) @@ -747,7 +747,8 @@ (define-public qtbase (assoc-ref %standard-phases 'configure)) (delete 'check) ;move after patch-prl-files (add-after 'patch-prl-files 'check - (lambda* (#:key tests? parallel-tests? #:allow-other-keys) + (lambda* (#:key tests? parallel-tests? + native-inputs inputs #:allow-other-keys) (when tests? ;; The tests expect to find the modules provided by this ;; package; extend the environment variables needed to do so. @@ -770,6 +771,18 @@ (define-public qtbase ;; /tree/src/testlib/qtestblacklist.cpp). (setenv "QTEST_ENVIRONMENT" "linux ci 32bit") (setenv "HOME" "/tmp") ;some tests require a writable HOME + + ;; Note: the search path specified for TZDIR is only + ;; effective for users of the package, not while it's being + ;; built. + (setenv "TZDIR" (search-input-directory + (or native-inputs inputs) "share/zoneinfo")) + + ;; This is to avoid QTimeZone::systemTimeZone() returning + ;; invalid QDate objects due to missing /etc/timezone or + ;; /etc/localtime. + (setenv "TZ" "Etc/UTC") + (invoke "xvfb-run" "ctest" "--output-on-failure" "-j" (if parallel-tests? @@ -783,11 +796,6 @@ (define-public qtbase ;; 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). @@ -826,14 +834,6 @@ (define-public qtbase ;; The 'test_import_plugins' fails with "Could NOT find ;; Qt6MockPlugins1". "test_import_plugins" - ;; The 'tst_QTimeZone::systemZone' validates the - ;; currently set timezone and fails. - "tst_qtimezone" - ;; The 'tst_qdatetime' fails with: - ;; FAIL! : tst_QDateTime::offsetFromUtc() Compared values are not the same - ;; Actual (dt5.offsetFromUtc()): 0 - ;; Expected (46800) : 46800 - "tst_qdatetime" ;; The tst_QObjectRace::destroyRace is flaky (see: ;; https://bugreports.qt.io/browse/QTBUG-103489). "tst_qobjectrace" @@ -910,7 +910,8 @@ (define-public qtbase (("\\$\\$\\[QT_HOST_DATA/src\\]") archdata))))))))) (native-inputs (modify-inputs (package-native-inputs qtbase-5) - (prepend wayland-protocols + (prepend tzdata-for-tests + wayland-protocols xvfb-run))) (inputs (modify-inputs (package-inputs qtbase-5) From patchwork Sun Sep 17 17:26:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 53995 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 E0ED527BBEC; Sun, 17 Sep 2023 18:28:39 +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 8D87427BBE9 for ; Sun, 17 Sep 2023 18:28:38 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qhvYy-0004gC-Ok; Sun, 17 Sep 2023 13:28: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 1qhvYt-0004ev-El for guix-patches@gnu.org; Sun, 17 Sep 2023 13:27:59 -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 1qhvYt-0007Xt-6m for guix-patches@gnu.org; Sun, 17 Sep 2023 13:27:59 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qhvYy-0006ag-0S; Sun, 17 Sep 2023 13:28:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65922] [qt-team PATCH v3 4/5] gnu: qtbase: Disable problematic tests on powerpc64le. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: maxim.cournoyer@gmail.com, andreas@enge.fr, iyzsong@envs.net, guix-patches@gnu.org Resent-Date: Sun, 17 Sep 2023 17:28:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65922 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65922@debbugs.gnu.org Cc: Maxim Cournoyer , Maxim Cournoyer , Andreas Enge , =?utf-8?b?5a6L5paH5q2m?= X-Debbugs-Original-Xcc: Maxim Cournoyer , Andreas Enge , =?utf-8?b?5a6L5paH5q2m?= Received: via spool by 65922-submit@debbugs.gnu.org id=B65922.169497165225244 (code B ref 65922); Sun, 17 Sep 2023 17:28:03 +0000 Received: (at 65922) by debbugs.gnu.org; 17 Sep 2023 17:27:32 +0000 Received: from localhost ([127.0.0.1]:51337 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qhvYR-0006Z3-Kk for submit@debbugs.gnu.org; Sun, 17 Sep 2023 13:27:32 -0400 Received: from mail-qv1-xf2a.google.com ([2607:f8b0:4864:20::f2a]:62638) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qhvYK-0006YD-6S for 65922@debbugs.gnu.org; Sun, 17 Sep 2023 13:27:24 -0400 Received: by mail-qv1-xf2a.google.com with SMTP id 6a1803df08f44-6535b9caa1eso21503976d6.0 for <65922@debbugs.gnu.org>; Sun, 17 Sep 2023 10:27:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1694971631; x=1695576431; darn=debbugs.gnu.org; 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=M4geRP2u6sexDWl4FP69gv//9N0p/qAQfXFucyIPg9s=; b=R2XGei/np+8At7C6IV/OGmNhcHgf2Z7pOPDQt7yLxC3AhUUk4jhKUKWF6Gl53W3X1z O6dRA3ZA9mUeAm3/wLo+SU6mBoMLnbNz62Cq6d0rnhBXG6nACoJBMgWr28fv4vkY6sxo Z7k4sb/VaCqS+XcJjcBUaRp35iCwyONhuQjhANShQdZXnOae3LL38HVjYLr/w+SwCtZs kMQQzykPjmvXd7mMX1RQtgTcy3TroGuDOGuzaZXSYNgb4kZcVKSXLy/cRLYaOHW/wQht nH7rzEFL0EiXSposUoartoxfxFlsO390Ih1m2Raezc1C+VFJH9r5RrDajgRr8kayX1o8 05gQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694971631; x=1695576431; 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=M4geRP2u6sexDWl4FP69gv//9N0p/qAQfXFucyIPg9s=; b=JenSwinex2X2xjedaUi+R1DqfjwEGwsyJBZuGj1sXZkrwNYWnzh5TK2yubDKJTAWmf 1pCkJVb5wh6O5CQUtY5sqUvKZX1z0t8FYVbMJNKzYvgpj5+SGcE2/sNMmPoEibSSYqhs /rU/RCF/Col0orGJ6f1ME33mje/QwHcl6UZvb5UHRqM/JYclhyeqUPKc1hJqYzs1j12e wkBhJ6FujKQIMOHmuO5PYsGL6urJNdKbCVxutXFNw2ICpV2+twG3Pg0LKRj5bqJpY/dX VSLt+6rETi1hHvpz0VagoUnnPhbF9IUb2/ifzgsPUonwHCPUHKU/8fJJODfzYKGea2Gy BMKA== X-Gm-Message-State: AOJu0YzJXoKUR8iBVfJ0jlaMoJahCruy9c0Sj1mjJBj+5LjcGOKvdLv6 JPKzAcs8DaztespIBk16obdb+2Zy3d0= X-Google-Smtp-Source: AGHT+IH6z8tJy90Rfw5ctVUGPg1TJ3fdygpLvA2ipRC+Rgbz9pjpOmUN0xAtW0YVVRRkU5CVMoxuyA== X-Received: by 2002:a05:6214:19e9:b0:63d:3b2:482f with SMTP id q9-20020a05621419e900b0063d03b2482fmr13933911qvc.5.1694971630709; Sun, 17 Sep 2023 10:27:10 -0700 (PDT) Received: from localhost.localdomain (dsl-10-149-131.b2b2c.ca. [72.10.149.131]) by smtp.gmail.com with ESMTPSA id fc14-20020ad44f2e000000b0064d0fb1a8c5sm2762468qvb.98.2023.09.17.10.27.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Sep 2023 10:27:10 -0700 (PDT) From: Maxim Cournoyer Date: Sun, 17 Sep 2023 13:26:16 -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 (qtbase) [arguments] [powerpc64le]: Disable the tst_qpainter, tst_qprocess and tst_qsqlthread tests in the check phase. --- Changes in v3: - New commit gnu/packages/qt.scm | 180 +++++++++++++++++++++++++------------------- 1 file changed, 101 insertions(+), 79 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index c06f27c03e2..8cc1fa7398d 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -792,85 +792,107 @@ (define-public qtbase (string-append "(" (string-join - (list - ;; The 'tst_moc' test fails with "'fi.exists()' returned FALSE". - "tst_moc" - - ;; 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, - ;; ====== - ;; 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0, - ;; >>>>>> expected - "tst_rcc" - ;; The 'tst_qtemporarydir' and 'tst_qtemporaryfile' - ;; tests depend on '/home' not being writable. - "tst_qtemporarydir" - "tst_qtemporaryfile" - ;; The 'tst_qdir' compares two directories which are - ;; unexpectedly different when inside the build - ;; container. - "tst_qdir" - ;; This checks the last modified time of '/', and fails - ;; because Epoch 0 is considered to be invalid. - "tst_qresourceengine" - ;; The 'tst_qfilesystemwatcher' installs a watcher on - ;; '/home', which doesn't exist in the build container. - "tst_qfilesystemwatcher" - ;; Not all of the tested formats are supported by our - ;; build of openssl; 871 passed, 122 failed. - "tst_qsslkey" - ;; The 'mockplugins' test fail following error: "Unknown - ;; platform linux-g++", and the other plugin tests - ;; depend on it. - "mockplugins" - "test_plugin_flavor.*" - ;; The 'test_import_plugins' fails with "Could NOT find - ;; Qt6MockPlugins1". - "test_import_plugins" - ;; The tst_QObjectRace::destroyRace is flaky (see: - ;; https://bugreports.qt.io/browse/QTBUG-103489). - "tst_qobjectrace" - ;; The 'tst_QSettings::fromFile' assumes the data - ;; location to be relative to the root directory and - ;; fails. - "tst_qsettings" - ;; The 'tst_qaddpreroutine', - ;; 'test_generating_cpp_exports' and - ;; 'test_static_resources' tests fail with: "Unknown - ;; platform linux-g++. - "tst_qaddpreroutine" - "test_generating_cpp_exports" - "test_static_resources" - ;; The 'tst_qfile' fails since there is no /home in the - ;; build container. - "tst_qfile" - ;; The 'tst_QGlyphRun::mixedScripts' test fails with: - ;; Actual (glyphRuns.size()): 1 - ;; Expected (2) : 2 - "tst_qglyphrun" - ;; The 'tst_qx11info' test fails with "Internal error: - ;; QPA plugin doesn't implement generatePeekerId", - ;; likely requires a real display. - "tst_qx11info" - ;; The 'tst_qgraphicswidget' test fails because "This - ;; plugin does not support propagateSizeHints". - "tst_qgraphicswidget" - ;; The 'tst_qdnslookup' test requires networking. - "tst_qdnslookup" - ;; The 'tst_qcompleter' and 'tst_QFiledialog::completer' - ;; attempt to complete paths they assume exist, such as - ;; "/home", "/etc" or "/root" and fail. - "tst_qcompleter" - "tst_qfiledialog" - ;; This test is susceptible to the 600 ms timeout used: - "tst_qpauseanimation") "|") ")"))))) + (append + (list + ;; The 'tst_moc' test fails with "'fi.exists()' returned FALSE". + "tst_moc" + + ;; 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, + ;; ====== + ;; 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0, + ;; >>>>>> expected + "tst_rcc" + ;; The 'tst_qtemporarydir' and 'tst_qtemporaryfile' + ;; tests depend on '/home' not being writable. + "tst_qtemporarydir" + "tst_qtemporaryfile" + ;; The 'tst_qdir' compares two directories which are + ;; unexpectedly different when inside the build + ;; container. + "tst_qdir" + ;; This checks the last modified time of '/', and fails + ;; because Epoch 0 is considered to be invalid. + "tst_qresourceengine" + ;; The 'tst_qfilesystemwatcher' installs a watcher on + ;; '/home', which doesn't exist in the build container. + "tst_qfilesystemwatcher" + ;; Not all of the tested formats are supported by our + ;; build of openssl; 871 passed, 122 failed. + "tst_qsslkey" + ;; The 'mockplugins' test fail following error: "Unknown + ;; platform linux-g++", and the other plugin tests + ;; depend on it. + "mockplugins" + "test_plugin_flavor.*" + ;; The 'test_import_plugins' fails with "Could NOT find + ;; Qt6MockPlugins1". + "test_import_plugins" + ;; The tst_QObjectRace::destroyRace is flaky (see: + ;; https://bugreports.qt.io/browse/QTBUG-103489). + "tst_qobjectrace" + ;; The 'tst_QSettings::fromFile' assumes the data + ;; location to be relative to the root directory and + ;; fails. + "tst_qsettings" + ;; The 'tst_qaddpreroutine', + ;; 'test_generating_cpp_exports' and + ;; 'test_static_resources' tests fail with: "Unknown + ;; platform linux-g++. + "tst_qaddpreroutine" + "test_generating_cpp_exports" + "test_static_resources" + ;; The 'tst_qfile' fails since there is no /home in the + ;; build container. + "tst_qfile" + ;; The 'tst_QGlyphRun::mixedScripts' test fails with: + ;; Actual (glyphRuns.size()): 1 + ;; Expected (2) : 2 + "tst_qglyphrun" + ;; The 'tst_qx11info' test fails with "Internal error: + ;; QPA plugin doesn't implement generatePeekerId", + ;; likely requires a real display. + "tst_qx11info" + + ;; The 'tst_qgraphicswidget' test fails because "This + ;; plugin does not support propagateSizeHints". + "tst_qgraphicswidget" + ;; The 'tst_qdnslookup' test requires networking. + "tst_qdnslookup" + ;; The 'tst_qcompleter' and 'tst_QFiledialog::completer' + ;; attempt to complete paths they assume exist, such as + ;; "/home", "/etc" or "/root" and fail. + "tst_qcompleter" + "tst_qfiledialog" + ;; This test is susceptible to the 600 ms timeout used: + "tst_qpauseanimation") + #$@(if (target-ppc64le?) + #~((list + ;; The 'tst_QPainter::fpe_radialGradients' + ;; test fails with a 'Floating point + ;; exception' error on powerpc64le (see: + ;; https://bugreports.qt.io/browse/QTBUG-117113). + "tst_qpainter" + + ;; The 'startStopStartStopBuffers' test fails + ;; on the powerpc64le architecture (see: + ;; https://bugreports.qt.io/browse/QTBUG-80953). + "tst_qprocess" + + ;; The 'tst_QSqlThread::readWriteThreading' + ;; test may fail with an sqlite related error, + ;; "'Unable to fetch row' || 'database is + ;; locked'" (see: + ;; https://bugreports.qt.io/browse/QTBUG-117114). + "tst_qsqlthread")) + #~())) "|") ")"))))) (replace 'patch-mkspecs (lambda* (#:key outputs #:allow-other-keys) (let* ((archdata (search-input-directory outputs "lib/qt6")) From patchwork Sun Sep 17 17:26:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 53993 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 5136F27BBE2; Sun, 17 Sep 2023 18:28:27 +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 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 C169927BBEA for ; Sun, 17 Sep 2023 18:28:23 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qhvYt-0004ew-S3; Sun, 17 Sep 2023 13:27:59 -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 1qhvYr-0004eK-Jy for guix-patches@gnu.org; Sun, 17 Sep 2023 13:27:57 -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 1qhvYr-0007XW-CJ for guix-patches@gnu.org; Sun, 17 Sep 2023 13:27:57 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qhvYy-0006as-J5; Sun, 17 Sep 2023 13:28:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65922] [qt-team PATCH v3 5/5] gnu: qtdeclarative: Add a debug output. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: maxim.cournoyer@gmail.com, andreas@enge.fr, iyzsong@envs.net, guix-patches@gnu.org Resent-Date: Sun, 17 Sep 2023 17:28:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65922 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65922@debbugs.gnu.org Cc: Maxim Cournoyer , Maxim Cournoyer , Andreas Enge , =?utf-8?b?5a6L5paH5q2m?= X-Debbugs-Original-Xcc: Maxim Cournoyer , Andreas Enge , =?utf-8?b?5a6L5paH5q2m?= Received: via spool by 65922-submit@debbugs.gnu.org id=B65922.169497165225250 (code B ref 65922); Sun, 17 Sep 2023 17:28:04 +0000 Received: (at 65922) by debbugs.gnu.org; 17 Sep 2023 17:27:32 +0000 Received: from localhost ([127.0.0.1]:51339 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qhvYS-0006Z7-8u for submit@debbugs.gnu.org; Sun, 17 Sep 2023 13:27:32 -0400 Received: from mail-oo1-xc35.google.com ([2607:f8b0:4864:20::c35]:61603) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qhvYM-0006YO-Ur for 65922@debbugs.gnu.org; Sun, 17 Sep 2023 13:27:28 -0400 Received: by mail-oo1-xc35.google.com with SMTP id 006d021491bc7-57355a16941so2485484eaf.2 for <65922@debbugs.gnu.org>; Sun, 17 Sep 2023 10:27:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1694971633; x=1695576433; darn=debbugs.gnu.org; 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=aLZZJ1WRwBh/m+1bKA2c2Z98PNMMBlLcjWlDy3GxZpQ=; b=ib/DZI03X3gs4NVBoGkoX+rkeykTDGreVuSlzjdhhV4H4ZpU70Dc8CPxSq7ombZso9 DLOLOcf3RCg0G6IRjV03cpvaidlziXBhDtM26Ee4iEjnREvJ4mkvEUhgkgveT0DDL/Do 6hX8sugysGON1ExdI/Lw7Pv5pqdwGLUjCbnsbZEQT7rN+LXseXeHpX7FleiLiK4mG6Pe y1Dh/8ivazeYuZ/oau9sLrKalpNB7Hwgkb7r8I/g7PRDgBDWVx7jOC5jzixaFTO9xn9B tDIuG7J8V2XSd0VQFDC5Ybmqa1qBhK7TSuwJhAFcC168Hf6j/wLFswLy0z/VnEC36h2V 65Xg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694971633; x=1695576433; 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=aLZZJ1WRwBh/m+1bKA2c2Z98PNMMBlLcjWlDy3GxZpQ=; b=UwlW6/7NXKsk/V2baOpkSjeaCwDWITKsq/9UoeDWGhmkxhx+VSOevquwh94jzM/8Gw ur2/O3rJ/m4dA6I/3d22Jp9Chyy4/McfywG0gY1a6uGrjpVJI+M8UWs6Owba4fv35ObN sca93tgDIa3NLXTxZlOWS1FG8ALfAPDw+VmqWsvPcusiZxnPpSMxnSXRpBnDUs6iXoZr uQjobSlExPFh+uaydPFEWD3kep+L79HY8rypDxhM0aGElui5RSWJg7ZZXqFGvsTi04LR FxEtHkZC0zkbdq30XL9xGgzoMHly1k7Vwh4lMkSE5VM0LH8m1i2wz9dg2UGmPE31BNUh V42Q== X-Gm-Message-State: AOJu0Yy3qsLdAsY6TJEBJjIzPRk0NO5WNWdM/1gWSoEZLxNx4HkVd+q4 aLB/7KeKMjx/TZ+c2kCY6ZN4XlAIOu4= X-Google-Smtp-Source: AGHT+IFOuWxFOSu40wz1ovD/CEI6ABwTsJBImh/BTKHIVAlr7OgqPFyL9sVTxj2FXW0JxIBalUtW1A== X-Received: by 2002:a05:6358:6f81:b0:135:acfd:8786 with SMTP id s1-20020a0563586f8100b00135acfd8786mr5699363rwn.3.1694971633347; Sun, 17 Sep 2023 10:27:13 -0700 (PDT) Received: from localhost.localdomain (dsl-10-149-131.b2b2c.ca. [72.10.149.131]) by smtp.gmail.com with ESMTPSA id fc14-20020ad44f2e000000b0064d0fb1a8c5sm2762468qvb.98.2023.09.17.10.27.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Sep 2023 10:27:12 -0700 (PDT) From: Maxim Cournoyer Date: Sun, 17 Sep 2023 13:26:17 -0400 Message-ID: <5bfc9e9fe16144a7231d2643da4abce5ae364930.1694971566.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 (qtdeclarative) [outputs]: New field. --- (no changes since v1) gnu/packages/qt.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 8cc1fa7398d..87de296013f 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1372,6 +1372,7 @@ (define-public qtdeclarative (base32 "06c7xfqn2a5s2m8j1bcvx3pyjqg1rgqkjvp49737gb4z9vjiz8gk")) (patches (search-patches "qtdeclarative-disable-qmlcache.patch")))) + (outputs '("out" "debug")) (build-system cmake-build-system) (arguments (list