From 7f0ff905386be612307a198ca98efda50d1362ff Mon Sep 17 00:00:00 2001
From: Liliana Marie Prikler <liliana.prikler@gmail.com>
Date: Sat, 17 Sep 2022 18:35:47 +0200
Subject: gnu: gfeeds: Update to 1.0.3.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/syndication.scm (gfeeds): Update to 1.0.3.
[arguments]<#:phases>: Add ‘skip-icon-cache’.
[native-inputs]: Remove gtk+:bin.  Add blueprint-compiler.
[inputs]: Replace gtk+ with gtk.
Replace libhandy with libadwaita.
Replace python-readability with python-readability-lxml.
Replace webkitgtk with webkitgtk-next.
Add python-humanize, python-magic, python-pygobject, and
syndication-domination.
---
 gnu/packages/syndication.scm | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/gnu/packages/syndication.scm b/gnu/packages/syndication.scm
index 7c2031cabf..c30d16c870 100644
--- a/gnu/packages/syndication.scm
+++ b/gnu/packages/syndication.scm
@@ -4,6 +4,7 @@
 ;;; Copyright © 2020 Vinicius Monego <monego@posteo.net>
 ;;; Copyright © 2021 Felix Gruber <felgru@posteo.net>
 ;;; Copyright © 2022 Luis Felipe López Acevedo <luis.felipe.la@protonmail.com>
+;;; Copyright © 2022 Liliana Marie Prikler <liliana.prikler@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -524,7 +525,7 @@ parser.  It is \"not fit for use at this point\", but gfeeds uses it anyway.")
 (define-public gfeeds
   (package
     (name "gfeeds")
-    (version "0.16.2")
+    (version "1.0.3")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -532,7 +533,7 @@ parser.  It is \"not fit for use at this point\", but gfeeds uses it anyway.")
                     (commit version)))
               (sha256
                (base32
-                "045889417506w2l25j7jxx7jfdpfljbirhm1s4whvhk83xap19zb"))))
+                "1lkvhff7pl1y4brqsix6sar5yl8flyhfp3w96fx0klhk3586bvhg"))))
     (build-system meson-build-system)
     (arguments
      (list
@@ -542,11 +543,10 @@ parser.  It is \"not fit for use at this point\", but gfeeds uses it anyway.")
             (lambda* (#:key inputs #:allow-other-keys)
               (substitute* "gfeeds/confManager.py"
                 (("mpv") (search-input-file inputs "/bin/mpv")))))
-          (add-after 'unpack 'patch-webkit2-version
-            (lambda* (#:key inputs #:allow-other-keys)
-              (substitute* "bin/gfeeds.in"
-                (("gi\\.require_version\\('WebKit2', '4\\.0'\\)")
-                 "gi.require_version('WebKit2', '4.1')"))))
+          (add-after 'unpack 'skip-icon-cache
+            (lambda _
+              (substitute* "meson_post_install.py"
+                (("gtk-update-icon-cache") "true"))))
           (add-after 'install 'wrap-gfeeds
             (lambda* (#:key outputs #:allow-other-keys)
               (wrap-program (string-append
@@ -556,31 +556,34 @@ parser.  It is \"not fit for use at this point\", but gfeeds uses it anyway.")
                 `("XDG_DATA_DIRS" ":" prefix (,(getenv "XDG_DATA_DIRS")))))))))
     (native-inputs
      (list `(,glib "bin")
-           `(,gtk+ "bin")
+           blueprint-compiler
            gobject-introspection
            pkg-config))
     (inputs
      (list bash-minimal
            glib
            gsettings-desktop-schemas
-           gtk+
+           gtk
            hicolor-icon-theme
-           libhandy
+           libadwaita
            mpv
            python
            python-beautifulsoup4
            python-dateutil
            python-feedparser
            python-html5lib
+           python-humanize
            python-listparser
            python-lxml
+           python-magic
            python-pillow
            python-pygments
+           python-pygobject
            python-pytz
-           python-readability
+           python-readability-lxml
            python-requests
-           webkitgtk
-           python-pygobject))
+           syndication-domination
+           webkitgtk-next))
     (home-page "https://gfeeds.gabmus.org/")
     (synopsis "Easy-to-use GTK+ RSS/Atom feed reader")
     (description "Feeds is an RSS/Atom feed reader made with GTK+
-- 
cgit v1.2.3