[arch-commits] Commit in totem/trunk (PKGBUILD fix_crash.patch)

[Jan Steffens]

    Date: Friday, September 2, 2011 @ 14:00:45
  Author: heftig
Revision: 136904

totem work, not finished

Modified:
  totem/trunk/PKGBUILD
Deleted:
  totem/trunk/fix_crash.patch

-----------------+
 PKGBUILD        |   42 ++++++++++++++++++++----------------------
 fix_crash.patch |   30 ------------------------------
 2 files changed, 20 insertions(+), 52 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-09-02 17:56:32 UTC (rev 136903)
+++ PKGBUILD	2011-09-02 18:00:45 UTC (rev 136904)
@@ -3,35 +3,35 @@
 
 pkgbase=totem
 pkgname=('totem' 'totem-plugin')
-pkgver=3.0.1
-pkgrel=3
+pkgver=3.1.4
+pkgrel=1
+pkgdesc="A GNOME3 integrated movie player based on Gstreamer."
 url="http://www.gnome.org"
 arch=('i686' 'x86_64')
 license=('GPL2' 'custom')
-makedepends=('intltool' 'gnome-doc-utils' 'gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'totem-plparser'
-    'libpeas' 'pygobject' 'pygobject-devel' 'nautilus' 'libxxf86vm' 'libxtst' 'desktop-file-utils' 'iso-codes' 'libgdata'
-    'xulrunner' 'lirc-utils' 'libepc' 'bluez' 'vala')
+depends=('gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'totem-plparser' 'libxxf86vm'
+         'libxtst' 'desktop-file-utils' 'iso-codes' 'python2' 'libpeas' 'hicolor-icon-theme'
+         'gnome-icon-theme-symbolic' 'gsettings-desktop-schemas' 'dconf' 'grilo' 'clutter-gst'
+         'clutter-gtk' 'mx')
+makedepends=('intltool' 'gtk-doc' 'python2-gobject2' 'nautilus' 'libgdata' 'xulrunner' 'lirc-utils'
+             'libepc' 'bluez' 'vala')
 options=('!libtool' '!emptydirs')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/${pkgver%.*}/${pkgbase}-${pkgver}.tar.bz2
-       fix_crash.patch)
-sha256sums=('013b6cfedac6ff264aa27de7346597d0b8da7f4ed1f91b2c966a13d3fdff679a'
-            '65125a0b8a1fd7f8840b2b7528de3bc553689e224a9aa3fd2c459918ab6f1f1c')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/${pkgver%.*}/${pkgbase}-${pkgver}.tar.xz)
+sha256sums=('46b9c1cf136de90ed649ca6ff636a63aa452c9724e137e983ba4e3250fa35749')
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
-
-  patch -Np1 -i "${srcdir}/fix_crash.patch"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --libexecdir=/usr/lib/totem \
-      --localstatedir=/var --disable-static \
-      --enable-python --enable-nautilus \
-      --with-dbus --disable-scrollkeeper
+  ./configure --prefix=/usr \
+    --sysconfdir=/etc \
+    --libexecdir=/usr/lib/totem \
+    --localstatedir=/var \
+    --disable-static \
+    --enable-python \
+    --enable-nautilus
   make
 }
 
 package_totem() {
-  pkgdesc="A GNOME3 integrated movie player based on Gstreamer."
-  depends=('gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'totem-plparser' 'libxxf86vm' 'libxtst' 'desktop-file-utils' 'iso-codes' 'python2' 'libpeas' 'hicolor-icon-theme' 'gnome-icon-theme-symbolic' 'gsettings-desktop-schemas' 'dconf')
   groups=('gnome-extra')
   install=totem.install
   optdepends=('gstreamer0.10-ugly-plugins: Extra media codecs'
@@ -45,8 +45,8 @@
   cd "${srcdir}/${pkgbase}-${pkgver}"
   make DESTDIR="${pkgdir}" install
 
-  rm -rf "${pkgdir}/usr/lib/mozilla"
-  rm -f "${pkgdir}/usr/lib/totem/totem-plugin-viewer"
+  rm -r "${pkgdir}/usr/lib/mozilla"
+  rm "${pkgdir}/usr/lib/totem/totem-plugin-viewer"
 
   sed -i "s|#!/usr/bin/python$|#!/usr/bin/python2|" \
     $pkgdir/usr/lib/totem/{totem/totem-bugreport.py,plugins/iplayer/iplayer2.py}
@@ -64,7 +64,5 @@
     xptdir=/usr/lib/mozilla/plugins \
     DESTDIR="${pkgdir}" install
 
-  rm -rf "${pkgdir}/usr/share"
-
   install -Dm644 COPYING "${pkgdir}/usr/share/licenses/totem-plugin/COPYING"
 }

Deleted: fix_crash.patch
===================================================================
--- fix_crash.patch	2011-09-02 17:56:32 UTC (rev 136903)
+++ fix_crash.patch	2011-09-02 18:00:45 UTC (rev 136904)
@@ -1,30 +0,0 @@
-From cee6399c1de27e5ccae35975aaae4fd7cfa40c2c Mon Sep 17 00:00:00 2001
-From: Marcel van den Hof <marcelvdh at gmail.com>
-Date: Sun, 29 May 2011 23:45:36 +0100
-Subject: [PATCH] Fix segfault in Bemused plugin
-
-If bluetoothd is not running sdp_connect() returns a null value which
-will cause the plugin to segfault.
-
-This patch adds a check for a possible null value from sdp_connect().
----
- src/plugins/bemused/totem-bemused.c |    3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-diff --git a/src/plugins/bemused/totem-bemused.c b/src/plugins/bemused/totem-bemused.c
-index 584b4d3..c51a0ee 100644
---- a/src/plugins/bemused/totem-bemused.c
-+++ b/src/plugins/bemused/totem-bemused.c
-@@ -655,7 +655,8 @@ sdp_svc_add_spp(u_int8_t port,
- 
- 	/* Connect to the local SDP server, register the service record */
- 	session = sdp_connect (BDADDR_ANY, BDADDR_LOCAL, 0);
--	sdp_record_register (session, &record, 0);
-+	if (session != NULL)	
-+		sdp_record_register (session, &record, 0);
- 
- 	/* Cleanup */
- 	sdp_data_free (channel);
--- 
-1.7.5.2
-