feat: update qt6-declarative to 6.6.2+dfsg-2

.cmake.conf

@@ -1,4 +1,4 @@
-set(QT_REPO_MODULE_VERSION "6.6.1")
+set(QT_REPO_MODULE_VERSION "6.6.2")
 set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "alpha1")
 
 set(QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_LEAN_HEADERS=1")

.tag

@@ -1 +1 @@
-a4d7c879a21db0bd1aff6e9a6970600bb2ea6c60
+1d65066ac1a3a4a6d2ba6af36f4aa60c059a11bf

debian/changelog

@@ -1,35 +1,38 @@
-qt6-declarative (6.6.1+dfsg-1deepin4) unstable; urgency=medium
+qt6-declarative (6.6.2+dfsg-2) experimental; urgency=medium
 
-  * Import patch from upstream:
-    - TextField-Only-enable-paste-action-if-clipboard-has-text.patch
-    https://codereview.qt-project.org/c/qt/qtdeclarative/+/535176
-
- -- Tianyu Chen <[email protected]>  Fri, 01 Mar 2024 10:16:35 +0800
+  [ Patrick Franz ]
+  * Re-introduce package libqt6qmlworkerscript6.
 
-qt6-declarative (6.6.1+dfsg-1deepin3) unstable; urgency=medium
+ -- Patrick Franz <[email protected]>  Tue, 12 Mar 2024 19:15:55 +0100
 
-  * Import patch from upstream:
-    - Fix-corrupt-rendering-when-toggling-rendernode-based-items.patch
-    https://codereview.qt-project.org/c/qt/qtdeclarative/+/521190
+qt6-declarative (6.6.2+dfsg-1) experimental; urgency=medium
 
- -- Tianyu Chen <[email protected]>  Wed, 17 Jan 2024 10:44:07 +0800
+  [ Patrick Franz ]
+  * New upstream release (6.6.2).
+  * Bump Qt B-Ds to 6.6.2.
+  * Build-depend on pkgconf instead of pkg-config as the latter has been
+    superseded by the former.
+  * Update ABI to 6.6.2.
 
-qt6-declarative (6.6.1+dfsg-1deepin2) unstable; urgency=medium
+ -- Patrick Franz <[email protected]>  Thu, 15 Feb 2024 20:55:06 +0100
 
-  * Import three patches:
-    - Add-the-reset-function-for-properties-of-QQuickPalet.patch.
-    - Rename-accent-color-in-QPalette.patch
-    - Palette-Remove-redundant-code.patch
-    https://codereview.qt-project.org/c/qt/qtdeclarative/+/414503
+qt6-declarative (6.6.1+dfsg-3) experimental; urgency=medium
 
+  [ Lisandro Damián Nicanor Pérez Meyer ]
+  * qt6-declarative-dev: add versioned depends on packages produced by this
+    source. This avoids mixed installed versions as reported by Stuart
+    Prescott on IRC.
 
- -- Tianyu Chen <sweetyfish@deepin.org>  Wed, 10 Jan 2024 14:30:45 +0800
+ -- Patrick Franz <deltaone@debian.org>  Sun, 14 Jan 2024 18:00:35 +0100
 
-qt6-declarative (6.6.1+dfsg-1deepin1) unstable; urgency=medium
+qt6-declarative (6.6.1+dfsg-2) experimental; urgency=medium
 
-  * Drop patch introduced by git-rebase.
+  [ Patrick Franz ]
+  * Re-introduce package libqt6quickshapes6.
+  * Update symbols from buildlogs.
+  * Fix typos in documentation.
 
- -- Tianyu Chen <sweetyfish@deepin.org>  Wed, 27 Dec 2023 10:25:26 +0800
+ -- Patrick Franz <deltaone@debian.org>  Tue, 09 Jan 2024 00:01:55 +0100
 
 qt6-declarative (6.6.1+dfsg-1) experimental; urgency=medium
 

debian/control

@@ -11,14 +11,14 @@ Build-Depends: cmake (>= 3.24~),
                libssl-dev,
                libvulkan-dev [linux-any],
                ninja-build,
-               pkg-config,
+               pkgconf,
                pkg-kde-tools,
-               qt6-base-dev (>= 6.6.1+dfsg~),
-               qt6-base-private-dev (>= 6.6.1+dfsg~),
+               qt6-base-dev (>= 6.6.2+dfsg~),
+               qt6-base-private-dev (>= 6.6.2+dfsg~),
                qt6-declarative-dev:native <cross>,
-               qt6-languageserver-private-dev (>= 6.6.1~),
-               qt6-shadertools-dev (>= 6.6.1~),
-               qt6-svg-dev (>= 6.6.1~),
+               qt6-languageserver-private-dev (>= 6.6.2~),
+               qt6-shadertools-dev (>= 6.6.2~),
+               qt6-svg-dev (>= 6.6.2~),
 Build-Depends-Indep: qt6-base-dev (>= 6.6~) <!nodoc>,
                      qt6-documentation-tools (>= 6.6~) <!nodoc>,
 Standards-Version: 4.6.2
@@ -31,7 +31,7 @@ Package: libqt6qml6
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends},
-Provides: qt6-declarative-private-abi (= 6.6.1),
+Provides: qt6-declarative-private-abi (= 6.6.2),
 Depends: ${misc:Depends}, ${shlibs:Depends},
 Recommends: libgl1, libglx-mesa0,
 Suggests: qt6-qmltooling-plugins,
