From patchwork Tue Dec 28 05:03:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Taiju HIGASHI X-Patchwork-Id: 35746 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 7583127BBEA; Tue, 28 Dec 2021 05:04:26 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL, 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 BD8CD27BBE9 for ; Tue, 28 Dec 2021 05:04:25 +0000 (GMT) Received: from localhost ([::1]:43264 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n24eu-0003B5-TM for patchwork@mira.cbaines.net; Tue, 28 Dec 2021 00:04:24 -0500 Received: from eggs.gnu.org ([209.51.188.92]:48262) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n24ee-0003At-Gx for guix-patches@gnu.org; Tue, 28 Dec 2021 00:04:08 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:33321) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n24eX-0007gf-Pg for guix-patches@gnu.org; Tue, 28 Dec 2021 00:04:08 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1n24eX-00049t-M3 for guix-patches@gnu.org; Tue, 28 Dec 2021 00:04:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52842] [PATCH] gnu: tootle: Fix build. References: <871r1xcoi4.fsf@taiju.info> In-Reply-To: <871r1xcoi4.fsf@taiju.info> Resent-From: Taiju HIGASHI Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 28 Dec 2021 05:04:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52842 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 52842@debbugs.gnu.org Cc: Taiju HIGASHI Received: via spool by 52842-submit@debbugs.gnu.org id=B52842.164066782715954 (code B ref 52842); Tue, 28 Dec 2021 05:04:01 +0000 Received: (at 52842) by debbugs.gnu.org; 28 Dec 2021 05:03:47 +0000 Received: from localhost ([127.0.0.1]:44867 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n24eD-000499-UP for submit@debbugs.gnu.org; Tue, 28 Dec 2021 00:03:47 -0500 Received: from mail-pj1-f48.google.com ([209.85.216.48]:38808) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n24e9-00048p-Bq for 52842@debbugs.gnu.org; Tue, 28 Dec 2021 00:03:40 -0500 Received: by mail-pj1-f48.google.com with SMTP id l10-20020a17090a384a00b001b22190e075so15047248pjf.3 for <52842@debbugs.gnu.org>; Mon, 27 Dec 2021 21:03:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=taiju-info.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=2MhiH7977rzzyUWJhIYYoYLi4QGENRHjVl0yeKuCl/0=; b=EkfxALBSaNjJFAJARPxdsNBkWiK7E/urBinjU7y3KDlKLIPKe62bUFrXVvr0lwVriq A4bSf2vo9BxpBUcX2iGMYerNJNmtm/oq8HTlfVEwdHClpKZMEOsd5szwxzGUUIti7AEM CTOqBjHM1iYpLDCTs/tnsCUGd5hFPyhd5Swl0Hc3YQr//jRZMt6MYAjBXIEUAWBRAaTf sx5CjrQrTLrf9smgnytlSUBzoTNb5n5QpN8U/2yWu1aAST9tfnc0kAfYlwm3RNOXYwnv dwXlmUCcTbAuwQEpgMaTxWIJUf5FRvOzPeGZFj1lBqOT4SPHuWUtw19s9FJ6w+eb4tSc maNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=2MhiH7977rzzyUWJhIYYoYLi4QGENRHjVl0yeKuCl/0=; b=nydNQGanqCDOAaifr808R98eSfrvcrk9TuailMoqyrhUVxVIoh0vaSe+bPLkpxB2Rl nFlXPCSHRnucV1To/SZRbyWEBPOt2idkgmk/bBfoFlOHfnrNniPwvJ2BJxse5sr71388 OJvR9eNsfoJcIDIhKNlQj3i2AUnEcAflDCI6hltvb1Nq1Duh6JxXDkuQRy/zb0cQCzS1 LlMS48CDv6uMjS5aaVS4mg7hJI6sE/m96h0vXbCLesm8pxY5EnBkUM59dTbBvm26L0dS TA3KqSJxYlO7ygtkA9wNkiZMN6cHOZh2TKA2L3M3m2zYt+zYUXUS1NDfT+UDuRmJiny8 AR6g== X-Gm-Message-State: AOAM53205ibmYCDI+8+1m5dzSnx19X8uSmoXQJsbQwKgXxwj4///OFDA SF0isi1vwahmwCEybAT6pUcPP45zCTTxA/+2 X-Google-Smtp-Source: ABdhPJzTLt0Qe7ARQhSQCJBpphZTPoi0RRT8NHKfkGJagzRkD5SV+JGnyUrxIZyeRtJ5qWysu5f2lg== X-Received: by 2002:a17:90b:1297:: with SMTP id fw23mr24011458pjb.97.1640667811034; Mon, 27 Dec 2021 21:03:31 -0800 (PST) Received: from Taix.flets-west.jp ([240b:253:ec40:2400:89a7:8e7a:a861:7c6b]) by smtp.gmail.com with ESMTPSA id u18sm19889718pfi.158.2021.12.27.21.03.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Dec 2021 21:03:26 -0800 (PST) From: Taiju HIGASHI Date: Tue, 28 Dec 2021 14:03:17 +0900 Message-Id: <20211228050317.7482-1-higashi@taiju.info> X-Mailer: git-send-email 2.34.0 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" X-getmail-retrieved-from-mailbox: Patches --- gnu/packages/mastodon.scm | 28 +++++--- ...re-to-GLib.Object-naming-conventions.patch | 66 +++++++++++++++++++ ...-reason_phrase-instead-of-get_phrase.patch | 48 ++++++++++++++ 3 files changed, 132 insertions(+), 10 deletions(-) create mode 100644 gnu/packages/patches/tootle-Adhere-to-GLib.Object-naming-conventions.patch create mode 100644 gnu/packages/patches/tootle-Use-reason_phrase-instead-of-get_phrase.patch diff --git a/gnu/packages/mastodon.scm b/gnu/packages/mastodon.scm index 8a8e2e7786..7ac02c3cf0 100644 --- a/gnu/packages/mastodon.scm +++ b/gnu/packages/mastodon.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2019, 2020, 2021 Efraim Flashner ;;; Copyright © 2019 Tobias Geerinckx-Rice +;;; Copyright © 2021 Taiju HIGASHI ;;; ;;; This file is part of GNU Guix. ;;; @@ -24,6 +25,7 @@ (define-module (gnu packages mastodon) #:use-module (guix build-system meson) #:use-module (guix build-system python) #:use-module ((guix licenses) #:prefix license:) + #:use-module (gnu packages) #:use-module (gnu packages check) #:use-module (gnu packages freedesktop) #:use-module (gnu packages gettext) @@ -79,15 +81,21 @@ (define-public tootle (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")))) + (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-Adhere-to-GLib.Object-naming-conventions.patch" + ;; https://github.com/bleakgrey/tootle/pull/322 + "tootle-Use-reason_phrase-instead-of-get_phrase.patch")))) (build-system meson-build-system) (arguments `(#:glib-or-gtk? #t @@ -125,7 +133,7 @@ (define-public tootle json-glib libgee libhandy - libsoup + libsoup-minimal-2 vala xdg-utils)) (home-page "https://github.com/bleakgrey/tootle") diff --git a/gnu/packages/patches/tootle-Adhere-to-GLib.Object-naming-conventions.patch b/gnu/packages/patches/tootle-Adhere-to-GLib.Object-naming-conventions.patch new file mode 100644 index 0000000000..08ee23dd8f --- /dev/null +++ b/gnu/packages/patches/tootle-Adhere-to-GLib.Object-naming-conventions.patch @@ -0,0 +1,66 @@ +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-Use-reason_phrase-instead-of-get_phrase.patch b/gnu/packages/patches/tootle-Use-reason_phrase-instead-of-get_phrase.patch new file mode 100644 index 0000000000..72a1d1ecfa --- /dev/null +++ b/gnu/packages/patches/tootle-Use-reason_phrase-instead-of-get_phrase.patch @@ -0,0 +1,48 @@ +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);