Refresh quilt patches.

backport upstream commit fc3e3d033584c62dfb2f3e3da551a7dbd7c0150d

debian/changelog

@@ -1,9 +1,34 @@
-qt6-base (6.7.2+dfsg-3) UNRELEASED; urgency=medium
+qt6-base (6.7.2+dfsg-5) UNRELEASED; urgency=medium
 
-  [ Dmitry Shachnev ]
-  * Replace Qml2Imports (deprecated) with QmlImports in debian/qt.conf.in.
+  * Refresh quilt patches.
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Tue, 17 Sep 2024 11:38:37 +0300
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Tue, 26 Nov 2024 02:12:10 -0600
+
+qt6-base (6.7.2+dfsg-4) unstable; urgency=medium
+
+  * Team upload.
+
+  [ Pino Toscano ]
+  * Backport upstream commit fc3e3d033584c62dfb2f3e3da551a7dbd7c0150d to fix
+    the build on the Hurd; patch
+    upstream_QStorageInfo-Unix-fix-declaration-of-mnt-on-Hurd.patch.
+  * Update the symbols files:
+    - mark some Linux symbols as such
+    - mark 64bit symbols as such
+    - drop ia64 markers, as that architecture was discontinued
+
+  [ Patrick Franz ]
+  * Do not ship the androiddeployqt tool any more and always use
+    androiddeployqt6 instead. Also, add a symlink for androiddeployqt6
+    in /usr/bin.
+
+ -- Pino Toscano <pino@debian.org>  Wed, 23 Oct 2024 19:35:31 +0200
+
+qt6-base (6.7.2+dfsg-3) unstable; urgency=medium
+
+  * Merge 6.6.2+dfsg-12 upload from unstable.
+
+ -- Patrick Franz <deltaone@debian.org>  Sat, 05 Oct 2024 01:12:57 +0200
 
 qt6-base (6.7.2+dfsg-2) experimental; urgency=medium
 
@@ -25,6 +50,13 @@ qt6-base (6.7.2+dfsg-1) experimental; urgency=medium
 
  -- Patrick Franz <deltaone@debian.org>  Thu, 29 Aug 2024 01:31:57 +0200
 
+qt6-base (6.6.2+dfsg-12) unstable; urgency=medium
+
+  * Team upload.
+  * Replace Qml2Imports (deprecated) with QmlImports in debian/qt.conf.in.
+
+ -- Dmitry Shachnev <mitya57@debian.org>  Sun, 22 Sep 2024 22:08:16 +0300
+
 qt6-base (6.6.2+dfsg-11) unstable; urgency=medium
 
   * Team upload.

debian/libqt6core6t64.symbols

@@ -19,7 +19,7 @@ libQt6Core.so.6 libqt6core6t64 #MINVER#
  (arch=sh4)_Z10qvsnprintfPcjPKc13__va_list_tag@Qt_6 6.1.2
  (arch=alpha)_Z10qvsnprintfPcmPKc13__va_list_tag@Qt_6 6.1.2
  (arch=amd64 powerpc s390x x32|subst)_Z10qvsnprintfPc{size_t}PKcP13__va_list_tag@Qt_6 6.7.2
- (arch=hppa ia64 loong64 m68k mips64el mipsel riscv64 sparc64|subst)_Z10qvsnprintfPc{size_t}PKcPv@Qt_6 6.6.0
+ (arch=hppa loong64 m68k mips64el mipsel riscv64 sparc64|subst)_Z10qvsnprintfPc{size_t}PKcPv@Qt_6 6.6.0
  (arch=hurd-i386 i386 ppc64 ppc64el|subst)_Z10qvsnprintfPc{size_t}PKcS_@Qt_6 6.1.2
  (arch=arm64 armel armhf|subst)_Z10qvsnprintfPc{size_t}PKcSt9__va_list@Qt_6 6.1.2
  _Z11qFpClassifyd@Qt_6 6.1.2
