From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id cLgtNgPMwV7UAQAA0tVLHw (envelope-from ) for ; Sun, 17 May 2020 23:42:59 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id IC0SMgPMwV5qAgAA1q6Kng (envelope-from ) for ; Sun, 17 May 2020 23:42:59 +0000 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 3FB4C9402D1 for ; Sun, 17 May 2020 23:42:59 +0000 (UTC) Received: from localhost ([::1]:34610 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jaSvp-0006Gv-0h for larch@yhetil.org; Sun, 17 May 2020 19:42:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42910) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jaSsA-0005l9-4D for guix-patches@gnu.org; Sun, 17 May 2020 19:39:12 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33574) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jaSs2-0004lE-E0 for guix-patches@gnu.org; Sun, 17 May 2020 19:39:09 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jaSs2-0001rD-C0 for guix-patches@gnu.org; Sun, 17 May 2020 19:39:02 -0400 Subject: bug#40791: todays patch Resent-From: Marius Bakke Original-Sender: "Debbugs-submit" Resent-To: guix-patches@gnu.org Resent-Date: Sun, 17 May 2020 23:39:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 40791 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Tom , 40791-done@debbugs.gnu.org Mail-Followup-To: 40791@debbugs.gnu.org, mbakke@fastmail.com, tomz@freedommail.ch Received: via spool by 40791-done@debbugs.gnu.org id=D40791.15897586847069 (code D ref 40791); Sun, 17 May 2020 23:39:02 +0000 Received: (at 40791-done) by debbugs.gnu.org; 17 May 2020 23:38:04 +0000 Received: from localhost ([127.0.0.1]:45117 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jaSr0-0001pU-UY for submit@debbugs.gnu.org; Sun, 17 May 2020 19:38:04 -0400 Received: from wout5-smtp.messagingengine.com ([64.147.123.21]:48485) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jaSqw-0001pE-LF for 40791-done@debbugs.gnu.org; Sun, 17 May 2020 19:37:58 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.west.internal (Postfix) with ESMTP id AD2375DA9; Sun, 17 May 2020 19:37:48 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Sun, 17 May 2020 19:37:48 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= from:to:subject:in-reply-to:references:date:message-id :mime-version:content-type; s=fm2; bh=k6OkWVJtHv5UPiiySXB3Ymsv/a WvpD3r8eEuZogPhgQ=; b=qbtJIBztAi3q9OPXiAOjKmlTu/lBzN97GzFJxtKo78 yjt/YtMjCvTLFSaeuDSfPc8fun+TquU2LSK0M18CMXAahI9CM6VuiSYf7IJkr5Vm cUWKVf1d40KfOb2UfzOcy+zCPL26L/reskSIPMLWDeL0pmMRPUZwicKJnFENHLhv FpqMm/90InQe3r4EcLL57V+ifX+U4P4y7/qEUSqjABA7b54qwe3lKpsnCbodzZpq vliUKoqXmMFhYDV+sajFus5fb382i/L2+l6LgdHj5slptFqRdL5PTU37dhsZCUny sYp2nTNtlBwkUYOE3aGQOxmiODMYry0uH6YvnSOv/D5w== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=k6OkWV JtHv5UPiiySXB3Ymsv/aWvpD3r8eEuZogPhgQ=; b=By+2duEZu4sNRCWAZouaOF sXjp/nYkonKzvBA/y6w5PcVqA1UQYL4+QXAzXwE10avq1MIUv4OsD5VLy2jbA4Y4 SkFk/7DumaMv8DAxW8oqJJSs/DNBWMe6YTGMf21RaUXUGrww2I3T7jbwOQmAzWx0 f4wpTQfnBsrQ8LQwaiLFmZ41qfozNkVA1EaaLQIfMF6Dy4tgyC43kz6e0gyKsSbt t0pr5M+lPrPfXGTu7WeguMbTuDFWJ61ug4M4usd3ItTZJbSq05uWSoAa1UaWp2Ua IOhfmi7qZkPXymwt8e6qAsRLnNkju3J/SFllFxRxOAMC3EzLVpyVHkrrCV0EKLfQ == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduhedruddtgedgvdefucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffujghffgffkfggtgesghdtre ertdertdenucfhrhhomhepofgrrhhiuhhsuceurghkkhgvuceomhgsrghkkhgvsehfrghs thhmrghilhdrtghomheqnecuggftrfgrthhtvghrnhepfeejfeeiffejjeethfekteetve efudehffefudejhfeiffdtudegtdeitdettdehnecuffhomhgrihhnpeguvggsihgrnhdr ohhrghdpqhhtrdhiohenucfkphepkeegrddvtddvrdeikedrjeehnecuvehluhhsthgvrh fuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepmhgsrghkkhgvsehfrghsthhm rghilhdrtghomh X-ME-Proxy: Received: from localhost (ti0006q161-2604.bb.online.no [84.202.68.75]) by mail.messagingengine.com (Postfix) with ESMTPA id C218F3280060; Sun, 17 May 2020 19:37:47 -0400 (EDT) From: Marius Bakke In-Reply-To: <1819894.BzRgMNaeKi@peach> References: <2419210.ElGaqSPkdT@peach> <1819894.BzRgMNaeKi@peach> User-Agent: Notmuch/0.29.3 (https://notmuchmail.org) Emacs/26.3 (x86_64-pc-linux-gnu) Date: Mon, 18 May 2020 01:37:46 +0200 Message-ID: <87imgurv3p.fsf@devup.no> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -1.7 (-) X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=fail (rsa verify failed) header.d=fastmail.com header.s=fm2 header.b=qbtJIBzt; dkim=fail (rsa verify failed) header.d=messagingengine.com header.s=fm2 header.b=By+2duEZ; dmarc=fail reason="SPF not aligned (relaxed)" header.from=fastmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam-Score: 0.49 X-TUID: SZBwZse04Baz --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Hello! Tom via Guix-patches via writes: > This incorporates all suggestions. > > As each individual missing item in the qtwebengine requires a full rebuil= d to=20 > get one line of error, I've done enough for today. See the amount of line= s=20 > added ;) Phew, there was still a _lot_ of dependencies missing. Even without repacking for every iteration it took hours just to collect them all. > From 180da08e2b2d17cafab4b92b1074867516a2d6eb Mon Sep 17 00:00:00 2001 > From: TomZ > Date: Thu, 23 Apr 2020 00:21:31 +0200 > Subject: [PATCH 1/2] gnu: Qt: update to 5.14.2 Please use full sentences in commit messages, i.e. capitalization and full stops. > * gnu/packages/qt.scm (qtsvg, qtimageformats, qtx11extras, > qtxmlpatterns, qtconnectivity, qtwebsockets, qtsensors, > qtmultimedia, qtserialport, qtserialbus, qtwebchannel, > qtwebview, qtlocation, qttools, qtscript, qtquickcontrols, > qtquickcontrols2, qtgraphicaleffects, qtgamepad, qtscxml, > qtpurchasing, qtcharts, qtdatavis3d, qtnetworkauth, > qtspeech, qtwebengine): Update to 5.14.2 > > * gnu/packages/qt.scm (qtcanvas3d): removed. Upstream deprected it. > > * gnu/packages/qt.scm (qtbase): drop TZDIR patch, patched code no > longer exists. Here you meant qtbase-QTBUG-81715.patch. > Drop X11lib substitute: patched dir no longer exists. > Update to 5.14.2 > > * gnu/packages/qt.scm (qtwayland): disable tests because most of > them crash without message. Actually only two failed, with fairly clear error messages. Figuring out how to disable them took some time though. I did not look very closely into what caused the failures, as one of the first hits on a web search was that Debian disables the exact same test: https://ftp-master.debian.org/new/qtwayland-opensource-src_5.14.2-1.html So we're in good company, at least. :-) > Update to 5.14.2 > > * gnu/packages/qt.scm (qtwebglplugin):[inputs] add zlib Nit-pick: colon after the [section]. > Update to 5.14.2 > > * gnu/packages/qt.scm (qtremoteobjects): disable some tests that missing [arguments] > fail due to missing network. > Update to 5.14.2 > > * gnu/packages/qt.scm (qtdeclarative):[inputs] add vulcan-headers > Update to 5.14.2 I fixed these issues and typos for you. > --- > gnu/packages/patches/qtbase-use-TZDIR.patch | 4 +- > gnu/packages/qt.scm | 222 ++++++++------------ > 2 files changed, 92 insertions(+), 134 deletions(-) > > diff --git a/gnu/packages/patches/qtbase-use-TZDIR.patch b/gnu/packages/p= atches/qtbase-use-TZDIR.patch > index 11c737d844..b6c377b133 100644 > --- a/gnu/packages/patches/qtbase-use-TZDIR.patch > +++ b/gnu/packages/patches/qtbase-use-TZDIR.patch > @@ -4,8 +4,8 @@ important to be able to update it fast. >=20=20 > Based on a patch fron NixOS. > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > ---- qtbase-opensource-src-5.9.4.orig/src/corelib/tools/qtimezoneprivate_= tz.cpp > -+++ qtbase-opensource-src-5.9.4/src/corelib/tools/qtimezoneprivate_tz.cpp > +--- 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 We both forgot to mention this part in the commit message though! > @@ -70,7 +70,11 @@ > // Parse zone.tab table, assume lists all installed zones, if not will = need to read directories > static QTzTimeZoneHash loadTzTimeZones() > diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm > index 8a57127771..aa121fbb5f 100644 > --- a/gnu/packages/qt.scm > +++ b/gnu/packages/qt.scm > @@ -351,7 +351,7 @@ developers using C++ or QML, a CSS & JavaScript like = language.") > (define-public qtbase > (package > (name "qtbase") > - (version "5.12.7") > + (version "5.14.2") > (source (origin > (method url-fetch) > (uri (string-append "https://download.qt.io/official_releas= es/qt/" > @@ -360,11 +360,9 @@ developers using C++ or QML, a CSS & JavaScript like= language.") > version ".tar.xz")) > (sha256 > (base32 > - "0pb68d30clksdhgy8n6rrs838bb3qcsfq4pv463yy2nr4p5kk2di")) > - ;; Use TZDIR to avoid depending on package "tzdata". I preserved this comment. > + "12mjsahlma9rw3vz9a6b5h2s6ylg8b34hxc2vnlna5ll429fgfa8")) > (patches (search-patches "qtbase-use-TZDIR.patch" > - "qtbase-moc-ignore-gcc-macro.patch" > - "qtbase-QTBUG-81715.patch")) > + "qtbase-moc-ignore-gcc-macro.patch= ")) Remember to delete patches from git as well as gnu/local.mk too. Fixed! I finally pushed this as 883d0484ddcf3b9f3ff8bd8e6de70627201f2763. However, qtwebengine is not finished building yet and may still be missing some dependencies. I'll fix any remaining issues tomorrow. Thanks a lot for the effort here, and sorry for the delay! --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAl7BysoACgkQoqBt8qM6 VPo7Vwf+OG55MfYaRuliA+Dde0WoSZo1qGWN5KTAQ3MDfVF6RC0HxM72FpHZL/bv ZTlPSPgHxIrTIaoEOZLc2LaOKpWwCJ7cKNH9w/PZffaDTj6xshVYG21BBxhByHcK 30iWYqrUUz1rTQa+Bjo6NgeThFkHeo6uVZfpFQ2RPjKvS+awMUCHSUVFIcCJ3Bng 6Vtyzc+K8racUJ9aCCRYWXYjNc/BDgpaaxJOAc7fmLaPxq9q1kM1HbPzbB1jH9qW mpQJ66MalzKJY8jfN1ZxlcaS60x9zh3EJqGVOVNO1XJzv7wlSOvapLQWjauSswFZ 7hEdkyqCZa98DUEs+y/qOHTPRsvylg== =X78+ -----END PGP SIGNATURE----- --=-=-=--