Date: Monday, September 30, 2013 @ 11:24:18 Author: jgc Revision: 195305
upgpkg: totem 3.10.1-1 Modified: totem/trunk/PKGBUILD Deleted: totem/trunk/bgo708647-2.patch totem/trunk/bgo708647.patch -------------------+ PKGBUILD | 17 +++++------------ bgo708647-2.patch | 22 ---------------------- bgo708647.patch | 28 ---------------------------- 3 files changed, 5 insertions(+), 62 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2013-09-30 09:19:58 UTC (rev 195304) +++ PKGBUILD 2013-09-30 09:24:18 UTC (rev 195305) @@ -4,8 +4,8 @@ pkgbase=totem pkgname=('totem' 'totem-plugin') -pkgver=3.10.0 -pkgrel=2 +pkgver=3.10.1 +pkgrel=1 pkgdesc="GNOME3 movie player based on GStreamer" url="http://www.gnome.org" arch=(i686 x86_64) @@ -17,13 +17,10 @@ itstool docbook-xsl python-pylint) options=('!libtool' '!emptydirs') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz - browser-plugins.ini bugreport.patch - bgo708647-2.patch bgo708647.patch) -sha256sums=('c223e953f9697cc932f3b7efd87cea767a3e5a2ba0e3cda08628aa364caee094' + browser-plugins.ini bugreport.patch) +sha256sums=('b6b6038c9104965671a6d25e98496a487c3a9c590c9c104f668bd9f4fa7be9e2' 'a50a3bbf35f0535f7e8e20af1893446a2e5711015484f9ae6d1ff91af3b23c4e' - '30481dab7e21b66257e3238f5a8b708e1a5c4797d7da904f7ebaba4c2c2ef167' - '749b95c4747e04f54fb9b41196435c33e5f30ea4583e66e365c012be194ec5d3' - 'aeec75abf32dd16b392d7821fe4c28bc381c1c50d3e028342aeb8f9dc20b17be') + '30481dab7e21b66257e3238f5a8b708e1a5c4797d7da904f7ebaba4c2c2ef167') prepare() { @@ -31,10 +28,6 @@ # Make compatible with Python 3 and Gstreamer 1.0 patch -Np1 -i ../bugreport.patch - - # Fix some asserts - patch -Np1 -i ../bgo708647.patch - patch -Np1 -i ../bgo708647-2.patch } build() { Deleted: bgo708647-2.patch =================================================================== --- bgo708647-2.patch 2013-09-30 09:19:58 UTC (rev 195304) +++ bgo708647-2.patch 2013-09-30 09:24:18 UTC (rev 195305) @@ -1,22 +0,0 @@ -From 437e64ffb5f19d2f088339954686e794cc276319 Mon Sep 17 00:00:00 2001 -From: Bastien Nocera <had...@hadess.net> -Date: Mon, 23 Sep 2013 18:27:17 +0000 -Subject: main: Fix typo in action name - -See: https://bugzilla.gnome.org/show_bug.cgi?id=708647 ---- -diff --git a/src/totem.c b/src/totem.c -index bf82c04..12a0e5b 100644 ---- a/src/totem.c -+++ b/src/totem.c -@@ -107,7 +107,7 @@ app_init (Totem *totem, char **argv) - set_rtl_icon_name (totem, "next-chapter", "media-skip-forward"); - set_rtl_icon_name (totem, "previous-chapter", "media-skip-backward"); - set_rtl_icon_name (totem, "skip-forward", "media-seek-forward"); -- set_rtl_icon_name (totem, "skip-backward", "media-seek-backward"); -+ set_rtl_icon_name (totem, "skip-backwards", "media-seek-backward"); - - totem->win = GTK_WIDGET (gtk_builder_get_object (totem->xml, "totem_main_window")); - g_object_bind_property (G_OBJECT (totem), "fullscreen", --- -cgit v0.9.2 Deleted: bgo708647.patch =================================================================== --- bgo708647.patch 2013-09-30 09:19:58 UTC (rev 195304) +++ bgo708647.patch 2013-09-30 09:24:18 UTC (rev 195305) @@ -1,28 +0,0 @@ -From b252133d765245a297e446c805822601e5a4924b Mon Sep 17 00:00:00 2001 -From: Bastien Nocera <had...@hadess.net> -Date: Fri, 27 Sep 2013 13:50:20 +0000 -Subject: main: Fix possible assertion on startup - -In some cases, Totem was focused on startup by the time we -handled command-line arguments. This triggered an assertion -when trying to show the fullscreen popups because we weren't -fullscreened yet. - -https://bugzilla.gnome.org/show_bug.cgi?id=708647 ---- -diff --git a/src/totem-fullscreen.c b/src/totem-fullscreen.c -index fac1b05..69e1fd7 100644 ---- a/src/totem-fullscreen.c -+++ b/src/totem-fullscreen.c -@@ -307,7 +307,8 @@ totem_fullscreen_show_popups (TotemFullscreen *fs, gboolean show_cursor) - { - GtkWidget *item; - -- g_assert (fs->priv->is_fullscreen != FALSE); -+ if (!fs->priv->is_fullscreen) -+ return; - - if (fs->priv->popup_in_progress != FALSE) - return; --- -cgit v0.9.2