Skip to content
Snippets Groups Projects
Commit ac2effac authored by Rocky Automation's avatar Rocky Automation :tv:
Browse files

import libcanberra-0.30-27.el9

parent 8c33ba02
No related branches found
Tags imports/r8/libcanberra-0.30-16.el8
No related merge requests found
Hide whitespace changes
Inline Side-by-side
.libcanberra.checksum 0 → 100644
+ 1
− 0
View file @ ac2effac
7d770c2345cab65f786433a0ffc7573db21452d939a26828f6bcbbeca461b800
.libcanberra.metadata
+ 1
− 1
View file @ ac2effac
fd4c16e341ffc456d688ed3462930d17ca6f6c20 SOURCES/libcanberra-0.30.tar.xz
c2b671e67e0c288a69fc33dc1b6f1b534d07882c2aceed37004bf48c601afa72 SOURCES/libcanberra-0.30.tar.xz
SOURCES/0001-desktop-add-q-option-to-suppress-errors.patch 0 → 100644
+ 51
− 0
View file @ ac2effac
From ca209c2cda581249011398df0678ca37d5204be6 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Thu, 3 Jan 2019 11:04:06 +0100
Subject: [PATCH] desktop: add -q option to suppress errors
It is possible that the sound theme does not have the specified sound
and we don't want to spam the log with error messages in that case.
---
src/libcanberra-login-sound.desktop.in | 2 +-
src/libcanberra-logout-sound.sh.in | 2 +-
src/libcanberra-ready-sound.desktop.in | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/libcanberra-login-sound.desktop.in b/src/libcanberra-login-sound.desktop.in
index 210d2c1..128391d 100644
--- a/src/libcanberra-login-sound.desktop.in
+++ b/src/libcanberra-login-sound.desktop.in
@@ -2,7 +2,7 @@
Type=Application
Name=GNOME Login Sound
Comment=Plays a sound whenever you log in
-Exec=@bindir@/canberra-gtk-play --id="desktop-login" --description="GNOME Login"
+Exec=@bindir@/canberra-gtk-play -q --id="desktop-login" --description="GNOME Login"
OnlyShowIn=GNOME;
AutostartCondition=GSettings org.gnome.desktop.sound event-sounds
X-GNOME-Autostart-Phase=Application
diff --git a/src/libcanberra-logout-sound.sh.in b/src/libcanberra-logout-sound.sh.in
index 8b50de7..96ba602 100644
--- a/src/libcanberra-logout-sound.sh.in
+++ b/src/libcanberra-logout-sound.sh.in
@@ -1,3 +1,3 @@
#!/bin/sh
-@bindir@/canberra-gtk-play --id="desktop-logout" --description="GNOME Logout"
+@bindir@/canberra-gtk-play -q --id="desktop-logout" --description="GNOME Logout"
diff --git a/src/libcanberra-ready-sound.desktop.in b/src/libcanberra-ready-sound.desktop.in
index 4e6a606..e70b080 100644
--- a/src/libcanberra-ready-sound.desktop.in
+++ b/src/libcanberra-ready-sound.desktop.in
@@ -2,7 +2,7 @@
Type=Application
Name=GNOME System Ready Sound
Comment=Plays a sound whenever your system is ready for login
-Exec=@bindir@/canberra-gtk-play --id="system-ready" --description="GNOME System Ready"
+Exec=@bindir@/canberra-gtk-play -q --id="system-ready" --description="GNOME System Ready"
OnlyShowIn=GNOME;
AutostartCondition=GSettings org.gnome.desktop.sound event-sounds
X-GNOME-Autostart-Phase=Application
--
2.19.2
SOURCES/add-quiet-option.patch 0 → 100644
+ 59
− 0
View file @ ac2effac
diff -ru libcanberra-0.30/src/canberra-gtk-play.c libcanberra-0.30.new/src/canberra-gtk-play.c
--- libcanberra-0.30/src/canberra-gtk-play.c 2012-09-25 02:21:07.000000000 +0200
+++ libcanberra-0.30.new/src/canberra-gtk-play.c 2019-01-03 10:01:13.090177362 +0100
@@ -33,6 +33,7 @@
static int ret = 0;
static ca_proplist *proplist = NULL;
static int n_loops = 1;
+static gboolean quiet = FALSE;
static void callback(ca_context *c, uint32_t id, int error, void *userdata);
@@ -51,7 +52,8 @@
r = ca_context_play_full(ca_gtk_context_get(), 1, proplist, callback, NULL);
if (r < 0) {
- g_printerr("Failed to play sound: %s\n", ca_strerror(r));
+ if (!quiet)
+ g_printerr("Failed to play sound: %s\n", ca_strerror(r));
ret = 1;
gtk_main_quit();
}
@@ -62,7 +64,8 @@
static void callback(ca_context *c, uint32_t id, int error, void *userdata) {
if (error < 0) {
- g_printerr("Failed to play sound (callback): %s\n", ca_strerror(error));
+ if (!quiet)
+ g_printerr("Failed to play sound (callback): %s\n", ca_strerror(error));
ret = 1;
} else if (n_loops > 1) {
@@ -128,6 +131,7 @@
{ "loop", 'l', 0, G_OPTION_ARG_INT, &n_loops, "Loop how many times (detault: 1)", "INTEGER" },
{ "volume", 'V', 0, G_OPTION_ARG_STRING, &volume, "A floating point dB value for the sample volume (ex: 0.0)", "STRING" },
{ "property", 0, 0, G_OPTION_ARG_CALLBACK, (void*) property_callback, "An arbitrary property", "STRING" },
+ { "quiet", 'q', 0, G_OPTION_ARG_NONE, &quiet, "Don't print error messages", NULL },
{ NULL, 0, 0, 0, NULL, NULL, NULL }
};
@@ -154,7 +158,8 @@
}
if (!event_id && !filename) {
- g_printerr("No event id or file specified.\n");
+ if (!quiet)
+ g_printerr("No event id or file specified.\n");
return 1;
}
@@ -182,7 +187,8 @@
r = ca_context_play_full(ca_gtk_context_get(), 1, proplist, callback, NULL);
if (r < 0) {
- g_printerr("Failed to play sound: %s\n", ca_strerror(r));
+ if (!quiet)
+ g_printerr("Failed to play sound: %s\n", ca_strerror(r));
ret = 1;
goto finish;
}
SPECS/libcanberra.spec
+ 10
− 2
View file @ ac2effac
Name: libcanberra
Version: 0.30
Release: 26%{?dist}
Release: 27%{?dist}
Summary: Portable Sound Event Library
Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.xz
Patch0: 0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch
Patch1: add-quiet-option.patch
Patch2: 0001-desktop-add-q-option-to-suppress-errors.patch
License: LGPLv2+
Url: http://git.0pointer.de/?p=libcanberra.git;a=summary
BuildRequires: gcc
......@@ -70,7 +72,9 @@ Development Files for libcanberra Client Development
%prep
%setup -q
%patch0 -p1
%patch0 -p1
%patch1 -p1
%patch2 -p1
%build
%configure --disable-static --enable-pulse --enable-alsa --enable-null --disable-oss --with-builtin=dso --with-systemdsystemunitdir=/usr/lib/systemd/system
......@@ -134,6 +138,10 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README
%{_datadir}/vala/vapi/libcanberra.vapi
%changelog
* Thu Jul 13 2023 Wim Taymans <wtaymans@redhat.com> - 0.30-27
- Add -q option to disable warnings.
Resolves: rhbz#2222172
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 0.30-26
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment