GNU bug report logs - #63026
[PATCH 0/2] Update gfeeds to 2.2.0.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 63026 in the body.
You can then email your comments to 63026 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
To: guix-patches <at> gnu.org
Subject: [PATCH 0/2] Update gfeeds to 2.2.0.
Date: Sun, 23 Apr 2023 01:45:19 +0200

Hi Guix,

as with the recent update to Evolution, this is an update to get a
package into a working state again.

Cheers

(Sorry for the first mail being sent to guix-devel by mistake.)

Liliana Marie Prikler (2):
  gnu: syndication-domination: Update to 1.0-1-7592032.
  gnu: gfeeds: Update to 2.2.0.

 gnu/local.mk                                  |  1 +
 .../patches/gfeeds-python-39-compat.patch     | 82 +++++++++++++++++++
 gnu/packages/syndication.scm                  | 18 ++--
 3 files changed, 93 insertions(+), 8 deletions(-)
 create mode 100644 gnu/packages/patches/gfeeds-python-39-compat.patch

-- 
2.39.2

Message #8 received at 63026 <at> debbugs.gnu.org (full text, mbox):

From: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
To: 63026 <at> debbugs.gnu.org
Subject: [PATCH 1/2] gnu: syndication-domination: Update to 1.0-1-7592032.
Date: Sat, 22 Apr 2023 07:03:34 +0200

* 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))
-- 
2.39.2

Message #11 received at 63026 <at> debbugs.gnu.org (full text, mbox):

From: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
To: 63026 <at> debbugs.gnu.org
Subject: [PATCH 2/2] gnu: gfeeds: Update to 2.2.0.
Date: Sat, 22 Apr 2023 07:05:00 +0200

* 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
-- 
2.39.2

Message #14 received at 63026 <at> debbugs.gnu.org (full text, mbox):

From: Andreas Enge <andreas <at> enge.fr>
To: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
Cc: 63026 <at> debbugs.gnu.org, guix-devel <at> gnu.org
Subject: Re: [PATCH 0/2] Update gfeeds to 2.2.0.
Date: Sun, 23 Apr 2023 09:07:03 +0200

Hello Liliana,

Am Sun, Apr 23, 2023 at 01:45:19AM +0200 schrieb Liliana Marie Prikler:
> as with the recent update to Evolution, this is an update to get a
> package into a working state again.

gfeeds has python-magic as input, which fails on the soon to be merged
core-updates. It would be interesting if you could have a look at this
package. Thanks!

Andreas

Message #17 received at 63026 <at> debbugs.gnu.org (full text, mbox):

From: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
To: Andreas Enge <andreas <at> enge.fr>
Cc: 63026 <at> debbugs.gnu.org, guix-devel <at> gnu.org
Subject: Re: [PATCH 0/2] Update gfeeds to 2.2.0.
Date: Sun, 23 Apr 2023 15:11:24 +0200

[Message part 1 (text/plain, inline)]

Am Sonntag, dem 23.04.2023 um 09:07 +0200 schrieb Andreas Enge:
> Hello Liliana,
> 
> Am Sun, Apr 23, 2023 at 01:45:19AM +0200 schrieb Liliana Marie
> Prikler:
> > as with the recent update to Evolution, this is an update to get a
> > package into a working state again.
> 
> gfeeds has python-magic as input, which fails on the soon to be
> merged core-updates. It would be interesting if you could have a look
> at this package. Thanks!
Patch is attached.

Cheers

[0001-gnu-python-magic-Update-to-0.4.27.patch (text/x-patch, attachment)]

Message #20 received at 63026 <at> debbugs.gnu.org (full text, mbox):

From: Andreas Enge <andreas <at> enge.fr>
To: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
Cc: 63026 <at> debbugs.gnu.org
Subject: Re: [PATCH 0/2] Update gfeeds to 2.2.0.
Date: Mon, 24 Apr 2023 10:37:28 +0200

Am Sun, Apr 23, 2023 at 03:11:24PM +0200 schrieb Liliana Marie Prikler:
> > gfeeds has python-magic as input, which fails on the soon to be
> > merged core-updates. It would be interesting if you could have a look
> > at this package. Thanks!
> Patch is attached.

Thanks! I took the liberty to push the python-magic patch to core-updates;
it might also enable the trytond set of packages to build (I checked trytond
itself). The other patch does not apply to core-updates; I let you update
it and push it at your convenience to core-updates or after the merge to
master. As no other package depends on it, it is safe.

Andreas

Message #23 received at 63026 <at> debbugs.gnu.org (full text, mbox):

From: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
To: Andreas Enge <andreas <at> enge.fr>
Cc: 63026 <at> debbugs.gnu.org
Subject: Re: [PATCH 0/2] Update gfeeds to 2.2.0.
Date: Mon, 24 Apr 2023 18:47:49 +0200

Am Montag, dem 24.04.2023 um 10:37 +0200 schrieb Andreas Enge:
> The other patch does not apply to core-updates; I let you update
> it and push it at your convenience to core-updates or after the merge
> to master. As no other package depends on it, it is safe.
It is intended for current master, perhaps that's causing some issue.
Do we have an ETA for core-updates?

Message #26 received at 63026 <at> debbugs.gnu.org (full text, mbox):

From: Andreas Enge <andreas <at> enge.fr>
To: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
Cc: 63026 <at> debbugs.gnu.org
Subject: Re: [PATCH 0/2] Update gfeeds to 2.2.0.
Date: Mon, 24 Apr 2023 18:56:37 +0200

Am Mon, Apr 24, 2023 at 06:47:49PM +0200 schrieb Liliana Marie Prikler:
> It is intended for current master, perhaps that's causing some issue.
> Do we have an ETA for core-updates?

It is supposed to be merged tomorrow, but since gfeeds has no dependents,
you can push it any time (before the merge to core-updates, or after the
merge to master). There is not much use in pushing it to master today
if we already know it will break with the merge tomorrow...

Andreas

Message #31 received at 63026-done <at> debbugs.gnu.org (full text, mbox):

From: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
To: Andreas Enge <andreas <at> enge.fr>
Cc: 63026-done <at> debbugs.gnu.org
Subject: Re: [PATCH 0/2] Update gfeeds to 2.2.0.
Date: Tue, 25 Apr 2023 21:15:07 +0200

Am Montag, dem 24.04.2023 um 18:56 +0200 schrieb Andreas Enge:
> It is supposed to be merged tomorrow, but since gfeeds has no
> dependents, you can push it any time (before the merge to core-
> updates, or after the merge to master). There is not much use in
> pushing it to master today if we already know it will break with the
> merge tomorrow...
Given that gfeeds already had an unclean upgrade on core-updates, I
simply fixed the build on the now-merged master and pushed that.

Thanks & cheers

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.