Dominique Leuenberger
24b4c4a4cf
+ gtk: Don't assume all GdkDisplays are GdkX11Displays. - Migrate package to obs_scm: we don't expect changes in git to happen anymore, but it's the line used across all GNOME packages. - Call autogen.sh in build section: the git checkout is not bootstrapped. - Drop libcanberra-broadway-fix.patch: part of the upstream git tree. - Pass --with-systemdunitdir=no to configure: dbus-broker newly pulls in systemd, but we have been running without those service files for like ever. With libcanberra being in maintenance only mode, there seems to be no justification to change this now. - Do not package documentation: building them requires lynx, which seems a bit exaggerated. OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/libcanberra?expand=0&rev=79
27 lines
1.0 KiB
Diff
27 lines
1.0 KiB
Diff
Index: libcanberra-0.29/src/driver-order.c
|
|
===================================================================
|
|
--- libcanberra-0.29.orig/src/driver-order.c
|
|
+++ libcanberra-0.29/src/driver-order.c
|
|
@@ -30,6 +30,7 @@
|
|
#include "driver-order.h"
|
|
|
|
const char* const ca_driver_order[] = {
|
|
+ "multi",
|
|
#ifdef HAVE_PULSE
|
|
"pulse",
|
|
#endif
|
|
Index: libcanberra-0.29/src/multi.c
|
|
===================================================================
|
|
--- libcanberra-0.29.orig/src/multi.c
|
|
+++ libcanberra-0.29/src/multi.c
|
|
@@ -107,8 +107,7 @@ int driver_open(ca_context *c) {
|
|
int ret = CA_SUCCESS;
|
|
|
|
ca_return_val_if_fail(c, CA_ERROR_INVALID);
|
|
- ca_return_val_if_fail(c->driver, CA_ERROR_NODRIVER);
|
|
- ca_return_val_if_fail(!strncmp(c->driver, "multi", 5), CA_ERROR_NODRIVER);
|
|
+ ca_return_val_if_fail(!c->driver || strncmp(c->driver, "multi", 5) == 0, CA_ERROR_NODRIVER);
|
|
ca_return_val_if_fail(!PRIVATE(c), CA_ERROR_STATE);
|
|
|
|
if (!(c->private = p = ca_new0(struct private, 1)))
|