@@ -2533,7 +2533,7 @@ libQt6Core.so.6 libqt6core6t64 #MINVER#
  (arch=alpha sh4)_ZN7QString9vasprintfEPKc13__va_list_tag@Qt_6 6.1.2
  (arch=amd64 powerpc s390x x32)_ZN7QString9vasprintfEPKcP13__va_list_tag@Qt_6 6.7.2
  (arch=hurd-i386 i386 ppc64 ppc64el)_ZN7QString9vasprintfEPKcPc@Qt_6 6.1.2
- (arch=hppa ia64 loong64 m68k mips64el mipsel riscv64 sparc64)_ZN7QString9vasprintfEPKcPv@Qt_6 6.6.0
+ (arch=hppa loong64 m68k mips64el mipsel riscv64 sparc64)_ZN7QString9vasprintfEPKcPv@Qt_6 6.6.0
  (arch=arm64 armel armhf)_ZN7QString9vasprintfEPKcSt9__va_list@Qt_6 6.1.2
  _ZN7QStringC1E5QChar@Qt_6 6.1.2
  (subst)_ZN7QStringC1EPK5QChar{qptrdiff}@Qt_6 6.1.2
@@ -3736,7 +3736,7 @@ libQt6Core.so.6 libqt6core6t64 #MINVER#
  _ZN9QtPrivate18ResultIteratorBaseppEv@Qt_6 6.1.2
  _ZN9QtPrivate18convertToLocal8BitE11QStringView@Qt_6 6.1.2
  _ZN9QtPrivate19QByteArrayList_joinEPK5QListI10QByteArrayEPKci@Qt_6 6.1.2
- (arch=alpha amd64 arm64 ia64 loong64 mips64el ppc64 ppc64el riscv64 s390x sparc64)_ZN9QtPrivate19QByteArrayList_joinEPK5QListI10QByteArrayEPKcx@Qt_6 6.6.2
+ (arch-bits=64)_ZN9QtPrivate19QByteArrayList_joinEPK5QListI10QByteArrayEPKcx@Qt_6 6.6.2
  (subst)_ZN9QtPrivate19QStringList_indexOfEPK5QListI7QStringERK18QRegularExpression{qptrdiff}@Qt_6 6.1.2
  (subst)_ZN9QtPrivate19QStringList_indexOfERK5QListI7QStringE11QStringView{qptrdiff}N2Qt15CaseSensitivityE@Qt_6 6.7.2
  (subst)_ZN9QtPrivate19QStringList_indexOfERK5QListI7QStringE13QLatin1String{qptrdiff}N2Qt15CaseSensitivityE@Qt_6 6.7.2
@@ -4789,7 +4789,7 @@ libQt6Core.so.6 libqt6core6t64 #MINVER#
  _ZNK26QMessageAuthenticationCode6resultEv@Qt_6 6.1.2
  _ZNK27QDynamicPropertyChangeEvent5cloneEv@Qt_6 6.4.0
  _ZNK27QStaticByteArrayMatcherBase9indexOfInEPKcjS1_ii@Qt_6 6.1.2
- (arch=alpha amd64 arm64 ia64 loong64 mips64el ppc64 ppc64el riscv64 s390x sparc64)_ZNK27QStaticByteArrayMatcherBase9indexOfInEPKcmS1_xx@Qt_6 6.6.2
+ (arch-bits=64)_ZNK27QStaticByteArrayMatcherBase9indexOfInEPKcmS1_xx@Qt_6 6.6.2
  _ZNK28QConcatenateTablesProxyModel10headerDataEiN2Qt11OrientationEi@Qt_6 6.1.2
  _ZNK28QConcatenateTablesProxyModel10metaObjectEv@Qt_6 6.1.2
  _ZNK28QConcatenateTablesProxyModel11columnCountERK11QModelIndex@Qt_6 6.1.2

debian/libqt6gui6.symbols

