20/63: gnu: totem: Update to 3.32.1.

[guix-commits]

kkebreau pushed a commit to branch wip-gnome-updates
in repository guix.

commit 5314ba68be2ec9ae07d60a4988de474e8e21540d
Author: Kei Kebreau <address@hidden>
Date:   Mon Jul 22 17:55:35 2019 -0400

    gnu: totem: Update to 3.32.1.
    
    * gnu/packages/gnome.scm (totem): Update to 3.32.1.
    [source]: Remove patches.
    [arguments]: Add 'pre-check' phase.  Remove #:parallel-build?.
    [native-inputs]: Add python-pylint and xorg-server-for-tests.
    [inputs]: Replace python2-pygobject with python-pygobject.
    * gnu/packages/patches/totem-meson-easy-codec.patch,
    gnu/packages/patches/totem-meson-compat.patch: Delete files.
    * gnu/local.mk (dist_patch_DATA): Adjust accordingly.
---
 gnu/local.mk                                      |  2 -
 gnu/packages/gnome.scm                            | 82 +++++++++++------------
 gnu/packages/patches/totem-meson-compat.patch     | 14 ----
 gnu/packages/patches/totem-meson-easy-codec.patch | 65 ------------------
 4 files changed, 39 insertions(+), 124 deletions(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index bfad6a1..7f18a08 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1383,8 +1383,6 @@ dist_patch_DATA =                                         
\
   %D%/packages/patches/tk-find-library.patch                   \
   %D%/packages/patches/ttf2eot-cstddef.patch                   \
   %D%/packages/patches/ttfautohint-source-date-epoch.patch     \
-  %D%/packages/patches/totem-meson-compat.patch                        \
-  %D%/packages/patches/totem-meson-easy-codec.patch            \
   %D%/packages/patches/tuxpaint-stamps-path.patch              \
   %D%/packages/patches/txr-shell.patch                         \
   %D%/packages/patches/u-boot-fix-mkimage-header-verification.patch    \
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 06f2a0d..8c5860e 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -3911,7 +3911,7 @@ for application developers.")
 (define-public totem
   (package
     (name "totem")
-    (version "3.30.0")
+    (version "3.32.1")
     (source
      (origin
        (method url-fetch)
@@ -3920,10 +3920,41 @@ for application developers.")
                            name "-" version ".tar.xz"))
        (sha256
         (base32
-         "0rahkybxbmxhlmrrgrzxny1xm7wycx7ib4blxp1i2l1q3i8s84b0"))
-       (patches (search-patches "totem-meson-easy-codec.patch"
-                                "totem-meson-compat.patch"))))
+         "0yra8apc7smpwf7d1k8crhrm8d4wix24ds6i9yxbch1v11jnhr3v"))))
     (build-system meson-build-system)
+    (arguments
+     `(#:glib-or-gtk? #t
+
+       ;; Disable automatic GStreamer plugin installation via PackageKit and
+       ;; all that.
+       #:configure-flags '("-D" "enable-easy-codec-installation=no"
+
+                           ;; Do not build .a files for the plugins, it's
+                           ;; completely useless.  This saves 2 MiB.
+                           "--default-library" "shared")
+       #:phases
+       (modify-phases %standard-phases
+         (add-before 'install 'disable-cache-generation
+          (lambda _
+            (setenv "DESTDIR" "/")
+            #t))
+         (add-before 'check 'pre-check
+           (lambda _
+             ;; Tests require a running X server.
+             (system "Xvfb :1 &")
+             (setenv "DISPLAY" ":1")
+             #t))
+         (add-after 'install 'wrap-totem
+          (lambda* (#:key inputs outputs #:allow-other-keys)
+            (let ((out             (assoc-ref outputs "out"))
+                  (gst-plugin-path (getenv "GST_PLUGIN_SYSTEM_PATH"))
+                  (grl-plugin-path (getenv "GRL_PLUGIN_PATH")))
+              (wrap-program (string-append out "/bin/totem")
+                `("GST_PLUGIN_SYSTEM_PATH" ":" prefix (,gst-plugin-path))
+                `("GRL_PLUGIN_PATH"        ":" prefix (,grl-plugin-path)))
+              (wrap-program (string-append out "/bin/totem-video-thumbnailer")
+                `("GST_PLUGIN_SYSTEM_PATH" ":" prefix (,gst-plugin-path))))
+            #t)))))
     (native-inputs
      `(("pkg-config" ,pkg-config)
        ("desktop-file-utils" ,desktop-file-utils)
@@ -3932,7 +3963,9 @@ for application developers.")
        ("gtk:bin" ,gtk+ "bin")                    ;for 'gtk-update-icon-cache'
        ("intltool" ,intltool)
        ("itstool" ,itstool)
-       ("xmllint" ,libxml2)))
+       ("xmllint" ,libxml2)
+       ("python-pylint" ,python-pylint)
+       ("xorg-server" ,xorg-server-for-tests)))
     (propagated-inputs
      `(("dconf" ,dconf)))
     (inputs
@@ -3960,48 +3993,11 @@ for application developers.")
        ("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
        ("adwaita-icon-theme" ,adwaita-icon-theme)
        ("python" ,python)
-       ("python-pygobject" ,python2-pygobject)
-       ;; XXX TODO pylint needed for python support
+       ("python-pygobject" ,python-pygobject)
        ("totem-pl-parser" ,totem-pl-parser)
        ("grilo" ,grilo)
        ("grilo-plugins" ,grilo-plugins)
        ("vala" ,vala)))
