Attachment 244103 Details for Bug 270881 – [patch] work around namespace collision for crypt_data (v2)

[patch] [patch] work around namespace collision for crypt_data (v2)

pr-accountsservice-crypt_data-collision-fix.diff (text/plain), 1.74 KB, created by John Hein on 2023-08-14 18:08:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: John Hein

Created: 2023-08-14 18:08:28 UTC

Size: 1.74 KB

patch

obsolete

>diff --git a/sysutils/accountsservice/Makefile b/sysutils/accountsservice/Makefile
>index e4b92dbde119..199a3bbce253 100644
>--- a/sysutils/accountsservice/Makefile
>+++ b/sysutils/accountsservice/Makefile
>@@ -16,8 +16,14 @@ LIB_DEPENDS=	libpolkit-gobject-1.so:sysutils/polkit \
> 
> USES=		cpe gettext gnome localbase:ldflags meson pkgconfig tar:xz
> CPE_VENDOR=	freedesktop
>+USE_GITLAB=	yes
>+GL_SITE=	https://gitlab.freedesktop.org
>+GL_ACCOUNT=	arrowd
>+#fetch: https://gitlab.freedesktop.org/arrowd/accountsservice/-/archive/1ad459450480baa3e2024db4edee0a30ca0edc20.tar.gz?dummy=/arrowd-accountsservice-1ad459450480baa3e2024db4edee0a30ca0edc20_GL0.tar.gz: size unknown
>+GL_TAGNAME=	1ad459450480baa3e2024db4edee0a30ca0edc20
> USE_GNOME=	glib20 intltool libxslt introspection:build
> USE_LDCONFIG=	yes
>+
> MESON_ARGS=	-Dconsolekit=true \
> 		-Dgdmconffile=${LOCALBASE}/etc/gdm/custom.conf \
> 		-Dlightdmconffile=${LOCALBASE}/etc/lightdm/lightdm.conf \
>@@ -26,9 +32,4 @@ MESON_ARGS=	-Dconsolekit=true \
> 		-Dvapi=false \
> 		-Dtests=false
> 
>-USE_GITLAB=	yes
>-GL_SITE=	https://gitlab.freedesktop.org
>-GL_ACCOUNT=	arrowd
>-GL_TAGNAME=	1ad459450480baa3e2024db4edee0a30ca0edc20
>-
> .include <bsd.port.mk>
>diff --git a/sysutils/accountsservice/files/patch-src-libaccountsservice-act-user.c b/sysutils/accountsservice/files/patch-src-libaccountsservice-act-user.c
>new file mode 100644
>index 000000000000..c5053ebdcf29
>--- /dev/null
>+++ b/sysutils/accountsservice/files/patch-src-libaccountsservice-act-user.c
>@@ -0,0 +1,12 @@
>+--- src/libaccountsservice/act-user.c.orig	2023-08-12 19:01:30 UTC
>++++ src/libaccountsservice/act-user.c
>+@@ -20,6 +20,10 @@
>+ 
>+ #include <config.h>
>+ 
>++#ifdef HAVE_CRYPT_H
>++#define _C11_SOURCE
>++#endif
>+ #include <float.h>
>+ #include <string.h>
>+ #include <sys/types.h>

Flags:

jcfyecrayz: maintainer-approval? (arrowd)

Actions: View | Diff

Attachments on bug 270881: 241529 | 244100 | 244103