Received: (at 65922) by debbugs.gnu.org; 13 Sep 2023 17:34:35 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed Sep 13 13:34:35 2023
Received: from localhost ([127.0.0.1]:35919 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qgTl4-00061D-NE
for submit <at> debbugs.gnu.org; Wed, 13 Sep 2023 13:34:35 -0400
Received: from mail-qk1-x733.google.com ([2607:f8b0:4864:20::733]:61833)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <maxim.cournoyer@HIDDEN>) id 1qgTl2-00060b-DD
for 65922 <at> debbugs.gnu.org; Wed, 13 Sep 2023 13:34:32 -0400
Received: by mail-qk1-x733.google.com with SMTP id
af79cd13be357-7708bfce474so5045585a.3
for <65922 <at> debbugs.gnu.org>; Wed, 13 Sep 2023 10:34:26 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20221208; t=1694626461; x=1695231261; 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=DllrI3sSNRBtXfdtRNJ0mCXEUX+oCRx9zJCR1dLcpuI=;
b=YceJexmqRvGa8DmsDu26Q/noSmqH4aE+aQtZTMTw4eTDF7cEn0RaLDPN9Nnud7uoYv
7/po1Yp9yfeMDD3fF9GgkcDdajVNyIpeIAPVC+XDQWtecjQVzVxxfjFMTZ2d7WQR1Fmj
Jws7C0ceiQb11p02Iduh2y27kwKD8eUyMN0yIdHX4rcaQXCEtxVYIJ8J0kXYQpfCz17m
KW5kZcJ5DA1YrfQU/F/QQSqS0QJsUmVnY7NS46rYniSmK07GC4xPAqUSVshA/2HovYMH
W8RxJwVWABRVKJtDVSU+dvXOC+BpudRBCms5neDdoJa4tMlO2i4Rehf0JPBRTHNctDlG
U6Tg==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1694626461; x=1695231261;
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=DllrI3sSNRBtXfdtRNJ0mCXEUX+oCRx9zJCR1dLcpuI=;
b=B3t84BUBXCsDWMwBEeKLiW1ynVRCRLVV7kJnuhw0DLf3AvhkGi58mEZdfloFo26a1z
+gO0c+1k1jJsn4SOUXYwZHXGzZ7Awn0hC8DrkUfSlrBDXgkSSaHwzIBW9wQdLpqlkIWH
vcPdjLWP3QoBhx+5aplDKPYIYhu7oCoDCWYAAu62U2J8AYCihrWzhy6gl39oo3L+UNQQ
eWptV+dGUzrPAKmyopslgGCIkREUhmQFXYB0FepCdDtFZIWp46xB8gQlHXYYEyYp6emv
/XhRETM5CTjpU05Kdj7qsaPBC0yGm5WnSX79QLWcl/aBpPEP7O11rXUA0/+42GRL83ZS
T2eA==
X-Gm-Message-State: AOJu0YwONmyyLAzXTnRJQQd6BqxGYvIr10P67exijSXQqoKY3kUEhaqO
oHPx+xZR7xArYeXMfgZi8LcMJyjfyt4=
X-Google-Smtp-Source: AGHT+IGrdZ/gSFGK0pBKJHMsEbaWL1qZ7DEy0Tb1YtbZydaYE8MiQCStnWrxfy/5FZI1GxZrhdjfVw==
X-Received: by 2002:a05:620a:408c:b0:772:6397:2aa2 with SMTP id
f12-20020a05620a408c00b0077263972aa2mr1277422qko.34.1694626461315;
Wed, 13 Sep 2023 10:34:21 -0700 (PDT)
Received: from localhost.localdomain (dsl-149-165.b2b2c.ca. [66.158.149.165])
by smtp.gmail.com with ESMTPSA id
d5-20020a05620a136500b0076f206cf16fsm4035194qkl.89.2023.09.13.10.34.20
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Wed, 13 Sep 2023 10:34:20 -0700 (PDT)
From: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
To: 65922 <at> debbugs.gnu.org
Subject: [qt-team PATCH v2 4/4] gnu: qtdeclarative: Add a debug output.
Date: Wed, 13 Sep 2023 13:33:16 -0400
Message-ID: <5cf937f9872ae58ffdc4249dc0cacf26857b7527.1694626350.git.maxim.cournoyer@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <cover.1694626350.git.maxim.cournoyer@HIDDEN>
References: <cover.1694626350.git.maxim.cournoyer@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Maxim Cournoyer <maxim.cournoyer@HIDDEN>, Andreas Enge <andreas@HIDDEN>, 宋文武 <iyzsong@HIDDEN>
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 65922
Cc: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* 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 c06f27c03e2..ab99f590b25 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1350,6 +1350,7 @@ (define-public qtdeclarative
(base32
"06c7xfqn2a5s2m8j1bcvx3pyjqg1rgqkjvp49737gb4z9vjiz8gk"))
(patches (search-patches "qtdeclarative-disable-qmlcache.patch"))))
+ (outputs '("out" "debug"))
(build-system cmake-build-system)
(arguments
(list
--
2.41.0
maxim.cournoyer@HIDDEN, andreas@HIDDEN, iyzsong@HIDDEN, guix-patches@HIDDEN:bug#65922; Package guix-patches.
Full text available.
Received: (at 65922) by debbugs.gnu.org; 13 Sep 2023 17:34:34 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed Sep 13 13:34:34 2023
Received: from localhost ([127.0.0.1]:35917 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qgTl3-00061A-Og
for submit <at> debbugs.gnu.org; Wed, 13 Sep 2023 13:34:34 -0400
Received: from mail-qk1-x735.google.com ([2607:f8b0:4864:20::735]:57710)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <maxim.cournoyer@HIDDEN>) id 1qgTl0-00060Q-F9
for 65922 <at> debbugs.gnu.org; Wed, 13 Sep 2023 13:34:31 -0400
Received: by mail-qk1-x735.google.com with SMTP id
af79cd13be357-76dc77fd01fso5391785a.3
for <65922 <at> debbugs.gnu.org>; Wed, 13 Sep 2023 10:34:25 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20221208; t=1694626458; x=1695231258; 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=AfE33+JjGsXpSwwV28+GpefQzh8ySkabOfHnQM/jTAk=;
b=mIR/4Ksq8IciaKeh/HzO99E1crkeiXvwNKcFOE+UMmqtNEkGOwv93lENN1Z2k+Om47
dlZjctZT6zGpCjWsNsmi/LNBvYHwQLGRRXGu8xIzZ9+f6Knp2oCFDGOBUxP5R5HQROTm
/EebCNIn/NqqeG338AHvLGtuCl4ncAtdsa+pX0rB7WK/3W5wSZ3KRvl5aVb3SZ/mxHsB
39zAuEqEIFH2moE/19fauHxU/X+8eWwDWdGhVX7zQ4F/13WHO1+EL2EAX8hNwDDZhhXl
nQ5PSihLOnVejmwHZhYCdRnhn+pC5oEdLysLb0R5UhwJ5YxrAglMLaMbXxVz5zWuY3kV
u+gQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1694626458; x=1695231258;
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=AfE33+JjGsXpSwwV28+GpefQzh8ySkabOfHnQM/jTAk=;
b=OIFWEDoasr3qmf9JjNx1lIuAsniLETk2VeTwBDNQeQEiijU4tB/JsIqmvyaKQfJxXL
3pOYzudhlk5SdQVnTUTZUuhxTw29w23EiTsT1KTX7m+1ZurpoKuWH6ElgR74PrUa9B1J
eH6/YGDho3LMkGqE8tYabMrKKgDSVRCpd9rigrW92PXNcBK262sgoWaIC0ZYWFV1tVvS
7qzAilTd4Cdu+AkjMy05A4JsO2stNgOUIvLoG9PxQLSjxlhmsX7BWVDdniVoB249NeMK
B99gvxSAXobaIw7yg8P0LapuZRL/zhwbZDa97GEOgGDPhlNUD7ZWMsQbkfqRehEORPEG
K1rA==
X-Gm-Message-State: AOJu0Yy5QWosBZBmeIYSGSpguanj9egSMDMsibTDujW3BiapSLkyvpoE
RDI9YkwJSkVI7Qk4d+VEucZWB7fn72Q=
X-Google-Smtp-Source: AGHT+IHyMt4jdOtKJh9H4bER0OtCp+2rpHC/yPUZyV/LmLbp5xM8m7dtnDoCIpqKyN+2EWv1TsIX4w==
X-Received: by 2002:a05:620a:25d0:b0:770:ef43:7638 with SMTP id
y16-20020a05620a25d000b00770ef437638mr3995518qko.33.1694626458171;
Wed, 13 Sep 2023 10:34:18 -0700 (PDT)
Received: from localhost.localdomain (dsl-149-165.b2b2c.ca. [66.158.149.165])
by smtp.gmail.com with ESMTPSA id
d5-20020a05620a136500b0076f206cf16fsm4035194qkl.89.2023.09.13.10.34.17
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Wed, 13 Sep 2023 10:34:17 -0700 (PDT)
From: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
To: 65922 <at> debbugs.gnu.org
Subject: [qt-team PATCH v2 3/4] gnu: qtbase: Reinstate date related tests.
Date: Wed, 13 Sep 2023 13:33:15 -0400
Message-ID: <931555dfc97a20c94e7ca50d61373a4d10548a17.1694626350.git.maxim.cournoyer@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <cover.1694626350.git.maxim.cournoyer@HIDDEN>
References: <cover.1694626350.git.maxim.cournoyer@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Maxim Cournoyer <maxim.cournoyer@HIDDEN>, Andreas Enge <andreas@HIDDEN>, 宋文武 <iyzsong@HIDDEN>
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 65922
Cc: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* 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.
---
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 <edward.welbourne@HIDDEN>
+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<QByteArray, QTzTimeZone> 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)
--
2.41.0
maxim.cournoyer@HIDDEN, andreas@HIDDEN, iyzsong@HIDDEN, guix-patches@HIDDEN:bug#65922; Package guix-patches.
Full text available.
Received: (at 65922) by debbugs.gnu.org; 13 Sep 2023 17:34:30 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed Sep 13 13:34:30 2023
Received: from localhost ([127.0.0.1]:35913 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qgTl0-00060q-Br
for submit <at> debbugs.gnu.org; Wed, 13 Sep 2023 13:34:30 -0400
Received: from mail-yw1-x112f.google.com ([2607:f8b0:4864:20::112f]:56415)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <maxim.cournoyer@HIDDEN>) id 1qgTkw-00060A-P8
for 65922 <at> debbugs.gnu.org; Wed, 13 Sep 2023 13:34:27 -0400
Received: by mail-yw1-x112f.google.com with SMTP id
00721157ae682-590685a3be5so952797b3.0
for <65922 <at> debbugs.gnu.org>; Wed, 13 Sep 2023 10:34:21 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20221208; t=1694626455; x=1695231255; 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=QxkjIvDMOE/37TXTSYko4O69Alr5BrLEsWYMed1uYlVH3wLjCSnCGwlksGe+0XUFLa
cMaZ2zlhNCVse1p0zCmbKbS4w43KjaaUJO+pHW7c+90CdGLulAxZ96Tx4MdbXuVeH15b
P6VzXVRwgQKzlLVNyk+pJpkIR4F7gOSH9DvC4gTrttq4ozvfU+OqeShq3yAArkYuxWZc
huOb+7mREGLNa3hJhGAnELTAd6COxaVEXCkxF/nPDcr/anNRlqX2aNxSW6PtPpzD0SOi
T+y4KHOkL74xkA+0SZwcYPWflV8ARBFdia5X2uNOfGg6YTUh+mdfKIVpf7ZphZ3lZNk4
Evqw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1694626455; x=1695231255;
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=GgvOfu+O901VAdXlf7NmI7lIQFtWRFsCbJo6RIvMfECSDzLvwhvXK2OJvcD4B2XY2+
P+5mdv0PT+0BbYWy9uMbWbpdkbc26uzOzIGSJNETkbgWXQHTrjCdnlxFdVDKN3AjKaOQ
vQxQQ6nRXP/ZM+D+zrb3gONhbjDZpur1PvdGA6rGxm4flkd7fJOFxU5MNCUpPYbA+R7j
/v/NWzRfZghpv7GexgS4SdE1GZD3upZhBpukCgJ4I3P83E0CPT02R+b6bvGYQfMUP5BM
DFNP25bk/j7ccGdsammypwJOYA9y72HyFQao7bHx7QotAiDL7/2/6n/HfWzxFDdNTuOQ
aNlA==
X-Gm-Message-State: AOJu0YyAAArjZFnx/ezLofjnyp7SB/7GbEVwHDHw7Sst1D3cwXj9Nt0y
f/N0fIm8+7ndseYb6i7J8h1RjqRpSUE=
X-Google-Smtp-Source: AGHT+IG7WNz6oBmvUdVdJ5vSBZqDx6UWkPaePaB+iXXuw+zAhOb0x/jKI7ryF9zl25x2BYAJlgatPQ==
X-Received: by 2002:a0d:e2ca:0:b0:595:5609:cb78 with SMTP id
l193-20020a0de2ca000000b005955609cb78mr3074998ywe.33.1694626455613;
Wed, 13 Sep 2023 10:34:15 -0700 (PDT)
Received: from localhost.localdomain (dsl-149-165.b2b2c.ca. [66.158.149.165])
by smtp.gmail.com with ESMTPSA id
d5-20020a05620a136500b0076f206cf16fsm4035194qkl.89.2023.09.13.10.34.15
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Wed, 13 Sep 2023 10:34:15 -0700 (PDT)
From: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
To: 65922 <at> debbugs.gnu.org
Subject: [qt-team PATCH v2 2/4] gnu: qtbase: Add $TZDIR to native search paths.
Date: Wed, 13 Sep 2023 13:33:14 -0400
Message-ID: <0e56555b7b6826b81d721836d5312b01f6e3525c.1694626350.git.maxim.cournoyer@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <cover.1694626350.git.maxim.cournoyer@HIDDEN>
References: <cover.1694626350.git.maxim.cournoyer@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Maxim Cournoyer <maxim.cournoyer@HIDDEN>, Andreas Enge <andreas@HIDDEN>, 宋文武 <iyzsong@HIDDEN>
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 65922
Cc: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* 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")))
--
2.41.0
maxim.cournoyer@HIDDEN, andreas@HIDDEN, iyzsong@HIDDEN, guix-patches@HIDDEN:bug#65922; Package guix-patches.
Full text available.
Received: (at 65922) by debbugs.gnu.org; 13 Sep 2023 17:34:27 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed Sep 13 13:34:27 2023
Received: from localhost ([127.0.0.1]:35910 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qgTkw-00060a-Pk
for submit <at> debbugs.gnu.org; Wed, 13 Sep 2023 13:34:27 -0400
Received: from mail-qk1-x732.google.com ([2607:f8b0:4864:20::732]:53441)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <maxim.cournoyer@HIDDEN>) id 1qgTku-000607-7C
for 65922 <at> debbugs.gnu.org; Wed, 13 Sep 2023 13:34:24 -0400
Received: by mail-qk1-x732.google.com with SMTP id
af79cd13be357-76ef935abaeso5507385a.2
for <65922 <at> debbugs.gnu.org>; Wed, 13 Sep 2023 10:34:18 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20221208; t=1694626453; x=1695231253; 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=osKxVdGV59kuouEExawLPHFHgQugcsmW7hiqXRXxijyIbuw5JtGkXT/wiPZ0qoP5+8
zpxzCn5bBrE0Q3YIRgOdd10UYRak2vw0/k7GrxBagwNdcJSOkHoHrq6cMDE9IygBNOSt
Fw4nUFnW17nBRcVrLKlcePbcS/bImVIkQXT5oQfIAX3AaAcLebGooxucDFvVtnyPOlUe
z9FxFCXQB75d37gFKMIsLaiM76TKhRkrs1OMwuqzhvsUWGx1IDQK3+f1TfQXzCkr2J3R
hHBDuegpMM8wvtYQa6IGxMfuCl5CN1pfFBgog4pBtAsVlDuwe+1kVF8CDPksjMO4d1La
Xa6w==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1694626453; x=1695231253;
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=cIBW5hcG8KXJqbBixXucEIswT9YFAs9Rok2fjFO7J7dOOXwQuufDFk3FHeX7C8Ufmb
Uv7JYp5JTW8AuKyMR53u3ye9rLC8YtF0YnPnViwMM8rH+0hqXmOpcDvXOqbWmvR5FB1c
mVg/MOZ1DHDYtSgKQn/RU/BSV4pUk6aB/ryo7mDHxvi7eSiSNjDucO9iZHm5y7pefpb5
/vtzCv6ZlCirs41vRQaeRLB5G7T75Jt1caRHlp50k44xP/Qen0R0XcgWIJAB40R/cQrb
fy0edvbynQXcaajnFgSbpPidXJp08JM8ZEu5H+xzMYKb6WCInwqQP1sgAylm9sqZb7A6
4oDw==
X-Gm-Message-State: AOJu0YwVHe1cB3xqOdGzZ3eYLpJxJypckzEteLgFiYBzChBOF7MQrbpe
BVUXpPhoQBbtRhdeSirTutlvuNvNBO8=
X-Google-Smtp-Source: AGHT+IEuhi6bJFKmbuP58RLvw7aVFF5LgAvucpSZ0vScxINnchyjJANOK51GmOz3faKKrvrLLI+K6g==
X-Received: by 2002:a05:620a:a03:b0:767:954:a752 with SMTP id
i3-20020a05620a0a0300b007670954a752mr2904718qka.73.1694626453113;
Wed, 13 Sep 2023 10:34:13 -0700 (PDT)
Received: from localhost.localdomain (dsl-149-165.b2b2c.ca. [66.158.149.165])
by smtp.gmail.com with ESMTPSA id
d5-20020a05620a136500b0076f206cf16fsm4035194qkl.89.2023.09.13.10.34.12
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Wed, 13 Sep 2023 10:34:12 -0700 (PDT)
From: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
To: 65922 <at> debbugs.gnu.org
Subject: [qt-team PATCH v2 1/4] gnu: qtbase: Do not capture Python (again).
Date: Wed, 13 Sep 2023 13:33:13 -0400
Message-ID: <ff4d270dd33e8ef2baf9cf3a89029548c61a208d.1694626350.git.maxim.cournoyer@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <cover.1694626350.git.maxim.cournoyer@HIDDEN>
References: <cover.1694626350.git.maxim.cournoyer@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Maxim Cournoyer <maxim.cournoyer@HIDDEN>, Andreas Enge <andreas@HIDDEN>, 宋文武 <iyzsong@HIDDEN>
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 65922
Cc: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
Fixes <https://issues.guix.gnu.org/65457>.
* 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
--
2.41.0
maxim.cournoyer@HIDDEN, andreas@HIDDEN, iyzsong@HIDDEN, guix-patches@HIDDEN:bug#65922; Package guix-patches.
Full text available.Received: (at 65922) by debbugs.gnu.org; 13 Sep 2023 17:34:23 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Wed Sep 13 13:34:23 2023 Received: from localhost ([127.0.0.1]:35907 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1qgTkt-00060J-Cp for submit <at> debbugs.gnu.org; Wed, 13 Sep 2023 13:34:23 -0400 Received: from mail-qk1-x732.google.com ([2607:f8b0:4864:20::732]:52490) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <maxim.cournoyer@HIDDEN>) id 1qgTkr-000603-M8 for 65922 <at> debbugs.gnu.org; Wed, 13 Sep 2023 13:34:22 -0400 Received: by mail-qk1-x732.google.com with SMTP id af79cd13be357-770ef0f51ccso6024185a.1 for <65922 <at> debbugs.gnu.org>; Wed, 13 Sep 2023 10:34:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1694626450; x=1695231250; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=M3+AA/uxa5bcrmwkxMhALxPH3hhBLlDcX3Q6BpcbBGA=; b=LodpYDaWkbz+9i4+XzCd94ILqX1Y5HqFcie342StvJcf37kGC8IbvNA+GIFFp65srj iCVxRlANVdmdQukDzGaIuXIjfP5QPdJwNOukwPeunBvkdJXADhj1sIMnmDt8DFZqOXne 6A9qLG0Oj9wmPV1wOUy3/Cm5hFtUqO87JGZa2B9s3rLiY/PmpWWSL6IY+Ufj6qrutC8b +3Os9Q8a5xPteLNmbPDyKH73v+2zp8lngj8dvF7leMC4/j9aO6wchpgR/XVO0b/pcFmw NY/RJFzJuyAZMi2qhWM8VueoD1t2HEO074Qim6QGhHXfgVmanZV1hwNuIRMgiT3xZPYI SBuA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694626450; x=1695231250; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=M3+AA/uxa5bcrmwkxMhALxPH3hhBLlDcX3Q6BpcbBGA=; b=MP0nIiCps/k4mLWQC5yhLcLwJjSG/cqj9ZxIs+W61VVk5lBg+x08wxMBVhY1rcrpiV AP85ZF6A9oVrXmbt4ZCI0ldTmRw7LrCMXj8Hm+70oADDj6R8lP+3Eqx2JKZVagdGbpUP XTz3OPTIaOTLCCJW4oqzy5NjqaZ3GEq9N16TWm7gsSIKV1mR8lJfcycb67VOxdz/FoZJ vehb3R98i6ukKdImtWisouKsVx5TmLSbfmFkPMNYjHO8O5pMtm4PmE8klQnC5zWuf08G xvl12cnOXNpo/pUd/66D+I7L2MFv4LTZNYxhqDXo2fwELfjAfblHHUYwXaI8c5+Sg44C rrnQ== X-Gm-Message-State: AOJu0Yyvx5+fJIUxE3HYcpD66OdsVjm9q/f5jvg1dK2Qs3yDB+CmsLt3 h1IKjqZJSbHnz8VXe9+pDCAUqoyt3Js= X-Google-Smtp-Source: AGHT+IEjDu0slnL0Jz2wLbauf6gQyuaDJZfLGwnpzeR7AHk9gq5uJSE+riLE5iVpOc3EEkTKQNuH6w== X-Received: by 2002:a05:620a:459e:b0:76f:f64:58bf with SMTP id bp30-20020a05620a459e00b0076f0f6458bfmr3143647qkb.18.1694626449351; Wed, 13 Sep 2023 10:34:09 -0700 (PDT) Received: from localhost.localdomain (dsl-149-165.b2b2c.ca. [66.158.149.165]) by smtp.gmail.com with ESMTPSA id d5-20020a05620a136500b0076f206cf16fsm4035194qkl.89.2023.09.13.10.34.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Sep 2023 10:34:08 -0700 (PDT) From: Maxim Cournoyer <maxim.cournoyer@HIDDEN> To: 65922 <at> debbugs.gnu.org Subject: [qt-team PATCH v2 0/4] Avoid capturing python in qtbase, reinstate tests Date: Wed, 13 Sep 2023 13:33:12 -0400 Message-ID: <cover.1694626350.git.maxim.cournoyer@HIDDEN> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-Debbugs-Cc: Maxim Cournoyer <maxim.cournoyer@HIDDEN>, Andreas Enge <andreas@HIDDEN>, 宋文武 <iyzsong@HIDDEN> Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 65922 Cc: Maxim Cournoyer <maxim.cournoyer@HIDDEN> X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) Thes series removes Python from the closure of qtbase, both for versions 5.15 and 6.5. It also reinstate a few tests that was made possible thanks to discussions with upstream following reported the issues. Changes in v2: - Use old TZDIR patch for qtbase@5 (the new one doesn't apply) Maxim Cournoyer (4): gnu: qtbase: Do not capture Python (again). gnu: qtbase: Add $TZDIR to native search paths. gnu: qtbase: Reinstate date related tests. gnu: qtdeclarative: Add a debug output. 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 | 56 +++--- 4 files changed, 208 insertions(+), 50 deletions(-) create mode 100644 gnu/packages/patches/qtbase-5-use-TZDIR.patch base-commit: 4cb2e08b8eb1acc824b72ec17b483d7d85b5af68 -- 2.41.0
maxim.cournoyer@HIDDEN, andreas@HIDDEN, iyzsong@HIDDEN, guix-patches@HIDDEN:bug#65922; Package guix-patches.
Full text available.
Received: (at 65922) by debbugs.gnu.org; 13 Sep 2023 16:58:54 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed Sep 13 12:58:54 2023
Received: from localhost ([127.0.0.1]:35847 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qgTCX-0002SH-W2
for submit <at> debbugs.gnu.org; Wed, 13 Sep 2023 12:58:54 -0400
Received: from mail-qv1-xf2c.google.com ([2607:f8b0:4864:20::f2c]:52624)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <maxim.cournoyer@HIDDEN>) id 1qgTCR-0002RN-63
for 65922 <at> debbugs.gnu.org; Wed, 13 Sep 2023 12:58:50 -0400
Received: by mail-qv1-xf2c.google.com with SMTP id
6a1803df08f44-655de2a5121so298726d6.1
for <65922 <at> debbugs.gnu.org>; Wed, 13 Sep 2023 09:58:41 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20221208; t=1694624316; x=1695229116; 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=t4iv9XSOREb5XDgrciR/Isy3gPeaNil721EVP6WSK2M=;
b=cUzQ+5+4Dj1S6LV2ZNSlkDYkGEgs7cPjHvXotl9rsvMrZpUTeEMSUAWtVYGAfLjcja
SZKsDPqFzppJW7PkoKvpRHWPr2LyHRSn4gXiqiI0ke9qTKfEAOElVjHJf8XtwEoCQhSR
/ri1nGgI5S/C3g/stMb4rqWJO/0bShfxODl2X9vC27fNrMcWX/Vq4OWOZ8z5QM2HnWUY
NvHkjuI30zm+eIjGNdvb48Eq/oZ3OwukPLhItabvyAjesr6x8ihCvKzX/WWdGmYZ3WkT
s+r79sAib3hjT0TnsxQIN7ouVGqFHP8uw9Cso6j/es5WB70jRPTYBPjnTfNpUp7CLYQ6
FtGQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1694624316; x=1695229116;
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=t4iv9XSOREb5XDgrciR/Isy3gPeaNil721EVP6WSK2M=;
b=BWpqyEXiOyoflvmstr/cK6trr3zkiB8kKT+eMmQfMPYu1kp+gRvReDySuTAFl38N/L
2A2MDRCuBY3sVShlaESjTc6vI+0oqjYB5YOTWYi2t5W72TOpxtsWt6meeeaKVh6MLLq/
dzHK4mCNW0Em/wCy90dC/y7czSfXmWOlBSXS2993ORR08UpyClAfIaTnHwadrBiWrogM
8SI5YIWHqZeZrOUU9ZKWI8FgWXSwMGymst5ftA1IpGGkjG4JEjzUU4fKuYdaKiT+Irtx
ozsjg6D0LV4B3XC9SpelBhXtCw8ZOj6vMAtzBaJGlCrww4OE//PeCQft7IV15iQ1ppoi
Ywsg==
X-Gm-Message-State: AOJu0YxpD9iXLEjFsulAeSgNXy2L4bummk83jqtRvkb3qtGoEIAG4wPZ
4EZPRKX2k5b0O+L/RWqQzQUXfnNRYLg=
X-Google-Smtp-Source: AGHT+IEjHB07GtXEZiY44WcAAk9JrTpZ0w9qxEhgPgKaMYJSbXpp9y4fn4QJKSzQh6YmFdlX3+0IRw==
X-Received: by 2002:a05:6214:4607:b0:64f:82d2:26fe with SMTP id
oq7-20020a056214460700b0064f82d226femr3594369qvb.39.1694624316063;
Wed, 13 Sep 2023 09:58:36 -0700 (PDT)
Received: from localhost.localdomain (dsl-149-165.b2b2c.ca. [66.158.149.165])
by smtp.gmail.com with ESMTPSA id
d13-20020a0cf0cd000000b0063fbfbde4adsm4526644qvl.129.2023.09.13.09.58.35
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Wed, 13 Sep 2023 09:58:35 -0700 (PDT)
From: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
To: 65922 <at> debbugs.gnu.org
Subject: [qt-team PATCH 3/4] gnu: qtbase: Reinstate date related tests.
Date: Wed, 13 Sep 2023 12:58:23 -0400
Message-ID: <cda01aa37eee1043d3c9246a64c58661a381d34f.1694624089.git.maxim.cournoyer@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <cover.1694624089.git.maxim.cournoyer@HIDDEN>
References: <cover.1694624089.git.maxim.cournoyer@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Andreas Enge <andreas@HIDDEN>, 宋文武 <iyzsong@HIDDEN>
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 65922
Cc: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* 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.
* gnu/packages/patches/qtbase-use-TZDIR.patch: Refresh patch with upstream
version.
---
(no changes since v1)
gnu/packages/patches/qtbase-use-TZDIR.patch | 162 ++++++++++++++++----
gnu/packages/qt.scm | 31 ++--
2 files changed, 148 insertions(+), 45 deletions(-)
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 <edward.welbourne@HIDDEN>
+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<QByteArray, QTzTimeZone> 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..d6255248c2a 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -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)
--
2.41.0
andreas@HIDDEN, iyzsong@HIDDEN, guix-patches@HIDDEN:bug#65922; Package guix-patches.
Full text available.
Received: (at 65922) by debbugs.gnu.org; 13 Sep 2023 16:58:54 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed Sep 13 12:58:54 2023
Received: from localhost ([127.0.0.1]:35845 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qgTCX-0002S9-Ll
for submit <at> debbugs.gnu.org; Wed, 13 Sep 2023 12:58:53 -0400
Received: from mail-qv1-xf2f.google.com ([2607:f8b0:4864:20::f2f]:52467)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <maxim.cournoyer@HIDDEN>) id 1qgTCS-0002RQ-H3
for 65922 <at> debbugs.gnu.org; Wed, 13 Sep 2023 12:58:50 -0400
Received: by mail-qv1-xf2f.google.com with SMTP id
6a1803df08f44-64c1d487e72so373806d6.0
for <65922 <at> debbugs.gnu.org>; Wed, 13 Sep 2023 09:58:43 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20221208; t=1694624317; x=1695229117; 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=L3mD24B3u75lNeiHQaV/qfzCG7DCgAQlXpGUWwHv5/c=;
b=k/H1rgKrlzp5f7VSWQnOxn1vUn1/C4vo4H+TeRcPg9q37GUT9DdbxmvVTBE9/qmuuB
yoWGbbXjZTcapzyX/xQFdypn6ETJE81xNab3U42iy7uVZ3GZ5pjYM8f4QrXVZjoI9dXD
sZNhaejwmcEpsiY/o6SW1upnsMxgzhc5qhUNDx+eIj6kMZpv4qfEcqoq2h9s/KhRCfsa
XF5zC6v/P3fwbkwF2/1a6JxDKg2ZS3A9OxE0Ln3tAUG562V+VnhhmR/9wk1uYOknfZ+L
W65tvG7AeHwEP/2zIq4xXRkLf8C0Igor360XBYqX/XQ0akQYKZGpCw6XzC4wM/Ftg4RU
zYWQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1694624317; x=1695229117;
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=L3mD24B3u75lNeiHQaV/qfzCG7DCgAQlXpGUWwHv5/c=;
b=DXCaUiglFRIB6CiQ+PlDSJOKQaexvGn0KEC+aOIKSzzZ2WXa77J0ZtAjlpCfmV9tlA
hVxcVKmkUDbVJ322COl379IrWEuA1xsz8lb45LZRle24U2QRemnKFNVmNnRWtfhZ7iww
MSANHs6AjBqEu9nT2nln3Wsv3qVmGd9LBrpX6b/FH04tp6j38PdJ72Axax+cwzIXee50
QfkuuDptIl6uEoLGNYjR7pxY3byMIHPeSXU43siTFaMMOi6AJCgT1sDkMWYLhVY/WEy0
RzeOa2YF8tuxUUo7ILDxnlsEJapMCkYecpuQV8EjMSi5xQIfDu04mTMB1lQGQQuYm6kG
uroA==
X-Gm-Message-State: AOJu0Ywt9g6ODGCRbA8gtenNp5euylxkWp8rz3Yo45wwrLbG/Y6Sn7Nw
FIaJmDJX/hAu7dkt+bLbsmtRFDnzpGM=
X-Google-Smtp-Source: AGHT+IEFUWtR+ZbAHQ52/YT2BYEsEaTA8TXC5TRFAwsHKBbkBbCo7Hv26WXbFs0jMS2s3EJGL6//uQ==
X-Received: by 2002:a0c:b4ca:0:b0:656:1858:a178 with SMTP id
h10-20020a0cb4ca000000b006561858a178mr41190qvf.9.1694624317332;
Wed, 13 Sep 2023 09:58:37 -0700 (PDT)
Received: from localhost.localdomain (dsl-149-165.b2b2c.ca. [66.158.149.165])
by smtp.gmail.com with ESMTPSA id
d13-20020a0cf0cd000000b0063fbfbde4adsm4526644qvl.129.2023.09.13.09.58.36
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Wed, 13 Sep 2023 09:58:37 -0700 (PDT)
From: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
To: 65922 <at> debbugs.gnu.org
Subject: [qt-team PATCH 4/4] gnu: qtdeclarative: Add a debug output.
Date: Wed, 13 Sep 2023 12:58:24 -0400
Message-ID: <0e039b26a95b285feb598d3effe67cc4e5c38a51.1694624089.git.maxim.cournoyer@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <cover.1694624089.git.maxim.cournoyer@HIDDEN>
References: <cover.1694624089.git.maxim.cournoyer@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Andreas Enge <andreas@HIDDEN>, 宋文武 <iyzsong@HIDDEN>
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 65922
Cc: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* 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 d6255248c2a..ed9d813756a 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1350,6 +1350,7 @@ (define-public qtdeclarative
(base32
"06c7xfqn2a5s2m8j1bcvx3pyjqg1rgqkjvp49737gb4z9vjiz8gk"))
(patches (search-patches "qtdeclarative-disable-qmlcache.patch"))))
+ (outputs '("out" "debug"))
(build-system cmake-build-system)
(arguments
(list
--
2.41.0
andreas@HIDDEN, iyzsong@HIDDEN, guix-patches@HIDDEN:bug#65922; Package guix-patches.
Full text available.
Received: (at 65922) by debbugs.gnu.org; 13 Sep 2023 16:58:53 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed Sep 13 12:58:53 2023
Received: from localhost ([127.0.0.1]:35843 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qgTCX-0002S7-Ct
for submit <at> debbugs.gnu.org; Wed, 13 Sep 2023 12:58:53 -0400
Received: from mail-qv1-xf32.google.com ([2607:f8b0:4864:20::f32]:57810)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <maxim.cournoyer@HIDDEN>) id 1qgTCQ-0002RL-0n
for 65922 <at> debbugs.gnu.org; Wed, 13 Sep 2023 12:58:50 -0400
Received: by mail-qv1-xf32.google.com with SMTP id
6a1803df08f44-64f387094ddso230006d6.3
for <65922 <at> debbugs.gnu.org>; Wed, 13 Sep 2023 09:58:40 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20221208; t=1694624315; x=1695229115; 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=Uoa6LRaTLRxRJSkLvUzh3lKLoal8uGlu1eRuH0OfFL+Sds2B2x16oA8tC1LrU4K403
xpzj5uXyKqfelDc+lD3Oda9yR++wwx16c8oE/8oIw/6K/9tDz6tqT+M8UfwJiL9UpHhs
UogQ5dJmIGajXobVifo9S++X4/3r0EsR02NOvA6EYh+Od1zVRLhuC58vCfjBYfBPi3nD
l+h8BlvlOxytEQXw4CnEWNCjZ2I9kudrRdpAIy13u5Gn1e2KpXjceFnvdnm1RGhD0I3k
H2iZBTfHp6KAWFzeqTNbRF8jGx+rQm568jgt0ZaUehBswMj6xBrUk0IY7SWgdGmhxFhM
iOdQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1694624315; x=1695229115;
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=B6JHIldKLjnlWMOLkX1Ec5+XB8v6LIHhEpgIY449hQhDCPtjHxTuHm0z/hem3FuAo8
TQbsx9X9giC7rW29QtRyw+DTKUxpDUJRMFZ1ih2KAmOCW7X/JQMYqu/h4kxsNzkx4EMs
tYFmffeRxUL/HBSOYWzLy+eG64Gpox1QSH821JqaE51mPhoCukXFzK3kpqXoHv855Khy
7WArqcQVT6ax2e+ewtS5qxV02+F4iilGMG32yMoC9uimxy6Xdd0CaFar2TzQndvGyzu0
q8/zKmYHOP6kpFYOsJ0M+3A72YoxTlUen6dxSqGijnzIMTaM+dI5Zf22SCi1t46/K2k8
e1aA==
X-Gm-Message-State: AOJu0YyG1NZ4+xKgZQQgnw01SumNOtkooinrLPFUIdpxTKLRmE9MvB3s
x72mv+8KtG2ZoWShof1yXA07KZLpDqw=
X-Google-Smtp-Source: AGHT+IHkJcdXECMJZ6ibyaYSyB/yumINO8yb9UJGLFp9jEFsYuR3PMEWaxqNKajlPeggBh3S2BPlrw==
X-Received: by 2002:ad4:50c6:0:b0:655:fbe6:5b42 with SMTP id
e6-20020ad450c6000000b00655fbe65b42mr2628739qvq.13.1694624314920;
Wed, 13 Sep 2023 09:58:34 -0700 (PDT)
Received: from localhost.localdomain (dsl-149-165.b2b2c.ca. [66.158.149.165])
by smtp.gmail.com with ESMTPSA id
d13-20020a0cf0cd000000b0063fbfbde4adsm4526644qvl.129.2023.09.13.09.58.34
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Wed, 13 Sep 2023 09:58:34 -0700 (PDT)
From: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
To: 65922 <at> debbugs.gnu.org
Subject: [qt-team PATCH 2/4] gnu: qtbase: Add $TZDIR to native search paths.
Date: Wed, 13 Sep 2023 12:58:22 -0400
Message-ID: <4cb2ed7b09b84662ba38669766052e38e0b00abb.1694624089.git.maxim.cournoyer@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <cover.1694624089.git.maxim.cournoyer@HIDDEN>
References: <cover.1694624089.git.maxim.cournoyer@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Andreas Enge <andreas@HIDDEN>, 宋文武 <iyzsong@HIDDEN>
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 65922
Cc: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* 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")))
--
2.41.0
andreas@HIDDEN, iyzsong@HIDDEN, guix-patches@HIDDEN:bug#65922; Package guix-patches.
Full text available.
Received: (at 65922) by debbugs.gnu.org; 13 Sep 2023 16:58:51 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed Sep 13 12:58:51 2023
Received: from localhost ([127.0.0.1]:35841 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qgTCT-0002Rg-Bs
for submit <at> debbugs.gnu.org; Wed, 13 Sep 2023 12:58:51 -0400
Received: from mail-qv1-xf30.google.com ([2607:f8b0:4864:20::f30]:54493)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <maxim.cournoyer@HIDDEN>) id 1qgTCK-0002RE-FU
for 65922 <at> debbugs.gnu.org; Wed, 13 Sep 2023 12:58:47 -0400
Received: by mail-qv1-xf30.google.com with SMTP id
6a1803df08f44-655cee6f752so365766d6.0
for <65922 <at> debbugs.gnu.org>; Wed, 13 Sep 2023 09:58:35 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20221208; t=1694624309; x=1695229109; 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=qAf92JelB4PDVyacHvCNSAbgjfRCxpxhdNloRvYDPwo=;
b=N+40NI1OmRv4U6ih9i3OWrjz36E4U8KKh8Enh4n+BwJoWAB1lx6G7hacNCF28jbYIU
4/O4BXn5nYMVBy/FgsmuTt/m7FEIyvpL9Lp1gEKpmo/En4wMiy7bBSILQdIZ0g0D3jbK
tokJrjLQzpNsvNYe8kpL0JJca62LtzLU5eD9xwEff7Zv58jTxCMmkauWkNFAuf0ny76p
ZX/pWoGXEFi57ZUX+15leXTQjV407njW7wxwhg8pctEgNDoznsgA9mlU+556MAWfatBe
EJPUNryGwuRM+80HFNcLvdvWHemwR7iixsWx+FV1VF5bdKononmVzYOzsdqioMaxXrB2
itzA==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1694624309; x=1695229109;
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=qAf92JelB4PDVyacHvCNSAbgjfRCxpxhdNloRvYDPwo=;
b=nl6eYmiZ6ZOwTQqFkROZEp5eZan69qLIuch7W/zGSSx9yl9Nmf7Wh246I5MKXy8OLJ
92BNPJE+HWNTVTW2hSo7wBXE4ea8kMdXd+SjWm3wL2DrC0NB6HrzHBxokAc6OnNBRbqx
QjodGCbmX76FjGULwx/yIoL5jDIxeb1oFTMskCCNUWKgNoGNge2Ap+0IWJXiN43SjE60
qttb/Sgg48eY1NHEEwPbFLLQ/OGRrq/N3vENjv+BOjQYV8st2TK0SD8Y8fmdAdava0uN
Uk5OABl3Iz+U9/RxtkvoyRhxsZAChjyTYakvZj/EuKZ5egM/fbwfXYHNGnWcW5K6YTXc
KrPA==
X-Gm-Message-State: AOJu0YxE8oUSD76in6AHPpe9MDblyX3fhlRK/s5QhIsCdNwUvTmp/eid
ghumbUK+OxeXpvq0VYU/IqDH8c4sYys=
X-Google-Smtp-Source: AGHT+IFrhjcZ2FCp+NmbcAWXTuB7DCgdWamTCYHmFElYmJJlRfmQfaxWwfsQtxU8APZ5uMcy5pAGYw==
X-Received: by 2002:a05:6214:459d:b0:651:679b:d35f with SMTP id
op29-20020a056214459d00b00651679bd35fmr3305072qvb.43.1694624309262;
Wed, 13 Sep 2023 09:58:29 -0700 (PDT)
Received: from localhost.localdomain (dsl-149-165.b2b2c.ca. [66.158.149.165])
by smtp.gmail.com with ESMTPSA id
d13-20020a0cf0cd000000b0063fbfbde4adsm4526644qvl.129.2023.09.13.09.58.28
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Wed, 13 Sep 2023 09:58:28 -0700 (PDT)
From: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
To: 65922 <at> debbugs.gnu.org
Subject: [qt-team PATCH 1/4] gnu: qtbase: Do not capture Python (again).
Date: Wed, 13 Sep 2023 12:58:21 -0400
Message-ID: <b58e39ce10c910087a8cb90e36d58213705f2728.1694624089.git.maxim.cournoyer@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <cover.1694624089.git.maxim.cournoyer@HIDDEN>
References: <cover.1694624089.git.maxim.cournoyer@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Andreas Enge <andreas@HIDDEN>, 宋文武 <iyzsong@HIDDEN>
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 65922
Cc: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
Fixes <https://issues.guix.gnu.org/65457>.
* 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.
---
Changes in v2:
- Also apply fix to qtbase-5 package.
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
--
2.41.0
andreas@HIDDEN, iyzsong@HIDDEN, guix-patches@HIDDEN:bug#65922; Package guix-patches.
Full text available.Received: (at submit) by debbugs.gnu.org; 13 Sep 2023 16:56:45 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Wed Sep 13 12:56:45 2023 Received: from localhost ([127.0.0.1]:35830 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1qgTAS-0002Nx-Sa for submit <at> debbugs.gnu.org; Wed, 13 Sep 2023 12:56:45 -0400 Received: from lists.gnu.org ([2001:470:142::17]:49328) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <maxim.cournoyer@HIDDEN>) id 1qgTAN-0002Nf-W7 for submit <at> debbugs.gnu.org; Wed, 13 Sep 2023 12:56:44 -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 <maxim.cournoyer@HIDDEN>) id 1qgTAD-0000nP-Br for guix-patches@HIDDEN; Wed, 13 Sep 2023 12:56:29 -0400 Received: from mail-qt1-x836.google.com ([2607:f8b0:4864:20::836]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from <maxim.cournoyer@HIDDEN>) id 1qgTA8-0004Rx-DL for guix-patches@HIDDEN; Wed, 13 Sep 2023 12:56:28 -0400 Received: by mail-qt1-x836.google.com with SMTP id d75a77b69052e-41206fd9717so45380971cf.3 for <guix-patches@HIDDEN>; Wed, 13 Sep 2023 09:56:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1694624182; x=1695228982; darn=gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=VPfSszXfbIXAs56mKY6qscXVxGUU7/joqfPq82f3b8E=; b=jDhzO7dm2qfV1iyeyKRvBHeWS9fGdPdGAi0IqSDwiTVxrTurxxDJk4sbDcCt9TGSVE c6XaXNGH9gx6MraB1v9ZBYL/HaP4LOEixHrQOA8NRsxLWAgoTXtbpg3BhILOkrklmkiL vBX7qx8/03UXE/a1Y42N/8NJ/ECSx+XkhGkYMCIZWsNVlu7TIVt3kJiNf6PtFk33EaPC eJ+LQMRX8v0z6veKGsCLDDojcR6L0uJDsQotcjt4+/JDKVkD94v1VTP0Ka5rXV8P+xwe 6JFk5qXY+Iiuj2ruFfRBpzZ/XEBG67eDpw1IkfIXVqDHRpZaUnxDXUmBreJrcQD/SqGM BXYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694624182; x=1695228982; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=VPfSszXfbIXAs56mKY6qscXVxGUU7/joqfPq82f3b8E=; b=IFD9Tebqb6KXTsEMXojyszSbB88Q1brMY4Z8GKX7Jc/8lE/x0BY5eHNd80H0EHHyK0 bhHJxM0WO/Tt9reapiKC67OIzToz2HCEqa9I2htGN/Nrwo/7q28Jx5xunZ8Ue3B2ZvBA bd+qY3EZZ0d0G0XPlthuEQa87VMt9q91B6halPRQxOba064LiyL9X8DyFjeDrmPrYRXp YBlSwCvlzz+RfUqzC+0tslQCG/0JfjcT/2odApdyCf9u5y2uM7YGNTqIMX0pp9aCs4pT FpmZJrgPyVCqoy37Cm9Iuf/CxvSirQLkuKZurbG2gZwNuEWEj29m1h2iom+EOYyD5KMi l/ww== X-Gm-Message-State: AOJu0YxCDT9YYUIhYBfzffy1f2ehBNtWfcvd/mNe07r57in6FopkCqG5 pTnKN7hvxrwu45FkJhRghGhlxwBHqHo= X-Google-Smtp-Source: AGHT+IHpf6OBVSFxNrv5KrgmP+NsNw9EEQW3K2H4cbNZC0zJgeAec6naHmK5RYWVo65WO0DlnsyTLQ== X-Received: by 2002:a05:622a:1c2:b0:413:5f30:9995 with SMTP id t2-20020a05622a01c200b004135f309995mr3771327qtw.36.1694624182439; Wed, 13 Sep 2023 09:56:22 -0700 (PDT) Received: from localhost.localdomain (dsl-149-165.b2b2c.ca. [66.158.149.165]) by smtp.gmail.com with ESMTPSA id jy1-20020a05622a818100b0040f8ac751a5sm4093270qtb.96.2023.09.13.09.56.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Sep 2023 09:56:21 -0700 (PDT) From: Maxim Cournoyer <maxim.cournoyer@HIDDEN> To: guix-patches@HIDDEN Subject: [qt-team PATCH 0/4] Avoid capturing python in qtbase, reinstate tests Date: Wed, 13 Sep 2023 12:56:13 -0400 Message-ID: <cover.1694624089.git.maxim.cournoyer@HIDDEN> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-Debbugs-Cc: Andreas Enge <andreas@HIDDEN>, 宋文武 <iyzsong@HIDDEN> Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:20::836; envelope-from=maxim.cournoyer@HIDDEN; helo=mail-qt1-x836.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: submit Cc: Maxim Cournoyer <maxim.cournoyer@HIDDEN> X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -0.0 (/) Thes series removes Python from the closure of qtbase, both for versions 5.15 and 6.5. It also reinstate a few tests that was made possible thanks to discussions with upstream following reported the issues. Changes in v2: - Also apply fix to qtbase-5 package. Maxim Cournoyer (4): gnu: qtbase: Do not capture Python (again). gnu: qtbase: Add $TZDIR to native search paths. gnu: qtbase: Reinstate date related tests. gnu: qtdeclarative: Add a debug output. gnu/packages/patches/qtbase-use-TZDIR.patch | 162 ++++++++++++++++---- gnu/packages/qt.scm | 54 ++++--- 2 files changed, 167 insertions(+), 49 deletions(-) base-commit: 4cb2e08b8eb1acc824b72ec17b483d7d85b5af68 -- 2.41.0
Maxim Cournoyer <maxim.cournoyer@HIDDEN>:andreas@HIDDEN, iyzsong@HIDDEN, guix-patches@HIDDEN.
Full text available.andreas@HIDDEN, iyzsong@HIDDEN, guix-patches@HIDDEN:bug#65922; Package guix-patches.
Full text available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.