diff -Nru qtbase-opensource-src-5.15.10+dfsg/debian/changelog qtbase-opensource-src-5.15.10+dfsg/debian/changelog --- qtbase-opensource-src-5.15.10+dfsg/debian/changelog 2023-10-24 11:07:10.000000000 +0000 +++ qtbase-opensource-src-5.15.10+dfsg/debian/changelog 2023-11-13 08:21:47.000000000 +0000 @@ -1,3 +1,10 @@ +qtbase-opensource-src (5.15.10+dfsg-5) unstable; urgency=medium + + * Add a patch to support LoongArch (closes: #1054569). Thanks Dandan Zhang! + * Add a debian/clean file (closes: #1048743). + + -- Dmitry Shachnev Mon, 13 Nov 2023 11:21:47 +0300 + qtbase-opensource-src (5.15.10+dfsg-4) unstable; urgency=medium * Backport upstream patch to fix build with libxkbcommon 1.6.0. diff -Nru qtbase-opensource-src-5.15.10+dfsg/debian/clean qtbase-opensource-src-5.15.10+dfsg/debian/clean --- qtbase-opensource-src-5.15.10+dfsg/debian/clean 1970-01-01 00:00:00.000000000 +0000 +++ qtbase-opensource-src-5.15.10+dfsg/debian/clean 2023-11-13 08:21:47.000000000 +0000 @@ -0,0 +1,142 @@ +.config.notes +bin/qmake +config.opt +config.status +config.tests/.qmake.cache +config.tests/.qmake.stash +config.tests/alloca_h/ +config.tests/arch/arch.target.txt +config.tests/atomicfptr/atomicfptr.pro +config.tests/atomicfptr/main.cpp +config.tests/c11/ +config.tests/c99/ +config.tests/clock-monotonic/ +config.tests/cloexec/ +config.tests/conftest-out +config.tests/conftest.cpp +config.tests/cups/ +config.tests/cxx11_future/ +config.tests/cxx11_random/ +config.tests/cxx14/ +config.tests/cxx17/ +config.tests/dbus/ +config.tests/doubleconversion/ +config.tests/drm/ +config.tests/drm_atomic/ +config.tests/dtls/ +config.tests/egl-egldevice/ +config.tests/egl-mali-2/ +config.tests/egl-mali/ +config.tests/egl-viv/ +config.tests/egl-x11/ +config.tests/egl/ +config.tests/evdev/ +config.tests/eventfd/ +config.tests/fontconfig/ +config.tests/freetype/ +config.tests/futimens/ +config.tests/gbm/ +config.tests/getauxval/ +config.tests/getentropy/ +config.tests/getifaddrs/ +config.tests/glib/ +config.tests/glibc/ +config.tests/gssapi/ +config.tests/harfbuzz/ +config.tests/ibase/ +config.tests/icu/ +config.tests/inotify/ +config.tests/intelcet/ +config.tests/ipc_sysv/ +config.tests/ipv6ifname/ +config.tests/libatomic/ +config.tests/libdl/ +config.tests/libinput/ +config.tests/libinput_axis_api/ +config.tests/libjpeg/ +config.tests/libmd4c/ +config.tests/libpng/ +config.tests/librt/ +config.tests/libudev/ +config.tests/linkat/ +config.tests/linux-netlink/ +config.tests/linuxfb/ +config.tests/mtdev/ +config.tests/mysql/ +config.tests/ocsp/ +config.tests/odbc/ +config.tests/opengl/ +config.tests/openssl_headers/ +config.tests/pcre2/ +config.tests/posix_fallocate/ +config.tests/posix_iconv/ +config.tests/ppoll/ +config.tests/precompile_header/ +config.tests/psql/ +config.tests/reduce_exports/ +config.tests/reduce_relocations/ +config.tests/renameat2/ +config.tests/signaling_nan/ +config.tests/sqlite3/ +config.tests/statx/ +config.tests/tds/ +config.tests/vulkan/ +config.tests/xcb/ +config.tests/xcb_glx/ +config.tests/xcb_syslibs/ +config.tests/xcb_xinput/ +config.tests/xcb_xlib/ +config.tests/xkbcommon/ +config.tests/xkbcommon_x11/ +config.tests/xlib/ +config.tests/xrender/ +config.tests/zlib/ +config.tests/zstd/ +doc/*.qch +doc/html/ +doc/qch/ +doc/qmake/ +doc/qtconcurrent/ +doc/qtcore/ +doc/qtdbus/ +doc/qtgui/ +doc/qtnetwork/ +doc/qtopengl/ +doc/qtplatformheaders/ +doc/qtprintsupport/ +doc/qtsql/ +doc/qttestlib/ +doc/qtwidgets/ +doc/qtxml/ +examples/dbus/*/Makefile.* +lib/ +mkspecs/qconfig.pri +plugins/ +qmake/codeattributions.qdoc +src/*/*-config.h +src/*/*-config.pri +src/*/*-config_p.h +src/*/*.version.in +src/*/codeattributions.qdoc +src/corelib/.tracegen/qtcore_tracepoints_p.h +src/corelib/global/qconfig.* +src/gui/.tracegen/qtgui_tracepoints_p.h +src/plugins/platforms/eglfs/QtEglFSDeviceIntegration.version +src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/QtEglFsKmsSupport.version +src/plugins/platforms/xcb/QtXcbQpa.version +src/plugins/sqldrivers/qtsqldrivers-config.h +src/plugins/sqldrivers/qtsqldrivers-config.pri +src/plugins/sqldrivers/qtsqldrivers-config_p.h +src/widgets/.tracegen/qtwidgets_tracepoints_p.h +tests/auto/cmake/mockplugins/mockplugins1/QtMockPlugins1.version.in +tests/auto/cmake/mockplugins/mockplugins2/QtMockPlugins2.version.in +tests/auto/cmake/mockplugins/mockplugins3/QtMockPlugins3.version.in +tests/auto/corelib/kernel/qcoreapplication/target_wrapper.sh +tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-cache/target_wrapper.sh +tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-xml/target_wrapper.sh +tests/auto/gui/kernel/qguiapplication/target_wrapper.sh +tests/auto/network/selftest/target_wrapper.sh +tests/auto/tools/moc/allmocs.qrc +util/corelib/qurl-generateTLDs/effective_tld_names.dat.qt +util/corelib/qurl-generateTLDs/effective_tld_names.dat.trimmed +util/corelib/qurl-generateTLDs/qurl-generateTLDs diff -Nru qtbase-opensource-src-5.15.10+dfsg/debian/patches/loongarch.diff qtbase-opensource-src-5.15.10+dfsg/debian/patches/loongarch.diff --- qtbase-opensource-src-5.15.10+dfsg/debian/patches/loongarch.diff 1970-01-01 00:00:00.000000000 +0000 +++ qtbase-opensource-src-5.15.10+dfsg/debian/patches/loongarch.diff 2023-11-13 08:21:47.000000000 +0000 @@ -0,0 +1,94 @@ +Description: add support for LoongArch +Origin: upstream, commits + https://code.qt.io/cgit/qt/qtbase.git/commit/?id=bdc16f086f1664b5 + https://code.qt.io/cgit/qt/qtbase.git/commit/?id=0ab51dcc3c0cca0d +Last-Update: 2023-11-05 + +--- a/src/3rdparty/forkfd/forkfd_linux.c ++++ b/src/3rdparty/forkfd/forkfd_linux.c +@@ -82,7 +82,8 @@ static int sys_clone(unsigned long clone + return syscall(__NR_clone, cloneflags, child_stack, stack_size, ptid, newtls, ctid); + #elif defined(__arc__) || defined(__arm__) || defined(__aarch64__) || defined(__mips__) || \ + defined(__nds32__) || defined(__hppa__) || defined(__powerpc__) || defined(__i386__) || \ +- defined(__x86_64__) || defined(__xtensa__) || defined(__alpha__) || defined(__riscv) ++ defined(__x86_64__) || defined(__xtensa__) || defined(__alpha__) || defined(__riscv) || \ ++ defined(__loongarch__) + /* ctid and newtls are inverted on CONFIG_CLONE_BACKWARDS architectures, + * but since both values are 0, there's no harm. */ + return syscall(__NR_clone, cloneflags, child_stack, ptid, ctid, newtls); +--- a/src/corelib/global/archdetect.cpp ++++ b/src/corelib/global/archdetect.cpp +@@ -59,6 +59,10 @@ + # define ARCH_PROCESSOR "x86_64" + #elif defined(Q_PROCESSOR_IA64) + # define ARCH_PROCESSOR "ia64" ++#elif defined(Q_PROCESSOR_LOONGARCH_32) ++# define ARCH_PROCESSOR "loongarch32" ++#elif defined(Q_PROCESSOR_LOONGARCH_64) ++# define ARCH_PROCESSOR "loongarch64" + #elif defined(Q_PROCESSOR_MIPS_64) + # define ARCH_PROCESSOR "mips64" + #elif defined(Q_PROCESSOR_MIPS) +--- a/src/corelib/global/qglobal.cpp ++++ b/src/corelib/global/qglobal.cpp +@@ -1816,6 +1816,37 @@ bool qSharedBuild() noexcept + */ + + /*! ++ \macro Q_PROCESSOR_LOONGARCH ++ \relates ++ ++ Defined if the application is compiled for LoongArch processors. ++ ++ \sa QSysInfo::buildCpuArchitecture() ++*/ ++ ++/*! ++ \macro Q_PROCESSOR_LOONGARCH_32 ++ \relates ++ ++ Defined if the application is compiled for 32-bit LoongArch processors. ++ The \l Q_PROCESSOR_LOONGARCH macro is also defined when ++ Q_PROCESSOR_LOONGARCH_32 is defined. ++ ++ \sa QSysInfo::buildCpuArchitecture() ++*/ ++ ++/*! ++ \macro Q_PROCESSOR_LOONGARCH_64 ++ \relates ++ ++ Defined if the application is compiled for 64-bit LoongArch processors. ++ The \l Q_PROCESSOR_LOONGARCH macro is also defined when ++ Q_PROCESSOR_LOONGARCH_64 is defined. ++ ++ \sa QSysInfo::buildCpuArchitecture() ++*/ ++ ++/*! + \macro Q_PROCESSOR_MIPS + \relates + +--- a/src/corelib/global/qprocessordetection.h ++++ b/src/corelib/global/qprocessordetection.h +@@ -224,6 +224,20 @@ + // Q_BYTE_ORDER not defined, use endianness auto-detection + + /* ++ LoongArch family, known variants: 32- and 64-bit ++ ++ LoongArch is little-endian. ++*/ ++#elif defined(__loongarch__) ++# define Q_PROCESSOR_LOONGARCH ++# if __loongarch_grlen == 64 ++# define Q_PROCESSOR_LOONGARCH_64 ++# else ++# define Q_PROCESSOR_LOONGARCH_32 ++# endif ++# define Q_BYTE_ORDER Q_LITTLE_ENDIAN ++ ++/* + MIPS family, known revisions: I, II, III, IV, 32, 64 + + MIPS is bi-endian, use endianness auto-detection implemented below. diff -Nru qtbase-opensource-src-5.15.10+dfsg/debian/patches/series qtbase-opensource-src-5.15.10+dfsg/debian/patches/series --- qtbase-opensource-src-5.15.10+dfsg/debian/patches/series 2023-10-24 11:07:10.000000000 +0000 +++ qtbase-opensource-src-5.15.10+dfsg/debian/patches/series 2023-11-13 08:21:47.000000000 +0000 @@ -22,6 +22,7 @@ CVE-2023-37369.diff CVE-2023-38197.diff libxkbcommon_1.6.0.diff +loongarch.diff # Debian specific. no_htmlinfo_example.diff diff -Nru qtbase-opensource-src-5.15.10+dfsg/debian/rules qtbase-opensource-src-5.15.10+dfsg/debian/rules --- qtbase-opensource-src-5.15.10+dfsg/debian/rules 2023-10-24 11:07:10.000000000 +0000 +++ qtbase-opensource-src-5.15.10+dfsg/debian/rules 2023-11-13 08:21:47.000000000 +0000 @@ -138,26 +138,6 @@ # Extra stuff missed by confclean/distclean - # Misc. files - rm -f \ - config.status \ - config.tests/.qmake.cache \ - examples/dbus/*/Makefile.* \ - mkspecs/qconfig.pri \ - src/corelib/global/qconfig.* \ - ; - - # Misc. directories - rm -rf \ - doc-build/ \ - doc/html/ \ - doc/qch/ \ - examples/tools/plugandpaint/plugins/ \ - examples/tools/styleplugin/styles/ \ - lib/ \ - plugins/ \ - ; - # Leftover dirs find -depth -type d \( -false \ -o -name debug-shared \ @@ -197,12 +177,6 @@ | grep -e application/x-executable \ | cut -d ':' -f 1 | xargs rm -f - # Generated on build - rm -vf debian/stamp-makefile-build-tools - - # more leftovers - rm -f .device.vars .qmake.vars - override_dh_auto_build-indep: dh_auto_build -- docs diff -Nru qtbase-opensource-src-5.15.10+dfsg/debian/source/options qtbase-opensource-src-5.15.10+dfsg/debian/source/options --- qtbase-opensource-src-5.15.10+dfsg/debian/source/options 1970-01-01 00:00:00.000000000 +0000 +++ qtbase-opensource-src-5.15.10+dfsg/debian/source/options 2023-11-13 08:21:47.000000000 +0000 @@ -0,0 +1 @@ +extend-diff-ignore = "^src/corelib/io/qurltlds_p\.h$"