[neon/qt6/qbs/Neon/release] debian: build quickjs on hurd

[Pino Toscano]

Git commit 1a1a25d02d521ccffbcec56e153b55e9322ed5f3 by Pino Toscano.
Committed on 10/12/2024 at 05:26.
Pushed by carlosdem into branch 'Neon/release'.

build quickjs on hurd

M  +3    -0    debian/changelog
A  +32   -0    debian/patches/quickjs_hurd.diff
M  +1    -0    debian/patches/series

https://invent.kde.org/neon/qt6/qbs/-/commit/1a1a25d02d521ccffbcec56e153b55e9322ed5f3

diff --git a/debian/changelog b/debian/changelog
index 30cd1e7..54ec357 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 qbs (2.5.0-2) UNRELEASED; urgency=medium
 
+  [ Pino Toscano ]
+  * Backport/adapt fixes from the upstream quickjs for GNU/Hurd to the embedded
+    copy in qbs; patch quickjs_hurd.diff.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 10 Dec 2024 06:15:15 +0100
 
diff --git a/debian/patches/quickjs_hurd.diff b/debian/patches/quickjs_hurd.diff
new file mode 100644
index 0000000..035c034
--- /dev/null
+++ b/debian/patches/quickjs_hurd.diff
@@ -0,0 +1,32 @@
+Author: Pino Toscano <pino at debian.org>
+Description: Make the quickjs embedded copy build on GNU/Hurd
+ Backport/adapt the changes done in the upstream quickjs project for supporting
+ GNU/Hurd to the embedded copy in qbs:
+ https://github.com/bellard/quickjs/pull/316
+ .
+ This patch can be dropped when qbs rebases its copy to a new version of the
+ upstream quickjs.
+Forwarded: not-needed
+Origin: vendor
+Last-Update: 2024-12-10
+
+--- a/src/shared/quickjs/quickjs.c
++++ b/src/shared/quickjs/quickjs.c
+@@ -36,7 +36,7 @@
+ #include <math.h>
+ #if defined(__APPLE__)
+ #include <malloc/malloc.h>
+-#elif defined(__linux__)
++#elif defined(__linux__) || defined(__GLIBC__)
+ #include <malloc.h>
+ #elif defined(__FreeBSD__)
+ #include <malloc_np.h>
+@@ -1763,7 +1763,7 @@ static size_t js_def_malloc_usable_size(
+     return _msize((void *)ptr);
+ #elif defined(EMSCRIPTEN)
+     return 0;
+-#elif defined(__linux__)
++#elif defined(__linux__) || defined(__GLIBC__)
+     return malloc_usable_size((void *)ptr);
+ #else
+     /* change this to `return 0;` if compilation fails */
diff --git a/debian/patches/series b/debian/patches/series
index ad6c86d..61f28a6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ test_sanitizers_only_on_amd64.diff
 no_nosys_specs.diff
 disable_bad_assembly.diff
 asan_atomic.diff
+quickjs_hurd.diff