Hello community, here is the log from the commit of package totem for openSUSE:12.3 checked in at 2013-02-11 11:14:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.3/totem (Old) and /work/SRC/openSUSE:12.3/.totem.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "totem", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:12.3/totem/totem.changes 2013-01-31 01:43:00.000000000 +0100 +++ /work/SRC/openSUSE:12.3/.totem.new/totem.changes 2013-02-11 11:14:40.000000000 +0100 @@ -1,0 +2,13 @@ +Sat Feb 9 20:20:29 UTC 2013 - [email protected] + +- Add totem-Use-Ctrl+C-as-the-shortcut.patch; So as not to clash + with Eject which already uses Ctrl+E (bgo#688298). +- Add totem-Fix-playing-files-from-recent-files.patch; Loads of + confusion as to the playback path for trash:/// and recent:/// + would cause an assertion when drag'n'dropping such a file. + (bgo#690304). +- Add totem-Fix-fetching-the-cover-art.patch; Initialise the type + of image so that we can save the cover image even if the + image-type isn't defined. (bgo#690286). + +------------------------------------------------------------------- New: ---- totem-Fix-fetching-the-cover-art.patch totem-Fix-playing-files-from-recent-files.patch totem-Use-Ctrl+C-as-the-shortcut.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ totem.spec ++++++ --- /var/tmp/diff_new_pack.4m8pm4/_old 2013-02-11 11:14:41.000000000 +0100 +++ /var/tmp/diff_new_pack.4m8pm4/_new 2013-02-11 11:14:41.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package totem # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -27,6 +27,12 @@ License: GPL-2.0+ and LGPL-2.1+ Group: Productivity/Multimedia/Video/Players Source0: http://download.gnome.org/sources/totem/3.6/%{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM totem-Use-Ctrl+C-as-the-shortcut.patch bgo#688298 [email protected] -- So as not to clash with Eject which already uses Ctrl+E, taken from upstream stable git. +Patch0: totem-Use-Ctrl+C-as-the-shortcut.patch +# PATCH-FIX-UPSTREAM totem-Fix-playing-files-from-recent-files.patch bgo#690304 [email protected] -- Loads of confusion as to the playback path for trash:/// and recent:/// would cause an assertion when drag'n'dropping such a file, taken from upstream stable git. +Patch1: totem-Fix-playing-files-from-recent-files.patch +# PATCH-FIX-UPSTREAM totem-Fix-fetching-the-cover-art.patch bgo#690286 [email protected] -- Initialise the type of image so that we can save the cover image even if the image-type isn't defined, taken from upstream stable git. +Patch2: totem-Fix-fetching-the-cover-art.patch BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: gnome-doc-utils-devel @@ -191,6 +197,9 @@ %lang_package %prep %setup -q +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 translation-update-upstream %build ++++++ totem-Fix-fetching-the-cover-art.patch ++++++ >From 0ee69cd1edf0cedd7f4813b4ab9e3085fae60c78 Mon Sep 17 00:00:00 2001 From: Bastien Nocera <[email protected]> Date: Tue, 18 Dec 2012 10:00:13 +0000 Subject: thumbnailer: Fix fetching the cover art on some systems Initialise the type of image so that we can save the cover image even if the image-type isn't defined. https://bugzilla.gnome.org/show_bug.cgi?id=690286 --- diff --git a/src/gst/totem-gst-pixbuf-helpers.c b/src/gst/totem-gst-pixbuf-helpers.c index 37bb493..1edef46 100644 --- a/src/gst/totem-gst-pixbuf-helpers.c +++ b/src/gst/totem-gst-pixbuf-helpers.c @@ -157,7 +157,7 @@ totem_gst_tag_list_get_cover_real (GstTagList *tag_list) GstSample *sample; GstCaps *caps; const GstStructure *caps_struct; - int type; + int type = GST_TAG_IMAGE_TYPE_UNDEFINED; if (!gst_tag_list_get_sample_index (tag_list, GST_TAG_IMAGE, i, &sample)) break; -- cgit v0.9.0.2 ++++++ totem-Fix-playing-files-from-recent-files.patch ++++++ >From 0725b5a541f08c65a4a8bfcf5a96ccca97756192 Mon Sep 17 00:00:00 2001 From: Bastien Nocera <[email protected]> Date: Mon, 17 Dec 2012 16:18:22 +0000 Subject: backend: Fix playing files from recent:/// Loads of confusion as to the playback path for trash:/// and recent:/// would cause an assertion when drag'n'dropping such a file. https://bugzilla.gnome.org/show_bug.cgi?id=690304 --- diff --git a/src/backend/bacon-video-widget.c b/src/backend/bacon-video-widget.c index 376eef8..bed827b 100644 --- a/src/backend/bacon-video-widget.c +++ b/src/backend/bacon-video-widget.c @@ -3506,19 +3506,20 @@ bacon_video_widget_open (BaconVideoWidget * bvw, path = NULL; } else if (g_file_has_uri_scheme (file, "trash") != FALSE || g_file_has_uri_scheme (file, "recent") != FALSE) { - path = get_target_uri (file); - if (path == NULL) + path = NULL; + bvw->priv->mrl = get_target_uri (file); + if (bvw->priv->mrl == NULL) path = g_file_get_path (file); else GST_DEBUG ("Found target location '%s' for original MRL '%s'", - GST_STR_NULL (path), mrl); + GST_STR_NULL (bvw->priv->mrl), mrl); } else { path = g_file_get_path (file); } if (path) { bvw->priv->mrl = g_filename_to_uri (path, NULL, NULL); g_free (path); - } else { + } else if (bvw->priv->mrl == NULL) { bvw->priv->mrl = g_strdup (mrl); } -- cgit v0.9.0.2 ++++++ totem-Use-Ctrl+C-as-the-shortcut.patch ++++++ >From 5eeeedf49e0ad2956b026787cd7437c9b1befca4 Mon Sep 17 00:00:00 2001 From: Bastien Nocera <[email protected]> Date: Wed, 14 Nov 2012 18:09:26 +0000 Subject: save-file: Use Ctrl+C as the shortcut So as not to clash with Eject which already uses Ctrl+E https://bugzilla.gnome.org/show_bug.cgi?id=688298 --- diff --git a/src/plugins/save-file/totem-save-file.c b/src/plugins/save-file/totem-save-file.c index 85c8fd5..c71b597 100644 --- a/src/plugins/save-file/totem-save-file.c +++ b/src/plugins/save-file/totem-save-file.c @@ -60,7 +60,7 @@ static void totem_save_file_plugin_copy (GtkAction *action, TotemSaveFilePlugin *pi); static GtkActionEntry totem_save_file_plugin_actions [] = { - { "SaveFile", "save-as", N_("Save a Copy..."), "<Ctrl>E", + { "SaveFile", "save-as", N_("Save a Copy..."), "<Ctrl>C", N_("Save a copy of the movie"), G_CALLBACK (totem_save_file_plugin_copy) }, }; -- cgit v0.9.0.2 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
