Compare commits

...

No commits in common. "c10s" and "c8" have entirely different histories.
c10s ... c8

11 changed files with 220 additions and 265 deletions

2
.gitignore vendored
View File

@ -1 +1 @@
/libcanberra-*.tar.xz SOURCES/libcanberra-0.30.tar.xz

1
.libcanberra.metadata Normal file
View File

@ -0,0 +1 @@
fd4c16e341ffc456d688ed3462930d17ca6f6c20 SOURCES/libcanberra-0.30.tar.xz

View File

@ -1,123 +0,0 @@
From d6dd5cdf45c1aac6c0519c8a4f5f89321770fb53 Mon Sep 17 00:00:00 2001
From: Michael Meeks <michael.meeks@suse.com>
Date: Fri, 9 Nov 2012 16:16:40 +0000
Subject: [PATCH] gtk: Don't assume all GdkDisplays are GdkX11Displays:
broadway/wayland
Co-Authored-By: Bastien Nocera <hadess@hadess.net>
---
src/canberra-gtk-module.c | 15 +++++++++++++++
src/canberra-gtk.c | 28 ++++++++++++++++++++++------
2 files changed, 37 insertions(+), 6 deletions(-)
diff --git a/src/canberra-gtk-module.c b/src/canberra-gtk-module.c
index 67791f0..c1532ab 100644
--- a/src/canberra-gtk-module.c
+++ b/src/canberra-gtk-module.c
@@ -307,6 +307,11 @@ static gint window_get_desktop(GdkDisplay *d, GdkWindow *w) {
guchar *data = NULL;
gint ret = -1;
+#ifdef GDK_IS_X11_DISPLAY
+ if (!GDK_IS_X11_DISPLAY(d))
+ return 0;
+#endif
+
if (XGetWindowProperty(GDK_DISPLAY_XDISPLAY(d), GDK_WINDOW_XID(w),
gdk_x11_get_xatom_by_name_for_display(d, "_NET_WM_DESKTOP"),
0, G_MAXLONG, False, XA_CARDINAL, &type_return,
@@ -335,6 +340,11 @@ static gint display_get_desktop(GdkDisplay *d) {
guchar *data = NULL;
gint ret = -1;
+#ifdef GDK_IS_X11_DISPLAY
+ if (!GDK_IS_X11_DISPLAY(d))
+ return 0;
+#endif
+
if (XGetWindowProperty(GDK_DISPLAY_XDISPLAY(d), DefaultRootWindow(GDK_DISPLAY_XDISPLAY(d)),
gdk_x11_get_xatom_by_name_for_display(d, "_NET_CURRENT_DESKTOP"),
0, G_MAXLONG, False, XA_CARDINAL, &type_return,
@@ -365,6 +375,11 @@ static gboolean window_is_xembed(GdkDisplay *d, GdkWindow *w) {
gboolean ret = FALSE;
Atom xembed;
+#ifdef GDK_IS_X11_DISPLAY
+ if (!GDK_IS_X11_DISPLAY(d))
+ return FALSE;
+#endif
+
/* Gnome Panel applets are XEMBED windows. We need to make sure we
* ignore them */
diff --git a/src/canberra-gtk.c b/src/canberra-gtk.c
index 34446f5..47285f8 100644
--- a/src/canberra-gtk.c
+++ b/src/canberra-gtk.c
@@ -185,6 +185,11 @@ static gint window_get_desktop(GdkDisplay *d, GdkWindow *w) {
guchar *data = NULL;
gint ret = -1;
+#ifdef GDK_IS_X11_DISPLAY
+ if (!GDK_IS_X11_DISPLAY(d))
+ return 0;
+#endif
+
if (XGetWindowProperty(GDK_DISPLAY_XDISPLAY(d), GDK_WINDOW_XID(w),
gdk_x11_get_xatom_by_name_for_display(d, "_NET_WM_DESKTOP"),
0, G_MAXLONG, False, XA_CARDINAL, &type_return,
@@ -254,18 +259,28 @@ int ca_gtk_proplist_set_for_widget(ca_proplist *p, GtkWidget *widget) {
if (gtk_widget_get_realized(GTK_WIDGET(w))) {
GdkWindow *dw = NULL;
+#ifdef GDK_IS_X11_DISPLAY
GdkScreen *screen = NULL;
+#endif
GdkDisplay *display = NULL;
gint x = -1, y = -1, width = -1, height = -1, screen_width = -1, screen_height = -1;
- if ((dw = gtk_widget_get_window(GTK_WIDGET(w))))
- if ((ret = ca_proplist_setf(p, CA_PROP_WINDOW_X11_XID, "%lu", (unsigned long) GDK_WINDOW_XID(dw))) < 0)
- return ret;
+ if ((dw = gtk_widget_get_window(GTK_WIDGET(w)))) {
+#ifdef GDK_IS_X11_DISPLAY
+ if (GDK_IS_X11_DISPLAY(display)) {
+ if ((ret = ca_proplist_setf(p, CA_PROP_WINDOW_X11_XID, "%lu", (unsigned long) GDK_WINDOW_XID(dw))) < 0)
+ return ret;
+ }
+#endif
+ }
if ((display = gtk_widget_get_display(GTK_WIDGET(w)))) {
- if ((t = gdk_display_get_name(display)))
+#ifdef GDK_IS_X11_DISPLAY
+ if (GDK_IS_X11_DISPLAY(display) && (t = gdk_display_get_name(display))) {
if ((ret = ca_proplist_sets(p, CA_PROP_WINDOW_X11_DISPLAY, t)) < 0)
return ret;
+ }
+#endif
if (dw) {
gint desktop = window_get_desktop(display, dw);
@@ -276,7 +291,8 @@ int ca_gtk_proplist_set_for_widget(ca_proplist *p, GtkWidget *widget) {
}
}
- if ((screen = gtk_widget_get_screen(GTK_WIDGET(w)))) {
+#ifdef GDK_IS_X11_DISPLAY
+ if (GDK_IS_X11_DISPLAY(display) && (screen = gtk_widget_get_screen(GTK_WIDGET(w)))) {
if ((ret = ca_proplist_setf(p, CA_PROP_WINDOW_X11_SCREEN, "%i", gdk_screen_get_number(screen))) < 0)
return ret;
@@ -285,7 +301,7 @@ int ca_gtk_proplist_set_for_widget(ca_proplist *p, GtkWidget *widget) {
if ((ret = ca_proplist_setf(p, CA_PROP_WINDOW_X11_MONITOR, "%i", gdk_screen_get_monitor_at_window(screen, dw))) < 0)
return ret;
}
-
+#endif
/* FIXME, this might cause a round trip */
if (dw) {
--
2.34.1

View File

@ -0,0 +1,51 @@
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

View File

@ -0,0 +1,70 @@
From c0620e432650e81062c1967cc669829dbd29b310 Mon Sep 17 00:00:00 2001
From: Michael Meeks <michael.meeks@suse.com>
Date: Fri, 9 Nov 2012 16:16:40 +0000
Subject: [PATCH] gtk: Don't assume all GdkDisplays are GdkX11Displays:
broadway/wayland
---
src/canberra-gtk-module.c | 15 +++++++++++++++
src/canberra-gtk.c | 5 +++++
2 files changed, 20 insertions(+)
diff --git a/src/canberra-gtk-module.c b/src/canberra-gtk-module.c
index 67791f0..c1532ab 100644
--- a/src/canberra-gtk-module.c
+++ b/src/canberra-gtk-module.c
@@ -307,6 +307,11 @@ static gint window_get_desktop(GdkDisplay *d, GdkWindow *w) {
guchar *data = NULL;
gint ret = -1;
+#ifdef GDK_IS_X11_DISPLAY
+ if (!GDK_IS_X11_DISPLAY(d))
+ return 0;
+#endif
+
if (XGetWindowProperty(GDK_DISPLAY_XDISPLAY(d), GDK_WINDOW_XID(w),
gdk_x11_get_xatom_by_name_for_display(d, "_NET_WM_DESKTOP"),
0, G_MAXLONG, False, XA_CARDINAL, &type_return,
@@ -335,6 +340,11 @@ static gint display_get_desktop(GdkDisplay *d) {
guchar *data = NULL;
gint ret = -1;
+#ifdef GDK_IS_X11_DISPLAY
+ if (!GDK_IS_X11_DISPLAY(d))
+ return 0;
+#endif
+
if (XGetWindowProperty(GDK_DISPLAY_XDISPLAY(d), DefaultRootWindow(GDK_DISPLAY_XDISPLAY(d)),
gdk_x11_get_xatom_by_name_for_display(d, "_NET_CURRENT_DESKTOP"),
0, G_MAXLONG, False, XA_CARDINAL, &type_return,
@@ -365,6 +375,11 @@ static gboolean window_is_xembed(GdkDisplay *d, GdkWindow *w) {
gboolean ret = FALSE;
Atom xembed;
+#ifdef GDK_IS_X11_DISPLAY
+ if (!GDK_IS_X11_DISPLAY(d))
+ return FALSE;
+#endif
+
/* Gnome Panel applets are XEMBED windows. We need to make sure we
* ignore them */
diff --git a/src/canberra-gtk.c b/src/canberra-gtk.c
index 34446f5..08cb668 100644
--- a/src/canberra-gtk.c
+++ b/src/canberra-gtk.c
@@ -185,6 +185,11 @@ static gint window_get_desktop(GdkDisplay *d, GdkWindow *w) {
guchar *data = NULL;
gint ret = -1;
+#ifdef GDK_IS_X11_DISPLAY
+ if (!GDK_IS_X11_DISPLAY(d))
+ return 0;
+#endif
+
if (XGetWindowProperty(GDK_DISPLAY_XDISPLAY(d), GDK_WINDOW_XID(w),
gdk_x11_get_xatom_by_name_for_display(d, "_NET_WM_DESKTOP"),
0, G_MAXLONG, False, XA_CARDINAL, &type_return,
--
1.9.0

View File

@ -0,0 +1,59 @@
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;
}

View File

@ -1,22 +1,17 @@
# RHEL 10 won't ship with GTK 2, don't build bit there, but build them elsewhere
%if 0%{?rhel} > 9
%bcond_with gtk2
%else
%bcond_without gtk2
%endif
Name: libcanberra Name: libcanberra
Version: 0.30 Version: 0.30
Release: 37%{?dist} Release: 18%{?dist}
Summary: Portable Sound Event Library Summary: Portable Sound Event Library
Group: System Environment/Libraries
Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.xz Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.xz
Patch0: 0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch Patch0: 0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch
License: LGPL-2.1-or-later Patch1: add-quiet-option.txt
Patch2: 0001-desktop-add-q-option-to-suppress-errors.patch
License: LGPLv2+
Url: http://git.0pointer.de/?p=libcanberra.git;a=summary Url: http://git.0pointer.de/?p=libcanberra.git;a=summary
BuildRequires: gcc
%if %{with gtk2}
BuildRequires: gtk2-devel BuildRequires: gtk2-devel
%endif
BuildRequires: gtk3-devel BuildRequires: gtk3-devel
BuildRequires: alsa-lib-devel BuildRequires: alsa-lib-devel
BuildRequires: libvorbis-devel BuildRequires: libvorbis-devel
@ -27,27 +22,29 @@ BuildRequires: gstreamer1-devel
BuildRequires: libtdb-devel BuildRequires: libtdb-devel
BuildRequires: gettext-devel BuildRequires: gettext-devel
BuildRequires: systemd-devel BuildRequires: systemd-devel
BuildRequires: make
Requires: sound-theme-freedesktop Requires: sound-theme-freedesktop
Requires: pulseaudio-libs >= 0.9.15 Requires: pulseaudio-libs >= 0.9.15
Requires(post): systemd
Requires(preun): systemd
Requires(postun): systemd
%description %description
A small and lightweight implementation of the XDG Sound Theme Specification A small and lightweight implementation of the XDG Sound Theme Specification
(http://0pointer.de/public/sound-theme-spec.html). (http://0pointer.de/public/sound-theme-spec.html).
%if %{with gtk2}
%package gtk2 %package gtk2
Summary: Gtk+ 2.x Bindings for libcanberra Summary: Gtk+ 2.x Bindings for libcanberra
Group: System Environment/Libraries
Requires: %{name}%{?_isa} = %{version}-%{release} Requires: %{name}%{?_isa} = %{version}-%{release}
# Some other stuff is included in the gtk3 package, so always pull that in. # Some other stuff is included in the gtk3 package, so always pull that in.
Requires: %{name}-gtk3%{?_isa} = %{version}-%{release} Requires: %{name}-gtk3%{?_isa} = %{version}-%{release}
%description gtk2 %description gtk2
Gtk+ 2.x bindings for libcanberra Gtk+ 2.x bindings for libcanberra
%endif
%package gtk3 %package gtk3
Summary: Gtk+ 3.x Bindings for libcanberra Summary: Gtk+ 3.x Bindings for libcanberra
Group: System Environment/Libraries
Requires: %{name}%{?_isa} = %{version}-%{release} Requires: %{name}%{?_isa} = %{version}-%{release}
%description gtk3 %description gtk3
@ -55,38 +52,40 @@ Gtk+ 3.x bindings for libcanberra
%package devel %package devel
Summary: Development Files for libcanberra Client Development Summary: Development Files for libcanberra Client Development
Group: Development/Libraries
Requires: %{name}%{?_isa} = %{version}-%{release} Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: %{name}-gtk3%{?_isa} = %{version}-%{release}
%if %{with gtk2}
Requires: %{name}-gtk2%{?_isa} = %{version}-%{release} Requires: %{name}-gtk2%{?_isa} = %{version}-%{release}
Requires: %{name}-gtk3%{?_isa} = %{version}-%{release}
Requires: gtk2-devel Requires: gtk2-devel
%endif
%description devel %description devel
Development Files for libcanberra Client Development Development Files for libcanberra Client Development
%post %post
/sbin/ldconfig
%systemd_post canberra-system-bootup.service canberra-system-shutdown.service canberra-system-shutdown-reboot.service %systemd_post canberra-system-bootup.service canberra-system-shutdown.service canberra-system-shutdown-reboot.service
%preun %preun
%systemd_preun canberra-system-bootup.service canberra-system-shutdown.service canberra-system-shutdown-reboot.service %systemd_preun canberra-system-bootup.service canberra-system-shutdown.service canberra-system-shutdown-reboot.service
%postun
/sbin/ldconfig
%systemd_postun canberra-system-bootup.service canberra-system-shutdown.service canberra-system-shutdown-reboot.service
%post gtk2 -p /sbin/ldconfig
%postun gtk2 -p /sbin/ldconfig
%post gtk3 -p /sbin/ldconfig
%postun gtk3 -p /sbin/ldconfig
%prep %prep
%setup -q %setup -q
%patch0 -p1 %patch0 -p1
%patch1 -p1
%patch2 -p1
%build %build
%configure \ %configure --disable-static --enable-pulse --enable-alsa --enable-null --disable-oss --with-builtin=dso --with-systemdsystemunitdir=/usr/lib/systemd/system
--disable-static \
--enable-pulse \
--enable-alsa \
%if %{without gtk2}
--disable-gtk \
%endif
--enable-null \
--disable-oss \
--with-builtin=dso \
--with-systemdsystemunitdir=/usr/lib/systemd/system
make %{?_smp_mflags} make %{?_smp_mflags}
%install %install
@ -109,11 +108,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README
%{_prefix}/lib/systemd/system/canberra-system-shutdown.service %{_prefix}/lib/systemd/system/canberra-system-shutdown.service
%{_bindir}/canberra-boot %{_bindir}/canberra-boot
%if %{with gtk2}
%files gtk2 %files gtk2
%{_libdir}/libcanberra-gtk.so.* %{_libdir}/libcanberra-gtk.so.*
%{_libdir}/gtk-2.0/modules/libcanberra-gtk-module.so %{_libdir}/gtk-2.0/modules/libcanberra-gtk-module.so
%endif
%files gtk3 %files gtk3
%{_libdir}/libcanberra-gtk3.so.* %{_libdir}/libcanberra-gtk3.so.*
@ -136,14 +133,12 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README
%doc %{_datadir}/gtk-doc %doc %{_datadir}/gtk-doc
%{_includedir}/canberra-gtk.h %{_includedir}/canberra-gtk.h
%{_includedir}/canberra.h %{_includedir}/canberra.h
%{_libdir}/libcanberra.so
%{_libdir}/pkgconfig/libcanberra.pc
%if %{with gtk2}
%{_libdir}/libcanberra-gtk.so %{_libdir}/libcanberra-gtk.so
%{_libdir}/pkgconfig/libcanberra-gtk.pc
%endif
%{_libdir}/libcanberra-gtk3.so %{_libdir}/libcanberra-gtk3.so
%{_libdir}/libcanberra.so
%{_libdir}/pkgconfig/libcanberra-gtk.pc
%{_libdir}/pkgconfig/libcanberra-gtk3.pc %{_libdir}/pkgconfig/libcanberra-gtk3.pc
%{_libdir}/pkgconfig/libcanberra.pc
# co-own these directories to avoid requiring vala # co-own these directories to avoid requiring vala
%dir %{_datadir}/vala %dir %{_datadir}/vala
%dir %{_datadir}/vala/vapi %dir %{_datadir}/vala/vapi
@ -151,71 +146,14 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README
%{_datadir}/vala/vapi/libcanberra.vapi %{_datadir}/vala/vapi/libcanberra.vapi
%changelog %changelog
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 0.30-37 * Thu Jan 03 2019 Wim Taymans <wtaymans@redhat.com> - 0.30-18
- Bump release for October 2024 mass rebuild: - Quiet theme sounds when not available
Resolves: RHEL-64018 - Resolves: rhbz#1856770
- fix systemd_postun
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 0.30-36 * Thu Jan 03 2019 Wim Taymans <wtaymans@redhat.com> - 0.30-17
- Bump release for June 2024 mass rebuild - Add quiet option
- Resolves: rhbz#1556800
* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.30-35
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.30-34
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Fri Oct 13 2023 Niels De Graef <ndegraef@redhat.com> - 0.30-33
- Migrate to SPDX license
* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.30-32
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.30-31
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Tue Jan 10 2023 Tomas Popela <tpopela@redhat.com> - 0.30-30
- Don't build GTK 2 bits on ELN/RHEL 10 as GTK 2 won't be there
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.30-29
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Sun Feb 06 2022 Bastien Nocera <bnocera@redhat.com> - 0.30-28
+ libcanberra-0.30-27
- Update X11 avoidance patch
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.30-27
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Fri Oct 01 2021 Kalev Lember <klember@redhat.com> - 0.30-26
- Avoid requiring systemd as per updated packaging guidelines
- Drop ldconfig scriptlets
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.30-25
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.30-24
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.30-23
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.30-22
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Fri Nov 8 2019 Tom Callaway <spot@fedoraproject.org> - 0.30-21
- remove %%systemd_postun macro to fix FTBFS
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.30-20
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Tue Feb 12 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.30-19
- Fix typo in postun
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org>
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.30-17
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.30-16 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.30-16
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild

View File

@ -1,6 +0,0 @@
--- !Policy
product_versions:
- rhel-10
decision_context: osci_compose_gate
rules:
- !PassingTestCaseRule {test_case_name: desktop-qe.desktop-ci.tier1-gating.functional}

View File

@ -1,10 +0,0 @@
#!/bin/sh
if [ -z "$GTK_MODULES" ] ; then
GTK_MODULES="canberra-gtk-module"
else
GTK_MODULES="$GTK_MODULES:canberra-gtk-module"
fi
export GTK_MODULES

View File

@ -1,24 +0,0 @@
diff -up libcanberra-0.26/src/canberra-gtk-module.c.quit-add libcanberra-0.26/src/canberra-gtk-module.c
--- libcanberra-0.26/src/canberra-gtk-module.c.quit-add 2011-01-07 22:48:49.388992626 -0500
+++ libcanberra-0.26/src/canberra-gtk-module.c 2011-01-07 22:49:02.339995153 -0500
@@ -932,11 +932,6 @@ static void connect_settings(void) {
connected = TRUE;
}
-static gboolean quit_handler(gpointer data) {
- dispatch_queue();
- return FALSE;
-}
-
G_MODULE_EXPORT void gtk_module_init(gint *argc, gchar ***argv[]) {
/* This is the same quark libgnomeui uses! */
@@ -963,8 +958,6 @@ G_MODULE_EXPORT void gtk_module_init(gin
install_hook(GTK_TYPE_WIDGET, "drag-drop", &signal_id_widget_drag_drop);
install_hook(GTK_TYPE_WIDGET, "drag-failed", &signal_id_widget_drag_failed);
install_hook(GTK_TYPE_EXPANDER, "activate", &signal_id_expander_activate);
-
- gtk_quit_add(1, quit_handler, NULL);
}
G_MODULE_EXPORT gchar* g_module_check_init(GModule *module);

View File

@ -1 +0,0 @@
34cb7e4430afaf6f447c4ebdb9b42072 libcanberra-0.30.tar.xz