[bug#57889] [PATCH 0/8] Add gfeeds-next

[bug#57889] [PATCH 0/8] Add gfeeds-next

[Liliana Marie Prikler]

Hi Guix,

given that we have webkitgtk-next now, I've decided to update some packages
that require it as part of their newer releases.  First up is gfeeds, which
also had me update some other things.

Cheers

Liliana Marie Prikler (8):
  gnu: blueprint-compiler: Wrap GUIX_PYTHONPATH and GI_TYPELIB_PATH.
  gnu: pugixml: Update to 1.12.1.
  gnu: Add python-timeout-decorator.
  gnu: Add python-readability-lxml.
  gnu: Add syndication-domination.
  gnu: gfeeds: Use git origin.
  gnu: gfeeds: Modernize package description.
  gnu: Add gfeeds-next.

 gnu/packages/gnome.scm       |  19 ++++++
 gnu/packages/python-xyz.scm  |  49 ++++++++++++++
 gnu/packages/syndication.scm | 126 ++++++++++++++++++++++++++---------
 gnu/packages/xml.scm         |   4 +-
 4 files changed, 165 insertions(+), 33 deletions(-)

-- 
2.37.3

[bug#57889] [PATCH 6/8] gnu: gfeeds: Use git origin.

[Liliana Marie Prikler]

* gnu/packages/syndication.scm (gfeeds)[origin]: Use git-fetch and
git-reference.
---
 gnu/packages/syndication.scm | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/syndication.scm b/gnu/packages/syndication.scm
index 44464d17a4..5e204c21ad 100644
--- a/gnu/packages/syndication.scm
+++ b/gnu/packages/syndication.scm
@@ -499,14 +499,13 @@ (define-public gfeeds
     (name "gfeeds")
     (version "0.16.2")
     (source (origin
-              (method url-fetch)
-              (uri
-               (string-append
-                "https://gitlab.gnome.org/World/gfeeds/-/archive/" version
-                "/gfeeds-" version ".tar.bz2"))
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://gitlab.gnome.org/World/gfeeds")
+                    (commit version)))
               (sha256
                (base32
-                "05gwwzqfz29m477imd5vh84jfla1wnklwpc2sdxnqli72wg08fli"))))
+                "045889417506w2l25j7jxx7jfdpfljbirhm1s4whvhk83xap19zb"))))
     (build-system meson-build-system)
     (arguments
      `(#:phases
-- 
2.37.3

[bug#57889] [PATCH 7/8] gnu: gfeeds: Modernize package description.

[Liliana Marie Prikler]

* gnu/packages/syndication.scm (gfeeds)[arguments]: Convert to list of
G-Expressions.  Drop trailing #t.
[native-inputs]: Drop labels.
[inputs]: Add bash-minimal.
---
 gnu/packages/syndication.scm | 52 +++++++++++++++++++-----------------
 1 file changed, 27 insertions(+), 25 deletions(-)

diff --git a/gnu/packages/syndication.scm b/gnu/packages/syndication.scm
index 5e204c21ad..dcd01d8933 100644
--- a/gnu/packages/syndication.scm
+++ b/gnu/packages/syndication.scm
@@ -26,6 +26,7 @@ (define-module (gnu packages syndication)
   #:use-module (guix git-download)
   #:use-module (guix packages)
   #:use-module (guix utils)
+  #:use-module (guix gexp)
   #:use-module (guix build-system cargo)
   #:use-module (guix build-system glib-or-gtk)
   #:use-module (guix build-system gnu)
@@ -35,6 +36,7 @@ (define-module (gnu packages syndication)
   #:use-module (gnu packages)
   #:use-module (gnu packages autotools)
   #:use-module (gnu packages base)
+  #:use-module (gnu packages bash)
   #:use-module (gnu packages build-tools)
   #:use-module (gnu packages check)
   #:use-module (gnu packages cmake)
@@ -508,33 +510,33 @@ (define-public gfeeds
                 "045889417506w2l25j7jxx7jfdpfljbirhm1s4whvhk83xap19zb"))))
     (build-system meson-build-system)
     (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'patch-mpv-path
-           (lambda* (#:key inputs #:allow-other-keys)
-             (substitute* "gfeeds/confManager.py"
-               (("mpv") (search-input-file inputs "/bin/mpv")))
-             #t))
-         (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 'install 'wrap-gfeeds
-           (lambda* (#:key outputs #:allow-other-keys)
-             (wrap-program (string-append
-                            (assoc-ref outputs "out") "/bin/gfeeds")
-               `("PYTHONPATH" ":" prefix (,(getenv "GUIX_PYTHONPATH")))
-               `("GI_TYPELIB_PATH" ":" prefix (,(getenv "GI_TYPELIB_PATH")))
-               `("XDG_DATA_DIRS" ":" prefix (,(getenv "XDG_DATA_DIRS"))))
-             #t)))))
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'patch-mpv-path
+            (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 'install 'wrap-gfeeds
+            (lambda* (#:key outputs #:allow-other-keys)
+              (wrap-program (string-append
+                             (assoc-ref outputs "out") "/bin/gfeeds")
+                `("PYTHONPATH" ":" prefix (,(getenv "GUIX_PYTHONPATH")))
+                `("GI_TYPELIB_PATH" ":" prefix (,(getenv "GI_TYPELIB_PATH")))
+                `("XDG_DATA_DIRS" ":" prefix (,(getenv "XDG_DATA_DIRS")))))))))
     (native-inputs
-     `(("glib:bin" ,glib "bin")
-       ("gobject-introspection" ,gobject-introspection)
-       ("gtk+:bin" ,gtk+ "bin")
-       ("pkg-config" ,pkg-config)))
+     (list `(,glib "bin")
+           `(,gtk+ "bin")
+           gobject-introspection
+           pkg-config))
     (inputs
-     (list glib
+     (list bash-minimal
+           glib
            gsettings-desktop-schemas
            gtk+
            hicolor-icon-theme
-- 
2.37.3

[bug#57889] [PATCH 1/8] gnu: blueprint-compiler: Wrap GUIX_PYTHONPATH and GI_TYPELIB_PATH.

[Liliana Marie Prikler]

* gnu/packages/gnome.scm (blueprint-compiler)[arguments]: Add
python-build-system's wrap phase, as well as a phase for GI_TYPELIB_PATH.
---
 gnu/packages/gnome.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 282c388b18..24db9c2024 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -3275,6 +3275,25 @@ (define-public blueprint-compiler
                (base32
                 "0hj7f4xhwjc4x32r3lswwclbw37fw3spy806g4plkmym25hz4ydy"))))
     (build-system meson-build-system)
+    (arguments
+     (list
+      #:imported-modules
+      `(,@%meson-build-system-modules
+        (guix build python-build-system))
+      #:modules
+      `((guix build meson-build-system)
+        ((guix build python-build-system) #:prefix python:)
+        (guix build utils))
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'wrap 'wrap-python
+            (assoc-ref python:%standard-phases 'wrap))
+          (add-after 'wrap-python 'wrap-gi
+            (lambda* (#:key outputs #:allow-other-keys)
+              (let ((out               (assoc-ref outputs "out"))
+                    (gi-typelib-path   (getenv "GI_TYPELIB_PATH")))
+                (wrap-program (string-append out "/bin/blueprint-compiler")
+                  `("GI_TYPELIB_PATH" ":" suffix (,gi-typelib-path)))))))))
     (native-inputs (list gtk python-pygobject python))
     (inputs (list python))
     (synopsis "Template markup language")
-- 
2.37.3

[bug#57889] [PATCH 8/8] gnu: Add gfeeds-next.

[Liliana Marie Prikler]

* gnu/packages/syndication.scm (gfeeds-next): New variable.
---
 gnu/packages/syndication.scm | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/gnu/packages/syndication.scm b/gnu/packages/syndication.scm
index dcd01d8933..4f25c0bdbb 100644
--- a/gnu/packages/syndication.scm
+++ b/gnu/packages/syndication.scm
@@ -586,3 +586,38 @@ (define-public syndication-domination
       (description "This package provides an experimental RSS/Atom feed
 parser.  It is \"not fit for use at this point\", but gfeeds uses it anyway.")
       (license license:agpl3))))
+
+(define-public gfeeds-next
+  (package
+    (inherit gfeeds)
+    (name "gfeeds-next")
+    (version "1.0.3")
+    (source (origin
+              (method git-fetch)
+              (uri
+               (git-reference
+                (url "https://gitlab.gnome.org/World/gfeeds/")
+                (commit version)))
+              (sha256
+               (base32
+                "1lkvhff7pl1y4brqsix6sar5yl8flyhfp3w96fx0klhk3586bvhg"))))
+    (arguments
+     (substitute-keyword-arguments (package-arguments gfeeds)
+       ((#:phases phases)
+        #~(modify-phases #$phases
+
+            (add-after 'unpack 'skip-icon-cache
+              (lambda _
+                (substitute* "meson_post_install.py"
+                  (("gtk-update-icon-cache") "true"))))))))
+    (inputs
+     (modify-inputs (package-inputs gfeeds)
+       (replace "libhandy" libadwaita)
+       (replace "gtk+" gtk)
+       (replace "webkitgtk" webkitgtk-next)
+       (prepend python-humanize python-magic syndication-domination)
+       (replace "python-readability" python-readability-lxml)))
+    (native-inputs
+     (modify-inputs (package-native-inputs gfeeds)
+       (prepend blueprint-compiler)
+       (delete "gtk+")))))
-- 
2.37.3

bug#57889: [PATCH 8/8] gnu: Add gfeeds-next.

[liliana.prikler]

Am Samstag, dem 17.09.2022 um 18:35 +0200 schrieb Liliana Marie
Prikler:
> * gnu/packages/syndication.scm (gfeeds-next): New variable.
Rewrote into a regular package update and pushed.

[bug#57889] [PATCH 2/8] gnu: pugixml: Update to 1.12.1.

[Liliana Marie Prikler]

* gnu/packages/xml.scm (pugixml): Update to 1.12.1.
---
 gnu/packages/xml.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm
index 467f90ab39..5814d1b0e3 100644
--- a/gnu/packages/xml.scm
+++ b/gnu/packages/xml.scm
@@ -1067,14 +1067,14 @@ (define-public perl-xml-xpath
 (define-public pugixml
   (package
     (name "pugixml")
-    (version "1.11")
+    (version "1.12.1")
     (source
      (origin
       (method url-fetch)
       (uri (string-append "https://github.com/zeux/pugixml/releases/download/v"
                           version "/pugixml-" version ".tar.gz"))
       (sha256
-       (base32 "0b5apqiisq8yk51x0cwks4h2m0zd2zgjdy0w80qp9h5rccz3v496"))))
+       (base32 "1ixg6fpr7vhkg9bn2g2qmmwpy974z7nx7zq81whm2h6c36lp3xnw"))))
     (build-system cmake-build-system)
     (arguments
      `(#:configure-flags '("-DBUILD_SHARED_LIBS=ON")
-- 
2.37.3

[bug#57889] [PATCH 3/8] gnu: Add python-timeout-decorator.

[Liliana Marie Prikler]

* gnu/packages/python-xyz.scm (python-timeout-decorator): New variable.
---
 gnu/packages/python-xyz.scm | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index ff9f458167..14d3b1a9c1 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -11204,6 +11204,23 @@ (define-public python-stopit
 blocks or callables with two context managers and two decorators.")
     (license license:expat)))
 
+(define-public python-timeout-decorator
+  (package
+    (name "python-timeout-decorator")
+    (version "0.5.0")
+    (source (origin
+              (method url-fetch)
+              (uri (pypi-uri "timeout-decorator" version))
+              (sha256
+               (base32
+                "1mxk2qyydhzncm93z08kvj5ssxq3fr2n7pkrrji28nqwvdc2ybva"))))
+    (build-system python-build-system)
+    (home-page "https://github.com/pnpnpn/timeout-decorator")
+    (synopsis "Timeout decorator")
+    (description "This package provides a decorator that raises an error
+when an operation takes longer than expected.")
+    (license license:expat)))
+
 (define-public python-straight-plugin
   (package
     (name "python-straight-plugin")
-- 
2.37.3

[bug#57889] [PATCH 4/8] gnu: Add python-readability-lxml.

[Liliana Marie Prikler]

* gnu/packages/python-xyz.scm (python-readability-lxml): New variable.
---
 gnu/packages/python-xyz.scm | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 14d3b1a9c1..1246d75095 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -27891,6 +27891,38 @@ (define-public python-readability
 number of words, syllables, and sentences.")
     (license license:asl2.0)))
 
+(define-public python-readability-lxml
+  (package
+    (name "python-readability-lxml")
+    (version "0.8.1")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/buriy/python-readability")
+                    (commit (string-append "v" version))))
+              (sha256
+               (base32
+                "13nfy2v0pbbf62jn9qwgi489gg97hbb22q6w3f78mnvjxd2m19rh"))
+              (snippet
+               #~(begin (delete-file "readability/compat/two.py")))))
+    (build-system python-build-system)
+    (arguments
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (replace 'check
+            (lambda* (#:key tests? #:allow-other-keys)
+              (when tests?
+                (invoke "python" "-m" "pytest" "-v" "tests/")))))))
+    (propagated-inputs (list python-chardet python-cssselect python-lxml))
+    (native-inputs (list python-timeout-decorator python-pytest))
+    (home-page "http://github.com/buriy/python-readability")
+    (synopsis "HTML to text parser")
+    (description
+     "This package provides classes and function that strip gratuitous markup
+from web pages to make them easier to read.")
+    (license license:asl2.0)))
+
 (define-public python-listparser
   (package
     (name "python-listparser")
-- 
2.37.3

[bug#57889] [PATCH 5/8] gnu: Add syndication-domination.

[Liliana Marie Prikler]

* gnu/packages/syndication.scm (syndication-domination): New variable.
---
 gnu/packages/syndication.scm | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/gnu/packages/syndication.scm b/gnu/packages/syndication.scm
index 6eb88afb8f..44464d17a4 100644
--- a/gnu/packages/syndication.scm
+++ b/gnu/packages/syndication.scm
@@ -35,7 +35,9 @@ (define-module (gnu packages syndication)
   #:use-module (gnu packages)
   #:use-module (gnu packages autotools)
   #:use-module (gnu packages base)
+  #:use-module (gnu packages build-tools)
   #:use-module (gnu packages check)
+  #:use-module (gnu packages cmake)
   #:use-module (gnu packages crates-io)
   #:use-module (gnu packages curl)
   #:use-module (gnu packages documentation)
@@ -48,6 +50,7 @@ (define-module (gnu packages syndication)
   #:use-module (gnu packages kde-frameworks)
   #:use-module (gnu packages ncurses)
   #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages pretty-print)
   #:use-module (gnu packages python)
   #:use-module (gnu packages python-check)
   #:use-module (gnu packages python-xyz)
@@ -557,3 +560,28 @@ (define-public gfeeds
     (description "Feeds is an RSS/Atom feed reader made with GTK+
 and it has an easy-to-use graphical user interface.")
     (license license:gpl3+)))
+
+(define-public syndication-domination
+  (let ((revision "1")
+        (commit "f64caabd6f46be14fdb92085971a7f2d6fa5e61e"))
+    (package
+      (name "syndication-domination")
+      (version (git-version "0.0" revision commit))
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url "https://gitlab.com/gabmus/syndication-domination")
+                      (commit commit)))
+                (file-name (git-file-name name version))
+                (sha256
+                 (base32 "1i0llzzm3lc2kw7rjhb46c7wlknsb6r9bdrf61chi2pk6hpjyscv"))))
+      (build-system meson-build-system)
+      (arguments
+       (list #:meson meson-0.63))
+      (inputs (list fmt tidy-html pybind11 python pugixml))
+      (native-inputs (list cmake pkg-config)) ; need cmake to find pybind11
+      (home-page "https://gitlab.com/gabmus/syndication-domination")
+      (synopsis "RSS/Atom feed parser")
+      (description "This package provides an experimental RSS/Atom feed
+parser.  It is \"not fit for use at this point\", but gfeeds uses it anyway.")
+      (license license:agpl3))))
-- 
2.37.3