From 05494d919424edf28b297ca453fd63f88446843078186417cb83830765fe10a8 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Thu, 22 Jul 2010 07:49:00 +0000 Subject: [PATCH] Accepting request 43296 from home:dimstar:branches:GNOME:Factory Copy from home:dimstar:branches:GNOME:Factory/libcanberra via accept of submit request 43296 revision 2. Request was accepted with message: thanks, will tweak a bit OBS-URL: https://build.opensuse.org/request/show/43296 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/libcanberra?expand=0&rev=33 --- baselibs.conf | 2 + libcanberra-0.23.tar.bz2 | 3 -- libcanberra-0.25.tar.bz2 | 3 ++ libcanberra-fix-pulse-crash.patch | 27 ------------ libcanberra.changes | 28 ++++++++++++ libcanberra.spec | 71 ++++++++++++++++++++++++++----- 6 files changed, 93 insertions(+), 41 deletions(-) delete mode 100644 libcanberra-0.23.tar.bz2 create mode 100644 libcanberra-0.25.tar.bz2 delete mode 100644 libcanberra-fix-pulse-crash.patch diff --git a/baselibs.conf b/baselibs.conf index a2d1440..697d2db 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -2,3 +2,5 @@ libcanberra0 libcanberra-gtk0 libcanberra-gtk supplements "packageand(libcanberra-gtk:gtk2-)" +libcanberra-gtk3-0 +libcanberra-gtk3 diff --git a/libcanberra-0.23.tar.bz2 b/libcanberra-0.23.tar.bz2 deleted file mode 100644 index 994b187..0000000 --- a/libcanberra-0.23.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cf36e440a5691e2c227bd622f79e634840287ad3bd3312158afa7e54a17fba32 -size 359554 diff --git a/libcanberra-0.25.tar.bz2 b/libcanberra-0.25.tar.bz2 new file mode 100644 index 0000000..5f435ce --- /dev/null +++ b/libcanberra-0.25.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d07cdcc059386a5f8b60bbf44327874601e0fbdd0c416ca13582f2719819d53d +size 363401 diff --git a/libcanberra-fix-pulse-crash.patch b/libcanberra-fix-pulse-crash.patch deleted file mode 100644 index 1303fcf..0000000 --- a/libcanberra-fix-pulse-crash.patch +++ /dev/null @@ -1,27 +0,0 @@ -From: Michal Schmidt -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); - } - diff --git a/libcanberra.changes b/libcanberra.changes index e46fcbf..12a309d 100644 --- a/libcanberra.changes +++ b/libcanberra.changes @@ -1,3 +1,31 @@ +------------------------------------------------------------------- +Tue Jul 13 16:37:13 CEST 2010 - dimstar@opensuse.org + +- Update to version 0.25: + + gtk: optionally build for both gtk2 and gtk3 + + build-sys: properly create gtk3 module link + + cache: don't use destructors unless running in valgrind + + build-sys: bump version + + docs: update for 0.25 + + git: ignore more files + + build-sys: drop duplicate conditional + + build-sys: various build-system beautifications + + build-sys: fix gconf build line + + build-sys: fix make distcheck + +------------------------------------------------------------------- +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 diff --git a/libcanberra.spec b/libcanberra.spec index bc84b56..56695a0 100644 --- a/libcanberra.spec +++ b/libcanberra.spec @@ -1,5 +1,5 @@ # -# spec file for package libcanberra (Version 0.23) +# spec file for package libcanberra (Version 0.25) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,22 +18,21 @@ Name: libcanberra -Version: 0.23 -Release: 2 -License: LGPLv2.0+ +Version: 0.25 +Release: 1 +License: LGPL v2.0 or later Summary: Portable sound event library Url: http://0pointer.de/lennart/projects/libcanberra/ 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 BuildRequires: gtk-doc BuildRequires: gtk2-devel +BuildRequires: gtk3-devel BuildRequires: libpulse-devel >= 0.9.11 BuildRequires: libvorbis-devel BuildRequires: lynx @@ -42,7 +41,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build %define debug_package_requires libcanberra0 = %{version}-%{release} %package -n libcanberra0 -License: LGPLv2.0+ +License: LGPL v2.0 or later Summary: Portable sound event library Group: System/Libraries Requires: libpulse0 >= 0.9.11 @@ -77,7 +76,7 @@ designed to be portable. It consists of the following parts: trigger input feedback event sounds %package gtk0 -License: LGPLv2.0+ +License: LGPL v2.0 or later Summary: Portable sound event library Group: System/Libraries Requires: libcanberra0 = %{version} @@ -96,8 +95,44 @@ designed to be portable. It consists of the following parts: 3. 3. libcanberra-gtk-module: a Gtk+ module that uses libcanberra-gtk to trigger input feedback event sounds +%package gtk3-0 +Summary: Portable sound event library +Group: System/Libraries + +%description gtk3-0 +libcanberra is an implementation of the XDG Sound Theme and Name +Specifications, for generating event sounds on free desktops, such as +GNOME. It comes with several backends (ALSA, PulseAudio, null) and is +designed to be portable. It consists of the following parts: + +1. 1. libcanberra: the main library + +2. 2. libcanberra-gtk: some glue code to make it easier to use + libcanberra from Gtk+ applications + +3. 3. libcanberra-gtk-module: a Gtk+ module that uses libcanberra-gtk to +trigger input feedback event sounds + +%package gtk3 +Summary: Portable sound event library +Group: System/Libraries + +%description gtk3 +libcanberra is an implementation of the XDG Sound Theme and Name +Specifications, for generating event sounds on free desktops, such as +GNOME. It comes with several backends (ALSA, PulseAudio, null) and is +designed to be portable. It consists of the following parts: + +1. 1. libcanberra: the main library + +2. 2. libcanberra-gtk: some glue code to make it easier to use + libcanberra from Gtk+ applications + +3. 3. libcanberra-gtk-module: a Gtk+ module that uses libcanberra-gtk to +trigger input feedback event sounds + %package gtk -License: LGPLv2.0+ +License: LGPL v2.0 or later Summary: Portable sound event library Group: System/Libraries Requires: libcanberra0 = %{version} @@ -118,12 +153,13 @@ designed to be portable. It consists of the following parts: trigger input feedback event sounds %package devel -License: LGPLv2.0+ +License: LGPL v2.0 or later Summary: Portable sound event library Group: Development/Libraries/C and C++ Requires: gtk-doc Requires: gtk2-devel Requires: libcanberra-gtk0 = %{version} +Requires: libcanberra-gtk3-0 = %{version} Requires: libcanberra0 = %{version} %description devel @@ -142,7 +178,6 @@ 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 @@ -168,6 +203,10 @@ rm -rf %{buildroot} %postun gtk0 -p /sbin/ldconfig +%post gtk3-0 -p /sbin/ldconfig + +%postun gtk3-0 -p /sbin/ldconfig + %pre gtk -f %{name}.schemas_pre %preun gtk -f %{name}.schemas_preun @@ -207,15 +246,25 @@ rm -rf %{buildroot} %dir %{_datadir}/gdm/autostart/LoginWindow %{_datadir}/gdm/autostart/LoginWindow/libcanberra-ready-sound.desktop +%files gtk3-0 +%defattr(-, root, root) +%{_libdir}/libcanberra-gtk3.so.* + +%files gtk3 +%defattr(-, root, root) +%{_libdir}/gtk-3.0/modules/libcanberra*.so + %files devel %defattr(-,root,root) %doc %{_datadir}/gtk-doc/html/libcanberra %{_includedir}/canberra-gtk.h %{_includedir}/canberra.h +%{_libdir}/libcanberra-gtk3.so %{_libdir}/libcanberra-gtk.so %{_libdir}/libcanberra.so %{_libdir}/pkgconfig/libcanberra-gtk.pc %{_libdir}/pkgconfig/libcanberra.pc +%{_libdir}/pkgconfig/libcanberra-gtk3.pc %dir %{_datadir}/vala %dir %{_datadir}/vala/vapi %{_datadir}/vala/vapi/*.vapi