@@ -65,6 +65,16 @@ Description: Qt 6 QML Models library
  .
  This package contains the Qt QML Models support library.
 
+Package: libqt6qmlworkerscript6
+Architecture: any
+Multi-Arch: same
+Depends: ${misc:Depends}, ${shlibs:Depends},
+Description: Qt 6 QML WorkerScript library
+ Qt is a cross-platform C++ application framework. Qt's primary feature
+ is its rich set of widgets that provide standard GUI functionality.
+ .
+ This package contains the Qt QML WorkerScript support library.
+
 Package: libqt6quick6
 Architecture: any
 Multi-Arch: same
@@ -90,6 +100,17 @@ Description: Qt 6 Quick Controls 2 library
  .
  This package contains the Qt Quick Controls 2 support library.
 
+Package: libqt6quickshapes6
+Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends},
+Depends: ${misc:Depends}, ${shlibs:Depends},
+Description: Qt 6 Quick Shapes library
+ Qt is a cross-platform C++ application framework. Qt's primary feature
+ is its rich set of widgets that provide standard GUI functionality.
+ .
+ This package contains the Qt Quick Shapes support library.
+
 Package: libqt6quicktemplates2-6
 Architecture: any
 Multi-Arch: same
@@ -298,8 +319,6 @@ Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends},
 Depends: ${misc:Depends}, ${shlibs:Depends},
-Breaks: libqt6qmlworkerscript6
-Replaces: libqt6qmlworkerscript6
 Description: Qt 6 QtQml Workerscript QML module
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
@@ -425,8 +444,6 @@ Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends},
 Depends: ${misc:Depends}, ${shlibs:Depends},
-Breaks: libqt6quickshapes6
-Replaces: libqt6quickshapes6
 Description: Qt 6 Quick Shapes QML module
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
@@ -486,15 +503,17 @@ Multi-Arch: same
 Depends: libqt6qml6 (= ${binary:Version}),
          libqt6qmlcompiler6 (= ${binary:Version}),
          libqt6qmlmodels6 (= ${binary:Version}),
+         libqt6qmlworkerscript6 (= ${binary:Version}),
          libqt6quick6 (= ${binary:Version}),
          libqt6quickcontrols2-6 (= ${binary:Version}),
+         libqt6quickshapes6 (= ${binary:Version}),
          libqt6quicktemplates2-6 (= ${binary:Version}),
          libqt6quicktest6 (= ${binary:Version}),
          libqt6quickwidgets6 (= ${binary:Version}),
          qt6-base-dev,
-         qt6-declarative-dev-tools,
-         qt6-qmllint-plugins,
-         qt6-qmltooling-plugins,
+         qt6-declarative-dev-tools (= ${binary:Version}),
+         qt6-qmllint-plugins (= ${binary:Version}),
+         qt6-qmltooling-plugins (= ${binary:Version}),
          ${misc:Depends},
 Description: Qt 6 declarative development files
  Qt is a cross-platform C++ application framework. Qt's primary feature

debian/libqt6qml6.symbols

@@ -1,6 +1,6 @@
 # SymbolsHelper-Confirmed: 6.6.1 amd64
 libQt6Qml.so.6 libqt6qml6 #MINVER#
-| libqt6qml6 #MINVER#, qt6-declarative-private-abi (= 6.6.1)
+| libqt6qml6 #MINVER#, qt6-declarative-private-abi (= 6.6.2)
 * Build-Depends-Packages: qt6-declarative-dev, qt6-declarative-private-dev
  Qt_6@Qt_6 6.6.0
  (symver)Qt_6_PRIVATE_API 0

debian/libqt6qmlcompiler6.symbols

