From patchwork Tue Dec 15 07:31:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andy Tai X-Patchwork-Id: 25782 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 A02C027BDAE; Tue, 15 Dec 2020 07:33:28 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id E152827BDFE for ; Tue, 15 Dec 2020 07:33:25 +0000 (GMT) Received: from localhost ([::1]:54312 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kp4po-0002o3-Vz for patchwork@mira.cbaines.net; Tue, 15 Dec 2020 02:33:25 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33218) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kp4pS-0002X6-DZ for guix-patches@gnu.org; Tue, 15 Dec 2020 02:33:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:43776) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kp4pS-0004lE-6D for guix-patches@gnu.org; Tue, 15 Dec 2020 02:33:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kp4pS-0001AK-41 for guix-patches@gnu.org; Tue, 15 Dec 2020 02:33:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45251] [PATCH] gnu: update terminator Resent-From: Andy Tai Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 15 Dec 2020 07:33:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 45251 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 45251@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16080175504438 (code B ref -1); Tue, 15 Dec 2020 07:33:01 +0000 Received: (at submit) by debbugs.gnu.org; 15 Dec 2020 07:32:30 +0000 Received: from localhost ([127.0.0.1]:55322 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kp4op-00019P-Hl for submit@debbugs.gnu.org; Tue, 15 Dec 2020 02:32:30 -0500 Received: from lists.gnu.org ([209.51.188.17]:47046) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kp4oo-00019H-3I for submit@debbugs.gnu.org; Tue, 15 Dec 2020 02:32:22 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33026) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kp4om-0002DH-8Q for guix-patches@gnu.org; Tue, 15 Dec 2020 02:32:21 -0500 Received: from mail-io1-xd32.google.com ([2607:f8b0:4864:20::d32]:36891) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kp4oj-0004Ys-Kr for guix-patches@gnu.org; Tue, 15 Dec 2020 02:32:19 -0500 Received: by mail-io1-xd32.google.com with SMTP id p187so19541505iod.4 for ; Mon, 14 Dec 2020 23:32:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=atai-org.20150623.gappssmtp.com; s=20150623; h=mime-version:from:date:message-id:subject:to :content-transfer-encoding; bh=EwSmxz5ZHXsDmCnqRYN01IyWS7FD3XE1H1Pohz2etAI=; b=IFm1DWfvBSHdkBp7sRa8ZlTEmW39wPdkZ17RO+ZQb0O3ITjxQTsCB/d1az1orgQE1w g0XX8TnIf0cR7Gmv1z/j8kaYVEzcSRDhqShOjHxppcurnTJwcfPoch382Eykjt8J1WMS MVPMvo9VSeBZRPuADYAD0jrZZEQsrroO1lgOlZmQjm3HF1K8pdNp7QyiQWVsu+gbpWN+ vG0zX+kBJBFNVmjjam+Mw+JRAJFuGMrEkQy7qEjIZS7CnCkVo4CFTV5QMhjUQ/QDfRkB uN2R+dyOmtpb/FvN3jOcMtL6i3ZpMeCGcmSwIecxSP5WoXglvkd+zT1PZjS2r8KtHilf 821w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to :content-transfer-encoding; bh=EwSmxz5ZHXsDmCnqRYN01IyWS7FD3XE1H1Pohz2etAI=; b=uUAtCQalxMZ7OjIu1nXsHZpyJ/NOFyPOM/F4O86L6GkeXw+GXL6k3c3fZ3BuxnHyMZ phDrmq87Y04yeBK//WJxOHF0t/2sB+I/7Ix+g0VNfVbBBX/gtbl22Ur1zUuMxGHEf0D6 qEHGyIoI1p4xSeB76z0wOgOOD1TaZpz74Uwu5Pc0oH17stfqZtMO0j5/GYyxBk8ZD80S 75ALWZfgn8Jd1LNoofYWs23NF5+TncEb0wn7++DaSokiofvRYG45jUNIUBx9NbT3/EdD tBC7OFRyEMxmiMMi9JyyqKo4mmE8mfJqYflFolVVrHv8Qf0rDeMoiGbYCmjoZwBd/Lhn Q/Lw== X-Gm-Message-State: AOAM53262Nqg7jg/GgI10/mdObQggtvb1PuU0LeqfWI2a/NJq0Ih8Y2y J6ZQQTUuGJsjKsBNKLwdn7bsZ+kwaxzGXNCj8fpM2UCbcZsvoQ== X-Google-Smtp-Source: ABdhPJwxlYbXRcPZWqqgCapqvsQQZ+1HzkXctGPfqaJwEThd+83Q9XKXOfmpMMukCHYO6hi2yyImIor9cl/gaG9YXqg= X-Received: by 2002:a05:6602:26d4:: with SMTP id g20mr36904326ioo.152.1608017535794; Mon, 14 Dec 2020 23:32:15 -0800 (PST) MIME-Version: 1.0 From: Andy Tai Date: Mon, 14 Dec 2020 23:31:39 -0800 Message-ID: Received-SPF: pass client-ip=2607:f8b0:4864:20::d32; envelope-from=lichengtai@gmail.com; helo=mail-io1-xd32.google.com X-Spam_score_int: -13 X-Spam_score: -1.4 X-Spam_bar: - X-Spam_report: (-1.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/gnome.scm (terminator): update to 1.92 --- gnu/packages/gnome.scm | 43 ++++++++++++++++++++++++++---------------- 1 file changed, 27 insertions(+), 16 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 64fded105a..3244cdd648 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -56,6 +56,7 @@ ;;; Copyright © 2020 Arun Isaac ;;; Copyright © 2020 Michael Rohleder ;;; Copyright © 2020 Tim Gesthuizen +;;; Copyright © 2020 Andy Tai ;;; ;;; This file is part of GNU Guix. ;;; @@ -10858,32 +10859,37 @@ advanced image management tool") (define-public terminator (package (name "terminator") - (version "1.91") + (version "1.92") (source (origin (method url-fetch) - (uri (string-append "https://launchpad.net/" name "/" - "gtk3/" version "/" "+download/" + (uri (string-append "https://github.com/gnome-" name "/" name "/" + "releases/download/v" version "/" name "-" version ".tar.gz")) (sha256 (base32 - "0sdyqwydmdnh7j6mn74vrywz35m416kqsbxbrqcnv5ak08y6xxwm")))) + "1wbkfp0nk6x9bcwi681zy30qmrp4h754sdz6b7hi9j22mmvdd50z")))) (build-system python-build-system) (native-inputs - `(("intltool" ,intltool) + `(("gettext" ,gettext-minimal) ("glib:bin" ,glib "bin") ; for glib-compile-resources - ("gettext" ,gettext-minimal) - ("pkg-config" ,pkg-config))) + ("gobject-introspection" ,gobject-introspection) + ("intltool" ,intltool) + ("pkg-config" ,pkg-config) + ("python-psutil" ,python-psutil) + ("python-pytest-runner" ,python-pytest-runner) + ("python-pytest" ,python-pytest))) (inputs `(("cairo" ,cairo) - ("gobject-introspection" ,gobject-introspection) + ("dbus-glib" ,dbus-glib) ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) - ("python2-pycairo" ,python2-pycairo) - ("python2-pygobject" ,python2-pygobject) - ("python2-psutil" ,python2-psutil) + ("gtk+" ,gtk+) + ("python-pycairo" ,python-pycairo) + ("python-pygobject" ,python-pygobject) ("vte" ,vte))) + (propagated-inputs + `(("python-configobj" ,python-configobj))) (arguments - `(#:python ,python-2 ; Python 3 isn't supported - #:imported-modules ((guix build glib-or-gtk-build-system) + `(#:imported-modules ((guix build glib-or-gtk-build-system) ,@%python-build-system-modules) #:modules ((guix build python-build-system) ((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:) @@ -10894,14 +10900,19 @@ advanced image management tool") 'install 'wrap-program (lambda* (#:key outputs #:allow-other-keys) (let ((prog (string-append (assoc-ref outputs "out") - "/bin/terminator"))) + "/bin/terminator")) + (pylib (string-append (assoc-ref outputs "out") + "/lib/python" + ,(version-major+minor + (package-version python)) + "/site-packages"))) (wrap-program prog - `("PYTHONPATH" = (,(getenv "PYTHONPATH"))) + `("PYTHONPATH" = (,(getenv "PYTHONPATH") ,pylib)) `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH")))) #t))) (add-after 'wrap-program 'glib-or-gtk-wrap (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))))) - (home-page "https://gnometerminator.blogspot.com/") + (home-page "https://gnome-terminator.org/") (synopsis "Store and run multiple GNOME terminals in one window") (description "Terminator allows you to run multiple GNOME terminals in a grid and