From 43e759c25a8e2960d3dff78c6696cb257ebaa394 Mon Sep 17 00:00:00 2001
From: Alfred Persson Forsberg <cat@catcream.org>
Date: Mon, 11 Apr 2022 13:49:23 +0000
Subject: dev-util/flatpak-builder: fixed building for musl

Closes: https://github.com/gentoo/gentoo/pull/24991
Closes: https://bugs.gentoo.org/834671
Signed-off-by: Alfred Persson Forsberg <cat@catcream.org>
Signed-off-by: Zac Medico <zmedico@gentoo.org>
---
 .../files/flatpak-builder-1.0.11-musl.patch        | 18 +++++++
 .../files/flatpak-builder-1.2.2-musl.patch         | 55 +++++++++++++++++++++-
 .../flatpak-builder/flatpak-builder-1.0.11.ebuild  |  2 +
 3 files changed, 73 insertions(+), 2 deletions(-)
 create mode 100644 dev-util/flatpak-builder/files/flatpak-builder-1.0.11-musl.patch

(limited to 'dev-util/flatpak-builder')

diff --git a/dev-util/flatpak-builder/files/flatpak-builder-1.0.11-musl.patch b/dev-util/flatpak-builder/files/flatpak-builder-1.0.11-musl.patch
new file mode 100644
index 000000000000..b5ef0ec15504
--- /dev/null
+++ b/dev-util/flatpak-builder/files/flatpak-builder-1.0.11-musl.patch
@@ -0,0 +1,18 @@
+--- a/libglnx/glnx-macros.h
++++ b/libglnx/glnx-macros.h
+@@ -28,6 +28,16 @@
+
+ G_BEGIN_DECLS
+
++/* taken from glibc unistd.h and fixes musl */
++#ifndef TEMP_FAILURE_RETRY
++#define TEMP_FAILURE_RETRY(expression) \
++  (__extension__                                                              \
++    ({ long int __result;                                                     \
++       do __result = (long int) (expression);                                 \
++       while (__result == -1L && errno == EINTR);                             \
++       __result; }))
++#endif
++
+ /* All of these are for C only. */
+ #ifndef __GI_SCANNER__
diff --git a/dev-util/flatpak-builder/files/flatpak-builder-1.2.2-musl.patch b/dev-util/flatpak-builder/files/flatpak-builder-1.2.2-musl.patch
index db207e0e353c..626fbddd0352 100644
--- a/dev-util/flatpak-builder/files/flatpak-builder-1.2.2-musl.patch
+++ b/dev-util/flatpak-builder/files/flatpak-builder-1.2.2-musl.patch
@@ -1,9 +1,59 @@
+diff --git a/subprojects/debugedit/tools/debugedit.c b/subprojects/debugedit/tools/debugedit.c
+index 668777a..b3ba5cb 100644
+--- a/subprojects/debugedit/tools/debugedit.c
++++ b/subprojects/debugedit/tools/debugedit.c
+@@ -25,7 +25,11 @@
+ #include <byteswap.h>
+ #include <endian.h>
+ #include <errno.h>
++#ifdef __GLIBC__
+ #include <error.h>
++#else
++#include "error.h"
++#endif
+ #include <limits.h>
+ #include <string.h>
+ #include <stdlib.h>
+diff --git a/subprojects/debugedit/tools/error.h b/subprojects/debugedit/tools/error.h
+new file mode 100644
+index 0000000..c330dc3
+--- /dev/null
++++ b/subprojects/debugedit/tools/error.h
+@@ -0,0 +1,26 @@
++#ifndef _ERROR_H
++#define _ERROR_H
++#include <stdarg.h>
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++#include <errno.h>
++
++static unsigned int error_message_count = 0;
++
++static inline void error(int status, int errnum, const char* format, ...)
++{
++  va_list ap;
++  fprintf(stderr, "%s: ", program_invocation_name);
++  va_start(ap, format);
++  vfprintf(stderr, format, ap);
++  va_end(ap);
++  if (errnum)
++    fprintf(stderr, ": %s", strerror(errnum));
++  fprintf(stderr, "\n");
++  error_message_count++;
++  if (status)
++    exit(status);
++}
++
++#endif
+diff --git a/subprojects/libglnx/glnx-macros.h b/subprojects/libglnx/glnx-macros.h
+index 6d8aca9..e3e4e33 100644
 --- a/subprojects/libglnx/glnx-macros.h
 +++ b/subprojects/libglnx/glnx-macros.h
 @@ -28,6 +28,16 @@
-
+ 
  G_BEGIN_DECLS
-
+ 
 +/* taken from glibc unistd.h and fixes musl */
 +#ifndef TEMP_FAILURE_RETRY
 +#define TEMP_FAILURE_RETRY(expression) \
@@ -16,3 +66,4 @@
 +
  /* All of these are for C only. */
  #ifndef __GI_SCANNER__
+ 
diff --git a/dev-util/flatpak-builder/flatpak-builder-1.0.11.ebuild b/dev-util/flatpak-builder/flatpak-builder-1.0.11.ebuild
index a8017f003f1d..20d616e0056d 100644
--- a/dev-util/flatpak-builder/flatpak-builder-1.0.11.ebuild
+++ b/dev-util/flatpak-builder/flatpak-builder-1.0.11.ebuild
@@ -33,6 +33,8 @@ BDEPEND="
 	)
 "
 
+PATCHES=("${FILESDIR}/flatpak-builder-1.0.11-musl.patch")
+
 src_configure() {
 	econf \
 		$(use_enable doc documentation) \
-- 
cgit v1.2.3-18-g5258