From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id uALfJM+OfWQDFgEASxT56A (envelope-from ) for ; Mon, 05 Jun 2023 09:29:19 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id +AwhJc+OfWRuiAAAauVa8A (envelope-from ) for ; Mon, 05 Jun 2023 09:29:19 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 2361B45B5A for ; Mon, 5 Jun 2023 09:29:19 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q64eG-0005EN-8e; Mon, 05 Jun 2023 03:29:04 -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 1q64eF-0005E8-53 for guix-patches@gnu.org; Mon, 05 Jun 2023 03:29:03 -0400 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 1q64eE-0002k7-S5 for guix-patches@gnu.org; Mon, 05 Jun 2023 03:29:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q64eE-0000pA-N5 for guix-patches@gnu.org; Mon, 05 Jun 2023 03:29:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63901] [PATCH 2/2] gnu: tootle: Deprecate in favor of tuba. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 05 Jun 2023 07:29:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63901 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63901@debbugs.gnu.org Cc: Efraim Flashner Received: via spool by 63901-submit@debbugs.gnu.org id=B63901.16859501203131 (code B ref 63901); Mon, 05 Jun 2023 07:29:02 +0000 Received: (at 63901) by debbugs.gnu.org; 5 Jun 2023 07:28:40 +0000 Received: from localhost ([127.0.0.1]:47933 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q64dp-0000oO-Co for submit@debbugs.gnu.org; Mon, 05 Jun 2023 03:28:40 -0400 Received: from mail-wm1-f42.google.com ([209.85.128.42]:46550) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q64dj-0000nu-BI for 63901@debbugs.gnu.org; Mon, 05 Jun 2023 03:28:36 -0400 Received: by mail-wm1-f42.google.com with SMTP id 5b1f17b1804b1-3f735259fa0so16785755e9.1 for <63901@debbugs.gnu.org>; Mon, 05 Jun 2023 00:28:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1685950105; x=1688542105; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=+LWITN2Q9K3Gj3ECDv49S8dx6rR0BYIYIFW/FdrUSA4=; b=WHi2d/CwMfWP11wO9cnc8dCRGWit56zmrcKHUh7SSYtDK8jKLqYraGdhOubEQQV/00 Z0ylfoqvRg+BOZHbklt/YimlrBKB63w9QM2D5ex0qdwA3oIpMTW6zI0wda3tyaeMcYyn 4z2YalPThQ4OOmND0KTi5FmrJKlNUHCAr4STNCQpNrR7Zck4FNapKvJ1DIk0Hxpwzn7a R7rYAvdPG6nFKi6HGz9gjmS3EvBKtttTWySmgEbQglmrma2QgxiXHnoFvJhsqtutM3za E6fmJpskt+ghBYnkYuASp3K9f2axmyj3Wxs6s2wHBALuadOG0F1vcddefPruj05+vGyi UV9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685950105; x=1688542105; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=+LWITN2Q9K3Gj3ECDv49S8dx6rR0BYIYIFW/FdrUSA4=; b=HjY6LVnMzFNoPM68jVmyxJl0QBVPJwpmLF4lMLkNbtyVz4J6ble1yLmiqmQ1YWLEss mpszfpRcOLcwVfI4ttNbY4Fp0kTjGiEDH+fTdmz5acmO0bwKmrP/U1muhoJ0tEc1T1Cb 8GmLYDWZOQDWK4Xe+KhuMhiN+Tx7vAwxvDNzulJ+KrcayqrveI2wKu8HUu+nnRdojkGZ pz7Y931qvRrdBL13t/RewDFpRLyMkchDN/JQzbG21JgDSP9oQTZtS18D2VfpY2Gci9da mjln7IhcdAMbA8Gupic/xoTIyJ5r0ahDA13MNQw8zpRN03u/+n/XlBnRgUVvsmiW2mYl lLKw== X-Gm-Message-State: AC+VfDyH4DWkrlE5OPszZFD7jFMv8WtOLGp8Bsn8MS5VIMwo8tM3aAGn /uTpUpMfzN9eccLwIZSA+91FJ+H2HlVS9g== X-Google-Smtp-Source: ACHHUZ6NhqhIZ2z4do0LNGK8Fv48u6ZJ2/1aGzWuK87WvbWqyizLB5sRjVcrlzH9HnzHuGmtsAOMNg== X-Received: by 2002:a1c:e902:0:b0:3f4:2ae5:b35d with SMTP id q2-20020a1ce902000000b003f42ae5b35dmr6434447wmc.40.1685950105541; Mon, 05 Jun 2023 00:28:25 -0700 (PDT) Received: from localhost ([37.46.46.3]) by smtp.gmail.com with ESMTPSA id s9-20020a5d5109000000b003063a1cdaf2sm8834621wrt.48.2023.06.05.00.28.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Jun 2023 00:28:25 -0700 (PDT) From: Efraim Flashner Date: Mon, 5 Jun 2023 10:28:24 +0300 Message-Id: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1685950159; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=+LWITN2Q9K3Gj3ECDv49S8dx6rR0BYIYIFW/FdrUSA4=; b=toZnYWH+Ia6NL+l06ZlbjERFlLhowleeOO+1TaR1zu5hxnuYDmGr8ikbcnLpcBWKL55gFF VW7csEJvEG2hhQ9O6icmeVUmMdZ0bpgRHCSLTv8rntEjp74DbbNxTjXAKWVAPZ4uvuHlKR HzMRvonxpFNFlGvNC0sj+hIADe+agKSwASYWDpwc1ngHexOBGSZfsnsm4PZPgByYrQ9HhD OUpUQgQpEVXSstVd/yQyzC5PeePxDG/7ly1AwW5vQaOvpfAU//KJwqBj8+N399P6g8G7K1 M/KyBi4VZanwC8Vs1P4Q2jNeHF6pi9oYHZvn6ftid7pBO7qJiNuxwF1/tq3UiQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20221208 header.b="WHi2d/Cw"; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1685950159; a=rsa-sha256; cv=none; b=FWmLwTAMlrvt+2nfz4om1kzFEyOrJxtyPBBv3VSWQ4jKac9+vt9hZy1WknPa/1cndQwDkD OqHR8QPw5dqTbm6MByaBxYgNfEsKoAl7bxi5OJTH3uyMepDy3OnW/LYjLkxVPooi5JMUj8 u+CRrAuzXp4AtTDLQIVj1JdFW8o+9MiMVKC722QkwAKGu4pSA/PnLsCq5wCENeRzN0buPK Pc1dkFnswdli+iueQvzmdBB46Rdr59toB5Y0PzEazPAGSY9VKj0H46uF0yYJcf1I+sz87G orq7yQIeRSAFzJoclPgQosNlw7sXUCc1rDt15zSIHRqEInZbsNL2QyOGRvad5A== X-Migadu-Scanner: scn1.migadu.com X-Migadu-Spam-Score: 0.31 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20221208 header.b="WHi2d/Cw"; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 2361B45B5A X-Spam-Score: 0.31 X-TUID: 22h0pL+Y6Ih1 * gnu/packages/mastodon.scm (tootle): Deprecate for tuba. * gnu/packages/patches/tootle-glib-object-renaming.patch, gnu/packages/patches/tootle-reason-phrase.patch: Remove files. * gnu/local.mk (dist_patch_DATA): Remove them. --- gnu/local.mk | 2 - gnu/packages/mastodon.scm | 63 +----------------- .../patches/tootle-glib-object-naming.patch | 66 ------------------- .../patches/tootle-reason-phrase.patch | 48 -------------- 4 files changed, 1 insertion(+), 178 deletions(-) delete mode 100644 gnu/packages/patches/tootle-glib-object-naming.patch delete mode 100644 gnu/packages/patches/tootle-reason-phrase.patch diff --git a/gnu/local.mk b/gnu/local.mk index 9adf593318..aeb7b6c65c 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1970,8 +1970,6 @@ dist_patch_DATA = \ %D%/packages/patches/tla2tools-build-xml.patch \ %D%/packages/patches/tlf-support-hamlib-4.2+.patch \ %D%/packages/patches/tofi-32bit-compat.patch \ - %D%/packages/patches/tootle-glib-object-naming.patch \ - %D%/packages/patches/tootle-reason-phrase.patch \ %D%/packages/patches/transcode-ffmpeg.patch \ %D%/packages/patches/transfig-gcc10-fno-common.patch \ %D%/packages/patches/trytond-add-egg-modules-to-path.patch \ diff --git a/gnu/packages/mastodon.scm b/gnu/packages/mastodon.scm index 0d430391dc..39dd4d4533 100644 --- a/gnu/packages/mastodon.scm +++ b/gnu/packages/mastodon.scm @@ -128,68 +128,7 @@ (define-public tuba (license license:gpl3))) (define-public tootle - (package - (name "tootle") - (version "1.0") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/bleakgrey/tootle") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1nm57239mhdq462an6bnhdlijpijxmjs9mqbyirwxwa048d3n4rm")) - (patches - (search-patches - ;; https://github.com/bleakgrey/tootle/pull/339 - "tootle-glib-object-naming.patch" - ;; https://github.com/bleakgrey/tootle/pull/322 - "tootle-reason-phrase.patch")))) - (build-system meson-build-system) - (arguments - `(#:glib-or-gtk? #t - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'skip-gtk-update-icon-cache - ;; Don't create 'icon-theme.cache'. - (lambda _ - (substitute* "meson/post_install.py" - (("gtk-update-icon-cache") "true")))) - (add-after 'unpack 'patch-source - (lambda _ - (substitute* "src/Dialogs/NewAccount.vala" - (("xdg-mime") (which "xdg-mime"))) - ;; Patch for building on glib < 2.64 - (substitute* "src/Build.vala" - (("(os_name = ).*" _ first) (string-append first "\"GNU\";\n")) - (("(os_ver = ).*" _ first) (string-append first "\"Guix\";\n")) - (("GLib.Environment.get_os_info.*") "\"unknown\";\n")))) - (add-after 'install 'symlink-package - (lambda* (#:key outputs #:allow-other-keys) - (symlink "com.github.bleakgrey.tootle" - (string-append (assoc-ref outputs "out") - "/bin/tootle"))))))) - (native-inputs - (list gettext-minimal - `(,glib "bin") ; for glib-compile-resources - gsettings-desktop-schemas pkg-config)) - (inputs - (list glib-networking - gtk+ - json-glib - libgee - libhandy - libsoup-minimal-2 - vala - xdg-utils)) - (home-page "https://github.com/bleakgrey/tootle") - (synopsis "GTK3 client for Mastodon") - (description "Tootle is a GTK client for Mastodon. It provides a clean, -native interface that allows you to integrate Mastodon's social experience -seamlessly with your desktop environment.") - (license license:gpl3+))) + (deprecated-package "tootle" tuba)) (define-public python-mastodon-py (package diff --git a/gnu/packages/patches/tootle-glib-object-naming.patch b/gnu/packages/patches/tootle-glib-object-naming.patch deleted file mode 100644 index 08ee23dd8f..0000000000 --- a/gnu/packages/patches/tootle-glib-object-naming.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 0816105028c26965e37c9afc7c598854f3fecde1 Mon Sep 17 00:00:00 2001 -From: Clayton Craft -Date: Tue, 26 Oct 2021 15:03:25 -0700 -Subject: [PATCH] Adhere to GLib.Object naming conventions for properties - -Vala now validates property names against GLib.Object conventions, this -fixes a compilation error as a result of this enforcement: - -../src/API/Status.vala:27.5-27.23: error: Name `_url' is not valid for a GLib.Object property - public string? _url { get; set; } - ^^^^^^^^^^^^^^^^^^^ - -Relevant Vala change: -https://gitlab.gnome.org/GNOME/vala/-/commit/38d61fbff037687ea4772e6df85c7e22a74b335e - -fixes #337 - -Signed-off-by: Clayton Craft ---- - src/API/Attachment.vala | 6 +++--- - src/API/Status.vala | 8 ++++---- - 2 files changed, 7 insertions(+), 7 deletions(-) - -diff --git a/src/API/Attachment.vala b/src/API/Attachment.vala -index 88bc5bb..35c4018 100644 ---- a/src/API/Attachment.vala -+++ b/src/API/Attachment.vala -@@ -4,10 +4,10 @@ public class Tootle.API.Attachment : Entity, Widgetizable { - public string kind { get; set; default = "unknown"; } - public string url { get; set; } - public string? description { get; set; } -- public string? _preview_url { get; set; } -+ private string? t_preview_url { get; set; } - public string? preview_url { -- set { this._preview_url = value; } -- get { return (this._preview_url == null || this._preview_url == "") ? url : _preview_url; } -+ set { this.t_preview_url = value; } -+ get { return (this.t_preview_url == null || this.t_preview_url == "") ? url : t_preview_url; } - } - - public File? source_file { get; set; } -diff --git a/src/API/Status.vala b/src/API/Status.vala -index 4f92cdb..00e8a9f 100644 ---- a/src/API/Status.vala -+++ b/src/API/Status.vala -@@ -28,16 +28,16 @@ public class Tootle.API.Status : Entity, Widgetizable { - public ArrayList? mentions { get; set; default = null; } - public ArrayList? media_attachments { get; set; default = null; } - -- public string? _url { get; set; } -+ private string? t_url { get; set; } - public string url { - owned get { return this.get_modified_url (); } -- set { this._url = value; } -+ set { this.t_url = value; } - } - string get_modified_url () { -- if (this._url == null) { -+ if (this.t_url == null) { - return this.uri.replace ("/activity", ""); - } -- return this._url; -+ return this.t_url; - } - - public Status formal { diff --git a/gnu/packages/patches/tootle-reason-phrase.patch b/gnu/packages/patches/tootle-reason-phrase.patch deleted file mode 100644 index 72a1d1ecfa..0000000000 --- a/gnu/packages/patches/tootle-reason-phrase.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 858ee78fbebe161a4cdd707a469dc0f045211a51 Mon Sep 17 00:00:00 2001 -From: Max Harmathy -Date: Wed, 25 Aug 2021 13:05:58 +0200 -Subject: [PATCH] Use reason_phrase instead of get_phrase - ---- - src/Services/Cache.vala | 2 +- - src/Services/Network.vala | 7 +------ - 2 files changed, 2 insertions(+), 7 deletions(-) - -diff --git a/src/Services/Cache.vala b/src/Services/Cache.vala -index 2251697..2ed314e 100644 ---- a/src/Services/Cache.vala -+++ b/src/Services/Cache.vala -@@ -88,7 +88,7 @@ public class Tootle.Cache : GLib.Object { - try { - var code = msg.status_code; - if (code != Soup.Status.OK) { -- var error = network.describe_error (code); -+ var error = msg.reason_phrase; - throw new Oopsie.INSTANCE (@"Server returned $error"); - } - -diff --git a/src/Services/Network.vala b/src/Services/Network.vala -index fa2839c..d0143b0 100644 ---- a/src/Services/Network.vala -+++ b/src/Services/Network.vala -@@ -56,7 +56,7 @@ public class Tootle.Network : GLib.Object { - else if (status == Soup.Status.CANCELLED) - debug ("Message is cancelled. Ignoring callback invocation."); - else -- ecb ((int32) status, describe_error ((int32) status)); -+ ecb ((int32) status, msg.reason_phrase); - }); - } - catch (Error e) { -@@ -65,11 +65,6 @@ public class Tootle.Network : GLib.Object { - } - } - -- public string describe_error (uint code) { -- var reason = Soup.Status.get_phrase (code); -- return @"$code: $reason"; -- } -- - public void on_error (int32 code, string message) { - warning (message); - app.toast (message); -- Efraim Flashner רנשלפ םירפא GPG key = A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted