From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1465813-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 71436158020
for <garchives@archives.gentoo.org>; Sat, 10 Dec 2022 09:35:51 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 99CE3E0909;
Sat, 10 Dec 2022 09:35:50 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 73076E0909
for <gentoo-commits@lists.gentoo.org>; Sat, 10 Dec 2022 09:35:50 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 5614B340F0D
for <gentoo-commits@lists.gentoo.org>; Sat, 10 Dec 2022 09:35:49 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id B5E173A5
for <gentoo-commits@lists.gentoo.org>; Sat, 10 Dec 2022 09:35:47 +0000 (UTC)
From: "Mart Raudsepp" <leio@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Mart Raudsepp" <leio@gentoo.org>
Message-ID: <1670664925.deb2056821331da239e3c7feacff70a3cc0eafc3.leio@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/libpulse/, media-libs/libpulse/files/
X-VCS-Repository: repo/gentoo
X-VCS-Files: media-libs/libpulse/files/pulseaudio-16.1-proplist-util-without-gdkx.patch media-libs/libpulse/libpulse-16.1-r2.ebuild
X-VCS-Directories: media-libs/libpulse/files/ media-libs/libpulse/
X-VCS-Committer: leio
X-VCS-Committer-Name: Mart Raudsepp
X-VCS-Revision: deb2056821331da239e3c7feacff70a3cc0eafc3
X-VCS-Branch: master
Date: Sat, 10 Dec 2022 09:35:47 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 5d3e7017-748f-4cac-bda5-7bedf2e7c4dd
X-Archives-Hash: e5ab906a38c322273a6d1890b7b96eab
commit: deb2056821331da239e3c7feacff70a3cc0eafc3
Author: Igor V. Kovalenko <igor.v.kovalenko <AT> gmail <DOT> com>
AuthorDate: Sat Dec 10 09:30:44 2022 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sat Dec 10 09:35:25 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=deb20568
media-libs/libpulse: Don't assume gdkx
Upstream commit 89ce6321bd19452097392ddfb416bc51a280b63e
Signed-off-by: Igor V. Kovalenko <igor.v.kovalenko <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/28623
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
...ulseaudio-16.1-proplist-util-without-gdkx.patch | 42 ++++++++++++++++++++++
media-libs/libpulse/libpulse-16.1-r2.ebuild | 1 +
2 files changed, 43 insertions(+)
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() {