From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:1008:1e59::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms1.migadu.com with LMTPS id 6FOdMLJoU2ZhRwAAA41jLg (envelope-from ) for ; Sun, 26 May 2024 18:52:02 +0200 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id +JdaKbJoU2ZUKgAA62LTzQ (envelope-from ) for ; Sun, 26 May 2024 18:52:02 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1716742322; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post; bh=ODewBXK1DhFba5+uluWzRqspCZIT131IE5aoyjAokSQ=; b=oausym4ktQ2tME6/pGUNOvYmw5WG9hGa4pHMjDSoA0QVsPvUXnzHp9CsWmmnMnWVMVU/7e G1At/mqEyxKzLA5h09doNHNvkq50wWpSZWIqDHsjuwfiItiA8G1dIl7Ml9a1v391T6Rmi5 l32S1Iw4EIlPp3+B5usWftMtVe4hDgyvk1e2IbTVR04d5ZKsKlxJEWLzArceEAq4I7rdO8 9fVT5sqRtjZCaV64GA/mWre79C80jRA7WV4RqYLsyqmwgZWunV2zs7zD9SLzpja1hTf0/M qcDBT4I4DCZFF/2dX5SaJPEk9eS5JcliEtHweImAtowhycEabs5+8FNy2B2uKA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=none ARC-Seal: i=1; s=key1; d=yhetil.org; t=1716742322; a=rsa-sha256; cv=none; b=FI5nBL6hHIRBRfQASYgo7lTXo5hN2ixbaPZ+3w54/R1E0XqPGZRgY2qabbMYtHp3DFAYHr kml3XYe9mMLYNhii+w1wro2iMjKxi0q2JRhCjKCKe8twminyhzX72cHkByVZIboi/SWkin JZRjC9v66QdjuERBLL/Gmj7JG+59PAJ/lTgFQcxPOfhoDne/2s/DBnf8y4yJLscvuX/3pW qn80awh94yc7cN/4jlrNNtgr6I0+g+Ddv/u4DxQeycWPPa1zNLiQ7aGIAIhqQjv51O7ty/ /P+ZA6q6CYCFtkkbof2gwxwr2PNxR3yfCvwxsfOzRR855DoeN/Hw5A2nPR+vxw== 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 738F867768 for ; Sun, 26 May 2024 18:52:02 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sBH6C-0001jn-9Z; Sun, 26 May 2024 12:51:56 -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 1sBH6A-0001jc-2W for guix-patches@gnu.org; Sun, 26 May 2024 12:51:54 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sBH69-0001Sb-Qe for guix-patches@gnu.org; Sun, 26 May 2024 12:51:53 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sBH6I-0008BS-0A for guix-patches@gnu.org; Sun, 26 May 2024 12:52:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70766] Request to merge "gnome-team" branch Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 26 May 2024 16:52:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70766 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Liliana Marie Prikler Cc: 70766@debbugs.gnu.org Received: via spool by 70766-submit@debbugs.gnu.org id=B70766.171674228131407 (code B ref 70766); Sun, 26 May 2024 16:52:01 +0000 Received: (at 70766) by debbugs.gnu.org; 26 May 2024 16:51:21 +0000 Received: from localhost ([127.0.0.1]:42371 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sBH5d-0008AU-GB for submit@debbugs.gnu.org; Sun, 26 May 2024 12:51:21 -0400 Received: from mira.cbaines.net ([212.71.252.8]:43584) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sBH5Z-0008AK-Ew for 70766@debbugs.gnu.org; Sun, 26 May 2024 12:51:21 -0400 Received: from localhost (unknown [212.132.255.10]) by mira.cbaines.net (Postfix) with ESMTPSA id 0131E27BBE2; Sun, 26 May 2024 17:51:07 +0100 (BST) Received: from felis (localhost.lan [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id d7cfa0ba; Sun, 26 May 2024 16:51:07 +0000 (UTC) From: Christopher Baines In-Reply-To: <2ed5b2af9eda9eb0d558608640d65e8f91af6bf2.camel@gmail.com> (Liliana Marie Prikler's message of "Sat, 25 May 2024 16:58:21 +0200") References: <877cfy3vut.fsf@cbaines.net> <87frugn9ig.fsf@cbaines.net> <86d3d2f83df1f6480f24c4e37d1eefa9bfe92665.camel@gmail.com> <87a5kfguup.fsf@cbaines.net> <2ed5b2af9eda9eb0d558608640d65e8f91af6bf2.camel@gmail.com> User-Agent: mu4e 1.12.2; emacs 29.3 Date: Sun, 26 May 2024 17:51:04 +0100 Message-ID: <87h6ekfrev.fsf@cbaines.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -8.44 X-Spam-Score: -8.44 X-Migadu-Queue-Id: 738F867768 X-Migadu-Scanner: mx13.migadu.com X-TUID: 4SzyeQvzCZHL --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Liliana Marie Prikler writes: > Am Freitag, dem 24.05.2024 um 15:14 +0100 schrieb Christopher Baines: >> Liliana Marie Prikler writes: >>=20 >> > Am Freitag, dem 17.05.2024 um 09:11 +0100 schrieb Christopher >> > Baines: >> > > gtk is failing to build on aarch64-linux which is blocking lots >> > > of packages, and the failure looks familiar but I haven't made >> > > any progress looking at it. >> >=20 >> > That looks like trouble.=C2=A0 I've fixed up some breaking builds on >> > x86, but I think we might have to block the merge for now if aarch >> > can't be fixed. >>=20 >> I've now pushed 36e49999227e4f621c211ed5f1a506a3046052df to gnome- >> team which I hope will fix gtk where it's broken. > > QA looks good[1]. Things had flipped to unknown rather than blocked, but I think there were still some blocked builds, but mostly due to a flaky python-scikit-image test. I've now pushed a fix for that to master [1] and rebased gnome-team. I've also squashed my gtk change in to the gtk update commit. 2: https://issues.guix.gnu.org/70997 > How do we proceed with the merge? Just `git merge`? Or should we > rebase on gnome-team and then merge? Now that I've rebased the branch, it'll take a little while for QA to check things again, but I don't know of any problems. To merge it to master, you can either just merge, or rebase and merge (so that it's a fast forward rebase). --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAmZTaHhfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh aW5lcy5uZXQACgkQXiijOwuE9Xfz8Q/9Ek9zclL2480bQpK0OhztgldKYUjcjtyb 1pj4AJfK+gjFFS/WVRUdRzaVd1mWSMGQluxLSCQx3GVpMb5534RVoPBFpnohAf9v DgOfauXUplYBrVbCzlkbymjf/cymZXvKhyl0cbeg3Dlvnepki4McF+JsULYuh+Me msOsGU3HnFb5H5GUL/ywwWoQWCT/8cR6UpLnMFHfY6IRmzLM1xwFj7fZnDmcSKZG KJcyvgsZgjxr3di9yhWQxOW5gQlKrr+zyybqQGj5U/ShCEeOGxhgFeZB53J9O+RG khhwFLb18HLkbRaSkYMA2BvFg359rCgFDX3C24GgNegVncpgJTRxElNRWzIJytdY 4vnaxwaJ+cJZCsRL5zmbrN/vkN1ib5TqLzht2tQ41Rc7kfXej8vzAINh10l942I7 iws9p5zxQuAGIok//Ecm6ActA+8VsFO8bIkB/6sxwfUUrZm4yHRBPJiAxKYd/L+H Ajf00PfAFwRRwSjmfSkDFjpjT0g0Jm5cgopXDNEgnY/tCR/6VBB1VKUx8XXU/oTM dfJahSbBgPGGlXzErJ8UnJllT/3UBHkdsHdHde0MSSIP9NKT4HTwfEYLw9sXLSRT m9GF42zjEShfXmVFLnfVkJQJj9O9zJqJSwZl4jyHeka8FYaNjMBnjdLGo4RFC4ww z1IHawn6+d4= =fWl1 -----END PGP SIGNATURE----- --=-=-=--