@@ -1,6 +1,6 @@
 # SymbolsHelper-Confirmed: 6.6.0 amd64 armel armhf hppa i386 powerpc riscv64
 libQt6QmlCompiler.so.6 libqt6qmlcompiler6 #MINVER#
-| libqt6qmlcompiler6 #MINVER#, qt6-declarative-private-abi (= 6.6.1)
+| libqt6qmlcompiler6 #MINVER#, qt6-declarative-private-abi (= 6.6.2)
 * Build-Depends-Packages: qt6-declarative-dev, qt6-declarative-private-dev
  Qt_6@Qt_6 6.6.0
  (symver)Qt_6_PRIVATE_API 0

debian/libqt6qmlmodels6.symbols

@@ -1,6 +1,6 @@
 # SymbolsHelper-Confirmed: 6.6.0 amd64
 libQt6QmlModels.so.6 libqt6qmlmodels6 #MINVER#
-| libqt6qmlmodels6 #MINVER#, qt6-declarative-private-abi (= 6.6.1)
+| libqt6qmlmodels6 #MINVER#, qt6-declarative-private-abi (= 6.6.2)
 * Build-Depends-Packages: qt6-declarative-dev, qt6-declarative-private-dev
  Qt_6@Qt_6 6.6.0
  (symver)Qt_6_PRIVATE_API 0

debian/libqt6qmlworkerscript6.install

@@ -0,0 +1 @@
+usr/lib/${DEB_HOST_MULTIARCH}/libQt6QmlWorkerScript.so.*

debian/libqt6qmlworkerscript6.lintian-overrides

@@ -0,0 +1,3 @@
+# This dependency has been added to track external packages building against
+# our private headers. It is ok if internal packages depend on the ABI one.
+libqt6qmlworkerscript6: symbols-declares-dependency-on-other-package qt6-declarative-private-abi *

debian/libqt6qmlworkerscript6.symbols

@@ -0,0 +1,9 @@
+# SymbolsHelper-Confirmed: 6.6.2 amd64
+libQt6QmlWorkerScript.so.6 libqt6qmlworkerscript6 #MINVER#
+| libqt6qmlworkerscript6 #MINVER#, qt6-declarative-private-abi (= 6.6.2)
+* Build-Depends-Packages: qt6-declarative-dev, qt6-declarative-private-dev
+ Qt_6@Qt_6 6.6.2
+ (symver)Qt_6_PRIVATE_API 0
+ _Z37qml_register_types_QtQml_WorkerScriptv@Qt_6 6.6.2
+ _ZTIN3QV415ExecutionEngine9DeletableE@Qt_6 6.6.2
+ _ZTSN3QV415ExecutionEngine9DeletableE@Qt_6 6.6.2

debian/libqt6quick6.symbols

@@ -1,6 +1,6 @@
-# SymbolsHelper-Confirmed: 6.6.0 amd64 arm64 armel armhf hppa i386 loong64 powerpc ppc64 ppc64el riscv64 s390x
+# SymbolsHelper-Confirmed: 6.6.1 mips64el
 libQt6Quick.so.6 libqt6quick6 #MINVER#
-| libqt6quick6 #MINVER#, qt6-declarative-private-abi (= 6.6.1)
+| libqt6quick6 #MINVER#, qt6-declarative-private-abi (= 6.6.2)
 * Build-Depends-Packages: qt6-declarative-dev, qt6-declarative-private-dev
  Qt_6@Qt_6 6.6.0
  (symver)Qt_6_PRIVATE_API 0
@@ -398,8 +398,7 @@ libQt6Quick.so.6 libqt6quick6 #MINVER#
  _ZN16QNativeInterface16QSGOpenGLTextureD0Ev@Qt_6 6.6.0
  _ZN16QNativeInterface16QSGOpenGLTextureD1Ev@Qt_6 6.6.0
  _ZN16QNativeInterface16QSGOpenGLTextureD2Ev@Qt_6 6.6.0
