From patchwork Sat Jan 28 09:25: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: 46479 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 2302027BBEB; Sat, 28 Jan 2023 09:26:33 +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_INVALID, DKIM_SIGNED,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 BFACB27BBE9 for ; Sat, 28 Jan 2023 09:26:29 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pLhTJ-0000au-5Z; Sat, 28 Jan 2023 04:26: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 1pLhTH-0000aR-2P for guix-patches@gnu.org; Sat, 28 Jan 2023 04:26:03 -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 1pLhTG-0002Lr-QE for guix-patches@gnu.org; Sat, 28 Jan 2023 04:26:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pLhTG-0002El-IQ for guix-patches@gnu.org; Sat, 28 Jan 2023 04:26:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#59059] [PATCH v2] 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: Sat, 28 Jan 2023 09:26: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: 59059@debbugs.gnu.org Cc: Andy Tai Received: via spool by 59059-submit@debbugs.gnu.org id=B59059.16748979178542 (code B ref 59059); Sat, 28 Jan 2023 09:26:02 +0000 Received: (at 59059) by debbugs.gnu.org; 28 Jan 2023 09:25:17 +0000 Received: from localhost ([127.0.0.1]:39579 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pLhSW-0002Di-Uv for submit@debbugs.gnu.org; Sat, 28 Jan 2023 04:25:17 -0500 Received: from mail-pf1-f176.google.com ([209.85.210.176]:45861) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pLhST-0002DL-V4 for 59059@debbugs.gnu.org; Sat, 28 Jan 2023 04:25:15 -0500 Received: by mail-pf1-f176.google.com with SMTP id z1so1777322pfg.12 for <59059@debbugs.gnu.org>; Sat, 28 Jan 2023 01:25:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:sender:from:to:cc:subject:date:message-id:reply-to; bh=LLyVolP2wAiGHlRuRpXQImlfPanWVilEmDOcII2TDiE=; b=ao8Kw6fokq/TuVygwgJqBNKm8AwrUvF22BWer52z392ikN7yAQQgHA9tx18EbJi3bG 1dcmwx9FywSpKJ/zCC9w6F5bnfNZMhFmJxrlOCS1I0STtdC6OHQETm+x8zLKMOfpxFgO QBM6zLvabkp/PyBnjv9Uyn1WthQZW20P7Kju8i369hazLLD3cI9sJz44/QTtrrwZR55k AWchPt7ewvsazNzZzGzy5pnP981nda6yXUVCz/2iGRMj7sYwTL+AMxSsZYHw6m+eg7M1 Bc8eet/31ZVLyeSN+J6mMxrUcMTSbHQCWpL8MDjg8/KRDU1r66x9VH+tlQccaw/ueqNs 5W0A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:sender:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=LLyVolP2wAiGHlRuRpXQImlfPanWVilEmDOcII2TDiE=; b=dDar4j4qp9syt89WLpyips0xOE7iinNgZ+q/ZWfoY8BQsiyDjMs3hkzRylPZez+bYK PKVG9NFq3AKOHLDIr5CeKrlNiv75XXC3P+HUglJGtQ8OTU6XeOl2F4ZEDIUVKrnv8nvw xAu1eyHbKbQQYwrAj/GBfu7q7C5MIZpnkHihGAy39axc1JifYUQWJ7c76+VLgrWW0MT2 JNUYAO+uQoId+D22TaduUbX0Jqrk+ASV/BDjCPG2noqlTH6BQNl468nPJx4BFgS0JVY/ WqW3N26xmhIdPDbTnMVtbyKKH2s86odYMG0bCJkKFeg32ako/ZOR9XgvwUVr3Z2uj5gu o1bg== X-Gm-Message-State: AO0yUKXso0uNwJ0xAgzZ8oZLplEZbb1QnQ5eSwqKx6a+6yqV5R3RUYV4 ZaNOsi+lTsXM/jIkGiWmcEMpi7uT8CU= X-Google-Smtp-Source: AK7set/sh0kyLaunN71dJcR92XHHr/cpwQIdGkGFpKjcSliM90j7uVVReoKfhJ+aXfI2vGEIMUR4oA== X-Received: by 2002:a62:6445:0:b0:592:557f:9f63 with SMTP id y66-20020a626445000000b00592557f9f63mr7339981pfb.11.1674897907679; Sat, 28 Jan 2023 01:25:07 -0800 (PST) Received: from localhost.localdomain ([98.37.226.98]) by smtp.googlemail.com with ESMTPSA id v64-20020a626143000000b00574ebfdc721sm4070237pfb.16.2023.01.28.01.25.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 28 Jan 2023 01:25:07 -0800 (PST) From: Andy Tai Date: Sat, 28 Jan 2023 01:25:03 -0800 Message-Id: <20230128092503.23970-1-atai@atai.org> X-Mailer: git-send-email 2.39.1 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: , 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 * gnu/packages/gnome.scm (gnome-terminator): Rename variable from (terminator): …this. 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 de5b5df450..1d64b106c4 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -11929,41 +11929,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. @@ -11971,30 +11975,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 @@ -12002,6 +12010,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")