From unknown Sun Jun 22 00:55:24 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#63901] [PATCH 0/2] Add tuba Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 05 Jun 2023 07:27:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 63901 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63901@debbugs.gnu.org Cc: Efraim Flashner X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16859499792879 (code B ref -1); Mon, 05 Jun 2023 07:27:01 +0000 Received: (at submit) by debbugs.gnu.org; 5 Jun 2023 07:26:19 +0000 Received: from localhost ([127.0.0.1]:47925 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q64bb-0000kN-DX for submit@debbugs.gnu.org; Mon, 05 Jun 2023 03:26:19 -0400 Received: from lists.gnu.org ([209.51.188.17]:47300) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q64bZ-0000kF-O0 for submit@debbugs.gnu.org; Mon, 05 Jun 2023 03:26:18 -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 1q64bZ-0004qx-4t for guix-patches@gnu.org; Mon, 05 Jun 2023 03:26:17 -0400 Received: from mail-lf1-x131.google.com ([2a00:1450:4864:20::131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q64bX-0002IW-6v for guix-patches@gnu.org; Mon, 05 Jun 2023 03:26:16 -0400 Received: by mail-lf1-x131.google.com with SMTP id 2adb3069b0e04-4f50470d77cso5441108e87.0 for ; Mon, 05 Jun 2023 00:26:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1685949973; x=1688541973; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:sender:from:to:cc:subject:date:message-id:reply-to; bh=m2H+TWrYLnr9V2SKL7A4blCFHhDQQx0e3ywL6aPzHGA=; b=L9D/Fg4krbZTUmYMLKjlRGL81UFDbfnfKzC++8ojGva5cZxt6BOI+l7gPG0jHy06i1 eaLI1PmleBJo7W6wxSjkze2/rQ/Qv6Ddwt0wvpYcFFEfYK8Vp6phc9MEWoxQiUmCmpxB IyzXX9ixUhUf1kITEJMRifYraGfNn0ETEA23VeDZ20jymh4EyqEutAwqbYiw8/ojhh9d cNCCS+eNjFtzYERTf8nXfVmGMGjb8G/Cyf13QMMKWQUcKvq82G/jg7hZ4hQes4hS+mIi dCEMtQDhcQPugD+wIszQODEHxe4n/GpCGIkBPVglLIcWcva8YfQlWOyyYcP9P1q4LFWN lLpQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685949973; x=1688541973; 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=m2H+TWrYLnr9V2SKL7A4blCFHhDQQx0e3ywL6aPzHGA=; b=dsKPSSOzJOfHYNUZbMAsBfdZwlGGp0ukJwsSEbXlMDcZCfKY2H3LiKPI3fxr8dSObY on3wJAcB5Luksjj/eMRvAxCg9kRvgNhfRqb3iUDslTpEb9yjP5AbAzS3EGLVQNGrIpqo bVIRn08TGRHs2KKyLeTvWxhcQJeiQILKgXxdoONVF7dDTazXGF81p5heqM+JsHJEQcmh CG97OVx1JKcl25B94/JgR17gQ9KEDC2f9pzU8/bizrgd0HD6BiDMRXtBCocX91p0Gd93 zqkbr84/Io62ijWaQJdlsC6BfbrdGJXmz8Iw1ioPDs03B7wDt+qKbSOmwgPi5mUkreAn KisQ== X-Gm-Message-State: AC+VfDzRc3CIffMFs5OoV0pVoKAXPQRreJzuycJ/MhpNyfRKmOiBqhmz cb/LvfismMVPqPlU+7d4VpXMfI1OiGcvEQ== X-Google-Smtp-Source: ACHHUZ7NpXTEF/pqpMx+aCsUh1rfC7F553poTuvyI94oLv4GNpr85z6/E091MtVfdBczUK2Gk8BUGw== X-Received: by 2002:ac2:4945:0:b0:4f3:8507:d90d with SMTP id o5-20020ac24945000000b004f38507d90dmr4354920lfi.34.1685949972517; Mon, 05 Jun 2023 00:26:12 -0700 (PDT) Received: from localhost ([37.46.46.3]) by smtp.gmail.com with ESMTPSA id f18-20020a1cc912000000b003f4e3ed98ffsm9792822wmb.35.2023.06.05.00.26.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Jun 2023 00:26:11 -0700 (PDT) From: Efraim Flashner Date: Mon, 5 Jun 2023 10:26:15 +0300 Message-Id: X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::131; envelope-from=efraim.flashner@gmail.com; helo=mail-lf1-x131.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-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, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.1 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.1 (--) Tootle has been deprecated by upstream. They've pointed people to a fork of tootle hosted by Gnome, but it hasn't really seen any work on it. Tuba is also a fork of tootle, but is receiving updates. Efraim Flashner (2): gnu: Add tuba. gnu: tootle: Deprecate in favor of tuba. gnu/local.mk | 2 - gnu/packages/mastodon.scm | 69 ++++++++----------- .../patches/tootle-glib-object-naming.patch | 66 ------------------ .../patches/tootle-reason-phrase.patch | 48 ------------- 4 files changed, 27 insertions(+), 158 deletions(-) delete mode 100644 gnu/packages/patches/tootle-glib-object-naming.patch delete mode 100644 gnu/packages/patches/tootle-reason-phrase.patch base-commit: eed55a6544d5bda2245ec853e5fa4b28e1865bea -- Efraim Flashner רנשלפ םירפא GPG key = A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted From unknown Sun Jun 22 00:55:24 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#63901] [PATCH 1/2] gnu: Add 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.16859501123111 (code B ref 63901); Mon, 05 Jun 2023 07:29:02 +0000 Received: (at 63901) by debbugs.gnu.org; 5 Jun 2023 07:28:32 +0000 Received: from localhost ([127.0.0.1]:47931 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q64dj-0000o7-T7 for submit@debbugs.gnu.org; Mon, 05 Jun 2023 03:28:32 -0400 Received: from mail-wr1-f49.google.com ([209.85.221.49]:42333) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q64dh-0000nr-Nl for 63901@debbugs.gnu.org; Mon, 05 Jun 2023 03:28:30 -0400 Received: by mail-wr1-f49.google.com with SMTP id ffacd0b85a97d-30aeee7c8a0so3145619f8f.1 for <63901@debbugs.gnu.org>; Mon, 05 Jun 2023 00:28:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1685950103; x=1688542103; 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=y50MqHfVFiVyNbYQOQnAkES2/uqAyK6288CL3YllgRE=; b=gNcQyW+DrcxsJEa9hfPn4gra1TbCtS+C7MFsaqilxr/BDLINSyYvfo9Zoho/9DJPu1 MzylI9SCeWRbdcKExhj+lJozPE7HEbUu8adlvev4kKFomn1HIyUpWHSd5KshwVRrTwvO Ch8pPfj3VzJXml/EVxn57jZwwgEJCWXv0CZiG2G/njgIKddEqZPay/fOyf4fszIxYCV7 eUCDlOpc02sJR6QOGofyqJOlOOJODgGmR/FqW8HdMU+dfbKChamnU92q5k6k2x268kUX siJFPwyZKBp+D2kcdP4tj4VQTuwTSlEBSAzcHc9MzZQONceJX1hlw822HhRFu4ACpl5B Y4OA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685950103; x=1688542103; 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=y50MqHfVFiVyNbYQOQnAkES2/uqAyK6288CL3YllgRE=; b=W2G197ndnkWrU05k8EveJsDBNigBNerxgLtOewWNuVFsWhfZh88sRALgpj0KEMWB/K HhJKcOavOyCJaPssJ6sqpQch9hcMlBN3f49KqnlyMsLOF6xCs/AMkdct1ODpaRcsYSAP LwPAtlSFHQByjMFmSYGx8XL5osNcLJ2uzDobb+BvgBxq5phzT5PCUrA1SaRk7vd1EMTP U2vaKp5HAvrymip+Nq2VRKwCzPbru6EjfNBPArLnrQYCADdNeyvPf1TzeOzFIk7zTknJ PEJ4sD+u7+eksmuzOugBbwwMRfWI+iCTPSt5uY4Omk4vtxsH5PVNc6ClJZVdZXLDO6Iw TBlw== X-Gm-Message-State: AC+VfDz3WNxQiupkljzHg7QP/Yi669lcjDekvmDsd0/4cukrYPk/Nl0t YUE0D485zbro3l2wlO+KB9TZFNinbMyV9g== X-Google-Smtp-Source: ACHHUZ73aaVHCT8ZHiJwPD0t96vr//QpC9tGRgRBVhofY6CX6CCFfX8ONJu8x5aFQZMOungNsjnjjA== X-Received: by 2002:a05:6000:103:b0:2f0:583:44be with SMTP id o3-20020a056000010300b002f0058344bemr5669195wrx.0.1685950102612; Mon, 05 Jun 2023 00:28:22 -0700 (PDT) Received: from localhost ([37.46.46.3]) by smtp.gmail.com with ESMTPSA id c15-20020adfe74f000000b002fae7408544sm8813777wrn.108.2023.06.05.00.28.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Jun 2023 00:28:22 -0700 (PDT) From: Efraim Flashner Date: Mon, 5 Jun 2023 10:28:23 +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-Spam-Score: 0.2 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.8 (/) * gnu/packages/mastodon.scm (tuba): New variable. --- gnu/packages/mastodon.scm | 46 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/gnu/packages/mastodon.scm b/gnu/packages/mastodon.scm index 9c1d3cd26f..0d430391dc 100644 --- a/gnu/packages/mastodon.scm +++ b/gnu/packages/mastodon.scm @@ -81,6 +81,52 @@ (define-public toot @end itemize") (license license:gpl3))) +(define-public tuba + (package + (name "tuba") + (version "0.3.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/GeopJr/Tuba") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1xhyz6wi17g4m76lr6qc75q4xnnw7c3dh3d04dg8m5gzk6j0y89x")))) + (build-system meson-build-system) + (arguments + `(#:glib-or-gtk? #t + #:configure-flags (list "-Ddistro=true") + #:phases + (modify-phases %standard-phases + (add-after 'glib-or-gtk-wrap 'symlink-package + (lambda* (#:key outputs #:allow-other-keys) + (with-directory-excursion + (string-append (assoc-ref outputs "out") "/bin") + (symlink "dev.geopjr.Tuba" "tuba"))))))) + (native-inputs + (list gettext-minimal + `(,glib "bin") ; for glib-compile-resources + pkg-config)) + (inputs + (list gtk + gtksourceview + json-glib + libadwaita + libgee + libsoup-minimal + libsecret + libwebp + libxml2 + vala)) + (home-page "https://tuba.geopjr.dev/") + (synopsis "GTK client for Mastodon") + (description "Tuba 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))) + (define-public tootle (package (name "tootle") -- Efraim Flashner רנשלפ םירפא GPG key = A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted From unknown Sun Jun 22 00:55:24 2025 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-Spam-Score: 0.2 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.8 (/) * 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 From unknown Sun Jun 22 00:55:24 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Efraim Flashner Subject: bug#63901: closed (Re: [PATCH 1/2] gnu: Add tuba.) Message-ID: References: X-Gnu-PR-Message: they-closed 63901 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 63901@debbugs.gnu.org Date: Wed, 14 Jun 2023 19:17:03 +0000 Content-Type: multipart/mixed; boundary="----------=_1686770223-7211-1" This is a multi-part message in MIME format... ------------=_1686770223-7211-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #63901: [PATCH 0/2] Add tuba which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 63901@debbugs.gnu.org. --=20 63901: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D63901 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1686770223-7211-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 63901-done) by debbugs.gnu.org; 14 Jun 2023 19:16:51 +0000 Received: from localhost ([127.0.0.1]:45476 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q9Vz8-0001rR-OK for submit@debbugs.gnu.org; Wed, 14 Jun 2023 15:16:51 -0400 Received: from mail-wm1-f41.google.com ([209.85.128.41]:47344) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q9Vz6-0001r8-Oa for 63901-done@debbugs.gnu.org; Wed, 14 Jun 2023 15:16:49 -0400 Received: by mail-wm1-f41.google.com with SMTP id 5b1f17b1804b1-3f8d17639feso11657605e9.2 for <63901-done@debbugs.gnu.org>; Wed, 14 Jun 2023 12:16:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686770203; x=1689362203; h=in-reply-to:content-disposition:mime-version:references :mail-followup-to:message-id:subject:to:from:date:sender:from:to:cc :subject:date:message-id:reply-to; bh=g2tQokJBeQDDWl7ilRdKdMcOeRCPt+Ivb8zqtNjSK1s=; b=qPS+rDCP87IIfInBTWz5QDU8k7inJbks2pYRsBIGpxM9H6za13IsVoMT1rKnMKkhDP 5Rr4FBoGOi6BVK0+ucYN5hDIMm04zaAjA8DnjDvzpvDrNr/mUcOYXn3eqa1JGihkL912 1AO+LPEQFudxw7QeVyxV0k2DH6SG0GKGMjczRWof+9naOgGunQyUgIUvNzucY7fLYVV5 CVB3jAyIYV1DPOscZYlDSC5njoCSM9Is/g6XyEjEmNILyFPEB7AQGpTRUszENLpjR2LS Ke83oGa2UymGkbK8ayAM3GcSepjPIa7+zYztpwo+Dei3JYC0TXc9Qd+ogwPO1HdTipD3 FZLQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686770203; x=1689362203; h=in-reply-to:content-disposition:mime-version:references :mail-followup-to:message-id:subject:to:from:date:sender :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=g2tQokJBeQDDWl7ilRdKdMcOeRCPt+Ivb8zqtNjSK1s=; b=jG6JWXk1ofPc15oM+jGFuOLzicIHS6DJjY0Uq6KVgnjg6IQszuAsqiO+YC1DwchOSt IuUct4rZH66HvtBSSZbBiaNJZZJRKAk6ZAMzi5vgvAmpeQ3/hFB5/ezpyi/wOo9237df 1JFVQTFDM9QN8QCeIM3bne4vaKqxv9FwikwJM44AhylE14VL0c3lkZ2xmrY3Uqqfh2gS n36HEP0AUfJj+JH9qtzW3tY+AvGa9WWa0jW6yFSKMywfObiwfPtPcXj6V+g81ECHiZG1 g640tMyGMn1TcrLlf9K6sh2g7Y8SW3YhTOKOwofTaquhi2k0aAJC/H40L1MO9wg+5UTf 4tMQ== X-Gm-Message-State: AC+VfDzYfjTbglAJ/GRwyzPgfelhTni1HFqM5O1H4K8so9c6+KfiuwuA zvEX7F2RJr1xEh32ZxDqsgSOJScDcKU25w== X-Google-Smtp-Source: ACHHUZ4uloelUF9pU25r+40+UUZwpcEazGFm5ke7uJeHNGR+5Rr6e7gtC9g9nbEpeLuPYP+XUVaoAw== X-Received: by 2002:a05:600c:2853:b0:3f8:d279:b1ef with SMTP id r19-20020a05600c285300b003f8d279b1efmr4309662wmb.30.1686770202903; Wed, 14 Jun 2023 12:16:42 -0700 (PDT) Received: from localhost ([37.46.46.3]) by smtp.gmail.com with ESMTPSA id l16-20020a1c7910000000b003f8d770e935sm3330756wme.0.2023.06.14.12.16.41 for <63901-done@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Jun 2023 12:16:42 -0700 (PDT) Date: Wed, 14 Jun 2023 22:16:40 +0300 From: Efraim Flashner To: 63901-done@debbugs.gnu.org Subject: Re: [PATCH 1/2] gnu: Add tuba. Message-ID: Mail-Followup-To: Efraim Flashner , 63901-done@debbugs.gnu.org References: MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="dLp0C3ECihinV+7y" Content-Disposition: inline In-Reply-To: X-PGP-Key-ID: 0x41AAE7DCCA3D8351 X-PGP-Key: https://flashner.co.il/~efraim/efraim_flashner.asc X-PGP-Fingerprint: A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 X-Spam-Score: 0.2 (/) X-Debbugs-Envelope-To: 63901-done X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.8 (/) --dLp0C3ECihinV+7y Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable I've pushed this one but I've held off on pushing the second one, deprecating tootle for tuba. It's abandoned upstream but I'd rather not rip it out of anyone's hands just yet. --=20 Efraim Flashner =D7=A8=D7=A0=D7=A9=D7=9C=D7=A4 = =D7=9D=D7=99=D7=A8=D7=A4=D7=90 GPG key =3D A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted --dLp0C3ECihinV+7y Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEoov0DD5VE3JmLRT3Qarn3Mo9g1EFAmSKEhUACgkQQarn3Mo9 g1FCsQ/9EnjkxT8tY6qi8PqvTmmztQhQj2sx/UThLHMq3Aye7jjwXxH9XA27E5+u WKW5jwWchY4BqlvAO02u8g0V2lSNFG8RlVzgm2OidOaSB7DwyYrFyu82b7EUUl0A g+YAd8OZnATJ0PRAUxx/i8wJcm2IxFy/ewO+6FD1wfywnl2N+WJCuZvrNL2vBSBs SMSiuCrVErBP+/IJDQN9UmXVLeSS4AT7/fjBHeVVL3oLl8196qbruqpYsemC89pz 1gJxHAOa4O5nQCexJI9Vm5/V6p6Mt7o7Om8GdkTYJqPTnWIntZk3XdWQbFRg0aXw Tb5wxMtraCf2E+jI5ZouaqDGE4rxHAiQBPDsNcNHAeInnYpuJYcOp/VMONJMV50k +wYvSG7f3qkg4AupamDwp8u3zwL64ztl/In8CFHE3QaftTeeezBpv6MMTm5Q7f3v QsOUoDFwVSkvKzupFTqfV604+THV3q/DnJ1dBG+01zWJOeeL2q2NUo+0uf98aiql Cx5e+Y3t2Y8eNBthRcad/yh5kFpKzh4mTS5W3mLMI06WlUWgA1S1/kmupsPRRn94 CK+4I2Gt14PYXh96YMxVy4RdEidXNWKPflg7HgNewV13W51/rDvSxMOmAOdFAGyJ xpKA6f+H5iRN5QZxIxbYRN6+zZNSP8HoJWk64RclZ5upNrm5lEQ= =3n8n -----END PGP SIGNATURE----- --dLp0C3ECihinV+7y-- ------------=_1686770223-7211-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 5 Jun 2023 07:26:19 +0000 Received: from localhost ([127.0.0.1]:47925 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q64bb-0000kN-DX for submit@debbugs.gnu.org; Mon, 05 Jun 2023 03:26:19 -0400 Received: from lists.gnu.org ([209.51.188.17]:47300) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q64bZ-0000kF-O0 for submit@debbugs.gnu.org; Mon, 05 Jun 2023 03:26:18 -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 1q64bZ-0004qx-4t for guix-patches@gnu.org; Mon, 05 Jun 2023 03:26:17 -0400 Received: from mail-lf1-x131.google.com ([2a00:1450:4864:20::131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q64bX-0002IW-6v for guix-patches@gnu.org; Mon, 05 Jun 2023 03:26:16 -0400 Received: by mail-lf1-x131.google.com with SMTP id 2adb3069b0e04-4f50470d77cso5441108e87.0 for ; Mon, 05 Jun 2023 00:26:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1685949973; x=1688541973; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:sender:from:to:cc:subject:date:message-id:reply-to; bh=m2H+TWrYLnr9V2SKL7A4blCFHhDQQx0e3ywL6aPzHGA=; b=L9D/Fg4krbZTUmYMLKjlRGL81UFDbfnfKzC++8ojGva5cZxt6BOI+l7gPG0jHy06i1 eaLI1PmleBJo7W6wxSjkze2/rQ/Qv6Ddwt0wvpYcFFEfYK8Vp6phc9MEWoxQiUmCmpxB IyzXX9ixUhUf1kITEJMRifYraGfNn0ETEA23VeDZ20jymh4EyqEutAwqbYiw8/ojhh9d cNCCS+eNjFtzYERTf8nXfVmGMGjb8G/Cyf13QMMKWQUcKvq82G/jg7hZ4hQes4hS+mIi dCEMtQDhcQPugD+wIszQODEHxe4n/GpCGIkBPVglLIcWcva8YfQlWOyyYcP9P1q4LFWN lLpQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685949973; x=1688541973; 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=m2H+TWrYLnr9V2SKL7A4blCFHhDQQx0e3ywL6aPzHGA=; b=dsKPSSOzJOfHYNUZbMAsBfdZwlGGp0ukJwsSEbXlMDcZCfKY2H3LiKPI3fxr8dSObY on3wJAcB5Luksjj/eMRvAxCg9kRvgNhfRqb3iUDslTpEb9yjP5AbAzS3EGLVQNGrIpqo bVIRn08TGRHs2KKyLeTvWxhcQJeiQILKgXxdoONVF7dDTazXGF81p5heqM+JsHJEQcmh CG97OVx1JKcl25B94/JgR17gQ9KEDC2f9pzU8/bizrgd0HD6BiDMRXtBCocX91p0Gd93 zqkbr84/Io62ijWaQJdlsC6BfbrdGJXmz8Iw1ioPDs03B7wDt+qKbSOmwgPi5mUkreAn KisQ== X-Gm-Message-State: AC+VfDzRc3CIffMFs5OoV0pVoKAXPQRreJzuycJ/MhpNyfRKmOiBqhmz cb/LvfismMVPqPlU+7d4VpXMfI1OiGcvEQ== X-Google-Smtp-Source: ACHHUZ7NpXTEF/pqpMx+aCsUh1rfC7F553poTuvyI94oLv4GNpr85z6/E091MtVfdBczUK2Gk8BUGw== X-Received: by 2002:ac2:4945:0:b0:4f3:8507:d90d with SMTP id o5-20020ac24945000000b004f38507d90dmr4354920lfi.34.1685949972517; Mon, 05 Jun 2023 00:26:12 -0700 (PDT) Received: from localhost ([37.46.46.3]) by smtp.gmail.com with ESMTPSA id f18-20020a1cc912000000b003f4e3ed98ffsm9792822wmb.35.2023.06.05.00.26.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Jun 2023 00:26:11 -0700 (PDT) From: Efraim Flashner To: guix-patches@gnu.org Subject: [PATCH 0/2] Add tuba Date: Mon, 5 Jun 2023 10:26:15 +0300 Message-Id: X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::131; envelope-from=efraim.flashner@gmail.com; helo=mail-lf1-x131.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-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, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.1 (-) X-Debbugs-Envelope-To: submit Cc: Efraim Flashner X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.1 (--) Tootle has been deprecated by upstream. They've pointed people to a fork of tootle hosted by Gnome, but it hasn't really seen any work on it. Tuba is also a fork of tootle, but is receiving updates. Efraim Flashner (2): gnu: Add tuba. gnu: tootle: Deprecate in favor of tuba. gnu/local.mk | 2 - gnu/packages/mastodon.scm | 69 ++++++++----------- .../patches/tootle-glib-object-naming.patch | 66 ------------------ .../patches/tootle-reason-phrase.patch | 48 ------------- 4 files changed, 27 insertions(+), 158 deletions(-) delete mode 100644 gnu/packages/patches/tootle-glib-object-naming.patch delete mode 100644 gnu/packages/patches/tootle-reason-phrase.patch base-commit: eed55a6544d5bda2245ec853e5fa4b28e1865bea -- Efraim Flashner רנשלפ םירפא GPG key = A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted ------------=_1686770223-7211-1--