From patchwork Mon Aug 21 04:26:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Aaron Covrig X-Patchwork-Id: 53059 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 59BBF27BBE2; Mon, 21 Aug 2023 05:28:15 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id CA09227BBE9 for ; Mon, 21 Aug 2023 05:28:13 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qXwWI-0005Zl-2m; Mon, 21 Aug 2023 00:28:02 -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 1qXwWG-0005Zc-B0 for guix-patches@gnu.org; Mon, 21 Aug 2023 00:28:00 -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 1qXwWG-0001SB-2q for guix-patches@gnu.org; Mon, 21 Aug 2023 00:28:00 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qXwWH-0004ao-PV for guix-patches@gnu.org; Mon, 21 Aug 2023 00:28:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65330] [PATCH v1] Fixing tilix compile issues by including updates References: In-Reply-To: Resent-From: Aaron Covrig Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 21 Aug 2023 04:28:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65330 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65330@debbugs.gnu.org Cc: Aaron Covrig Received: via spool by 65330-submit@debbugs.gnu.org id=B65330.169259203017593 (code B ref 65330); Mon, 21 Aug 2023 04:28:01 +0000 Received: (at 65330) by debbugs.gnu.org; 21 Aug 2023 04:27:10 +0000 Received: from localhost ([127.0.0.1]:55155 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qXwVR-0004Zh-J8 for submit@debbugs.gnu.org; Mon, 21 Aug 2023 00:27:09 -0400 Received: from mail-qt1-x82e.google.com ([2607:f8b0:4864:20::82e]:61917) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qXwVP-0004ZB-6x for 65330@debbugs.gnu.org; Mon, 21 Aug 2023 00:27:08 -0400 Received: by mail-qt1-x82e.google.com with SMTP id d75a77b69052e-4106b6aa94bso20600371cf.3 for <65330@debbugs.gnu.org>; Sun, 20 Aug 2023 21:27:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ieee.org; s=google; t=1692592019; x=1693196819; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=78sQ4rjXqSrnRBwUZlCZTX51we0T88gEx1hgCrYcMUs=; b=MDTGeJXo9TEKFhFAqNUXEO2a1pp+Z5nblcKqzXjzzQ4TBd14JleRvr0jXJcodoT/qV kvuMvF+TkkGP44KY8amKD+RzhnYhqSKF6dZGUqDlTEdfggLI0Fpl7B/FgrWwFRhfL1kJ c45QW04yZURUPqAqEsSFWrhL6Ab4dknDTWYuY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692592019; x=1693196819; 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=78sQ4rjXqSrnRBwUZlCZTX51we0T88gEx1hgCrYcMUs=; b=EHxq2gjS3MZOGEbk7FFAWySz5LFqO7EyUMnnF2rBJln4xl1rEvHNnp/AXB8YMf/GCH uvc71SzmkWZQzaL3UjBNzlqan9F/HxXxKJLXvBDaM1OAVoWlzMZi5rM4YUNYg8pqZkp6 V9obQX+QLCRmud0bAU1RIedGazIE0DSMyYJGqdTXJiV+hT8TD7XnCB0OVR6siE/Ex9g4 lw4NR04i29hrmv2/Eqhvvkk7JSwAJDeiJvQG3BphBLa8HNOVWogzsvHip9/lH/Vrb4UO R7FsEmELJxq0GSfRSFOgQqC77jkPRo3Ioqjmsdnc1bClybNAtz3TzFHrkL1ygf8O577F 9RCg== X-Gm-Message-State: AOJu0Yyluhl/e0TKLNAKtr7LiqlgAZp9V7e5XIpSF3SvFRvNIjnTI23V pwubuYlaJ8zZrtuBRdW0S8g9OihEcTrgs3w6g87WXiALjQFVgufNPLgrQ5omv8oXqTWh6OOm1Xb u62cw/1DhDJbJtz7xpqD2QfdlHcMQ1P4sZhIJghpmOZiU9+0sRsvMn8gfLM14I5S3U7azGaCMMz meSBqBDQ== X-Google-Smtp-Source: AGHT+IH475XcvGbEbyek3/3AL4xMU8joE7plHw/sE61+lGwz8MvM0mwoqJgdSpirfs8sH3VkTg2ZQA== X-Received: by 2002:ac8:590f:0:b0:405:5ae6:9f3e with SMTP id 15-20020ac8590f000000b004055ae69f3emr7760500qty.33.1692592019306; Sun, 20 Aug 2023 21:26:59 -0700 (PDT) Received: from mobile-dev.lan (c-73-172-106-204.hsd1.md.comcast.net. [73.172.106.204]) by smtp.gmail.com with ESMTPSA id ih14-20020a05622a6a8e00b00400a99b8b38sm2074031qtb.78.2023.08.20.21.26.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Aug 2023 21:26:59 -0700 (PDT) Date: Mon, 21 Aug 2023 00:26:15 -0400 Message-ID: <17bcec724e8a16665c3f17079ced6ac46bff7e98.1692591975.git.aaron.covrig.us@ieee.org> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 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: Aaron Covrig X-ACL-Warn: , Aaron Covrig via Guix-patches X-Patchwork-Original-From: Aaron Covrig via Guix-patches via From: Aaron Covrig Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches 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 gnu/packages/terminals.scm | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) base-commit: 7cad70566322262f6acdbbb965e867e34010eb55 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 © 2022 Felipe Balbi ;;; Copyright © 2022 ( ;;; Copyright © 2022 jgart +;;; Copyright © 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