Accepting request 39966 from GNOME:Factory

checked in (request 39966)

OBS-URL: https://build.opensuse.org/request/show/39966
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/libcanberra?expand=0&rev=32

libcanberra-0.23.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cf36e440a5691e2c227bd622f79e634840287ad3bd3312158afa7e54a17fba32
+size 359554

libcanberra-0.24.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a1b97c649cde4365df8b100ca7ee82c1a73eb8578c12341020c8cf5816c1f713
-size 359552

libcanberra-fix-pulse-crash.patch

@@ -0,0 +1,27 @@
+From: Michal Schmidt <mschmidt@redhat.com>
+Date: Tue, 30 Mar 2010 15:50:04 +0000 (+0200)
+Subject: pulse: fix use after free in stream_drain_cb()
+X-Git-Url: http://git.0pointer.de/?p=libcanberra.git;a=commitdiff_plain;h=04a2c7cac4ff384880309b950c8201803aa37786
+
+pulse: fix use after free in stream_drain_cb()
+---
+
+diff --git a/src/pulse.c b/src/pulse.c
+index fcb6b05..d4225d1 100644
+--- a/src/pulse.c
++++ b/src/pulse.c
+@@ -663,12 +663,12 @@ static void stream_drain_cb(pa_stream *s, int success, void *userdata) {
+                 pa_stream_disconnect(s);
+                 out->error = err;
+                 out->finished = TRUE;
+-        }
+ 
+         if (out->drain_operation) {
+                 pa_operation_unref(out->drain_operation);
+                 out->drain_operation = NULL;
+         }
++        }
+ 
+         pa_threaded_mainloop_signal(p->mainloop, FALSE);
+ }
+

libcanberra.changes

@@ -1,16 +1,3 @@
--------------------------------------------------------------------
-Sun May  9 21:53:46 CEST 2010 - dimstar@opensuse.org
-
-- Update to version 0.24:
-  + fdo#27048: Compile with -DSEAL_ENABLE
-  + props: set a couple of additional properties by default and
-    ensure clients may override them
-  + pulse: fix finish notification for cached sample playback
-  + fork: call getpid() only once
-  + build-sys: bump sonames for v0.24
-  + pulse: fix use after free in stream_drain_cb().
-- Drop libcanberra-fix-pulse-crash.patch, fixed by upstream.
-
 -------------------------------------------------------------------
 Thu Apr  1 19:49:35 CEST 2010 - vuntz@opensuse.org
 

libcanberra.spec

@@ -1,5 +1,5 @@
 #
-# spec file for package libcanberra (Version 0.24)
+# spec file for package libcanberra (Version 0.23)
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -18,8 +18,8 @@
 
 
 Name:           libcanberra
-Version:        0.24
+Version:        0.23
-Release:        1
+Release:        2
 License:        LGPLv2.0+
 Summary:        Portable sound event library
 Url:            http://0pointer.de/lennart/projects/libcanberra/
@@ -27,6 +27,8 @@ Group:          System/Libraries
 Source:         libcanberra-%{version}.tar.bz2
 Source1:        libcanberra-gtk-module.sh
 Source99:       baselibs.conf
+# PATCH-FIX-UPSTREAM libcanberra-fix-pulse-crash.patch vuntz@opensuse.org -- Taken from upstream, fix a crash
+Patch0:         libcanberra-fix-pulse-crash.patch
 BuildRequires:  alsa-devel
 BuildRequires:  gconf2-devel
 BuildRequires:  gstreamer-0_10-devel
@@ -140,6 +142,7 @@ trigger input feedback event sounds
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure --with-pic --disable-static --disable-rpath --enable-pulse --enable-alsa --enable-null --with-builtin=dso