From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:403:478a::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id 2FlkGeYH5WT2iQAASxT56A (envelope-from ) for ; Tue, 22 Aug 2023 21:09:26 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:478a::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id sC+AGOYH5WRtsAAAG6o9tA (envelope-from ) for ; Tue, 22 Aug 2023 21:09:26 +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 323D56B239 for ; Tue, 22 Aug 2023 21:09:26 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=protonmail.com header.s=protonmail3 header.b=fiEHps+R; 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=pass (policy=none) header.from=gnu.org ARC-Seal: i=1; s=key1; d=yhetil.org; t=1692731366; a=rsa-sha256; cv=none; b=Cm93c0KxFlmssxEwMshPctp00vKFCJSvq1woUvRa7PGjCAjWCZDHmJp+Ka021Elk4hHx0B Ae33bbHZWSXkZO7v0C9acXNo8rHcFZSI01kfqFtKPLkoGDoDo5CZcliV82HnYipNk7kn9n MKsoEliPFyZXhYCtUEqGfHyN3sr2ptrILNH5iOk6Wxa1w2i3xwJJJLZwprm45l+1qQDlnr gHzUAuaxNiSTG6gkql9MYOMvXQa9a+aoJ3qE58BBP28WoRO9KTN5OnnVeRd2WqeDJQvsVe d/z1Zd1eVcV46xCKxmvSM30CcmUmZMg5xi9Ky/uTlKgsFrlVz1ndP4aY8NCDqQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=protonmail.com header.s=protonmail3 header.b=fiEHps+R; 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=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1692731366; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-to: 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:dkim-signature; bh=A3orf1kUUkjwgxDHGS2QazmFCBJr00jf/X0GhOltWuk=; b=t7lAe5ezj7pkOZFZVJXNIhtwsfBS8iBKKJ6nZKcdArXIGvMaB6nAjKdHCrII6iRSLp1Dvq Lx+4Mh4ftRQg1++k7iFcKNH9RuUMDRkUfx8z5l/maTxkkX0Jj9HTlQkQHVWOCJLI99eBC+ gxihjRwaNQo2tYyFJ0xKSVCBMY4NfIXTOKxouxdocr07g7k1E9id+Z8NQZHyY2xcP0NZse OBwX5REoBTh/rVyGwkhZ1NBi0b2Z2LUIr/ZFrwLyTDxM6uZ52WioGBxeXzgy9snPFSWENM WftWYwNJDdetIR9ceNSzkyPfFecjUL5QwSQwt5YM3ynnhpzlIO87XIQKofZ51A== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qYWkW-0007oW-Oz; Tue, 22 Aug 2023 15:09:08 -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 1qYWkP-0007co-6J for guix-patches@gnu.org; Tue, 22 Aug 2023 15:09:01 -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 1qYWkN-0006lW-Jd for guix-patches@gnu.org; Tue, 22 Aug 2023 15:09:00 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qYWkQ-0005Iw-2e for guix-patches@gnu.org; Tue, 22 Aug 2023 15:09:02 -0400 Subject: bug#65330: [PATCH] Fixing tilix compile issue by upgrading version References: In-Reply-To: Resent-From: John Kehayias Original-Sender: "Debbugs-submit" Resent-To: guix-patches@gnu.org Resent-Date: Tue, 22 Aug 2023 19:09:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 65330 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Aaron Covrig Cc: 65330-done@debbugs.gnu.org Mail-Followup-To: 65330@debbugs.gnu.org, john.kehayias@protonmail.com, aaron.covrig.us@ieee.org Received: via spool by 65330-done@debbugs.gnu.org id=D65330.169273133120366 (code D ref 65330); Tue, 22 Aug 2023 19:09:01 +0000 Received: (at 65330-done) by debbugs.gnu.org; 22 Aug 2023 19:08:51 +0000 Received: from localhost ([127.0.0.1]:60480 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qYWkF-0005IQ-5E for submit@debbugs.gnu.org; Tue, 22 Aug 2023 15:08:51 -0400 Received: from mail-4316.protonmail.ch ([185.70.43.16]:31197) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qYWkC-0005IB-3o for 65330-done@debbugs.gnu.org; Tue, 22 Aug 2023 15:08:49 -0400 Date: Tue, 22 Aug 2023 19:08:26 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1692731318; x=1692990518; bh=A3orf1kUUkjwgxDHGS2QazmFCBJr00jf/X0GhOltWuk=; h=Date:To:From:Cc:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector; b=fiEHps+R6cKIYdRx5tThJvT2XpPD45v0sYOUO/fd/7Jd3D50/wIbkVndVsU6Gh8Qu Fq4PQPE1bTWaM74ui/91TbI1FJYPZqezBh8ETeu6KmbjDdgdz8SBTK3+Tw+uScFZvk xSAwtdEs5Vne0K0cEOz6FvJVn56aWzkDH8tTXukRBYttSC82v/SH5oxfpEWzi4JtoZ ttSW8zN7g58HPHe4lx/lxQSClAYYZcpHTFGfvpG2SqnbZMOmy+iWUj3g+dHQRi4PDd Mfyw7Af0AdAE/boEmCEPEvcO6QumfnIaDc7yzl3XhP0UWLPSHvGYLJX02vPvxQXE9i IbINuWmFhBOiw== Message-ID: <87y1i2j3oa.fsf_-_@protonmail.com> Feedback-ID: 7805494:user:proton MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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: , Reply-to: John Kehayias X-ACL-Warn: , John Kehayias via Guix-patches From: John Kehayias via Guix-patches via 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-Scanner: mx0.migadu.com X-Spam-Score: -6.70 X-Migadu-Queue-Id: 323D56B239 X-Migadu-Spam-Score: -6.70 X-TUID: /BWdYPZi8DmI Hello, On Mon, Aug 21, 2023 at 12:26 AM, Aaron Covrig wrote: > 1. Changed tilix from v1.9.5 to v1.9.5 + commits > --- > This revision changes the version to reflect that this is built > upon v1.9.5 with added commits, rather than being v1.9.6; > additionally, it corrects line spacing so that only the > changed parts are seen as modified by git We were discussing on IRC the other day. I meant that no changes to the formatting besides the spacing introduced by the let should be made; this still requires re-indenting the rest of the package definition. Anyway, I adjusted the commit message, fixed the formatting, and used the latest commit of tilix. I checked that this built locally as well. Thanks for your contribution! John > gnu/packages/terminals.scm | 26 +++++++++++++++----------- > 1 file changed, 15 insertions(+), 11 deletions(-) > > diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm > index 5fc72d7937..fd55233a5b 100644 > --- a/gnu/packages/terminals.scm > +++ b/gnu/packages/terminals.scm > @@ -33,6 +33,7 @@ > ;;; Copyright =C2=A9 2022 Felipe Balbi > ;;; Copyright =C2=A9 2022 ( > ;;; Copyright =C2=A9 2022 jgart > +;;; Copyright =C2=A9 2023 Aaron Covrig > ;;; > ;;; This file is part of GNU Guix. > ;;; > @@ -1339,18 +1340,21 @@ (define-public wterm > (deprecated-package "wterm" foot)) > > (define-public tilix > +(let ((commit "e2c75f417a84ad784735524f1b8bf01c516f705d") > + (revision "0")) > (package > (name "tilix") > - (version "1.9.5") > - (source > - (origin > - (method git-fetch) > - (uri (git-reference > - (url "https://github.com/gnunn1/tilix") > - (commit version))) > - (file-name (git-file-name name version)) > - (sha256 > - (base32 "1ij3ix6yhi8hicxvglrxjyyv8bch9birrgsr8ml6jfh3hvk4pxdh"))= )) > + ;; includes commits that fix glibc related build issues > + (version (git-version "1.9.5" revision commit)) > + (source (origin > + (method git-fetch) > + (uri (git-reference > + (url "https://github.com/gnunn1/tilix") > + (commit commit))) > + (file-name (git-file-name name version)) > + (sha256 > + (base32 > + "1k5r99c9ab1l0v37hs1zy08rspgv8n7y3bd13ljqg607cyalbgbf"))= )) > (build-system meson-build-system) > (arguments > `(#:glib-or-gtk? #t > @@ -1394,7 +1398,7 @@ (define-public tilix > terminal are replicated to the others. > @item Supports notifications when processes are completed out of view. > @end enumerate") > - (license license:mpl2.0))) > + (license license:mpl2.0)))) > > (define-public tio > (package > > base-commit: 7cad70566322262f6acdbbb965e867e34010eb55