-    (arguments
-     `(#:glib-or-gtk? #t
-
-       ;; Disable parallel builds until
-       ;; https://debbugs.gnu.org/cgi/bugreport.cgi?bug=28813 is
-       ;; fixed.  Try enabling it when updating this package in case
-       ;; upstream has fixed it.
-       #:parallel-build? #f
-
-       ;; Disable automatic GStreamer plugin installation via PackageKit and
-       ;; all that.
-       #:configure-flags '("-D" "enable-easy-codec-installation=no"
-
-                           ;; Do not build .a files for the plugins, it's
-                           ;; completely useless.  This saves 2 MiB.
-                           "--default-library" "shared")
-
-       #:phases
-       (modify-phases %standard-phases
-         (add-before
-          'install 'disable-cache-generation
-          (lambda _
-            (setenv "DESTDIR" "/")
-            #t))
-         (add-after
-          'install 'wrap-totem
-          (lambda* (#:key inputs outputs #:allow-other-keys)
-            (let ((out             (assoc-ref outputs "out"))
-                  (gst-plugin-path (getenv "GST_PLUGIN_SYSTEM_PATH"))
-                  (grl-plugin-path (getenv "GRL_PLUGIN_PATH")))
-              (wrap-program (string-append out "/bin/totem")
-                `("GST_PLUGIN_SYSTEM_PATH" ":" prefix (,gst-plugin-path))
-                `("GRL_PLUGIN_PATH"        ":" prefix (,grl-plugin-path)))
-              (wrap-program (string-append out "/bin/totem-video-thumbnailer")
-                `("GST_PLUGIN_SYSTEM_PATH" ":" prefix (,gst-plugin-path))))
-            #t)))))
     (home-page "https://wiki.gnome.org/Apps/Videos";)
     (synopsis "Simple media player for GNOME based on GStreamer")
     (description "Totem is a simple yet featureful media player for GNOME
diff --git a/gnu/packages/patches/totem-meson-compat.patch 
b/gnu/packages/patches/totem-meson-compat.patch
deleted file mode 100644
index 8557908..0000000
--- a/gnu/packages/patches/totem-meson-compat.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Fix an error that occurs with Meson 0.50.0 and later:
-"ERROR: Subdir keyword must not be an absolute path".
-
---- a/src/meson.build  2019-03-15 00:10:26.882293850 +0100
-+++ b/src/meson.build  2019-03-15 00:10:54.312197229 +0100
-@@ -82,7 +82,7 @@
- 
- install_headers(
-   headers,
--  subdir: join_paths(totem_includedir, totem_api_path)
-+  install_dir: join_paths(totem_includedir, totem_api_path)
- )
- 
- libtotem_player_sources = files(
diff --git a/gnu/packages/patches/totem-meson-easy-codec.patch 
b/gnu/packages/patches/totem-meson-easy-codec.patch
deleted file mode 100644
index b97d555..0000000
--- a/gnu/packages/patches/totem-meson-easy-codec.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-Fix a bug whereby the 'have_easy_codec' would be left undefined
-when passing '-D enable-easy-codec-installation=no'.  Likewise,
-don't rely on GStreamer's plug-in support when it's disabled.
-
---- totem-3.26.0/meson.build   2017-10-11 22:29:44.506280919 +0200
-+++ totem-3.26.0/meson.build   2017-10-11 22:29:50.902252058 +0200
-@@ -203,6 +203,8 @@ if easy_codec_option != 'no'
-   missing_plugins_deps += gst_pbutils_dep
-   config_h.set('ENABLE_MISSING_PLUGIN_INSTALLATION', have_easy_codec,
-                description: 'Whether we can and want to do installation of 
missing plugins')
-+else
-+  have_easy_codec = false
- endif
- 
- # python support
-
---- totem-3.26.0/src/backend/bacon-video-widget.c      2017-10-11 
22:40:52.531217356 +0200
-+++ totem-3.26.0/src/backend/bacon-video-widget.c      2017-10-11 
22:45:44.973847231 +0200
-@@ -341,6 +341,22 @@ get_type_name (GType class_type, int typ
-   return value->value_nick;
- }
- 
-+#ifndef ENABLE_MISSING_PLUGIN_INSTALLATION
-+
-+gchar *
-+gst_missing_plugin_message_get_installer_detail (GstMessage *message)
-+{
-+  return NULL;
-+}
-+
-+char *
-+gst_missing_plugin_message_get_description (GstMessage *message)
-+{
-+  return NULL;
-+}
-+
-+#endif
-+
- static gchar **
- bvw_get_missing_plugins_foo (const GList * missing_plugins, MsgToStrFunc func)
- {
-@@ -1654,10 +1670,12 @@ bvw_handle_element_message (BaconVideoWi
-       }
-     }
-     goto done;
-+#ifdef ENABLE_MISSING_PLUGIN_INSTALLATION
-   } else if (gst_is_missing_plugin_message (msg)) {
-     bvw->priv->missing_plugins =
-       g_list_prepend (bvw->priv->missing_plugins, gst_message_ref (msg));
-     goto done;
-+#endif
-   } else if (strcmp (type_name, "not-mounted") == 0) {
-     const GValue *val;
-     GFile *file;
-@@ -6109,7 +6127,9 @@ bacon_video_widget_initable_init (GInita
-   GST_DEBUG ("Initialised %s", version_str);
-   g_free (version_str);
- 
-+#ifdef ENABLE_MISSING_PLUGIN_INSTALLATION
-   gst_pb_utils_init ();
-+#endif
- 
-   /* Instantiate all the fallible plugins */
-   bvw->priv->play = element_make_or_warn ("playbin", "play");
-