From patchwork Fri Jan 13 06:51:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andy Tai X-Patchwork-Id: 46080 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 ECBB027BBEB; Fri, 13 Jan 2023 06:52:17 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,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 3F58127BBE9 for ; Fri, 13 Jan 2023 06:52:15 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pGDv3-0005xJ-4Y; Fri, 13 Jan 2023 01:52:05 -0500 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 1pGDv0-0005x4-SH for guix-patches@gnu.org; Fri, 13 Jan 2023 01:52:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pGDv0-0003mC-Am for guix-patches@gnu.org; Fri, 13 Jan 2023 01:52:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pGDv0-000793-7F for guix-patches@gnu.org; Fri, 13 Jan 2023 01:52:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#59059] [PATCH] gnu: terminator: Renamed to "gnome-terminator" and update to 2.1.2 References: In-Reply-To: Resent-From: Andy Tai Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 13 Jan 2023 06:52:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 59059 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: zimoun , 59059@debbugs.gnu.org Received: via spool by 59059-submit@debbugs.gnu.org id=B59059.167359270827441 (code B ref 59059); Fri, 13 Jan 2023 06:52:02 +0000 Received: (at 59059) by debbugs.gnu.org; 13 Jan 2023 06:51:48 +0000 Received: from localhost ([127.0.0.1]:49382 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pGDul-00078X-Le for submit@debbugs.gnu.org; Fri, 13 Jan 2023 01:51:48 -0500 Received: from mail-qk1-f173.google.com ([209.85.222.173]:46909) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pGDuj-00078J-PY for 59059@debbugs.gnu.org; Fri, 13 Jan 2023 01:51:46 -0500 Received: by mail-qk1-f173.google.com with SMTP id k3so10399547qki.13 for <59059@debbugs.gnu.org>; Thu, 12 Jan 2023 22:51:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=M6Zpi2QJhDO2GZNrTOfY9Ne4duq5aJifMCTVZUYczjI=; b=MrcXp+BlH1ksN8NW8W0MeZoEPzdzHjGGgS58ahC0CF6wsbAacGRQL4Q6jtWJpjDRLu 8AsuXEdb4KgstWm1KTi5MkqkT8psFhWCoyGrrjU/DAQCQMwMIdnxAypJ8AIOGmnM30DX NBmtmZ7nfzU/rxQ2FNHBQ5O+A4OH8hODcR05BzZeaGO5fVP7c7uZR9rgFdXqo+F/27hp YQSoxOB+4p4hNSbuqyJTWAvW5aNNf3HOIoZLgE1s9MFxBzLykXvltgfEM4hs7Dj/zb9O /FepifrIdQGWNYoI7dSnlaCDdobEIKvrMDg77omWURbAikbWZZSyajfbq2XNRxIhHyed hBKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=M6Zpi2QJhDO2GZNrTOfY9Ne4duq5aJifMCTVZUYczjI=; b=GWW+RiSMIbzJc4xweASVxj9tVc7h3RYU+EIV/Zy+kQVtA1R/6MHTGTaDvXVGG8nmFb NAxDDCl6Hg8nMRi2YkgzjPywj4bh2DojYJ1Uc63tAoom2CO2xrc4pJxmBxizYGp79auy dfb39xu7BKdkLJbywPuOtVLC33dn65BrhfWQEO2FnkwUiD0RHdi84yGnZPgagjoM/e1l 0cTpU03Uizs0ZcmEHk404nigx4DEP9/t6Cy89cixiCD6UHhUjk5XPmrLthtDm4kkvg0z fG2j7X0U1op3GpreJF7I6zmlTdOTK3/i3MamSgSj0ewDJX02q5udxdzipy288ioPStHk 7KUA== X-Gm-Message-State: AFqh2koGeL1Rjd/26wun45c445yOEcI9xhQLIS+R+9QoaVafhfxiLUj+ 2a7DBERVXju1FTVgv7p4KK40G46ayU7JgoR9nhiB4ufi X-Google-Smtp-Source: AMrXdXs4n2mcpH6E130XGT42CgKdtdtHc9O0e2pfKU6UihLUyjpBTCoqemGgKfsWRn/OYm6KhzQblVkyf5xswNvpa0I= X-Received: by 2002:a05:620a:4720:b0:6ff:cfb5:7c0c with SMTP id bs32-20020a05620a472000b006ffcfb57c0cmr4217563qkb.711.1673592700004; Thu, 12 Jan 2023 22:51:40 -0800 (PST) MIME-Version: 1.0 From: Andy Tai Date: Thu, 12 Jan 2023 22:51:03 -0800 Message-ID: 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches patch reformatted with guix style to be consistent with current desired format From 79f92a9b35ab37c63956ed0958aa196c983111f9 Mon Sep 17 00:00:00 2001 From: Andy Tai Date: Thu, 12 Jan 2023 22:38:50 -0800 Subject: [PATCH] gnu: terminator: Renamed to "gnome-terminator" and update to 2.1.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/gnome.scm (gnome-terminator): Rename variable from (terminator): …this one. Redefine using DEPRECATED-PACKAGE. Update to 2.1.2 --- gnu/packages/gnome.scm | 123 ++++++++++++++++++++++------------------- 1 file changed, 67 insertions(+), 56 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 09b8056cc9..d94363cc35 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -11921,41 +11921,45 @@ (define-public gthumb advanced image management tool") (license license:gpl2+))) -(define-public terminator +(define-public gnome-terminator (package - (name "terminator") - (version "2.1.1") - (source - (origin - (method url-fetch) - (uri (string-append "https://github.com/gnome-terminator/terminator/" - "releases/download/v" version "/" - name "-" version ".tar.gz")) - (sha256 - (base32 "0xdgmam7ghnxw6g38a4gjw3kk3rhga8c66lns18k928jlr9fmddw")))) + (name "gnome-terminator") + (version "2.1.2") + (source (origin + (method url-fetch) + (uri (string-append + "https://github.com/gnome-terminator/terminator/" + "releases/download/v" + version + "/" + "terminator" + "-" + version + ".tar.gz")) + (sha256 + (base32 + "10shpn8id7z43d4dpx16x76mgxnk4mr976j5cg28icjiiaidyfc2")))) (build-system python-build-system) - (native-inputs - `(("gettext" ,gettext-minimal) - ("glib:bin" ,glib "bin") ; for glib-compile-resources - ("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) - ("dbus-glib" ,dbus-glib) - ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) - ("gtk+" ,gtk+) - ("python" ,python-wrapper) - ("python-dbus" ,python-dbus) - ("python-notify2" ,python-notify2) - ("python-pycairo" ,python-pycairo) - ("python-pygobject" ,python-pygobject) - ("vte" ,vte))) - (propagated-inputs - (list python-configobj)) + (native-inputs (list gettext-minimal + `(,glib "bin") ;for glib-compile-resources + gobject-introspection + intltool + pkg-config + python-psutil + python-pytest-runner + python-pytest)) + (inputs (list bash-minimal + cairo + dbus-glib + gsettings-desktop-schemas + gtk+ + python-wrapper + python-dbus + python-notify2 + python-pycairo + python-pygobject + vte)) + (propagated-inputs (list python-configobj)) (arguments ;; One test out of 28 fails due to dbus-python and python-notify; skip ;; tests. @@ -11963,30 +11967,34 @@ (define-public terminator #: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:) + ((guix build glib-or-gtk-build-system) + #:prefix glib-or-gtk:) (guix build utils)) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'handle-dbus-python - (lambda _ - ;; python-dbus cannot be found but it's really there. See - ;; https://github.com/SpotlightKid/jack-select/issues/2 - (substitute* "setup.py" - (("'dbus-python',") "")))) - (add-after 'install 'wrap-program - (lambda* (#:key outputs #:allow-other-keys) - (let ((prog (string-append (assoc-ref outputs "out") - "/bin/terminator")) - (pylib (string-append (assoc-ref outputs "out") - "/lib/python" - ,(version-major+minor - (package-version python)) - "/site-packages"))) - (wrap-program prog - `("GUIX_PYTHONPATH" = (,(getenv "GUIX_PYTHONPATH") ,pylib)) - `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH"))))))) - (add-after 'wrap-program 'glib-or-gtk-wrap - (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))))) + #:phases (modify-phases %standard-phases + (add-after 'unpack 'handle-dbus-python + (lambda _ + ;; python-dbus cannot be found but it's really there. See + ;; https://github.com/SpotlightKid/jack-select/issues/2 + (substitute* "setup.py" + (("'dbus-python',") + "")))) + (add-after 'install 'wrap-program + (lambda* (#:key outputs #:allow-other-keys) + (let ((prog (string-append (assoc-ref outputs "out") + "/bin/terminator")) + (pylib (string-append (assoc-ref outputs "out") + "/lib/python" + ,(version-major+minor (package-version + python)) + "/site-packages"))) + (wrap-program prog + `("GUIX_PYTHONPATH" = + (,(getenv "GUIX_PYTHONPATH") ,pylib)) + `("GI_TYPELIB_PATH" = + (,(getenv "GI_TYPELIB_PATH"))))))) + (add-after 'wrap-program 'glib-or-gtk-wrap + (assoc-ref glib-or-gtk:%standard-phases + 'glib-or-gtk-wrap))))) (home-page "https://gnome-terminator.org/") (synopsis "Store and run multiple GNOME terminals in one window") (description @@ -11994,6 +12002,9 @@ (define-public terminator tabs, and it supports drag and drop re-ordering of terminals.") (license license:gpl2))) +(define-public terminator + (deprecated-package "terminator" gnome-terminator)) + (define-public libhandy (package (name "libhandy") -- 2.38.1