diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-06-21 11:27:08 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-06-21 11:27:08 -0300 |
| commit | 840283e9012eff70d83361c5ae058c4fb855979e (patch) | |
| tree | a0f93f9812348b55c9dfbf1cc6b81eba78caf6ee /extra/totem | |
| parent | 93c61adf5995517ceecb6308255ff7fb85d59fcb (diff) | |
| parent | f02c28de0bbcb85e152fc19d0008805021fe1a33 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/ascii/PKGBUILD
extra/gnome-utils/PKGBUILD
extra/libmodplug/PKGBUILD
extra/mkvtoolnix/PKGBUILD
extra/rox/PKGBUILD
extra/totem/PKGBUILD
kde-unstable/calligra/PKGBUILD
multilib/lib32-gtk2/PKGBUILD
multilib/lib32-libcups/PKGBUILD
multilib/zsnes/PKGBUILD
testing/perl-compress-bzip2/PKGBUILD
Diffstat (limited to 'extra/totem')
| -rw-r--r-- | extra/totem/PKGBUILD | 16 | ||||
| -rw-r--r-- | extra/totem/fix_crash.patch | 30 |
2 files changed, 40 insertions, 6 deletions
diff --git a/extra/totem/PKGBUILD b/extra/totem/PKGBUILD index 75b5f10da..765a40e98 100644 --- a/extra/totem/PKGBUILD +++ b/extra/totem/PKGBUILD @@ -1,22 +1,26 @@ -# $Id: PKGBUILD 125547 2011-05-26 16:47:44Z ibiru $ +# $Id: PKGBUILD 127845 2011-06-18 19:41:13Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=totem pkgname=('totem' 'totem-plugin') pkgver=3.0.1 -pkgrel=2 -url="http://www.hadess.net/totem.php3" -arch=('i686' 'x86_64' 'mips64el') +pkgrel=3 +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') options=('!libtool' '!emptydirs') -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/${pkgver%.*}/${pkgbase}-${pkgver}.tar.bz2) -sha256sums=('013b6cfedac6ff264aa27de7346597d0b8da7f4ed1f91b2c966a13d3fdff679a') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/${pkgver%.*}/${pkgbase}-${pkgver}.tar.bz2 + fix_crash.patch) +sha256sums=('013b6cfedac6ff264aa27de7346597d0b8da7f4ed1f91b2c966a13d3fdff679a' + '65125a0b8a1fd7f8840b2b7528de3bc553689e224a9aa3fd2c459918ab6f1f1c') 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 \ diff --git a/extra/totem/fix_crash.patch b/extra/totem/fix_crash.patch new file mode 100644 index 000000000..08409696c --- /dev/null +++ b/extra/totem/fix_crash.patch @@ -0,0 +1,30 @@ +From cee6399c1de27e5ccae35975aaae4fd7cfa40c2c Mon Sep 17 00:00:00 2001 +From: Marcel van den Hof <marcelvdh@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 + |