[bug#38930] gnu: grilo-plugins: Update to 0.3.10.

[bug#38930] gnu: grilo-plugins: Update to 0.3.10.

[Raghav Gururajan]

[-- Attachment #1: Type: text/plain, Size: 121 bytes --]

Hello Guix!

Please find the attached patch to update grilo-plugins to version 0.3.10.

Thank you!

Regards,
RG.

[-- Attachment #2: grilo-plugins.patch --]
[-- Type: application/octet-stream, Size: 4538 bytes --]

From 977d95de15a2759e46331255c52e6fc17f07b825 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Sat, 4 Jan 2020 17:43:08 -0500
Subject: [PATCH] gnu: grilo-plugins: Update to 0.3.10.

* gnu/packages/gnome.scm (grilo-plugins): Update to 0.3.10.
---
 gnu/packages/gnome.scm | 97 ++++++++++++++++++++----------------------
 1 file changed, 45 insertions(+), 52 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index e5f5a94d49..c88e96f0b5 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -246,6 +246,51 @@ Desktop.  It is designed to be as simple as possible and has some unique
 features to enable users to create their discs easily and quickly.")
     (license license:gpl2+)))  
 
+(define-public grilo-plugins
+  (package
+    (name "grilo-plugins")
+    (version "0.3.10")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "mirror://gnome/sources/" name "/"
+                           (version-major+minor version) "/"
+                           name "-" version ".tar.xz"))
+       (sha256
+        (base32
+         "0jldaixc4kzycn5v8ixkjld1n0z3dp0l1p3vchgdwpvdvc7kcfw0"))))
+    (build-system meson-build-system)
+    (native-inputs
+     `(("gettext" ,gettext-minimal)
+       ("glib:bin" ,glib "bin")
+       ("gtk+:bin" ,gtk+ "bin")
+       ("itstools" ,itstool)
+       ("pkg-config" ,pkg-config)))
+    (inputs
+     `(("gmime" ,gmime)
+       ("gnome-online-accounts:lib" ,gnome-online-accounts "lib")
+       ("gom" ,gom)
+       ("grilo" ,grilo)
+       ("gssdp" ,gssdp)
+       ("gupnp" ,gupnp)
+       ("gupnp-av" ,gupnp-av)
+       ("json-glib" ,json-glib)
+       ("libgdata" ,libgdata)
+       ("libmediaart" ,libmediaart)
+       ("librest" ,rest)
+       ("libsoup" ,libsoup)
+       ("totam-pl-parser" ,totem-pl-parser)
+       ("tracker" ,tracker)))
+    (arguments
+      ;;Disable lua-factory as it needs missing dependencies
+     `(#:configure-flags '("-Denable-lua-factory=no")))
+    (home-page "https://live.gnome.org/Grilo")
+    (synopsis "Plugins for the Grilo media discovery library")
+    (description
+     "Grilo is a framework focused on making media discovery and browsing easy
+for application developers.")
+    (license license:lgpl2.1+)))
+
 (define-public gnome-user-share
   (package
    (name "gnome-user-share")
@@ -4612,58 +4657,6 @@ as possible!")
 for application developers.")
     (license license:lgpl2.1+)))
 
-(define-public grilo-plugins
-  (package
-    (name "grilo-plugins")
-    (version "0.3.3")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (string-append "mirror://gnome/sources/" name "/"
-                           (version-major+minor version) "/"
-                           name "-" version ".tar.xz"))
-       (sha256
-        (base32
-         "172vr1y98d2mzlmg5akjn4ibrcj3gh22cwnb3cv9rvvzhj3yhrpy"))))
-    (build-system gnu-build-system)
-    (native-inputs
-     `(("glib:bin" ,glib "bin")     ; for glib-mkenums and glib-genmarshal
-       ("intltool" ,intltool)
-       ("itstool" ,itstool)
-       ("pkg-config" ,pkg-config)))
-    (inputs
-     `(("grilo" ,grilo)
-       ("glib" ,glib)
-       ("libxml2" ,libxml2)
-       ("sqlite" ,sqlite)
-       ("gom" ,gom)
-       ;; XXX TODO: Add oauth
-       ;; XXX TODO: Add goa
-       ;; XXX TODO: Add gdata (e.g. needed for youtube plugin)
-       ;; XXX TODO: Add lua (needs help finding it)
-       ("json-glib" ,json-glib)
-       ("avahi" ,avahi)
-       ("gmime" ,gmime)
-       ("libsoup" ,libsoup)
-       ("libarchive" ,libarchive)
-       ("totem-pl-parser" ,totem-pl-parser)))
-    (arguments
-     `(#:make-flags (list (string-append "GRL_PLUGINS_DIR="
-                                         %output
-                                         "/lib/grilo-"
-                                         ,(version-major+minor version)))
-       ;; XXX FIXME: Try to get the test suite working.  It appears to require
-       ;; a working system dbus.  Inside the build container, all tests fail
-       ;; with: "assertion failed: (source)".  Outside of the build container,
-       ;; most tests succeed.
-       #:tests? #f))
-    (home-page "https://live.gnome.org/Grilo")
-    (synopsis "Plugins for the Grilo media discovery library")
-    (description
-     "Grilo is a framework focused on making media discovery and browsing easy
-for application developers.")
-    (license license:lgpl2.1+)))
-
 (define-public totem
   (package
     (name "totem")
-- 
2.24.1

[bug#38930] gnu: grilo-plugins: Update to 0.3.10.

[Danny Milosavljevic]

[-- Attachment #1: Type: text/plain, Size: 153 bytes --]

Hi RG,

please, if possible, don't move blocks.  It complicates merging between our many
git branches for no good reason and it makes review harder.

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[bug#38930] gnu: grilo-plugins: Update to 0.3.10.

[Raghav Gururajan]

[-- Attachment #1.1: Type: text/plain, Size: 267 bytes --]

Hello Danny!

> please, if possible, don't move blocks.  It complicates merging
> between our many
> git branches for no good reason and it makes review harder.

Sure, sorry about that. Please find the revised patch attached with
this email.

Regards,
RG.

[-- Attachment #1.2: grilo-plugins.patch --]
[-- Type: text/x-patch, Size: 3154 bytes --]

From befe35fd309355cb7aa0bfeda97142f4f8064958 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Mon, 6 Jan 2020 00:28:08 -0500
Subject: [PATCH] gnu: grilo-plugins: Update to 0.3.10.

* gnu/packages/gnome.scm (grilo-plugins): Update to 0.3.10.
---
 gnu/packages/gnome.scm | 47 ++++++++++++++++++------------------------
 1 file changed, 20 insertions(+), 27 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index d53c123729..6aed46b3b2 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -4376,7 +4376,7 @@ for application developers.")
 (define-public grilo-plugins
   (package
     (name "grilo-plugins")
-    (version "0.3.3")
+    (version "0.3.10")
     (source
      (origin
        (method url-fetch)
@@ -4385,39 +4385,32 @@ for application developers.")
                            name "-" version ".tar.xz"))
        (sha256
         (base32
-         "172vr1y98d2mzlmg5akjn4ibrcj3gh22cwnb3cv9rvvzhj3yhrpy"))))
-    (build-system gnu-build-system)
+         "0jldaixc4kzycn5v8ixkjld1n0z3dp0l1p3vchgdwpvdvc7kcfw0"))))
+    (build-system meson-build-system)
     (native-inputs
-     `(("glib:bin" ,glib "bin")     ; for glib-mkenums and glib-genmarshal
-       ("intltool" ,intltool)
-       ("itstool" ,itstool)
+     `(("gettext" ,gettext-minimal)
+       ("glib:bin" ,glib "bin")
+       ("gtk+:bin" ,gtk+ "bin")
+       ("itstools" ,itstool)
        ("pkg-config" ,pkg-config)))
     (inputs
-     `(("grilo" ,grilo)
-       ("glib" ,glib)
-       ("libxml2" ,libxml2)
-       ("sqlite" ,sqlite)
+     `(("gmime" ,gmime)
+       ("gnome-online-accounts:lib" ,gnome-online-accounts "lib")
        ("gom" ,gom)
-       ;; XXX TODO: Add oauth
-       ;; XXX TODO: Add goa
-       ;; XXX TODO: Add gdata (e.g. needed for youtube plugin)
-       ;; XXX TODO: Add lua (needs help finding it)
+       ("grilo" ,grilo)
+       ("gssdp" ,gssdp)
+       ("gupnp" ,gupnp)
+       ("gupnp-av" ,gupnp-av)
        ("json-glib" ,json-glib)
-       ("avahi" ,avahi)
-       ("gmime" ,gmime)
+       ("libgdata" ,libgdata)
+       ("libmediaart" ,libmediaart)
+       ("librest" ,rest)
        ("libsoup" ,libsoup)
-       ("libarchive" ,libarchive)
-       ("totem-pl-parser" ,totem-pl-parser)))
+       ("totam-pl-parser" ,totem-pl-parser)
+       ("tracker" ,tracker)))
     (arguments
-     `(#:make-flags (list (string-append "GRL_PLUGINS_DIR="
-                                         %output
-                                         "/lib/grilo-"
-                                         ,(version-major+minor version)))
-       ;; XXX FIXME: Try to get the test suite working.  It appears to require
-       ;; a working system dbus.  Inside the build container, all tests fail
-       ;; with: "assertion failed: (source)".  Outside of the build container,
-       ;; most tests succeed.
-       #:tests? #f))
+      ;;Disable lua-factory as it needs missing dependencies
+     `(#:configure-flags '("-Denable-lua-factory=no")))
     (home-page "https://live.gnome.org/Grilo")
     (synopsis "Plugins for the Grilo media discovery library")
     (description
-- 
2.24.1


[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

bug#38930: gnu: grilo-plugins: Update to 0.3.10.

[Danny Milosavljevic]

[-- Attachment #1: Type: text/plain, Size: 210 bytes --]

Pushed to guix master as commit 281f6b3a9e00be224f4727820747c081a0a69b97
after modifying the description and removing inputs gmime, gssdp, gupnp,
gupnp-av and librest because they were not picked up anyway.

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[bug#38930] gnu: grilo-plugins: Update to 0.3.10.

[Tobias Geerinckx-Rice via Guix-patches via]

[-- Attachment #1: Type: text/plain, Size: 494 bytes --]

Danny,

Danny Milosavljevic 写道：
> Pushed to guix master as commit 
> 281f6b3a9e00be224f4727820747c081a0a69b97
> after modifying the description and removing inputs gmime, 
> gssdp, gupnp,
> gupnp-av and librest because they were not picked up anyway.

Thanks!  Somewhere Raghav's (correct) commit message

    gnu: grilo-plugins: Update to 0.3.10.

got changed to

    gnu: Add grilo-plugins.

If you use scripts, you might want to check them.

Kind regards,

T G-R

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]