From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id oGzUI7UXN2SgDAEASxT56A (envelope-from ) for ; Wed, 12 Apr 2023 22:42:29 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id 8L7SI7UXN2TENwEA9RJhRA (envelope-from ) for ; Wed, 12 Apr 2023 22:42:29 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 8514339D58 for ; Wed, 12 Apr 2023 22:38:39 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pmhET-000834-Dz; Wed, 12 Apr 2023 16:38:21 -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 1pmhER-00082p-F6 for guix-devel@gnu.org; Wed, 12 Apr 2023 16:38:19 -0400 Received: from jpoiret.xyz ([206.189.101.64]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pmhEP-0001QN-R3 for guix-devel@gnu.org; Wed, 12 Apr 2023 16:38:19 -0400 Received: from authenticated-user (jpoiret.xyz [206.189.101.64]) by jpoiret.xyz (Postfix) with ESMTPA id 4EF01184F2A; Wed, 12 Apr 2023 20:38:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jpoiret.xyz; s=dkim; t=1681331895; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Wil/4O+tXda3qce1E80VBNLPzpO/55FKfVGl45NQr+s=; b=Q41BRwL86+K0ZWqEWIkvPRVWkfZCC36hNvJhOPTPfBVlXCi0q41bv8OIKJRQd6+WYG0EHI srlUXHH7OM72hTLlPwOkgiykYOQkYqDsjD4D5NZf4GeO2NrJeleaNqknr/nSwytRFZTwbB vWk5kDQCXroPWHYXObOJYruykd0bE+X7iFfO9/g6VAtqVbWU469MhYW7ojY2nC0dq6K/87 P1D6YzSVRBlMAIM03yK5F24UGaN5d58jpMInILaGQ+D9gHouO/z/I1sZbcFbG+84AwkCtc pQ5e8Jhieal4BY7mVXT5uqa2q6+APActfbVjtf9YfPbId9EXkMTgGuxby8XU/A== From: Josselin Poiret To: Josselin Poiret , Ricardo Wurmus , guix-devel@gnu.org Subject: [PATCH] WIP upgrade qt 6 to 6.5.0 Date: Wed, 12 Apr 2023 22:38:13 +0200 Message-Id: <5997a4d57e6c2ddfdfa36dea9e485b5dbac51f52.1681331856.git.dev@jpoiret.xyz> In-Reply-To: <877cugvnwq.fsf@jpoiret.xyz> References: <877cugvnwq.fsf@jpoiret.xyz> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spamd-Bar: / Received-SPF: pass client-ip=206.189.101.64; envelope-from=dev@jpoiret.xyz; helo=jpoiret.xyz 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, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: guix-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+larch=yhetil.org@gnu.org Sender: guix-devel-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Seal: i=1; s=key1; d=yhetil.org; t=1681331919; a=rsa-sha256; cv=none; b=e6zhea2CheYAlPk0YkdSozJ40/ihJTyx8Cem0pllaPqxo8VehFf8QdJ0dItVplyhPfhv/X BSY9epZWxB+IHwufmbh/J5j8b3jYCpElUenuTx3AaaoCG47RYposCcb/gLk0ANScJxYfJS QPUvwczD5jUptYZQmrS2rE3SJlaLIoIPWRsUv3qkz3WDMPttnjfVkQBhAukj1Qng9kLe+U 7VfUxLp+UXE9MOHCRJDRiijyKG9RrQAqMafait9PEmdG/YAmHVEXm3auQbtSQlb/Es7HPT GLkFowr0juvANfs+1ou3O+X7+di0wkPlm1sEM4v2hhIFR1J9/AZLiwNcMH/XrQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=jpoiret.xyz header.s=dkim header.b=Q41BRwL8; spf=pass (aspmx1.migadu.com: domain of "guix-devel-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-devel-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=reject) header.from=jpoiret.xyz ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1681331919; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=Wil/4O+tXda3qce1E80VBNLPzpO/55FKfVGl45NQr+s=; b=S6vsx5AggOVYuwBmGK2J4C5MnxWfQI/014Wx8rA3mdSVFFYRpF32Xkr59dS8jud28+LeCm 00RkGXW/sRnsHdFiDXP2vYOv0/m4tY+3EWmyOPczKk17ffXcXhMRqCCVt3YrcHUDzGvKV7 hanX7ICW4Al41f3RHhfErosrh76dFkEearztby0rYUX/MV/aqEIS3/R+TUUaO5tV+5WR6N LuitXI4ELrxKKZ6XdffHVWzutTTfUT7H67nPEXUKfT7RUuMzkwOy+QWzFhuNMHOXOZjEGR qyzOBW8kq36/4hATZQ98K6QlZOX+DR3Kf259+eegWdCe6LDd45eTDyq+7GV6jg== X-Migadu-Scanner: scn1.migadu.com X-Migadu-Spam-Score: -3.10 X-Spam-Score: -3.10 X-Migadu-Queue-Id: 8514339D58 Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=jpoiret.xyz header.s=dkim header.b=Q41BRwL8; spf=pass (aspmx1.migadu.com: domain of "guix-devel-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-devel-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=reject) header.from=jpoiret.xyz X-TUID: cBTV4Jw0Mg8W --- gnu/packages/qt.scm | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index acf2d70736..46fbdb2368 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -68,6 +68,7 @@ (define-module (gnu packages qt) #:use-module (gnu packages cmake) #:use-module (gnu packages compression) #:use-module (gnu packages cpp) + #:use-module (gnu packages crypto) #:use-module (gnu packages cups) #:use-module (gnu packages curl) #:use-module (gnu packages databases) @@ -593,29 +594,28 @@ (define-public qtbase-5 (define-public qtbase (package/inherit qtbase-5 (name "qtbase") - (version "6.3.2") + (version "6.5.0") (source (origin (inherit (package-source qtbase-5)) (uri (qt-urls name version)) (sha256 (base32 - "19m9r8sf9mvyrwipn44if3nhding4ljys2mwf04b7dkhz16vlabr")) + "1vzmxak112llvnx9rdgss99i9bc88rzsaxn59wdyqr5y9xxsmqgx")) (modules '((guix build utils))) (snippet ;; corelib uses bundled harfbuzz, md4, md5, sha3 '(with-directory-excursion "src/3rdparty" (for-each delete-file-recursively - ;; The bundled pcre2 copy is kept, as its headers - ;; are required by some internal bootstrap target - ;; used for the tools. - (list "double-conversion" "freetype" "harfbuzz-ng" - "libpng" "libjpeg" "sqlite" "xcb" "zlib")))))) + (list "blake2" "double-conversion" "freetype" + "harfbuzz-ng" "libpng" "libjpeg" "pcre2" + "sqlite" "xcb" "zlib")))))) (build-system cmake-build-system) (arguments (substitute-keyword-arguments (package-arguments qtbase-5) ((#:configure-flags _ ''()) `(let ((out (assoc-ref %outputs "out"))) - (list "-DQT_BUILD_TESTS=ON" + (list "-GNinja" + "-DQT_BUILD_TESTS=ON" (string-append "-DINSTALL_ARCHDATADIR=" out "/lib/qt6") (string-append "-DINSTALL_DATADIR=" out "/share/qt6") (string-append "-DINSTALL_DOCDIR=" out "/share/doc/qt6") @@ -759,9 +759,6 @@ (define-public qtbase ;; 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. @@ -848,14 +845,21 @@ (define-public qtbase '("device_config.prf" "moc.prf" "qt_build_config.prf" "qt_config.prf")) (("\\$\\$\\[QT_HOST_DATA/get\\]") archdata) - (("\\$\\$\\[QT_HOST_DATA/src\\]") archdata))))))))) + (("\\$\\$\\[QT_HOST_DATA/src\\]") archdata))))) + (replace 'build + (lambda* _ + (invoke "cmake" "--build" "."))) + (replace 'install + (lambda* _ + (invoke "cmake" "--install" "."))))))) (native-inputs (modify-inputs (package-native-inputs qtbase-5) - (prepend wayland-protocols + (prepend ninja + wayland-protocols xvfb-run))) (inputs (modify-inputs (package-inputs qtbase-5) - (prepend bash-minimal coreutils-minimal libxcb md4c) + (prepend bash-minimal coreutils-minimal libb2 libxcb md4c) (replace "postgresql" postgresql))) ;use latest postgresql (native-search-paths (list (search-path-specification base-commit: ac8b2a0469a4884353ac5c0f0854012da0b04fda -- 2.39.2