@@ -1632,15 +1632,15 @@ libQt6Gui.so.6 libqt6gui6 #MINVER#
  _ZN16QNativeInterface11QGLXContextD0Ev@Qt_6 6.6.0
  _ZN16QNativeInterface11QGLXContextD1Ev@Qt_6 6.6.0
  _ZN16QNativeInterface11QGLXContextD2Ev@Qt_6 6.6.0
- _ZN16QNativeInterface14QWaylandScreenD0Ev@Qt_6 6.7.2
- _ZN16QNativeInterface14QWaylandScreenD1Ev@Qt_6 6.7.2
- _ZN16QNativeInterface14QWaylandScreenD2Ev@Qt_6 6.7.2
+ (arch=linux-any)_ZN16QNativeInterface14QWaylandScreenD0Ev@Qt_6 6.7.2
+ (arch=linux-any)_ZN16QNativeInterface14QWaylandScreenD1Ev@Qt_6 6.7.2
+ (arch=linux-any)_ZN16QNativeInterface14QWaylandScreenD2Ev@Qt_6 6.7.2
  _ZN16QNativeInterface15QX11ApplicationD0Ev@Qt_6 6.6.0
  _ZN16QNativeInterface15QX11ApplicationD1Ev@Qt_6 6.6.0
  _ZN16QNativeInterface15QX11ApplicationD2Ev@Qt_6 6.6.0
- _ZN16QNativeInterface19QWaylandApplicationD0Ev@Qt_6 6.6.0
- _ZN16QNativeInterface19QWaylandApplicationD1Ev@Qt_6 6.6.0
- _ZN16QNativeInterface19QWaylandApplicationD2Ev@Qt_6 6.6.0
+ (arch=linux-any)_ZN16QNativeInterface19QWaylandApplicationD0Ev@Qt_6 6.6.0
+ (arch=linux-any)_ZN16QNativeInterface19QWaylandApplicationD1Ev@Qt_6 6.6.0
+ (arch=linux-any)_ZN16QNativeInterface19QWaylandApplicationD2Ev@Qt_6 6.6.0
  _ZN16QOpenGLFunctions25initializeOpenGLFunctionsEv@Qt_6 6.1.2
  _ZN16QOpenGLFunctionsC1EP14QOpenGLContext@Qt_6 6.1.2
  _ZN16QOpenGLFunctionsC1Ev@Qt_6 6.1.2
@@ -4763,9 +4763,9 @@ libQt6Gui.so.6 libqt6gui6 #MINVER#
  _ZTIN11QAccessible18ActivationObserverE@Qt_6 6.1.2
  _ZTIN16QNativeInterface11QEGLContextE@Qt_6 6.1.2
  _ZTIN16QNativeInterface11QGLXContextE@Qt_6 6.6.0
- _ZTIN16QNativeInterface14QWaylandScreenE@Qt_6 6.7.2
+ (arch=linux-any)_ZTIN16QNativeInterface14QWaylandScreenE@Qt_6 6.7.2
  _ZTIN16QNativeInterface15QX11ApplicationE@Qt_6 6.6.0
- _ZTIN16QNativeInterface19QWaylandApplicationE@Qt_6 6.6.0
+ (arch=linux-any)_ZTIN16QNativeInterface19QWaylandApplicationE@Qt_6 6.6.0
  _ZTIN4QCss13StyleSelectorE@Qt_6 6.6.0
  _ZTIN5QTest19QTouchEventSequenceE@Qt_6 6.1.2
  (arch=armel riscv64)_ZTIN9__gnu_cxx7__mutexE@Qt_6 6.3.0
@@ -4916,9 +4916,9 @@ libQt6Gui.so.6 libqt6gui6 #MINVER#
  _ZTSN11QAccessible18ActivationObserverE@Qt_6 6.1.2
  _ZTSN16QNativeInterface11QEGLContextE@Qt_6 6.1.2
  _ZTSN16QNativeInterface11QGLXContextE@Qt_6 6.6.0
- _ZTSN16QNativeInterface14QWaylandScreenE@Qt_6 6.7.2
+ (arch=linux-any)_ZTSN16QNativeInterface14QWaylandScreenE@Qt_6 6.7.2
  _ZTSN16QNativeInterface15QX11ApplicationE@Qt_6 6.6.0
