mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-23 16:49:10 -07:00
media-libs/libcanberra: drop 0.30-r7
Closes: https://bugs.gentoo.org/769464 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
This commit is contained in:
Andreas Sturmlechner
@@ -1,64 +0,0 @@
|
||||
From c0620e432650e81062c1967cc669829dbd29b310 Mon Sep 17 00:00:00 2001
|
||||
From: Michael Meeks <michael.meeks@suse.com>
|
||||
Date: Fri, 09 Nov 2012 16:16:40 +0000
|
||||
Subject: gtk: Don't assume all GdkDisplays are GdkX11Displays: broadway/wayland
|
||||
|
||||
---
|
||||
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,
|
||||
--
|
||||
cgit v0.9.2
|
||||
@@ -1,16 +0,0 @@
|
||||
#!/bin/sh
|
||||
# to be sourced
|
||||
|
||||
case "$SESSION" in
|
||||
GNOME)
|
||||
# Done by gnome-settings-daemon
|
||||
;;
|
||||
*)
|
||||
if [ -z "$GTK_MODULES" ] ; then
|
||||
GTK_MODULES="canberra-gtk-module"
|
||||
else
|
||||
GTK_MODULES="$GTK_MODULES:canberra-gtk-module"
|
||||
fi
|
||||
export GTK_MODULES
|
||||
;;
|
||||
esac
|
||||
@@ -1,88 +0,0 @@
|
||||
# Copyright 1999-2024 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
inherit libtool multilib-minimal systemd
|
||||
|
||||
DESCRIPTION="Portable sound event library"
|
||||
HOMEPAGE="https://0pointer.de/lennart/projects/libcanberra/"
|
||||
SRC_URI="https://0pointer.de/lennart/projects/${PN}/${P}.tar.xz"
|
||||
|
||||
LICENSE="LGPL-2.1+"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
|
||||
IUSE="alsa gnome gstreamer gtk2 +gtk3 oss pulseaudio +sound tdb udev"
|
||||
|
||||
DEPEND="
|
||||
dev-libs/libltdl:0[${MULTILIB_USEDEP}]
|
||||
media-libs/libvorbis[${MULTILIB_USEDEP}]
|
||||
alsa? (
|
||||
media-libs/alsa-lib:=[${MULTILIB_USEDEP}]
|
||||
udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] ) )
|
||||
gstreamer? ( media-libs/gstreamer:1.0[${MULTILIB_USEDEP}] )
|
||||
gtk2? (
|
||||
>=dev-libs/glib-2.32:2[${MULTILIB_USEDEP}]
|
||||
>=x11-libs/gtk+-2.20.0:2[${MULTILIB_USEDEP}]
|
||||
x11-libs/libX11[${MULTILIB_USEDEP}] )
|
||||
gtk3? (
|
||||
>=dev-libs/glib-2.32:2[${MULTILIB_USEDEP}]
|
||||
x11-libs/gtk+:3[X,${MULTILIB_USEDEP}]
|
||||
x11-libs/libX11[${MULTILIB_USEDEP}] )
|
||||
pulseaudio? ( media-libs/libpulse[${MULTILIB_USEDEP}] )
|
||||
tdb? ( sys-libs/tdb:=[${MULTILIB_USEDEP}] )
|
||||
"
|
||||
RDEPEND="${DEPEND}
|
||||
gnome? (
|
||||
gnome-base/dconf
|
||||
gnome-base/gsettings-desktop-schemas )
|
||||
sound? ( x11-themes/sound-theme-freedesktop )" # Required for index.theme wrt #323379
|
||||
BDEPEND="
|
||||
app-arch/xz-utils
|
||||
virtual/pkgconfig
|
||||
"
|
||||
|
||||
REQUIRED_USE="udev? ( alsa )"
|
||||
|
||||
PATCHES=(
|
||||
# gtk: Don't assume all GdkDisplays are GdkX11Displays: broadway/wayland (from 'master')
|
||||
"${FILESDIR}/${PN}-0.30-wayland.patch"
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
elibtoolize
|
||||
}
|
||||
|
||||
multilib_src_configure() {
|
||||
ECONF_SOURCE="${S}" econf \
|
||||
--docdir="${EPREFIX}"/usr/share/doc/${PF} \
|
||||
$(use_enable alsa) \
|
||||
$(use_enable oss) \
|
||||
$(use_enable pulseaudio pulse) \
|
||||
$(use_enable gstreamer) \
|
||||
$(use_enable gtk2 gtk) \
|
||||
$(use_enable gtk3) \
|
||||
$(use_enable tdb) \
|
||||
$(use_enable udev) \
|
||||
--disable-lynx \
|
||||
--disable-gtk-doc \
|
||||
--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
|
||||
|
||||
if multilib_is_native_abi; then
|
||||
ln -s "${S}"/gtkdoc/html gtkdoc/html || die
|
||||
fi
|
||||
}
|
||||
|
||||
multilib_src_install() {
|
||||
# Disable parallel installation until bug #253862 is solved
|
||||
emake DESTDIR="${D}" -j1 install
|
||||
}
|
||||
|
||||
multilib_src_install_all() {
|
||||
einstalldocs
|
||||
find "${ED}" -type f -name '*.la' -delete || die
|
||||
|
||||
# This is needed for desktops different than GNOME, bug #520550
|
||||
exeinto /etc/X11/xinit/xinitrc.d
|
||||
newexe "${FILESDIR}"/libcanberra-gtk-module.sh 40-libcanberra-gtk-module
|
||||
}
|
||||
@@ -17,21 +17,10 @@
|
||||
<flag name="alsa">Enables ALSA sound driver.</flag>
|
||||
<flag name="gstreamer">Enables gstreamer sound driver. Not useful when
|
||||
alsa or pulseaudio is available.</flag>
|
||||
<flag name="gtk2">Enables building of gtk+ helper library, gtk+ runtime
|
||||
sound effects and the canberra-gtk-play utility. To enable the gtk+
|
||||
sound effects add canberra-gtk-module to the colon separated list of
|
||||
modules in the GTK_MODULES environment variable.</flag>
|
||||
<flag name="gtk3">Enables building of gtk+3 helper library, gtk+3
|
||||
runtime sound effects and the canberra-gtk-play utility. To enable
|
||||
the gtk+3 sound effects add canberra-gtk-module to the colon
|
||||
separated list of modules in the GTK_MODULES environment
|
||||
variable.</flag>
|
||||
<flag name="pulseaudio">Enables PulseAudio sound driver that should be
|
||||
able to support positional event sounds. This is the preferred
|
||||
choice for best sound events experience and picked by default if
|
||||
compiled in and possible to use at runtime.</flag>
|
||||
<flag name="sound">Install <pkg>x11-themes/sound-theme-freedesktop</pkg> to get
|
||||
sounds on Gnome and Xfce.</flag>
|
||||
<flag name="tdb">Enables Trivial Database support for caching
|
||||
purposes.</flag>
|
||||
</use>
|
||||
|
||||
Reference in New Issue
Block a user