Hi again, > > In case it is line 91, then simply changing defined(Q_PROCESSOR_X86) to > > defined (Q_PROCESSOR_X86_32) should be enough. Can you try that and > > see if it helps? > > I can and will, thanks! Well, it built. Only time will tell whether this will also fix #895375 but I’ll porter-upload this to d-ports “unreleased” so the buildds can go wild on the reverse build-deps already. bye, //mirabilos -- tarent solutions GmbH Rochusstraße 2-4, D-53123 Bonn • http://www.tarent.de/ Tel: +49 228 54881-393 • Fax: +49 228 54881-235 HRB 5168 (AG Bonn) • USt-ID (VAT): DE122264941 Geschäftsführer: Dr. Stefan Barth, Kai Ebenrett, Boris Esser, Alexander Steeg
diff -Nru qtdeclarative-opensource-src-5.11.3/debian/changelog qtdeclarative-opensource-src-5.11.3/debian/changelog --- qtdeclarative-opensource-src-5.11.3/debian/changelog 2018-12-26 20:16:50.000000000 +0100 +++ qtdeclarative-opensource-src-5.11.3/debian/changelog 2019-01-09 11:05:11.000000000 +0100 @@ -1,3 +1,10 @@ +qtdeclarative-opensource-src (5.11.3-2+x32.1) unreleased; urgency=medium + + * Non-maintainer upload. + * Fix FTBFS on x32 (Closes: #918545). + + -- Thorsten Glaser <tg@mirbsd.de> Wed, 09 Jan 2019 11:05:11 +0100 + qtdeclarative-opensource-src (5.11.3-2) unstable; urgency=medium [ Simon Quigley ] diff -Nru qtdeclarative-opensource-src-5.11.3/debian/patches/series qtdeclarative-opensource-src-5.11.3/debian/patches/series --- qtdeclarative-opensource-src-5.11.3/debian/patches/series 2018-12-06 19:41:54.000000000 +0100 +++ qtdeclarative-opensource-src-5.11.3/debian/patches/series 2019-01-09 11:04:30.000000000 +0100 @@ -4,3 +4,4 @@ disableopengltests.patch fix_test_remove_qlibraryinfo.patch testcase_array_iteration.patch +x32_fix.patch diff -Nru qtdeclarative-opensource-src-5.11.3/debian/patches/x32_fix.patch qtdeclarative-opensource-src-5.11.3/debian/patches/x32_fix.patch --- qtdeclarative-opensource-src-5.11.3/debian/patches/x32_fix.patch 1970-01-01 01:00:00.000000000 +0100 +++ qtdeclarative-opensource-src-5.11.3/debian/patches/x32_fix.patch 2019-01-09 11:05:07.000000000 +0100 @@ -0,0 +1,13 @@ +# DP: see #918545 + +--- a/src/qml/jsruntime/qv4global_p.h ++++ b/src/qml/jsruntime/qv4global_p.h +@@ -88,7 +88,7 @@ inline double trunc(double d) { return d + // + // NOTE: This should match the logic in qv4targetplatform_p.h! + +-#if defined(Q_PROCESSOR_X86) && (QT_POINTER_SIZE == 4) \ ++#if defined(Q_PROCESSOR_X86_32) && (QT_POINTER_SIZE == 4) \ + && (defined(Q_OS_WIN) || defined(Q_OS_LINUX) || defined(Q_OS_QNX) || defined(Q_OS_FREEBSD)) + # define V4_ENABLE_JIT + #elif defined(Q_PROCESSOR_X86_64) && (QT_POINTER_SIZE == 8) \
Attachment:
qtdeclarative-opensource-src_5.11.3-2+x32.1_x32.build.xz
Description: application/xz