- _ZTSN16QNativeInterface19QWaylandApplicationE@Qt_6 6.6.0
+ (arch=linux-any)_ZTSN16QNativeInterface19QWaylandApplicationE@Qt_6 6.6.0
  _ZTSN4QCss13StyleSelectorE@Qt_6 6.6.0
  _ZTSN5QTest19QTouchEventSequenceE@Qt_6 6.1.2
  (arch=armel riscv64)_ZTSN9__gnu_cxx7__mutexE@Qt_6 6.3.0
@@ -5067,9 +5067,9 @@ libQt6Gui.so.6 libqt6gui6 #MINVER#
  _ZTVN11QAccessible18ActivationObserverE@Qt_6 6.1.2
  _ZTVN16QNativeInterface11QEGLContextE@Qt_6 6.1.2
  _ZTVN16QNativeInterface11QGLXContextE@Qt_6 6.6.0
- _ZTVN16QNativeInterface14QWaylandScreenE@Qt_6 6.7.2
+ (arch=linux-any)_ZTVN16QNativeInterface14QWaylandScreenE@Qt_6 6.7.2
  _ZTVN16QNativeInterface15QX11ApplicationE@Qt_6 6.6.0
- _ZTVN16QNativeInterface19QWaylandApplicationE@Qt_6 6.6.0
+ (arch=linux-any)_ZTVN16QNativeInterface19QWaylandApplicationE@Qt_6 6.6.0
  _ZTVN4QCss13StyleSelectorE@Qt_6 6.6.0
  _ZTVN5QTest19QTouchEventSequenceE@Qt_6 6.1.2
  (optional=templinst)_ZZN9QMetaType21registerConverterImplI4QMapI7QStringS2_E9QIterableI16QMetaAssociationEEEbSt8functionIFbPKvPvEES_S_E10unregister@Qt_6 6.6.0

debian/not-installed

@@ -6,6 +6,7 @@ usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Gui/Qt6GuiPlugins.cmake
 usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Network/Qt6NetworkPlugins.cmake
 usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6PrintSupport/Qt6PrintSupportPlugins.cmake
 usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Sql/Qt6SqlPlugins.cmake
+usr/lib/qt6/bin/androiddeployqt
 usr/lib/qt6/bin/qmake
 usr/lib/qt6/bin/qtpaths
 # cross build specific:

debian/patches/armv4.diff

@@ -5,7 +5,7 @@ Last-Update: 2016-07-01
 
 --- a/src/corelib/global/qprocessordetection.h
 +++ b/src/corelib/global/qprocessordetection.h
-@@ -132,6 +132,8 @@
+@@ -99,6 +99,8 @@
  #  elif defined(__ARM_ARCH_5TEJ__) \
          || defined(__ARM_ARCH_5TE__)
  #    define Q_PROCESSOR_ARM 5
@@ -14,7 +14,7 @@ Last-Update: 2016-07-01
  #  else
  #    define Q_PROCESSOR_ARM 0
  #  endif
-@@ -146,6 +148,9 @@
+@@ -113,6 +115,9 @@
  #  endif
  #  if Q_PROCESSOR_ARM >= 5
  #    define Q_PROCESSOR_ARM_V5

debian/patches/build_path_embedded_qtbuildinternalsextra_cmake.patch

@@ -14,7 +14,7 @@ https://reproducible-builds.org/docs/build-path/
 
 --- a/cmake/QtBuildInternalsExtra.cmake.in
 +++ b/cmake/QtBuildInternalsExtra.cmake.in
-@@ -74,9 +74,6 @@ endif()
+@@ -77,9 +77,6 @@ endif()
  set(QT_WILL_INSTALL @QT_WILL_INSTALL@ CACHE BOOL
      "Boolean indicating if doing a Qt prefix build (vs non-prefix build)." FORCE)
  

debian/patches/enable_skip_plugins.patch

