From patchwork Sat Apr 22 05:03:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 49419 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 C8C1E27BBE2; Sun, 23 Apr 2023 00:57:19 +0100 (BST) 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 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 409201758A for ; Sun, 23 Apr 2023 00:57:17 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pqN6G-0007yq-DZ; Sat, 22 Apr 2023 19:57: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 1pqN6E-0007yS-Ov for guix-patches@gnu.org; Sat, 22 Apr 2023 19:57:02 -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 1pqN6E-0007rA-1R for guix-patches@gnu.org; Sat, 22 Apr 2023 19:57:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pqN6D-00074Y-ND for guix-patches@gnu.org; Sat, 22 Apr 2023 19:57:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63026] [PATCH 1/2] gnu: syndication-domination: Update to 1.0-1-7592032. References: <56b1af9dff7d6ce0c2f0cfb20a107d67190a1e12.camel@gmail.com> In-Reply-To: <56b1af9dff7d6ce0c2f0cfb20a107d67190a1e12.camel@gmail.com> Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 22 Apr 2023 23:57:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63026 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63026@debbugs.gnu.org Received: via spool by 63026-submit@debbugs.gnu.org id=B63026.168220776527104 (code B ref 63026); Sat, 22 Apr 2023 23:57:01 +0000 Received: (at 63026) by debbugs.gnu.org; 22 Apr 2023 23:56:05 +0000 Received: from localhost ([127.0.0.1]:44327 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pqN5J-000736-58 for submit@debbugs.gnu.org; Sat, 22 Apr 2023 19:56:05 -0400 Received: from mail-ej1-f67.google.com ([209.85.218.67]:57514) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pqN5F-000721-NZ for 63026@debbugs.gnu.org; Sat, 22 Apr 2023 19:56:03 -0400 Received: by mail-ej1-f67.google.com with SMTP id a640c23a62f3a-94f7a0818aeso427761766b.2 for <63026@debbugs.gnu.org>; Sat, 22 Apr 2023 16:56:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1682207756; x=1684799756; h=mime-version:message-id:to:subject:date:from:from:to:cc:subject :date:message-id:reply-to; bh=o7nfqqHCsQf6HNEaVuqCeoGskng1TdDIh3hfYC67l5A=; b=RcWI4NaevwY3JcydP+flKPI6sHwXY4eTqp++dEjS+3f6Ly5zENNAtyJXXaZwMySYD1 U6dUN8Er7AoR4ORKPExwt3nogL7k6fHSakHvzLTDSyuA1fswh84igpYEOjJeEOkqYJpf qu7Nnli1IuIbNIqEviZSdBYJtSOQSj7qycbPk/OsFMszGBne1LCalV8EL+M40ULHkUAE Btf1ss/rzmaDvC+UDCVnaC84vdodCIlNQAQnOM1FMVOLzbRG/CdCOBzFzt/5W1IxDQTd ZLa2QxyR/xoEP2bMIMu17Br4RG52wAKHUMWLXKIMlQG7mqE3jKS0W1dzIE81r7q8+Fqs qyIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682207756; x=1684799756; h=mime-version:message-id:to:subject:date:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=o7nfqqHCsQf6HNEaVuqCeoGskng1TdDIh3hfYC67l5A=; b=MRo21D5YOHoezzNqXK6SpkEMeDxbm6puq2P6np8kqFd0SIc838j63IxEGTu5eICxAH +K9BSWYsLgSkFFF62YQqzUyAbTzPVPS9EW+8fdBgMGO/wNpKTdckGFFqpwhEAJh19k46 eNG+j0jI3heguiqE8AyAWW/N6AiKDATxbIPV4pfcbEZ8i1ZIh7pkOz4KUabWZs/W+4yF ptoeaee4TDTFOqcW0QnD49LvcmHX4Jxk+sjBkwBTiiSRQaTtTgrdklV/+maOHPfOoirD ZedVieREtaLNhyNRzjTF1SGDt+WvUQAPmyKjydvm2zb4qPp7Csp2qFlkkyM70+nCDiuy N0cg== X-Gm-Message-State: AAQBX9dQbE1X5wdWSotuanJPWOraWpi4WPjJFbD0YNUtQ1IOThIVRXz4 XpA2/ccGUSNdsjOfoq7GHU+EIgHcc7hUbg== X-Google-Smtp-Source: AKy350ZIXEwGBArXrC5ZxvGsc7QR5NR5wsEqcmBI34jIdiA13gMxt85z89uQf+owfP/kHM7V2wN77A== X-Received: by 2002:a17:906:250b:b0:94f:a309:67b9 with SMTP id i11-20020a170906250b00b0094fa30967b9mr5915607ejb.6.1682207755688; Sat, 22 Apr 2023 16:55:55 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id jt11-20020a170906ca0b00b00958434d4ecesm1135589ejb.13.2023.04.22.16.55.55 for <63026@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 22 Apr 2023 16:55:55 -0700 (PDT) From: Liliana Marie Prikler Date: Sat, 22 Apr 2023 07:03:34 +0200 Message-ID: <842a0bd2f3b8617cc5c9f251d159b4bfd0ab11de.camel@gmail.com> 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/syndication.scm (syndication-domination): Update to 1.0-1-7592032. --- gnu/packages/syndication.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/syndication.scm b/gnu/packages/syndication.scm index 55c9d871e3..d0aa014ade 100644 --- a/gnu/packages/syndication.scm +++ b/gnu/packages/syndication.scm @@ -510,10 +510,10 @@ (define-public tuir (define-public syndication-domination (let ((revision "1") - (commit "f64caabd6f46be14fdb92085971a7f2d6fa5e61e")) + (commit "75920321062d682437f3fb0319dad227d8b18f6c")) (package (name "syndication-domination") - (version (git-version "0.0" revision commit)) + (version (git-version "1.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -521,7 +521,7 @@ (define-public syndication-domination (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "1i0llzzm3lc2kw7rjhb46c7wlknsb6r9bdrf61chi2pk6hpjyscv")))) + (base32 "1fl362920n6nz4x9wihyzbr82d9cy60sknhmajj62whd5gs49sbw")))) (build-system meson-build-system) (arguments (list #:meson meson-0.63)) From patchwork Sat Apr 22 05:05:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 49420 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 DE80427BBE9; Sun, 23 Apr 2023 00:57:21 +0100 (BST) 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=ham 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 C4D731758A for ; Sun, 23 Apr 2023 00:57:20 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pqN6G-0007yk-77; Sat, 22 Apr 2023 19:57: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 1pqN6E-0007yT-M3 for guix-patches@gnu.org; Sat, 22 Apr 2023 19:57:02 -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 1pqN6E-0007rJ-9Z for guix-patches@gnu.org; Sat, 22 Apr 2023 19:57:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pqN6E-00074g-5E for guix-patches@gnu.org; Sat, 22 Apr 2023 19:57:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63026] [PATCH 2/2] gnu: gfeeds: Update to 2.2.0. References: <56b1af9dff7d6ce0c2f0cfb20a107d67190a1e12.camel@gmail.com> In-Reply-To: <56b1af9dff7d6ce0c2f0cfb20a107d67190a1e12.camel@gmail.com> Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 22 Apr 2023 23:57:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63026 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63026@debbugs.gnu.org Received: via spool by 63026-submit@debbugs.gnu.org id=B63026.168220777227119 (code B ref 63026); Sat, 22 Apr 2023 23:57:02 +0000 Received: (at 63026) by debbugs.gnu.org; 22 Apr 2023 23:56:12 +0000 Received: from localhost ([127.0.0.1]:44329 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pqN5N-00073H-DG for submit@debbugs.gnu.org; Sat, 22 Apr 2023 19:56:12 -0400 Received: from mail-ed1-f65.google.com ([209.85.208.65]:55653) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pqN5G-000725-D1 for 63026@debbugs.gnu.org; Sat, 22 Apr 2023 19:56:04 -0400 Received: by mail-ed1-f65.google.com with SMTP id 4fb4d7f45d1cf-507bdc5ca2aso5316663a12.3 for <63026@debbugs.gnu.org>; Sat, 22 Apr 2023 16:56:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1682207756; x=1684799756; h=message-id:to:content-transfer-encoding:mime-version:subject:date :from:from:to:cc:subject:date:message-id:reply-to; bh=V86yKlHijiB/WnhdsEJ9YKxLT5SNZSTBD9PuKqk5efg=; b=AEon6E6Oe15aVFcmVGOJYO0db3JTs1MIWNLcE6yKxx3MbOiLmiJBWf5D/DYheoc0Ov 8Peeu1CO14C6v29BokaI84iTBRDZoT5dnOkYLGJi4vOYRhBm8zTxbD9/eyijA5fD85HP J8KDkK6Cn03pRIjbZpZlnESdN3iZXcVA2xjGhsYBjj7TPX8V+u9/hosZ3+0Wj0vRjSLT JLpHOsZjuje2Sx+1uK1i7nqe72kc+mYcyCVbngmHoBE5eu5k0VzvcjnqlGEF5RyJ8Jeo y4C+tXTFAdv/qAlhZnI8oWR64WYXgf2x/SNRbBOQoTQCXFwLZ5c426sfu9W89vBvTbxz rWFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682207756; x=1684799756; h=message-id:to:content-transfer-encoding:mime-version:subject:date :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=V86yKlHijiB/WnhdsEJ9YKxLT5SNZSTBD9PuKqk5efg=; b=eOMyAJjCGq6TQ9O1nogD71PalvBO/+LhNTFhoGtww9ytWWiYs//3keI5aOuvUHxjsT 7ipK7digbDAq+jnaRJFMZVVbjh19EYqlbbK79cv03uJ9t4dd38Xx3qLGKthZx1lgs49E VtoIC9dD+CJdssFHCCm13V9kSpbXkSVOSw0fl5wlVWTHRO0f7XAx0f9AL3lGa8GUCh4N Ps1L5kMWvZYMUKMahsw5kh2DIVQTWA8Lh8X//8QyxHN4k67nKJJ2gOaJ2OH9t5PVMBqY 01oK8QjCYRJF6UEBuSLawzubWfGebZBLqUIU0lxJORA2DVBR/OUmRidUGtO3LjIziVHF npVQ== X-Gm-Message-State: AAQBX9dfFAnWNCRyAIktufiCXrw2A2vQhWTjb5JfgWn37CAlF05XDZRC bJcA4UldofWm73vAiG0jEvfV1xUFqRLwYQ== X-Google-Smtp-Source: AKy350ZKATe7+b43GIsOnQtCX9SMVvud3nG3gxOZ2paxoz4zduUAo4X0YrV0X/+hio+IC6kcHwEV0Q== X-Received: by 2002:a17:906:2485:b0:94d:56f7:4fc3 with SMTP id e5-20020a170906248500b0094d56f74fc3mr5929872ejb.44.1682207756465; Sat, 22 Apr 2023 16:55:56 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id jt11-20020a170906ca0b00b00958434d4ecesm1135589ejb.13.2023.04.22.16.55.55 for <63026@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 22 Apr 2023 16:55:56 -0700 (PDT) From: Liliana Marie Prikler Date: Sat, 22 Apr 2023 07:05:00 +0200 MIME-Version: 1.0 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 * gnu/packages/patches/gfeeds-python-39-compat.patch: New file. * gnu/local.mk: Register it here. * gnu/packages/syndication.scm (gfeeds): Update to 2.2.0. [source]: Add gfeeds-python-39-compat.patch. [arguments]: Adjust ‘skip-icon-cache’ phase accordingly. --- gnu/local.mk | 1 + .../patches/gfeeds-python-39-compat.patch | 82 +++++++++++++++++++ gnu/packages/syndication.scm | 12 +-- 3 files changed, 90 insertions(+), 5 deletions(-) create mode 100644 gnu/packages/patches/gfeeds-python-39-compat.patch diff --git a/gnu/local.mk b/gnu/local.mk index b631fa6d5a..68361252c3 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1209,6 +1209,7 @@ dist_patch_DATA = \ %D%/packages/patches/gemmi-fix-sajson-types.patch \ %D%/packages/patches/genimage-mke2fs-test.patch \ %D%/packages/patches/geoclue-config.patch \ + %D%/packages/patches/gfeeds-python-39-compat.patch \ %D%/packages/patches/ghc-8.0-fall-back-to-madv_dontneed.patch \ %D%/packages/patches/ghc-9.2-glibc-2.33-link-order.patch \ %D%/packages/patches/ghc-testsuite-dlopen-pie.patch \ diff --git a/gnu/packages/patches/gfeeds-python-39-compat.patch b/gnu/packages/patches/gfeeds-python-39-compat.patch new file mode 100644 index 0000000000..edf64f9f72 --- /dev/null +++ b/gnu/packages/patches/gfeeds-python-39-compat.patch @@ -0,0 +1,82 @@ +Index: gfeeds-2.2.0/gfeeds/conf_mapper.py +=================================================================== +--- gfeeds-2.2.0.orig/gfeeds/conf_mapper.py ++++ gfeeds-2.2.0/gfeeds/conf_mapper.py +@@ -1,4 +1,4 @@ +-from typing import Dict, List, Literal, cast ++from typing import Dict, List, Literal, Union, cast + from gfeeds.gsettings_wrapper import GSETTINGS_TYPES, GsettingsWrapper + + +@@ -9,7 +9,8 @@ class ConfMapper: + @property + def feeds(self) -> Dict[ + str, +- Dict[Literal['tags', 'last-modified'], List[str] | str] ++ Dict[Literal['tags', 'last-modified'], ++ Union[List[str], str]] + ]: + return cast(dict, self.gsw.get('feeds')) + +Index: gfeeds-2.2.0/gfeeds/gsettings_wrapper.py +=================================================================== +--- gfeeds-2.2.0.orig/gfeeds/gsettings_wrapper.py ++++ gfeeds-2.2.0/gfeeds/gsettings_wrapper.py +@@ -80,19 +80,18 @@ class GsettingsWrapper: + + def set(self, key: str, value: GSETTINGS_TYPES): + key = self.convert_and_check_key(key) +- match value: +- case str(value): +- self.gs.set_string(key, value) +- case dict(value) | list(value): +- self.set(key, json.dumps(value, cls=CustomJSONEncoder)) +- case bool(value): +- self.gs.set_boolean(key, value) +- case int(value): +- self.gs.set_int(key, value) +- case float(value): +- self.gs.set_double(key, value) +- case _: +- return self.__type_err() ++ if isinstance(value, str): ++ self.gs.set_string(key, value) ++ elif isinstance(value, dict) or isinstance(value, list): ++ self.set(key, json.dumps(value, cls=CustomJSONEncoder)) ++ elif isinstance(value, bool): ++ self.gs.set_boolean(key, value) ++ elif isinstance(value, int): ++ self.gs.set_int(key, value) ++ elif isinstance(value, float): ++ self.gs.set_double(key, value) ++ else: ++ return self.__type_err() + + def __type_err(self): + raise TypeError( +Index: gfeeds-2.2.0/gfeeds/signal_helper.py +=================================================================== +--- gfeeds-2.2.0.orig/gfeeds/signal_helper.py ++++ gfeeds-2.2.0/gfeeds/signal_helper.py +@@ -1,7 +1,7 @@ +-from typing import Literal, Tuple, Type ++from typing import Literal, Tuple, Union, Type + from gi.repository import GObject + +-SignalReturnType = ( ++SignalReturnType = Union[ + Literal[ + GObject.TYPE_INT, + GObject.TYPE_BOOLEAN, +@@ -11,9 +11,8 @@ SignalReturnType = ( + GObject.TYPE_STRING, + GObject.TYPE_NONE, + GObject.TYPE_PYOBJECT, +- ] +- | None +-) ++ ], None ++] + + + def signal_tuple( diff --git a/gnu/packages/syndication.scm b/gnu/packages/syndication.scm index d0aa014ade..3f0eecde93 100644 --- a/gnu/packages/syndication.scm +++ b/gnu/packages/syndication.scm @@ -536,7 +536,7 @@ (define-public syndication-domination (define-public gfeeds (package (name "gfeeds") - (version "1.0.3") + (version "2.2.0") (source (origin (method git-fetch) (uri (git-reference @@ -545,7 +545,8 @@ (define-public gfeeds (file-name (git-file-name name version)) (sha256 (base32 - "1lkvhff7pl1y4brqsix6sar5yl8flyhfp3w96fx0klhk3586bvhg")))) + "0p2hyjif9yhpc6r3ig7fdxpb2q8s9g42mz38svsc38gq7hb13b2w")) + (patches (search-patches "gfeeds-python-39-compat.patch")))) (build-system meson-build-system) (arguments (list @@ -556,9 +557,10 @@ (define-public gfeeds (substitute* "gfeeds/confManager.py" (("mpv") (search-input-file inputs "/bin/mpv"))))) (add-after 'unpack 'skip-icon-cache - (lambda _ - (substitute* "meson_post_install.py" - (("gtk-update-icon-cache") "true")))) + (lambda _ + (substitute* "meson.build" + (("gtk_update_icon_cache: true") + "gtk_update_icon_cache: false")))) (add-after 'install 'wrap-gfeeds (lambda* (#:key outputs #:allow-other-keys) (wrap-program (string-append