diff options
| author |   Igor V. Kovalenko <igor.v.kovalenko@gmail.com> | 2022-12-10 12:30:44 +0300 |
|---|---|---|
| committer |   Mart Raudsepp <leio@gentoo.org> | 2022-12-10 09:35:25 +0000 |
| commit | deb2056821331da239e3c7feacff70a3cc0eafc3 (patch) | |
| tree | ec518ab51bc9f0dca770b738715f1eedcde54dec /media-libs/libpulse | |
| parent | dev-python/xarray: Stabilize 2022.11.0 x86, #885269 (diff) | |
| download | gentoo-deb2056821331da239e3c7feacff70a3cc0eafc3.tar.gz gentoo-deb2056821331da239e3c7feacff70a3cc0eafc3.tar.bz2 gentoo-deb2056821331da239e3c7feacff70a3cc0eafc3.zip | |
media-libs/libpulse: Don't assume gdkx
Upstream commit 89ce6321bd19452097392ddfb416bc51a280b63e
Signed-off-by: Igor V. Kovalenko <igor.v.kovalenko@gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/28623
Signed-off-by: Mart Raudsepp <leio@gentoo.org>
Diffstat (limited to 'media-libs/libpulse')
| -rw-r--r-- | media-libs/libpulse/files/pulseaudio-16.1-proplist-util-without-gdkx.patch | 42 | ||||
| -rw-r--r-- | media-libs/libpulse/libpulse-16.1-r2.ebuild | 1 |
2 files changed, 43 insertions, 0 deletions
diff --git a/media-libs/libpulse/files/pulseaudio-16.1-proplist-util-without-gdkx.patch b/media-libs/libpulse/files/pulseaudio-16.1-proplist-util-without-gdkx.patch new file mode 100644 index 000000000000..a5e025ccb4dc --- /dev/null +++ b/media-libs/libpulse/files/pulseaudio-16.1-proplist-util-without-gdkx.patch @@ -0,0 +1,42 @@ +commit 89ce6321bd19452097392ddfb416bc51a280b63e +Author: Mart Raudsepp <leio@gentoo.org> +Date: Wed Nov 30 09:25:22 2022 +0200 + + proplist-util: Don't assume gdkx is there as gtk could be built without it + + Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/757> + +diff --git a/src/pulsecore/proplist-util.c b/src/pulsecore/proplist-util.c +index 16ea9e006..1330ef5ef 100644 +--- a/src/pulsecore/proplist-util.c ++++ b/src/pulsecore/proplist-util.c +@@ -51,10 +51,12 @@ static const gchar* _g_get_application_name(void) PA_GCC_WEAKREF(g_get_applicati + #if defined(HAVE_GTK) && defined(PA_GCC_WEAKREF) + #pragma GCC diagnostic ignored "-Wstrict-prototypes" + #include <gtk/gtk.h> +-#include <gdk/gdkx.h> + static const gchar* _gtk_window_get_default_icon_name(void) PA_GCC_WEAKREF(gtk_window_get_default_icon_name); ++#ifdef GDK_WINDOWING_X11 ++#include <gdk/gdkx.h> + static Display *_gdk_display PA_GCC_WEAKREF(gdk_display); + #endif ++#endif + + #include "proplist-util.h" + +@@ -89,6 +91,7 @@ static void add_gtk_properties(pa_proplist *p) { + pa_proplist_sets(p, PA_PROP_APPLICATION_ICON_NAME, t); + } + ++#ifdef GDK_WINDOWING_X11 + if (!pa_proplist_contains(p, PA_PROP_WINDOW_X11_DISPLAY)) + if (&_gdk_display && _gdk_display) { + const char *t; +@@ -99,6 +102,7 @@ static void add_gtk_properties(pa_proplist *p) { + pa_proplist_sets(p, PA_PROP_WINDOW_X11_DISPLAY, t); + } + ++#endif + #endif + } + diff --git a/media-libs/libpulse/libpulse-16.1-r2.ebuild b/media-libs/libpulse/libpulse-16.1-r2.ebuild index 773e74668690..5ee6d6fdcbad 100644 --- a/media-libs/libpulse/libpulse-16.1-r2.ebuild +++ b/media-libs/libpulse/libpulse-16.1-r2.ebuild @@ -77,6 +77,7 @@ DOCS=( NEWS README ) # patches merged upstream, to be removed with 16.2 or later bump PATCHES=( "${FILESDIR}"/pulseaudio-16.1-memfd-cleanup.patch + "${FILESDIR}"/pulseaudio-16.1-proplist-util-without-gdkx.patch ) src_prepare() { |