- (arch=amd64 arm64 loong64 ppc64 ppc64el riscv64 s390x)_ZN16QNativeInterface16QSGVulkanTexture10fromNativeEP9VkImage_T13VkImageLayoutP12QQuickWindowRK5QSize6QFlagsINS4_19CreateTextureOptionEE@Qt_6 6.6.0
- (arch=!amd64 !arm64 !loong64 !ppc64 !ppc64el !riscv64 !s390x)_ZN16QNativeInterface16QSGVulkanTexture10fromNativeEy13VkImageLayoutP12QQuickWindowRK5QSize6QFlagsINS2_19CreateTextureOptionEE@Qt_6 6.6.0
+ (arch=amd64 arm64 loong64 mips64el ppc64 ppc64el riscv64 s390x)_ZN16QNativeInterface16QSGVulkanTexture10fromNativeEP9VkImage_T13VkImageLayoutP12QQuickWindowRK5QSize6QFlagsINS4_19CreateTextureOptionEE@Qt_6 6.6.1
  _ZN16QNativeInterface16QSGVulkanTextureD0Ev@Qt_6 6.6.0
  _ZN16QNativeInterface16QSGVulkanTextureD1Ev@Qt_6 6.6.0
  _ZN16QNativeInterface16QSGVulkanTextureD2Ev@Qt_6 6.6.0
@@ -525,10 +524,8 @@ libQt6Quick.so.6 libqt6quick6 #MINVER#
  _ZN17QSGSimpleRectNodeC2ERK6QRectFRK6QColor@Qt_6 6.6.0
  _ZN17QSGSimpleRectNodeC2Ev@Qt_6 6.6.0
  _ZN18QQuickRenderTarget15fromPaintDeviceEP12QPaintDevice@Qt_6 6.6.0
- (arch=amd64 arm64 loong64 ppc64 ppc64el riscv64 s390x)_ZN18QQuickRenderTarget15fromVulkanImageEP9VkImage_T13VkImageLayout8VkFormatRK5QSizei@Qt_6 6.6.0
- (arch=amd64 arm64 loong64 ppc64 ppc64el riscv64 s390x)_ZN18QQuickRenderTarget15fromVulkanImageEP9VkImage_T13VkImageLayoutRK5QSizei@Qt_6 6.6.0
- (arch=!amd64 !arm64 !loong64 !ppc64 !ppc64el !riscv64 !s390x)_ZN18QQuickRenderTarget15fromVulkanImageEy13VkImageLayout8VkFormatRK5QSizei@Qt_6 6.6.0
- (arch=!amd64 !arm64 !loong64 !ppc64 !ppc64el !riscv64 !s390x)_ZN18QQuickRenderTarget15fromVulkanImageEy13VkImageLayoutRK5QSizei@Qt_6 6.6.0
+ (arch=amd64 arm64 loong64 mips64el ppc64 ppc64el riscv64 s390x)_ZN18QQuickRenderTarget15fromVulkanImageEP9VkImage_T13VkImageLayout8VkFormatRK5QSizei@Qt_6 6.6.1
+ (arch=amd64 arm64 loong64 mips64el ppc64 ppc64el riscv64 s390x)_ZN18QQuickRenderTarget15fromVulkanImageEP9VkImage_T13VkImageLayoutRK5QSizei@Qt_6 6.6.1
  _ZN18QQuickRenderTarget17fromOpenGLTextureEjRK5QSizei@Qt_6 6.6.0
  _ZN18QQuickRenderTarget17fromOpenGLTextureEjjRK5QSizei@Qt_6 6.6.0
  _ZN18QQuickRenderTarget19fromRhiRenderTargetEP16QRhiRenderTarget@Qt_6 6.6.0

debian/libqt6quickcontrols2-6.symbols

@@ -1,6 +1,6 @@
 # SymbolsHelper-Confirmed: 6.6.0 amd64
 libQt6QuickControls2.so.6 libqt6quickcontrols2-6 #MINVER#
-| libqt6quickcontrols2-6 #MINVER#, qt6-declarative-private-abi (= 6.6.1)
+| libqt6quickcontrols2-6 #MINVER#, qt6-declarative-private-abi (= 6.6.2)
 * Build-Depends-Packages: qt6-declarative-dev, qt6-declarative-private-dev
  Qt_6@Qt_6 6.6.0
  (symver)Qt_6_PRIVATE_API 0

debian/libqt6quickshapes6.install

@@ -0,0 +1 @@
+usr/lib/${DEB_HOST_MULTIARCH}/libQt6QuickShapes.so.*

debian/libqt6quickshapes6.lintian-overrides

@@ -0,0 +1,3 @@
+# This dependency has been added to track external packages building against
+# our private headers. It is ok if internal packages depend on the ABI one.
+libqt6quickshapes6: symbols-declares-dependency-on-other-package qt6-declarative-private-abi *

debian/libqt6quickshapes6.symbols

