[neon/qt6/qbs/Neon/release] debian: update the patches

Pino Toscano null at kde.org
Sat Aug 30 06:05:04 BST 2025


Git commit f8a3b7c967ce597bd1e9f6dcb41bc164e2fa0024 by Pino Toscano.
Committed on 20/08/2025 at 01:52.
Pushed by carlosdem into branch 'Neon/release'.

update the patches

- quickjs_hurd.diff: drop, as it refers to quickjs and not to the
  actually used quickjs-ng

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

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

diff --git a/debian/changelog b/debian/changelog
index 4bbd5bf..da7aed7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,9 @@ qbs (3.0.1-0r1) UNRELEASED; urgency=medium
   * New upstream release.
   * Rename libqbscore2.6 to libqbscore3.0 according to the upstream SONAME
     bump.
+  * Update the patches:
+    - quickjs_hurd.diff: drop, as it refers to quickjs and not to the actually
+      used quickjs-ng
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 18 Aug 2025 08:57:40 +0200
 
diff --git a/debian/patches/quickjs_hurd.diff b/debian/patches/quickjs_hurd.diff
deleted file mode 100644
index 035c034..0000000
--- a/debian/patches/quickjs_hurd.diff
+++ /dev/null
@@ -1,32 +0,0 @@
-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 61f28a6..ad6c86d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,4 +3,3 @@ test_sanitizers_only_on_amd64.diff
 no_nosys_specs.diff
 disable_bad_assembly.diff
 asan_atomic.diff
-quickjs_hurd.diff



More information about the Neon-commits mailing list