Hello community, here is the log from the commit of package totem for openSUSE:Factory checked in at 2017-11-30 16:31:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/totem (Old) and /work/SRC/openSUSE:Factory/.totem.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "totem" Thu Nov 30 16:31:44 2017 rev:128 rq:544551 version:3.26.0 Changes: -------- --- /work/SRC/openSUSE:Factory/totem/totem.changes 2017-09-15 21:08:04.246952984 +0200 +++ /work/SRC/openSUSE:Factory/.totem.new/totem.changes 2017-11-30 16:31:46.970366220 +0100 @@ -1,0 +2,22 @@ +Tue Nov 21 20:28:55 UTC 2017 - [email protected] + +- Update Url to https://wiki.gnome.org/Apps/Videos: current Totem's + web page. + +------------------------------------------------------------------- +Mon Nov 20 21:10:02 UTC 2017 - [email protected] + +- Add upstream stable branch bug fix commits: + + totem-remove-pycopile.patch (bgo#787965). + + totem-fix-properties-crash.patch (bgo#787996). + + totem-add-opus-ogg.patch (bgo#788440). + + totem-fix-gtk-doc.patch (bgo#789202). + + totem-nb-translations.patch. +- Enable gtk-doc BuildRequires again and pass -Denable-gtk-doc=true + to meson, no longer fails to build. +- No longer Provide and Obsolete totem-devel, we have been building + this sub-package again for a long time. +- Stop removing SWF and Real mime types. +- No longer pass suse_update_desktop_file macro, no longer needed. + +------------------------------------------------------------------- New: ---- totem-add-opus-ogg.patch totem-fix-gtk-doc.patch totem-fix-properties-crash.patch totem-nb-translations.patch totem-remove-pycopile.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ totem.spec ++++++ --- /var/tmp/diff_new_pack.QHD75e/_old 2017-11-30 16:31:47.622342502 +0100 +++ /var/tmp/diff_new_pack.QHD75e/_new 2017-11-30 16:31:47.626342356 +0100 @@ -17,20 +17,30 @@ %define build_zeitgeist_plugin 0 + Name: totem Version: 3.26.0 Release: 0 Summary: Movie Player for the GNOME Desktop License: GPL-2.0+ AND LGPL-2.1+ Group: Productivity/Multimedia/Video/Players -Url: http://www.gnome.org/projects/totem/ +Url: https://wiki.gnome.org/Apps/Videos Source0: http://download.gnome.org/sources/totem/3.26/%{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM totem-remove-pycopile.patch bgo#787965 [email protected] -- No longer use debian specific tool +Patch0: totem-remove-pycopile.patch +# PATCH-FIX-UPSTREAM totem-fix-properties-crash.patch bgo#787996 [email protected] -- Fix crash when properties are closed fast +Patch1: totem-fix-properties-crash.patch +# PATCH-FIX-UPSTREAM totem-add-opus-ogg.patch bgo#788440 [email protected] -- Add opus ogg files support in mime +Patch2: totem-add-opus-ogg.patch +# PATCH-FIX-UPSTREAM totem-fix-gtk-doc.patch bgo#789202 [email protected] -- Fix gtk-doc build fail +Patch3: totem-fix-gtk-doc.patch +# PATCH-FIX-UPSTREAM totem-nb-translations.patch [email protected] -- Update Norwegian Bokmål translation +Patch4: totem-nb-translations.patch BuildRequires: appstream-glib BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: gstreamer-plugins-good >= 0.11.93 -# Temp disabled as gtk-doc 1.26 gives failed build -#BuildRequires: gtk-doc +BuildRequires: gtk-doc # For gst-inspect tool BuildRequires: gstreamer-utils >= 0.11.93 BuildRequires: intltool @@ -74,9 +84,6 @@ Recommends: gstreamer-plugins-bad Recommends: totem-plugins Suggests: gnome-dvb-daemon -# Since totem-devel no longer exists, obsolete it. -Provides: totem-devel = %{version} -Obsoletes: totem-devel < %{version} # totem-plugin-upnp has been substituted by a grilo plugin. Obsoletes: totem-plugin-upnp <= %{version} # The browser plugins were dropped with totem 3.13.90 @@ -164,7 +171,7 @@ %lang_package %prep -%setup -q +%autosetup -p1 %if !0%{?is_opensuse} translation-update-upstream %endif @@ -172,10 +179,9 @@ %build # FIXME once we figure out whats wrong with lirc-devel, add this to meson calls # -Dwith-plugins=all \ -# FIXME gtk-doc 1.26 and totem fails to build -# -Denable-gtk-doc=true \ %meson \ -D enable-easy-codec-installation=yes \ + -D enable-gtk-doc=true \ -D enable-introspection=yes \ -D enable-nautilus=yes \ -D enable-python=yes \ @@ -187,10 +193,7 @@ %install %meson_install -# Remove SWF (#72417) and any Real (#72985) MIME types. -sed -i ':1;s/^\(MimeType=.*\);[^;]*\(real\|shockwave-flash\)[^;]*/\1/;t1' \ - %{buildroot}%{_datadir}/applications/org.gnome.Totem.desktop -%suse_update_desktop_file org.gnome.Totem + %find_lang %{name} %{?no_lang_C} find %{buildroot}%{_libdir} -name '*.la' -type f -delete -print %fdupes %{buildroot}/%{_prefix} @@ -199,8 +202,7 @@ %postun -p /sbin/ldconfig %files -%defattr(-, root, root) -%doc AUTHORS COPYING NEWS README +%doc COPYING %doc %{_datadir}/help/C/%{name}/ %{_bindir}/* %{_datadir}/GConf/gsettings/totem.convert @@ -226,11 +228,9 @@ %files lang -f %{name}.lang %files -n nautilus-totem -%defattr(-, root, root) %{_libdir}/nautilus/extensions-3.0/*.so %files plugins -%defattr(-, root, root) # Explicitly list plugins %{_libdir}/totem/plugins/apple-trailers/ %{_libdir}/totem/plugins/autoload-subtitles/ @@ -257,22 +257,16 @@ %{_datadir}/glib-2.0/schemas/org.gnome.totem.plugins.pythonconsole.gschema.xml %files plugin-brasero -%defattr(-, root, root) %{_libdir}/totem/plugins/brasero-disc-recorder/ %if %{build_zeitgeist_plugin} %files plugin-zeitgeist -%defattr(-, root, root) %{_libdir}/totem/plugins/zeitgeist-dp/ %endif %files devel -%defattr(-, root, root) -# Disabled as it fails to build with gtk-doc 1.26 -#%%{_datadir}/gtk-doc/html/totem/ -## Own these repositories to not depend on gtk-doc while building: -#%%dir %%{_datadir}/gtk-doc -#%%dir %%{_datadir}/gtk-doc/html +%doc AUTHORS NEWS README +%{_datadir}/gtk-doc/html/totem/ %{_includedir}/totem/ %{_libdir}/libtotem.so %{_libdir}/pkgconfig/totem.pc ++++++ totem-add-opus-ogg.patch ++++++ >From 13b0a777b41db9837b030c110b697d41dc975de1 Mon Sep 17 00:00:00 2001 From: Dimitrios Christidis <[email protected]> Date: Mon, 2 Oct 2017 19:27:22 +0200 Subject: data: Add audio/x-opus+ogg as a mime-type This enables the thumbnailer to process OPUS files. https://bugzilla.gnome.org/show_bug.cgi?id=788440 --- data/mime-type-list.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/data/mime-type-list.txt b/data/mime-type-list.txt index 67b7501..47082c3 100644 --- a/data/mime-type-list.txt +++ b/data/mime-type-list.txt @@ -67,6 +67,7 @@ audio/x-ms-asx audio/x-ms-wax audio/x-ms-wma audio/x-musepack +audio/x-opus+ogg audio/x-pn-aiff audio/x-pn-au audio/x-pn-realaudio -- cgit v0.12 ++++++ totem-fix-gtk-doc.patch ++++++ >From 6bf1e1d06d1a93b727f2fa7a4ba5c6dae2977199 Mon Sep 17 00:00:00 2001 From: Jeremy Bicha <[email protected]> Date: Thu, 19 Oct 2017 10:41:55 -0400 Subject: build: Fix build with gtk-doc 1.26 https://bugzilla.gnome.org/show_bug.cgi?id=789202 --- docs/reference/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/reference/meson.build b/docs/reference/meson.build index 16f64bb..ff61274 100644 --- a/docs/reference/meson.build +++ b/docs/reference/meson.build @@ -89,7 +89,7 @@ gnome.gtkdoc( '--ignore-headers=' + ' '.join(private_headers), ], mkdb_args: [ - '--sgml-mode', + '--xml-mode', '--output-format=xml', '--name-space=' + meson.project_name() ], -- cgit v0.12 ++++++ totem-fix-properties-crash.patch ++++++ >From 57ceb48f4db464f785a084859c55ad20cbc639f5 Mon Sep 17 00:00:00 2001 From: Bastien Nocera <[email protected]> Date: Thu, 21 Sep 2017 20:04:31 +0200 Subject: properties: Fix crash when properties are closed fast Cancel the GstDiscoverer process when closing the window. https://bugzilla.gnome.org/show_bug.cgi?id=787996 --- src/totem-properties-view.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/totem-properties-view.c b/src/totem-properties-view.c index bf681c8..51c1334 100644 --- a/src/totem-properties-view.c +++ b/src/totem-properties-view.c @@ -345,7 +345,13 @@ totem_properties_view_finalize (GObject *object) props = TOTEM_PROPERTIES_VIEW (object); if (props->priv != NULL) { - g_clear_object (&props->priv->disco); + if (props->priv->disco) { + g_signal_handlers_disconnect_by_func (props->priv->disco, + discovered_cb, + props); + gst_discoverer_stop (props->priv->disco); + g_clear_object (&props->priv->disco); + } g_clear_object (&props->priv->label); g_free (props->priv); } -- cgit v0.12 ++++++ totem-nb-translations.patch ++++++ ++++ 2759 lines (skipped) ++++++ totem-remove-pycopile.patch ++++++ >From 39f82f0a3a78382206badb72fe58b4f611d89c68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?I=C3=B1igo=20Mart=C3=ADnez?= <[email protected]> Date: Thu, 21 Sep 2017 19:08:53 +0200 Subject: build: Remove pycompile utility Since the meson port, Totem has been using the debian specific pycompile utility. This patch removes this utility and uses the python binary to compile python files, which is also used to generate the optimized compiled files. https://bugzilla.gnome.org/show_bug.cgi?id=787965 --- meson_compile_python.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meson_compile_python.py b/meson_compile_python.py index 11eba43..9e399c8 100644 --- a/meson_compile_python.py +++ b/meson_compile_python.py @@ -7,5 +7,7 @@ installdir = os.environ['MESON_INSTALL_PREFIX'] if not os.environ.get('DESTDIR'): print('Byte-compiling python modules...') - subprocess.call(['pycompile', installdir]) + subprocess.call(['python', '-m', 'compileall', '-f', '-q', installdir]) + + print('Byte-compiling python modules (optimized versions) ...') subprocess.call(['python', '-O', '-m', 'compileall', '-f', '-q', installdir]) -- cgit v0.12