@@ -0,0 +1,19 @@
+# SymbolsHelper-Confirmed: 6.6.0 amd64
+libQt6QuickShapes.so.6 libqt6quickshapes6 #MINVER#
+| libqt6quickshapes6 #MINVER#, qt6-declarative-private-abi (= 6.6.2)
+* Build-Depends-Packages: qt6-declarative-dev, qt6-declarative-private-dev
+ Qt_6@Qt_6 6.6.0
+ (symver)Qt_6_PRIVATE_API 0
+ _Z29QQuickShapes_initializeModulev@Qt_6 6.6.0
+ _Z33qml_register_types_QtQuick_Shapesv@Qt_6 6.6.0
+ _ZGVZN9QMetaType21registerConverterImplI5QListIdE9QIterableI13QMetaSequenceEEEbSt8functionIFbPKvPvEES_S_E10unregister@Qt_6 6.6.0
+ _ZGVZN9QMetaType23registerMutableViewImplI5QListIdE9QIterableI13QMetaSequenceEEEbSt8functionIFbPvS7_EES_S_E10unregister@Qt_6 6.6.0
+ _ZN13QMetaSequence12MetaSequenceI5QListIdEE5valueE@Qt_6 6.6.0
+ _ZTI17QQuickPathPrivate@Qt_6 6.6.0
+ _ZTIZN9QMetaType17registerConverterI5QListIdE9QIterableI13QMetaSequenceEN9QtPrivate33QSequentialIterableConvertFunctorIS2_EEEEbT1_EUlPKvPvE_@Qt_6 6.6.0
+ _ZTIZN9QMetaType19registerMutableViewI5QListIdE9QIterableI13QMetaSequenceEN9QtPrivate37QSequentialIterableMutableViewFunctorIS2_EEEEbT1_EUlPvSA_E_@Qt_6 6.6.0
+ _ZTS17QQuickPathPrivate@Qt_6 6.6.0
+ _ZTSZN9QMetaType17registerConverterI5QListIdE9QIterableI13QMetaSequenceEN9QtPrivate33QSequentialIterableConvertFunctorIS2_EEEEbT1_EUlPKvPvE_@Qt_6 6.6.0
+ _ZTSZN9QMetaType19registerMutableViewI5QListIdE9QIterableI13QMetaSequenceEN9QtPrivate37QSequentialIterableMutableViewFunctorIS2_EEEEbT1_EUlPvSA_E_@Qt_6 6.6.0
+ (optional=templinst)_ZZN9QMetaType21registerConverterImplI5QListIdE9QIterableI13QMetaSequenceEEEbSt8functionIFbPKvPvEES_S_E10unregister@Qt_6 6.6.0
+ (optional=templinst)_ZZN9QMetaType23registerMutableViewImplI5QListIdE9QIterableI13QMetaSequenceEEEbSt8functionIFbPvS7_EES_S_E10unregister@Qt_6 6.6.0

debian/libqt6quicktemplates2-6.symbols

@@ -1,6 +1,6 @@
 # SymbolsHelper-Confirmed: 6.6.0 amd64
 libQt6QuickTemplates2.so.6 libqt6quicktemplates2-6 #MINVER#
-| libqt6quicktemplates2-6 #MINVER#, qt6-declarative-private-abi (= 6.6.1)
+| libqt6quicktemplates2-6 #MINVER#, qt6-declarative-private-abi (= 6.6.2)
 * Build-Depends-Packages: qt6-declarative-dev, qt6-declarative-private-dev
  Qt_6@Qt_6 6.6.0
  (symver)Qt_6_PRIVATE_API 0

debian/libqt6quicktest6.symbols

@@ -1,6 +1,6 @@
 # SymbolsHelper-Confirmed: 6.6.0 amd64
 libQt6QuickTest.so.6 libqt6quicktest6 #MINVER#
-| libqt6quicktest6 #MINVER#, qt6-declarative-private-abi (= 6.6.1)
+| libqt6quicktest6 #MINVER#, qt6-declarative-private-abi (= 6.6.2)
 * Build-Depends-Packages: qt6-declarative-dev, qt6-declarative-private-dev
  Qt_6@Qt_6 6.6.0
  (symver)Qt_6_PRIVATE_API 0

debian/libqt6quickwidgets6.symbols

@@ -1,6 +1,6 @@
 # SymbolsHelper-Confirmed: 6.6.0 amd64
 libQt6QuickWidgets.so.6 libqt6quickwidgets6 #MINVER#
-| libqt6quickwidgets6 #MINVER#, qt6-declarative-private-abi (= 6.6.1)
+| libqt6quickwidgets6 #MINVER#, qt6-declarative-private-abi (= 6.6.2)
 * Build-Depends-Packages: qt6-declarative-dev, qt6-declarative-private-dev
  Qt_6@Qt_6 6.6.0
  (symver)Qt_6_PRIVATE_API 0