[arch-commits] Commit in totem/repos (20 files)
Jan Steffens
heftig at nymeria.archlinux.org
Mon Sep 30 02:32:04 UTC 2013
Date: Monday, September 30, 2013 @ 04:32:04
Author: heftig
Revision: 195292
archrelease: copy trunk to gnome-unstable-i686, gnome-unstable-x86_64
Added:
totem/repos/gnome-unstable-i686/PKGBUILD
(from rev 195291, totem/trunk/PKGBUILD)
totem/repos/gnome-unstable-i686/bgo708647-2.patch
(from rev 195291, totem/trunk/bgo708647-2.patch)
totem/repos/gnome-unstable-i686/bgo708647.patch
(from rev 195291, totem/trunk/bgo708647.patch)
totem/repos/gnome-unstable-i686/browser-plugins.ini
(from rev 195291, totem/trunk/browser-plugins.ini)
totem/repos/gnome-unstable-i686/bugreport.patch
(from rev 195291, totem/trunk/bugreport.patch)
totem/repos/gnome-unstable-i686/totem.install
(from rev 195291, totem/trunk/totem.install)
totem/repos/gnome-unstable-x86_64/PKGBUILD
(from rev 195291, totem/trunk/PKGBUILD)
totem/repos/gnome-unstable-x86_64/bgo708647-2.patch
(from rev 195291, totem/trunk/bgo708647-2.patch)
totem/repos/gnome-unstable-x86_64/bgo708647.patch
(from rev 195291, totem/trunk/bgo708647.patch)
totem/repos/gnome-unstable-x86_64/browser-plugins.ini
(from rev 195291, totem/trunk/browser-plugins.ini)
totem/repos/gnome-unstable-x86_64/bugreport.patch
(from rev 195291, totem/trunk/bugreport.patch)
totem/repos/gnome-unstable-x86_64/totem.install
(from rev 195291, totem/trunk/totem.install)
Deleted:
totem/repos/gnome-unstable-i686/PKGBUILD
totem/repos/gnome-unstable-i686/browser-plugins.ini
totem/repos/gnome-unstable-i686/bugreport.patch
totem/repos/gnome-unstable-i686/totem.install
totem/repos/gnome-unstable-x86_64/PKGBUILD
totem/repos/gnome-unstable-x86_64/browser-plugins.ini
totem/repos/gnome-unstable-x86_64/bugreport.patch
totem/repos/gnome-unstable-x86_64/totem.install
-------------------------------------------+
/PKGBUILD | 178 ++++++++++++++++++++++++++++
/browser-plugins.ini | 4
/bugreport.patch | 44 ++++++
/totem.install | 26 ++++
gnome-unstable-i686/PKGBUILD | 82 ------------
gnome-unstable-i686/bgo708647-2.patch | 22 +++
gnome-unstable-i686/bgo708647.patch | 28 ++++
gnome-unstable-i686/browser-plugins.ini | 2
gnome-unstable-i686/bugreport.patch | 22 ---
gnome-unstable-i686/totem.install | 13 --
gnome-unstable-x86_64/PKGBUILD | 82 ------------
gnome-unstable-x86_64/bgo708647-2.patch | 22 +++
gnome-unstable-x86_64/bgo708647.patch | 28 ++++
gnome-unstable-x86_64/browser-plugins.ini | 2
gnome-unstable-x86_64/bugreport.patch | 22 ---
gnome-unstable-x86_64/totem.install | 13 --
16 files changed, 352 insertions(+), 238 deletions(-)
Deleted: gnome-unstable-i686/PKGBUILD
===================================================================
--- gnome-unstable-i686/PKGBUILD 2013-09-30 02:30:16 UTC (rev 195291)
+++ gnome-unstable-i686/PKGBUILD 2013-09-30 02:32:04 UTC (rev 195292)
@@ -1,82 +0,0 @@
-# $Id$
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-# Contributor: Jan de Groot <jgc at archlinux.org>
-
-pkgbase=totem
-pkgname=('totem' 'totem-plugin')
-pkgver=3.10.0
-pkgrel=1
-pkgdesc="GNOME3 movie player based on GStreamer"
-url="http://www.gnome.org"
-arch=(i686 x86_64)
-license=(GPL2 custom)
-depends=(gst-plugins-base gst-plugins-good totem-plparser desktop-file-utils iso-codes libpeas
- hicolor-icon-theme gnome-icon-theme gsettings-desktop-schemas dconf clutter-gst
- clutter-gtk python-gobject python-xdg gst-plugins-bad)
-makedepends=(intltool libnautilus-extension lirc-utils vala grilo dbus-glib zeitgeist
- 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)
-sha256sums=('c223e953f9697cc932f3b7efd87cea767a3e5a2ba0e3cda08628aa364caee094'
- 'a50a3bbf35f0535f7e8e20af1893446a2e5711015484f9ae6d1ff91af3b23c4e'
- '30481dab7e21b66257e3238f5a8b708e1a5c4797d7da904f7ebaba4c2c2ef167')
-
-
-prepare() {
- cd "$pkgbase-$pkgver"
-
- # Make compatible with Python 3 and Gstreamer 1.0
- patch -Np1 -i ../bugreport.patch
-}
-
-build() {
- cd "$pkgbase-$pkgver"
- ./configure --prefix=/usr \
- --sysconfdir=/etc \
- --libexecdir=/usr/lib/totem \
- --localstatedir=/var \
- --disable-static \
- --enable-python \
- --enable-nautilus
-
- # https://bugzilla.gnome.org/show_bug.cgi?id=655517
- sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-
- make
-}
-
-package_totem() {
- groups=(gnome)
- install=totem.install
- optdepends=('gst-plugins-ugly: Extra media codecs'
- 'gst-libav: Extra media codecs'
- 'lirc-utils: Infrared Remote Control plugin'
- 'grilo-plugins: Browse sidebar (remote media)'
- 'zeitgeist: Zeitgeist plugin')
-
- cd "$pkgbase-$pkgver"
- make DESTDIR="${pkgdir}" install
-
- rm -r "$pkgdir/usr/lib/mozilla"
- rm "$pkgdir/usr/lib/totem/totem-plugin-viewer"
-
- install -Dm644 COPYING "$pkgdir/usr/share/licenses/totem/COPYING"
-}
-
-package_totem-plugin() {
- groups=(gnome)
- pkgdesc="Totem plugin for web browsers"
- depends=("totem=$pkgver" dbus-glib)
- backup=(etc/totem/browser-plugins.ini)
-
- cd "$pkgbase-$pkgver"
- make -C browser-plugin \
- plugindir=/usr/lib/mozilla/plugins \
- xptdir=/usr/lib/mozilla/plugins \
- DESTDIR="$pkgdir" install
-
- install -Dm644 ../browser-plugins.ini "$pkgdir/etc/totem/browser-plugins.ini"
-
- install -Dm644 COPYING "$pkgdir/usr/share/licenses/totem-plugin/COPYING"
-}
Copied: totem/repos/gnome-unstable-i686/PKGBUILD (from rev 195291, totem/trunk/PKGBUILD)
===================================================================
--- gnome-unstable-i686/PKGBUILD (rev 0)
+++ gnome-unstable-i686/PKGBUILD 2013-09-30 02:32:04 UTC (rev 195292)
@@ -0,0 +1,89 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Contributor: Jan de Groot <jgc at archlinux.org>
+
+pkgbase=totem
+pkgname=('totem' 'totem-plugin')
+pkgver=3.10.0
+pkgrel=2
+pkgdesc="GNOME3 movie player based on GStreamer"
+url="http://www.gnome.org"
+arch=(i686 x86_64)
+license=(GPL2 custom)
+depends=(gst-plugins-base gst-plugins-good totem-plparser desktop-file-utils iso-codes libpeas
+ hicolor-icon-theme gnome-icon-theme gsettings-desktop-schemas dconf clutter-gst
+ clutter-gtk python-gobject python-xdg gst-plugins-bad)
+makedepends=(intltool libnautilus-extension lirc-utils vala grilo dbus-glib zeitgeist
+ 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'
+ 'a50a3bbf35f0535f7e8e20af1893446a2e5711015484f9ae6d1ff91af3b23c4e'
+ '30481dab7e21b66257e3238f5a8b708e1a5c4797d7da904f7ebaba4c2c2ef167'
+ '749b95c4747e04f54fb9b41196435c33e5f30ea4583e66e365c012be194ec5d3'
+ 'aeec75abf32dd16b392d7821fe4c28bc381c1c50d3e028342aeb8f9dc20b17be')
+
+
+prepare() {
+ cd "$pkgbase-$pkgver"
+
+ # 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() {
+ cd "$pkgbase-$pkgver"
+ ./configure --prefix=/usr \
+ --sysconfdir=/etc \
+ --libexecdir=/usr/lib/totem \
+ --localstatedir=/var \
+ --disable-static \
+ --enable-python \
+ --enable-nautilus
+
+ # https://bugzilla.gnome.org/show_bug.cgi?id=655517
+ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
+ make
+}
+
+package_totem() {
+ groups=(gnome)
+ install=totem.install
+ optdepends=('gst-plugins-ugly: Extra media codecs'
+ 'gst-libav: Extra media codecs'
+ 'lirc-utils: Infrared Remote Control plugin'
+ 'grilo-plugins: Browse sidebar (remote media)'
+ 'zeitgeist: Zeitgeist plugin')
+
+ cd "$pkgbase-$pkgver"
+ make DESTDIR="${pkgdir}" install
+
+ rm -r "$pkgdir/usr/lib/mozilla"
+ rm "$pkgdir/usr/lib/totem/totem-plugin-viewer"
+
+ install -Dm644 COPYING "$pkgdir/usr/share/licenses/totem/COPYING"
+}
+
+package_totem-plugin() {
+ groups=(gnome)
+ pkgdesc="Totem plugin for web browsers"
+ depends=("totem=$pkgver" dbus-glib)
+ backup=(etc/totem/browser-plugins.ini)
+
+ cd "$pkgbase-$pkgver"
+ make -C browser-plugin \
+ plugindir=/usr/lib/mozilla/plugins \
+ xptdir=/usr/lib/mozilla/plugins \
+ DESTDIR="$pkgdir" install
+
+ install -Dm644 ../browser-plugins.ini "$pkgdir/etc/totem/browser-plugins.ini"
+
+ install -Dm644 COPYING "$pkgdir/usr/share/licenses/totem-plugin/COPYING"
+}
Copied: totem/repos/gnome-unstable-i686/bgo708647-2.patch (from rev 195291, totem/trunk/bgo708647-2.patch)
===================================================================
--- gnome-unstable-i686/bgo708647-2.patch (rev 0)
+++ gnome-unstable-i686/bgo708647-2.patch 2013-09-30 02:32:04 UTC (rev 195292)
@@ -0,0 +1,22 @@
+From 437e64ffb5f19d2f088339954686e794cc276319 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess at 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
Copied: totem/repos/gnome-unstable-i686/bgo708647.patch (from rev 195291, totem/trunk/bgo708647.patch)
===================================================================
--- gnome-unstable-i686/bgo708647.patch (rev 0)
+++ gnome-unstable-i686/bgo708647.patch 2013-09-30 02:32:04 UTC (rev 195292)
@@ -0,0 +1,28 @@
+From b252133d765245a297e446c805822601e5a4924b Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess at 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
Deleted: gnome-unstable-i686/browser-plugins.ini
===================================================================
--- gnome-unstable-i686/browser-plugins.ini 2013-09-30 02:30:16 UTC (rev 195291)
+++ gnome-unstable-i686/browser-plugins.ini 2013-09-30 02:32:04 UTC (rev 195292)
@@ -1,2 +0,0 @@
-[Plugins]
-application/x-shockwave-flash.disabled=true
Copied: totem/repos/gnome-unstable-i686/browser-plugins.ini (from rev 195291, totem/trunk/browser-plugins.ini)
===================================================================
--- gnome-unstable-i686/browser-plugins.ini (rev 0)
+++ gnome-unstable-i686/browser-plugins.ini 2013-09-30 02:32:04 UTC (rev 195292)
@@ -0,0 +1,2 @@
+[Plugins]
+application/x-shockwave-flash.disabled=true
Deleted: gnome-unstable-i686/bugreport.patch
===================================================================
--- gnome-unstable-i686/bugreport.patch 2013-09-30 02:30:16 UTC (rev 195291)
+++ gnome-unstable-i686/bugreport.patch 2013-09-30 02:32:04 UTC (rev 195292)
@@ -1,22 +0,0 @@
-diff -u -r totem-3.8.2/data/totem-bugreport.py totem-3.8.2-bugreport/data/totem-bugreport.py
---- totem-3.8.2/data/totem-bugreport.py 2013-03-13 16:34:44.000000000 +0100
-+++ totem-3.8.2-bugreport/data/totem-bugreport.py 2013-05-14 13:54:04.243699665 +0200
-@@ -4,7 +4,7 @@
- from gi.repository import Gtk
-
- # Get the GStreamer version
--if os.system ('gst-typefind-0.10 --version') == 0:
-+if os.system ('gst-typefind-1.0 --version') == 0:
- # List the formats of the last files played
- last_visited = 0
- recent_manager = Gtk.RecentManager.get_default ()
-@@ -15,7 +15,7 @@
- last = recent.get_uri_display ()
-
- if last != None:
-- file_handle = os.popen ('gst-typefind-0.10 "%s"' % (last))
-+ file_handle = os.popen ('gst-typefind-1.0 "%s"' % (last))
- parts = file_handle.read ().split (' ')
- date = datetime.fromtimestamp (last_visited)
-- print 'Listened to a "%s" file on %s' % (parts.pop ().strip (), date.isoformat ())
-+ print('Listened to a "%s" file on %s' % (parts.pop ().strip (), date.isoformat ()))
Copied: totem/repos/gnome-unstable-i686/bugreport.patch (from rev 195291, totem/trunk/bugreport.patch)
===================================================================
--- gnome-unstable-i686/bugreport.patch (rev 0)
+++ gnome-unstable-i686/bugreport.patch 2013-09-30 02:32:04 UTC (rev 195292)
@@ -0,0 +1,22 @@
+diff -u -r totem-3.8.2/data/totem-bugreport.py totem-3.8.2-bugreport/data/totem-bugreport.py
+--- totem-3.8.2/data/totem-bugreport.py 2013-03-13 16:34:44.000000000 +0100
++++ totem-3.8.2-bugreport/data/totem-bugreport.py 2013-05-14 13:54:04.243699665 +0200
+@@ -4,7 +4,7 @@
+ from gi.repository import Gtk
+
+ # Get the GStreamer version
+-if os.system ('gst-typefind-0.10 --version') == 0:
++if os.system ('gst-typefind-1.0 --version') == 0:
+ # List the formats of the last files played
+ last_visited = 0
+ recent_manager = Gtk.RecentManager.get_default ()
+@@ -15,7 +15,7 @@
+ last = recent.get_uri_display ()
+
+ if last != None:
+- file_handle = os.popen ('gst-typefind-0.10 "%s"' % (last))
++ file_handle = os.popen ('gst-typefind-1.0 "%s"' % (last))
+ parts = file_handle.read ().split (' ')
+ date = datetime.fromtimestamp (last_visited)
+- print 'Listened to a "%s" file on %s' % (parts.pop ().strip (), date.isoformat ())
++ print('Listened to a "%s" file on %s' % (parts.pop ().strip (), date.isoformat ()))
Deleted: gnome-unstable-i686/totem.install
===================================================================
--- gnome-unstable-i686/totem.install 2013-09-30 02:30:16 UTC (rev 195291)
+++ gnome-unstable-i686/totem.install 2013-09-30 02:32:04 UTC (rev 195292)
@@ -1,13 +0,0 @@
-post_install() {
- /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
- update-desktop-database -q
- gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: totem/repos/gnome-unstable-i686/totem.install (from rev 195291, totem/trunk/totem.install)
===================================================================
--- gnome-unstable-i686/totem.install (rev 0)
+++ gnome-unstable-i686/totem.install 2013-09-30 02:32:04 UTC (rev 195292)
@@ -0,0 +1,13 @@
+post_install() {
+ /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
+ update-desktop-database -q
+ gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Deleted: gnome-unstable-x86_64/PKGBUILD
===================================================================
--- gnome-unstable-x86_64/PKGBUILD 2013-09-30 02:30:16 UTC (rev 195291)
+++ gnome-unstable-x86_64/PKGBUILD 2013-09-30 02:32:04 UTC (rev 195292)
@@ -1,82 +0,0 @@
-# $Id$
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-# Contributor: Jan de Groot <jgc at archlinux.org>
-
-pkgbase=totem
-pkgname=('totem' 'totem-plugin')
-pkgver=3.10.0
-pkgrel=1
-pkgdesc="GNOME3 movie player based on GStreamer"
-url="http://www.gnome.org"
-arch=(i686 x86_64)
-license=(GPL2 custom)
-depends=(gst-plugins-base gst-plugins-good totem-plparser desktop-file-utils iso-codes libpeas
- hicolor-icon-theme gnome-icon-theme gsettings-desktop-schemas dconf clutter-gst
- clutter-gtk python-gobject python-xdg gst-plugins-bad)
-makedepends=(intltool libnautilus-extension lirc-utils vala grilo dbus-glib zeitgeist
- 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)
-sha256sums=('c223e953f9697cc932f3b7efd87cea767a3e5a2ba0e3cda08628aa364caee094'
- 'a50a3bbf35f0535f7e8e20af1893446a2e5711015484f9ae6d1ff91af3b23c4e'
- '30481dab7e21b66257e3238f5a8b708e1a5c4797d7da904f7ebaba4c2c2ef167')
-
-
-prepare() {
- cd "$pkgbase-$pkgver"
-
- # Make compatible with Python 3 and Gstreamer 1.0
- patch -Np1 -i ../bugreport.patch
-}
-
-build() {
- cd "$pkgbase-$pkgver"
- ./configure --prefix=/usr \
- --sysconfdir=/etc \
- --libexecdir=/usr/lib/totem \
- --localstatedir=/var \
- --disable-static \
- --enable-python \
- --enable-nautilus
-
- # https://bugzilla.gnome.org/show_bug.cgi?id=655517
- sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-
- make
-}
-
-package_totem() {
- groups=(gnome)
- install=totem.install
- optdepends=('gst-plugins-ugly: Extra media codecs'
- 'gst-libav: Extra media codecs'
- 'lirc-utils: Infrared Remote Control plugin'
- 'grilo-plugins: Browse sidebar (remote media)'
- 'zeitgeist: Zeitgeist plugin')
-
- cd "$pkgbase-$pkgver"
- make DESTDIR="${pkgdir}" install
-
- rm -r "$pkgdir/usr/lib/mozilla"
- rm "$pkgdir/usr/lib/totem/totem-plugin-viewer"
-
- install -Dm644 COPYING "$pkgdir/usr/share/licenses/totem/COPYING"
-}
-
-package_totem-plugin() {
- groups=(gnome)
- pkgdesc="Totem plugin for web browsers"
- depends=("totem=$pkgver" dbus-glib)
- backup=(etc/totem/browser-plugins.ini)
-
- cd "$pkgbase-$pkgver"
- make -C browser-plugin \
- plugindir=/usr/lib/mozilla/plugins \
- xptdir=/usr/lib/mozilla/plugins \
- DESTDIR="$pkgdir" install
-
- install -Dm644 ../browser-plugins.ini "$pkgdir/etc/totem/browser-plugins.ini"
-
- install -Dm644 COPYING "$pkgdir/usr/share/licenses/totem-plugin/COPYING"
-}
Copied: totem/repos/gnome-unstable-x86_64/PKGBUILD (from rev 195291, totem/trunk/PKGBUILD)
===================================================================
--- gnome-unstable-x86_64/PKGBUILD (rev 0)
+++ gnome-unstable-x86_64/PKGBUILD 2013-09-30 02:32:04 UTC (rev 195292)
@@ -0,0 +1,89 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Contributor: Jan de Groot <jgc at archlinux.org>
+
+pkgbase=totem
+pkgname=('totem' 'totem-plugin')
+pkgver=3.10.0
+pkgrel=2
+pkgdesc="GNOME3 movie player based on GStreamer"
+url="http://www.gnome.org"
+arch=(i686 x86_64)
+license=(GPL2 custom)
+depends=(gst-plugins-base gst-plugins-good totem-plparser desktop-file-utils iso-codes libpeas
+ hicolor-icon-theme gnome-icon-theme gsettings-desktop-schemas dconf clutter-gst
+ clutter-gtk python-gobject python-xdg gst-plugins-bad)
+makedepends=(intltool libnautilus-extension lirc-utils vala grilo dbus-glib zeitgeist
+ 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'
+ 'a50a3bbf35f0535f7e8e20af1893446a2e5711015484f9ae6d1ff91af3b23c4e'
+ '30481dab7e21b66257e3238f5a8b708e1a5c4797d7da904f7ebaba4c2c2ef167'
+ '749b95c4747e04f54fb9b41196435c33e5f30ea4583e66e365c012be194ec5d3'
+ 'aeec75abf32dd16b392d7821fe4c28bc381c1c50d3e028342aeb8f9dc20b17be')
+
+
+prepare() {
+ cd "$pkgbase-$pkgver"
+
+ # 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() {
+ cd "$pkgbase-$pkgver"
+ ./configure --prefix=/usr \
+ --sysconfdir=/etc \
+ --libexecdir=/usr/lib/totem \
+ --localstatedir=/var \
+ --disable-static \
+ --enable-python \
+ --enable-nautilus
+
+ # https://bugzilla.gnome.org/show_bug.cgi?id=655517
+ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
+ make
+}
+
+package_totem() {
+ groups=(gnome)
+ install=totem.install
+ optdepends=('gst-plugins-ugly: Extra media codecs'
+ 'gst-libav: Extra media codecs'
+ 'lirc-utils: Infrared Remote Control plugin'
+ 'grilo-plugins: Browse sidebar (remote media)'
+ 'zeitgeist: Zeitgeist plugin')
+
+ cd "$pkgbase-$pkgver"
+ make DESTDIR="${pkgdir}" install
+
+ rm -r "$pkgdir/usr/lib/mozilla"
+ rm "$pkgdir/usr/lib/totem/totem-plugin-viewer"
+
+ install -Dm644 COPYING "$pkgdir/usr/share/licenses/totem/COPYING"
+}
+
+package_totem-plugin() {
+ groups=(gnome)
+ pkgdesc="Totem plugin for web browsers"
+ depends=("totem=$pkgver" dbus-glib)
+ backup=(etc/totem/browser-plugins.ini)
+
+ cd "$pkgbase-$pkgver"
+ make -C browser-plugin \
+ plugindir=/usr/lib/mozilla/plugins \
+ xptdir=/usr/lib/mozilla/plugins \
+ DESTDIR="$pkgdir" install
+
+ install -Dm644 ../browser-plugins.ini "$pkgdir/etc/totem/browser-plugins.ini"
+
+ install -Dm644 COPYING "$pkgdir/usr/share/licenses/totem-plugin/COPYING"
+}
Copied: totem/repos/gnome-unstable-x86_64/bgo708647-2.patch (from rev 195291, totem/trunk/bgo708647-2.patch)
===================================================================
--- gnome-unstable-x86_64/bgo708647-2.patch (rev 0)
+++ gnome-unstable-x86_64/bgo708647-2.patch 2013-09-30 02:32:04 UTC (rev 195292)
@@ -0,0 +1,22 @@
+From 437e64ffb5f19d2f088339954686e794cc276319 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess at 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
Copied: totem/repos/gnome-unstable-x86_64/bgo708647.patch (from rev 195291, totem/trunk/bgo708647.patch)
===================================================================
--- gnome-unstable-x86_64/bgo708647.patch (rev 0)
+++ gnome-unstable-x86_64/bgo708647.patch 2013-09-30 02:32:04 UTC (rev 195292)
@@ -0,0 +1,28 @@
+From b252133d765245a297e446c805822601e5a4924b Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess at 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
Deleted: gnome-unstable-x86_64/browser-plugins.ini
===================================================================
--- gnome-unstable-x86_64/browser-plugins.ini 2013-09-30 02:30:16 UTC (rev 195291)
+++ gnome-unstable-x86_64/browser-plugins.ini 2013-09-30 02:32:04 UTC (rev 195292)
@@ -1,2 +0,0 @@
-[Plugins]
-application/x-shockwave-flash.disabled=true
Copied: totem/repos/gnome-unstable-x86_64/browser-plugins.ini (from rev 195291, totem/trunk/browser-plugins.ini)
===================================================================
--- gnome-unstable-x86_64/browser-plugins.ini (rev 0)
+++ gnome-unstable-x86_64/browser-plugins.ini 2013-09-30 02:32:04 UTC (rev 195292)
@@ -0,0 +1,2 @@
+[Plugins]
+application/x-shockwave-flash.disabled=true
Deleted: gnome-unstable-x86_64/bugreport.patch
===================================================================
--- gnome-unstable-x86_64/bugreport.patch 2013-09-30 02:30:16 UTC (rev 195291)
+++ gnome-unstable-x86_64/bugreport.patch 2013-09-30 02:32:04 UTC (rev 195292)
@@ -1,22 +0,0 @@
-diff -u -r totem-3.8.2/data/totem-bugreport.py totem-3.8.2-bugreport/data/totem-bugreport.py
---- totem-3.8.2/data/totem-bugreport.py 2013-03-13 16:34:44.000000000 +0100
-+++ totem-3.8.2-bugreport/data/totem-bugreport.py 2013-05-14 13:54:04.243699665 +0200
-@@ -4,7 +4,7 @@
- from gi.repository import Gtk
-
- # Get the GStreamer version
--if os.system ('gst-typefind-0.10 --version') == 0:
-+if os.system ('gst-typefind-1.0 --version') == 0:
- # List the formats of the last files played
- last_visited = 0
- recent_manager = Gtk.RecentManager.get_default ()
-@@ -15,7 +15,7 @@
- last = recent.get_uri_display ()
-
- if last != None:
-- file_handle = os.popen ('gst-typefind-0.10 "%s"' % (last))
-+ file_handle = os.popen ('gst-typefind-1.0 "%s"' % (last))
- parts = file_handle.read ().split (' ')
- date = datetime.fromtimestamp (last_visited)
-- print 'Listened to a "%s" file on %s' % (parts.pop ().strip (), date.isoformat ())
-+ print('Listened to a "%s" file on %s' % (parts.pop ().strip (), date.isoformat ()))
Copied: totem/repos/gnome-unstable-x86_64/bugreport.patch (from rev 195291, totem/trunk/bugreport.patch)
===================================================================
--- gnome-unstable-x86_64/bugreport.patch (rev 0)
+++ gnome-unstable-x86_64/bugreport.patch 2013-09-30 02:32:04 UTC (rev 195292)
@@ -0,0 +1,22 @@
+diff -u -r totem-3.8.2/data/totem-bugreport.py totem-3.8.2-bugreport/data/totem-bugreport.py
+--- totem-3.8.2/data/totem-bugreport.py 2013-03-13 16:34:44.000000000 +0100
++++ totem-3.8.2-bugreport/data/totem-bugreport.py 2013-05-14 13:54:04.243699665 +0200
+@@ -4,7 +4,7 @@
+ from gi.repository import Gtk
+
+ # Get the GStreamer version
+-if os.system ('gst-typefind-0.10 --version') == 0:
++if os.system ('gst-typefind-1.0 --version') == 0:
+ # List the formats of the last files played
+ last_visited = 0
+ recent_manager = Gtk.RecentManager.get_default ()
+@@ -15,7 +15,7 @@
+ last = recent.get_uri_display ()
+
+ if last != None:
+- file_handle = os.popen ('gst-typefind-0.10 "%s"' % (last))
++ file_handle = os.popen ('gst-typefind-1.0 "%s"' % (last))
+ parts = file_handle.read ().split (' ')
+ date = datetime.fromtimestamp (last_visited)
+- print 'Listened to a "%s" file on %s' % (parts.pop ().strip (), date.isoformat ())
++ print('Listened to a "%s" file on %s' % (parts.pop ().strip (), date.isoformat ()))
Deleted: gnome-unstable-x86_64/totem.install
===================================================================
--- gnome-unstable-x86_64/totem.install 2013-09-30 02:30:16 UTC (rev 195291)
+++ gnome-unstable-x86_64/totem.install 2013-09-30 02:32:04 UTC (rev 195292)
@@ -1,13 +0,0 @@
-post_install() {
- /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
- update-desktop-database -q
- gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: totem/repos/gnome-unstable-x86_64/totem.install (from rev 195291, totem/trunk/totem.install)
===================================================================
--- gnome-unstable-x86_64/totem.install (rev 0)
+++ gnome-unstable-x86_64/totem.install 2013-09-30 02:32:04 UTC (rev 195292)
@@ -0,0 +1,13 @@
+post_install() {
+ /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
+ update-desktop-database -q
+ gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
More information about the arch-commits
mailing list