@@ -18,22 +18,22 @@ Forwarded: not-needed
 --- a/cmake/QtPlugins.cmake.in
 +++ b/cmake/QtPlugins.cmake.in
 @@ -6,7 +6,7 @@ include_guard(DIRECTORY)
-
+ 
  # Distributions should probably change this default.
  if(NOT DEFINED QT_SKIP_AUTO_PLUGIN_INCLUSION)
 -    set(QT_SKIP_AUTO_PLUGIN_INCLUSION OFF)
 +    set(QT_SKIP_AUTO_PLUGIN_INCLUSION ON)
  endif()
-
+ 
  if(NOT QT_NO_CREATE_TARGETS AND NOT QT_SKIP_AUTO_PLUGIN_INCLUSION)
 --- a/cmake/QtPostProcessHelpers.cmake
 +++ b/cmake/QtPostProcessHelpers.cmake
-@@ -448,7 +448,7 @@ function(qt_internal_create_plugins_auto_inclusion_files)
-
+@@ -507,7 +507,7 @@ function(qt_internal_create_plugins_auto
+ 
  # Distributions should probably change this default.
  if(NOT DEFINED QT_SKIP_AUTO_QML_PLUGIN_INCLUSION)
 -    set(QT_SKIP_AUTO_QML_PLUGIN_INCLUSION OFF)
 +    set(QT_SKIP_AUTO_QML_PLUGIN_INCLUSION ON)
  endif()
-
+ 
  set(__qt_qml_plugins_config_file_list \"\")

debian/patches/remove_rpath_from_examples.patch

@@ -11,12 +11,12 @@ Last-Update: 2024-02-15
 
 --- a/cmake/QtBuildRepoExamplesHelpers.cmake
 +++ b/cmake/QtBuildRepoExamplesHelpers.cmake
-@@ -97,7 +97,7 @@ macro(qt_examples_build_begin)
+@@ -113,7 +113,7 @@ macro(qt_examples_build_begin)
      # This means that installed examples are not relocatable at the moment. We would need to
      # annotate where each example is installed to, to be able to derive a relative rpath, and it
      # seems there's no way to query such information from CMake itself.
 -    set(CMAKE_INSTALL_RPATH "${_default_install_rpath}")
 +    #set(CMAKE_INSTALL_RPATH "${_default_install_rpath}")
-
+ 
      install(CODE "
  # Backup CMAKE_INSTALL_PREFIX because we're going to change it in each example subdirectory

debian/patches/series

@@ -1,12 +1,6 @@
-# fixed in 6.9.0
-upstream_IPC-add-PATH_MAX-less-fallback-definition-for-MAX_PA.patch
-
 # Needs to be fixed upstream.
 Add-SH-detection.patch
 
-# Pushed to gerrit
-use_float16_only_with_sse2.patch
-
 # Debian specific
 remove_privacy_breaches.diff
 build_path_embedded_qtbuildinternalsextra_cmake.patch

debian/patches/upstream_IPC-add-PATH_MAX-less-fallback-definition-for-MAX_PA.patch

@@ -1,36 +0,0 @@
-From f319895389705a3db7c2134d1ed47ceade1b204e Mon Sep 17 00:00:00 2001
-From: Pino Toscano <toscano.pino@tiscali.it>
-Date: Sat, 22 Jun 2024 19:55:15 +0200
-Subject: [PATCH] IPC: add PATH_MAX-less fallback definition for MAX_PATH
-
-Define MAX_PATH also when PATH_MAX is not defined (e.g on GNU/Hurd).
-MAX_PATH is Windows constant, and it is used in this file only in a
-code path for Windows; because of this, the static fallback define
-should be good enough.
-
-Change-Id: Ic1b9fee3b62505f86aa8ec89bbd20493bfe1f67c
-Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
----
- src/corelib/ipc/qsharedmemory.cpp | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/src/corelib/ipc/qsharedmemory.cpp b/src/corelib/ipc/qsharedmemory.cpp
-index 02761c0263..6ee662dc53 100644
---- a/src/corelib/ipc/qsharedmemory.cpp
-+++ b/src/corelib/ipc/qsharedmemory.cpp
-@@ -14,7 +14,11 @@
- #endif
- 
- #ifndef MAX_PATH
--#  define MAX_PATH PATH_MAX
-+#  ifdef PATH_MAX
-+#    define MAX_PATH PATH_MAX
-+#  else
-+#    define MAX_PATH 1024
-+#  endif
- #endif
- 
- QT_BEGIN_NAMESPACE
--- 
-2.43.0
-

debian/patches/use_float16_only_with_sse2.patch

@@ -1,39 +0,0 @@
-Description: use _Float16 only when SSE2 is enabled
- The GCC documentation [1] says: “On x86 targets with SSE2 enabled, GCC
- supports half-precision (16-bit) floating point via the _Float16 type”.
- .
- On non-SSE2 x86 (such as Debian i386 baseline [2]), __FLT16_MAX__ is
- defined starting with GCC 14 [3], however any non-trivial use of the
- _Float16 type results in an error:
- .
- error: operation not permitted on type ‘_Float16’ without option ‘-msse2’
- .
- which makes some packages fail to build on i386 architecture [4].
- .
- [1]: https://gcc.gnu.org/onlinedocs/gcc/Half-Precision.html
- [2]: https://wiki.debian.org/ArchitectureSpecificsMemo#i386-1
- [3]: https://gcc.gnu.org/g:9a19fa8b616f83474c35cc5b34a3865073ced829
- [4]: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1076986
-Author: Dmitry Shachnev <mitya57@debian.org>
-Forwarded: https://codereview.qt-project.org/c/qt/qtbase/+/579205
-Last-Update: 2024-08-01
-
---- a/src/corelib/global/qtypes.h
-+++ b/src/corelib/global/qtypes.h
-@@ -263,13 +263,12 @@ using NativeFloat16Type = std::float16_t
- // disabled due to https://github.com/llvm/llvm-project/issues/56963
- #  define QFLOAT16_IS_NATIVE        1
- using NativeFloat16Type = decltype(__FLT16_MAX__);
--#elif defined(Q_CC_GNU_ONLY) && defined(__FLT16_MAX__)
-+#elif defined(Q_CC_GNU_ONLY) && defined(__FLT16_MAX__) && defined(__ARM_FP16_FORMAT_IEEE)
- #  define QFLOAT16_IS_NATIVE        1
--#  ifdef __ARM_FP16_FORMAT_IEEE
- using NativeFloat16Type = __fp16;
--#  else
-+#elif defined(Q_CC_GNU_ONLY) && defined(__FLT16_MAX__) && defined(__SSE2__)
-+#  define QFLOAT16_IS_NATIVE        1
- using NativeFloat16Type = _Float16;
--#  endif
- #else
- #  define QFLOAT16_IS_NATIVE        0
- using NativeFloat16Type = void;

debian/qt6-base-dev-tools.install

@@ -1,4 +1,3 @@
-usr/lib/qt6/bin/androiddeployqt
 usr/lib/qt6/bin/androiddeployqt6
 usr/lib/qt6/bin/androidtestrunner
 usr/lib/qt6/bin/qdbuscpp2xml

debian/qt6-base-dev-tools.links

@@ -3,3 +3,9 @@
 usr/lib/qt6/bin/qtpaths6 usr/lib/qt6/bin/qtpaths
 # On public path we want qtpaths6.
 usr/lib/qt6/bin/qtpaths6 usr/bin/qtpaths6
+
+# androiddeployqt and androiddeployqt6 are identical files. We want people to use androiddeployqt6,
+# so we do not install androiddeployqt. Instead, androiddeployqt is a symbolic link pointing to androiddeployqt6.
+usr/lib/qt6/bin/androiddeployqt6 usr/lib/qt6/bin/androiddeployqt
+# On public path we want androiddeployqt6.
+usr/lib/qt6/bin/androiddeployqt6 usr/bin/androiddeployqt6