[neon/qt6/qbs/Neon/release] debian: fix build on 32bit archs

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


Git commit d33c86c1e5bc57ed35faef48fe25ce400dd2958c by Pino Toscano.
Committed on 30/08/2025 at 03:39.
Pushed by carlosdem into branch 'Neon/release'.

fix build on 32bit archs

backport upstream review
https://codereview.qt-project.org/c/qbs/qbs/+/671159

M  +4    -0    debian/changelog
A  +19   -0    debian/patches/Fix-check-for-uninitialized-JSValue.diff
M  +1    -0    debian/patches/series

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

diff --git a/debian/changelog b/debian/changelog
index cfa4496..a16027e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
 qbs (3.0.1-2) UNRELEASED; urgency=medium
 
+  [ Pino Toscano ]
+  * Backport the upstream https://codereview.qt-project.org/c/qbs/qbs/+/671159
+    to fix the build on 32bit architectures; patch
+    Fix-check-for-uninitialized-JSValue.diff.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 30 Aug 2025 05:36:33 +0200
 
diff --git a/debian/patches/Fix-check-for-uninitialized-JSValue.diff b/debian/patches/Fix-check-for-uninitialized-JSValue.diff
new file mode 100644
index 0000000..4bbb968
--- /dev/null
+++ b/debian/patches/Fix-check-for-uninitialized-JSValue.diff
@@ -0,0 +1,19 @@
+Author: Pino Toscano <toscano.pino at tiscali.it>
+Description: Fix check for uninitialized JSValue
+ Use the right helper function to check whether a JSValue object is
+ uninitialized, as getting the value of its tag depends on how the tag
+ is boxed on each architecture.
+Last-Update: 2025-08-27
+Forwarded: https://codereview.qt-project.org/c/qbs/qbs/+/671159
+
+--- a/src/lib/corelib/tools/scripttools.h
++++ b/src/lib/corelib/tools/scripttools.h
+@@ -190,7 +190,7 @@ public:
+     JsException(const JsException &) = delete;
+     JsException &operator=(const JsException &) = delete;
+ 
+-    operator bool() const { return m_exception.tag != JS_TAG_UNINITIALIZED; }
++    operator bool() const { return !JS_IsUninitialized(m_exception); }
+     QString message() const;
+     const QStringList stackTrace() const;
+     ErrorInfo toErrorInfo() const;
diff --git a/debian/patches/series b/debian/patches/series
index ad6c86d..4824aae 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
+Fix-check-for-uninitialized-JSValue.diff



More information about the Neon-commits mailing list