From patchwork Wed Aug 16 01:34:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Aaron Covrig X-Patchwork-Id: 52948 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 F13EC27BBE2; Wed, 16 Aug 2023 14:01:28 +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 6FF6C27BBE9 for ; Wed, 16 Aug 2023 14:01:26 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qWG9B-0008GC-L0; Wed, 16 Aug 2023 09:01:13 -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 1qW6Ae-00017h-4L for guix-patches@gnu.org; Tue, 15 Aug 2023 22:22:04 -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 1qW6Ad-0000hS-QZ for guix-patches@gnu.org; Tue, 15 Aug 2023 22:22:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qW6Ad-00031G-JZ for guix-patches@gnu.org; Tue, 15 Aug 2023 22:22:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65330] [PATCH] Fixing tilix compile issue by upgrading version Resent-From: Aaron Covrig Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 16 Aug 2023 02:22:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 65330 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65330@debbugs.gnu.org Cc: Aaron Covrig X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.169215249611537 (code B ref -1); Wed, 16 Aug 2023 02:22:03 +0000 Received: (at submit) by debbugs.gnu.org; 16 Aug 2023 02:21:36 +0000 Received: from localhost ([127.0.0.1]:38475 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qW6AA-0002zy-OD for submit@debbugs.gnu.org; Tue, 15 Aug 2023 22:21:36 -0400 Received: from lists.gnu.org ([2001:470:142::17]:56132) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qW5RR-0001oq-37 for submit@debbugs.gnu.org; Tue, 15 Aug 2023 21:35:23 -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 1qW5RK-0002gF-2Z for guix-patches@gnu.org; Tue, 15 Aug 2023 21:35:14 -0400 Received: from mail-qt1-x833.google.com ([2607:f8b0:4864:20::833]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qW5RG-00088p-UH for guix-patches@gnu.org; Tue, 15 Aug 2023 21:35:13 -0400 Received: by mail-qt1-x833.google.com with SMTP id d75a77b69052e-40fee14093dso35121881cf.1 for ; Tue, 15 Aug 2023 18:35:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ieee.org; s=google; t=1692149708; x=1692754508; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=ZPsqEQXOkEB2XkmiQej09FJoFLn6Fb+DgvNpV5b88/0=; b=GszFpFGi7vBvNzpJLtG148+YmMoGezX6G9meIR8bxB36FaXwH+ndRmHS5wFuoIOWZL DZnthqW+P5pPusH5sruLFDbakh5fNhYhY8WERJcvCY03n2d/l5DbD4jLIRiY2S1kPUy5 5zevp2maadWkD/keDeVHZKIbnJJZ3Xr6axwrc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692149708; x=1692754508; 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=ZPsqEQXOkEB2XkmiQej09FJoFLn6Fb+DgvNpV5b88/0=; b=Mgtd+Fvbaos+BtxKOwstq8RYm7b6pVM+URao0C7R4VYd77/QePQkEZ7cj33R9zBaVl PV/lLX1gGacqYU/CUFhtZoiKxMBl3AsCEeUdbIGrn5uSi9jZ7+ysLQz6aZuxQXfTymG9 NmuGVSJOqFXEHYWIpHCIM/jSkH8x1rV7gigXtcOb4C3HKwjnBx60Xm/Zk+WFK132rD3y J7CedvbG1+egp4Bd7PiIgooUYQXISqWCuvAnwG9iyyH2BC9C+9YTPiWg8o3WNlmVhfMP +CjXpQjhOszZkhZinpcqtiNXgGF49V1eMEXoYxSuIStPGjHYdFfeebbI39ezT2wEwCLR k4nQ== X-Gm-Message-State: AOJu0Yx3wNILzaQiDnUmUyoRxItTavjJ0d14eOscZql+MZuVsfC5TSBk Y8XEgIgqTS/aFjLppFRzHpxEjlNaN8z05TuMRF/jGJnSoPrG+Jvog3nC+HUVRbNezwnTESx3WFi IHvLjnS0qUftgwg4FMHg3YIdy5ViovNaIp497jLYHVjn3iKz+PlQzZXvcnlX8emESZd3qOcxfLK q16W4P X-Google-Smtp-Source: AGHT+IFL7c8MsulwU/R20Fe0WBWDo1ZIfFvC5KZiHd1Rwf4trGoh3EafuOHM1Dtj0xwOOrkmfqTNPQ== X-Received: by 2002:a05:622a:40f:b0:40f:efce:dcf with SMTP id n15-20020a05622a040f00b0040fefce0dcfmr610328qtx.16.1692149708026; Tue, 15 Aug 2023 18:35:08 -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 e29-20020ac8011d000000b00405553305casm4214057qtg.86.2023.08.15.18.35.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Aug 2023 18:35:07 -0700 (PDT) Date: Tue, 15 Aug 2023 21:34:59 -0400 Message-ID: X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::833; envelope-from=aaron.covrig.us@ieee.org; helo=mail-qt1-x833.google.com 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, DKIMWL_WL_HIGH=-0.04, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Tue, 15 Aug 2023 22:21:31 -0400 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Mailman-Approved-At: Wed, 16 Aug 2023 09:01:09 -0400 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 Changes: 1. Changed tilix from v1.9.5 to untagged v1.9.6 --- gnu/packages/terminals.scm | 92 +++++++++++++++++++------------------- 1 file changed, 47 insertions(+), 45 deletions(-) base-commit: be6f5edd445850720dfcec2642db643b84fc0645 diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index 081ef19af1..57f72881a8 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,50 +1340,51 @@ (define-public wterm (deprecated-package "wterm" foot)) (define-public tilix - (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")))) - (build-system meson-build-system) - (arguments - `(#:glib-or-gtk? #t - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'set-env-variables - (lambda _ - (setenv "CC" ,(cc-for-target)))) - (add-after 'unpack 'skip-gtk-update-icon-cache - (lambda _ - (substitute* "meson_post_install.py" - (("gtk-update-icon-cache") (which "true")) - (("update-desktop-database") (which "true")))))))) - (inputs - (list dbus - dconf - gsettings-desktop-schemas - gtk+ - gtkd - ldc - libsecret - libunwind - vte)) - (native-inputs - (list appstream - gettext-minimal - (list glib "bin") - ldc - pkg-config)) - (home-page "https://gnunn1.github.io/tilix-web/") - (synopsis "Tiling terminal emulator") - (description "Tilix is a tiling terminal emulator following the + (let ((commit "e2c75f417a84ad784735524f1b8bf01c516f705d") + (revision "1")) ;Guix package revision + (package + (name "tilix") + ;; unreleased version 1.9.6 (RELEASE.md reports 1.9.6, but no Git tag created) + (version (git-version "1.9.6" 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 + #:phases (modify-phases %standard-phases + (add-after 'unpack 'set-env-variables + (lambda _ + (setenv "CC" + ,(cc-for-target)))) + (add-after 'unpack 'skip-gtk-update-icon-cache + (lambda _ + (substitute* "meson_post_install.py" + (("gtk-update-icon-cache") + (which "true")) + (("update-desktop-database") + (which "true")))))))) + (inputs (list dbus + dconf + gsettings-desktop-schemas + gtk+ + gtkd + ldc + libsecret + libunwind + vte)) + (native-inputs (list appstream gettext-minimal + (list glib "bin") ldc pkg-config)) + (home-page "https://gnunn1.github.io/tilix-web/") + (synopsis "Tiling terminal emulator") + (description + "Tilix is a tiling terminal emulator following the Gnome Human Interface Guidelines. Its features include: @enumerate @item Layout terminals in any fashion by splitting them horizontally or @@ -1394,7 +1396,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