commit: f0404d3658c4019adcea3392415fec540c1ac5ab Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sat May 10 01:11:59 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat May 10 01:11:59 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0404d36
x11-wm/xpra: fix build w/ >=sys-libs/pam-1.7.0 As of >=sys-libs/pam-1.7.0 (upstream commit 941bfc1de4c8d4963c8b9d63d32fed391f1476c8), pam's .pc files expect proper includes in consumers with the <security/*> namespace. Adapt to that. Closes: https://bugs.gentoo.org/948461 Signed-off-by: Sam James <sam <AT> gentoo.org> x11-wm/xpra/files/xpra-6.0.1-pam.patch | 19 +++++++++++++++++++ x11-wm/xpra/xpra-6.0.1-r1.ebuild | 4 +++- x11-wm/xpra/xpra-9999.ebuild | 3 ++- 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/x11-wm/xpra/files/xpra-6.0.1-pam.patch b/x11-wm/xpra/files/xpra-6.0.1-pam.patch new file mode 100644 index 000000000000..48362fd894e9 --- /dev/null +++ b/x11-wm/xpra/files/xpra-6.0.1-pam.patch @@ -0,0 +1,19 @@ +https://bugs.gentoo.org/948461 +--- a/xpra/server/pam.pyx ++++ b/xpra/server/pam.pyx +@@ -36,12 +36,12 @@ + cdef extern from "stdlib.h": + void *calloc(size_t nitems, size_t size) + +-cdef extern from "pam_misc.h": ++cdef extern from "security/pam_misc.h": + ctypedef struct pam_handle_t: + pass + void misc_conv(int num_msg, const pam_message **msgm, pam_response **response, void *appdata_ptr) + +-cdef extern from "pam_appl.h": ++cdef extern from "security/pam_appl.h": + struct pam_conv: + void *conv + #int (*conv)(int num_msg, const pam_message **msg, pam_response **resp, void *appdata_ptr) + diff --git a/x11-wm/xpra/xpra-6.0.1-r1.ebuild b/x11-wm/xpra/xpra-6.0.1-r1.ebuild index b71df2518d5a..5f50288a929b 100644 --- a/x11-wm/xpra/xpra-6.0.1-r1.ebuild +++ b/x11-wm/xpra/xpra-6.0.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -73,6 +73,7 @@ DEPEND=" x11-libs/gtk+:3[X?,introspection] ) jpeg? ( media-libs/libjpeg-turbo ) + !minimal? ( sys-libs/pam ) mdns? ( dev-libs/mdns ) openh264? ( media-libs/openh264:= ) pulseaudio? ( @@ -143,6 +144,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}/${PN}-9999-pep517.patch" + "${FILESDIR}/${PN}-6.0.1-pam.patch" ) src_prepare() { diff --git a/x11-wm/xpra/xpra-9999.ebuild b/x11-wm/xpra/xpra-9999.ebuild index b71df2518d5a..159f00fb5a4c 100644 --- a/x11-wm/xpra/xpra-9999.ebuild +++ b/x11-wm/xpra/xpra-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -74,6 +74,7 @@ DEPEND=" ) jpeg? ( media-libs/libjpeg-turbo ) mdns? ( dev-libs/mdns ) + !minimal? ( sys-libs/pam ) openh264? ( media-libs/openh264:= ) pulseaudio? ( media-plugins/gst-plugins-pulse:1.0
