[neon/qt6/qt6-webengine/Neon/release] debian: New release
Carlos De Maine
null at kde.org
Sun Dec 10 05:57:16 GMT 2023
Git commit 9744e3fbdd2b73beddccb392a89e1e96b82b803b by Carlos De Maine.
Committed on 10/12/2023 at 06:49.
Pushed by carlosdem into branch 'Neon/release'.
New release
M +6 -2 debian/changelog
M +70 -40 debian/control
D +0 -495 debian/patches/gcc-13.patch
M +0 -5 debian/patches/series
D +0 -32 debian/patches/system-openjpeg2.patch
https://invent.kde.org/neon/qt6/qt6-webengine/-/commit/9744e3fbdd2b73beddccb392a89e1e96b82b803b
diff --git a/debian/changelog b/debian/changelog
index 8d41075..b9378f6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
-qt6-webengine (6.6.0-0neon) UNRELEASED; urgency=medium
+qt6-webengine (6.6.1-0neon) jammy; urgency=medium
+ [ Patrick Franz ]
+ * New release
+
+ [ Carlos De Maine ]
* New release
- -- Patrick Franz <deltaone at debian.org> Mon, 03 Apr 2023 16:58:32 +0100
+ -- Carlos De Maine <carlosdemaine at gmail.com> Sun, 10 Dec 2023 15:49:51 +1000
qt6-webengine (6.4.2+dfsg-1) experimental; urgency=medium
diff --git a/debian/control b/debian/control
index 27f1c8f..61aea8d 100644
--- a/debian/control
+++ b/debian/control
@@ -86,21 +86,21 @@ Build-Depends: binutils (>= 2.32-8~),
protobuf-compiler,
python3,
python3-html5lib,
- qt6-base-dev (>= 6.4.2+dfsg~),
- qt6-declarative-dev (>= 6.4.2+dfsg~),
- qt6-image-formats-plugins,
- qt6-positioning-dev (>= 6.4.2~),
- qt6-tools-dev (>= 6.4.2~),
- qt6-webchannel-dev (>= 6.4.2~),
- qt6-websockets-dev (>= 6.4.2~),
+ qt6-base-dev (>= 6.6.1~),
+ qt6-base-doc (>= 6.6~) <!nodoc>,
+ qt6-declarative-dev (>= 6.6.1~),
+ qt6-documentation-tools (>= 6.6~) <!nodoc>,
+ qt6-imageformats-dev (>= 6.6.1~),
+ qt6-positioning-dev (>= 6.6.1~),
+ qt6-tools-dev (>= 6.6.1~),
+ qt6-webchannel-dev (>= 6.6.1~),
+ qt6-websockets-dev (>= 6.6.1~),
re2c,
# rollup,
ruby,
xauth <!nocheck>,
xvfb <!nocheck>,
zlib1g-dev,
- qt6-documentation-tools (>= 6.4~) <!nodoc>,
- qt6-base-doc (>= 6.4~) <!nodoc>,
Standards-Version: 4.6.2
Homepage: https://www.qt.io/developers/
Vcs-Browser: https://salsa.debian.org/qt-kde-team/qt6/qt6-webengine
@@ -112,11 +112,38 @@ Architecture: any
Section: kde
X-Neon-MergedPackage: true
Pre-Depends: ${misc:Pre-Depends}
-Provides: qt6-webengine-abi (= 6.6.0)
Depends: qt6-declarative,
sse3-support [amd64 i386],
${misc:Depends},
${shlibs:Depends}
+Breaks: libqt6webenginequickdelegatesqml6
+Provides: convert-bdic,
+ qt6-webengine-abi (= 6.6.1),
+ libqt6pdf6,
+ libqt6pdfquick6,
+ libqt6pdfwidgets6,
+ libqt6webengine6,
+ libqt6webenginecore6,
+ libqt6webenginecore6-bin,
+ libqt6webenginequick6,
+ libqt6webenginequickdelegatesqml6,
+ libqt6webenginewidgets6,
+ libqt6webengine6-data,
+ qt6-image-formats-plugin-pdf,
+ qml6-module-qtwebengine,
+ qml6-module-qtwebengine-controlsdelegates,
+Replaces: libqt6pdf6,
+ libqt6pdfquick6,
+ libqt6pdfwidgets6,
+ libqt6webengine6,
+ libqt6webenginecore6,
+ libqt6webenginecore6-bin,
+ libqt6webenginequick6,
+ libqt6webenginequickdelegatesqml6,
+ libqt6webenginewidgets6,
+ libqt6webengine6-data,
+ qt6-image-formats-plugin-pdf,
+ qml6-module-qtwebengine,
Description: Qt 6 WebEngine Core library
Qt is a cross-platform C++ application framework. Qt's primary feature
is its rich set of widgets that provide standard GUI functionality.
@@ -130,6 +157,7 @@ Package: qt6-webengine-dev
Architecture: any
Section: kde
X-Neon-MergedPackage: true
+Pre-Depends: ${misc:Pre-Depends}
Depends: qt6-base-dev,
qt6-declarative-dev,
qt6-positioning-dev,
@@ -137,6 +165,11 @@ Depends: qt6-base-dev,
qt6-webengine (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends}
+Provides: qt6-pdf-dev,
+ qt6-webengine-dev-tools,
+ qt6-webengine-doc-dev,
+ qt6-webengine-examples,
+ qt6-webengine-private-dev,
Description: Qt 6 WebEngine library - development files
Qt is a cross-platform C++ application framework. Qt's primary feature
is its rich set of widgets that provide standard GUI functionality.
@@ -151,9 +184,12 @@ Package: qt6-webengine-doc
Architecture: all
Section: kde
X-Neon-MergedPackage: true
+Pre-Depends: ${misc:Pre-Depends}
Depends: qt6-base-doc,
qt6-webengine-dev (= ${binary:Version}),
${misc:Depends}
+Provides: qt6-webengine-doc-html,
+Replaces: qt6-webengine-doc-html,
Description: Qt 6 WebEngine library - documentation files
Qt is a cross-platform C++ application framework. Qt's primary feature
is its rich set of widgets that provide standard GUI functionality.
@@ -164,116 +200,110 @@ Description: Qt 6 WebEngine library - documentation files
This package contains the documentation to help build Qt 6 applications
using Qt WebEngine libraries.
-Package: libqt6webenginecore6
-Architecture: all
-Depends: qt6-webengine
-Description: Dummy transitional
- Transitional dummy package.
-
Package: libqt6pdf6
Architecture: all
-Depends: qt6-webengine
+Depends: qt6-webengine, ${misc:Depends}
Description: Dummy transitional
Transitional dummy package.
Package: libqt6pdfquick6
Architecture: all
-Depends: qt6-webengine
+Depends: qt6-webengine, ${misc:Depends}
Description: Dummy transitional
Transitional dummy package.
Package: libqt6pdfwidgets6
Architecture: all
-Depends: qt6-webengine
+Depends: qt6-webengine, ${misc:Depends}
Description: Dummy transitional
Transitional dummy package.
-Package: libqt6webenginecore6-bin
+Package: libqt6webenginecore6
Architecture: all
-Depends: qt6-webengine
+Depends: qt6-webengine, ${misc:Depends}
Description: Dummy transitional
Transitional dummy package.
-Package: libqt6webenginequick6
+Package: libqt6webenginecore6-bin
Architecture: all
-Depends: qt6-webengine
+Depends: qt6-webengine, ${misc:Depends}
Description: Dummy transitional
Transitional dummy package.
-Package: libqt6webenginequickdelegatesqml6
+Package: libqt6webenginequick6
Architecture: all
-Depends: qt6-webengine
+Depends: qt6-webengine, ${misc:Depends}
Description: Dummy transitional
Transitional dummy package.
Package: libqt6webenginewidgets6
Architecture: all
-Depends: qt6-webengine
+Depends: qt6-webengine, ${misc:Depends}
Description: Dummy transitional
Transitional dummy package.
Package: libqt6webengine6-data
Architecture: all
-Depends: qt6-webengine
+Depends: qt6-webengine, ${misc:Depends}
Description: Dummy transitional
Transitional dummy package.
Package: qt6-image-formats-plugin-pdf
Architecture: all
-Depends: qt6-webengine
+Depends: qt6-webengine, ${misc:Depends}
Description: Dummy transitional
Transitional dummy package.
Package: qml6-module-qtquick-pdf
Architecture: all
-Depends: qt6-webengine
+Depends: qt6-webengine, ${misc:Depends}
Description: Dummy transitional
Transitional dummy package.
Package: qml6-module-qtwebengine
Architecture: all
-Depends: qt6-webengine
+Depends: qt6-webengine, ${misc:Depends}
Description: Dummy transitional
Transitional dummy package.
Package: qml6-module-qtwebengine-controlsdelegates
Architecture: all
-Depends: qt6-webengine
+Depends: qt6-webengine, ${misc:Depends}
Description: Dummy transitional
Transitional dummy package.
-Package: qt6-webengine-private-dev
+Package: qt6-pdf-dev
Architecture: all
-Depends: qt6-webengine-dev
+Depends: qt6-webengine-dev, ${misc:Depends}
Description: Dummy transitional
Transitional dummy package.
-Package: qt6-webengine-dev-tools
+Package: qt6-webengine-private-dev
Architecture: all
-Depends: qt6-webengine-dev
+Depends: qt6-webengine-dev, ${misc:Depends}
Description: Dummy transitional
Transitional dummy package.
-Package: qt6-pdf-dev
+Package: qt6-webengine-dev-tools
Architecture: all
-Depends: qt6-webengine-dev
+Depends: qt6-webengine-dev, ${misc:Depends}
Description: Dummy transitional
Transitional dummy package.
Package: qt6-webengine-doc-dev
Architecture: all
-Depends: qt6-webengine-dev
+Depends: qt6-webengine-dev, ${misc:Depends}
Description: Dummy transitional
Transitional dummy package.
Package: qt6-webengine-doc-html
Architecture: all
-Depends: qt6-webengine-doc
+Depends: qt6-webengine-doc, ${misc:Depends}
Description: Dummy transitional
Transitional dummy package.
Package: qt6-webengine-examples
Architecture: all
-Depends: qt6-webengine-dev
+Depends: qt6-webengine-dev, ${misc:Depends}
Description: Dummy transitional
Transitional dummy package.
diff --git a/debian/patches/gcc-13.patch b/debian/patches/gcc-13.patch
deleted file mode 100644
index 3c34dec..0000000
--- a/debian/patches/gcc-13.patch
+++ /dev/null
@@ -1,495 +0,0 @@
-From 78d4b0d916a6216e394045a3ba11284fe1ced6b0 Mon Sep 17 00:00:00 2001
-From: Martin Negyokru <negyokru at inf.u-szeged.hu>
-Date: Fri, 03 Mar 2023 16:56:50 +0100
-Subject: [PATCH] Fixes for building with GCC-13
-
-Fixes: QTBUG-111697
-Change-Id: I51fca3b3eb627b2617ff5c6c051fa1182671244d
-Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/464490
-Reviewed-by: Allan Sandfeld Jensen <allan.jensen at qt.io>
-(cherry picked from commit 9de0d8a90d9b0176542db8b54d678a9fcbb69337)
-Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/468197
-
-Forwarded: not-needed
----
-
-diff --git a/src/3rdparty/chromium/base/debug/profiler.h b/src/3rdparty/chromium/base/debug/profiler.h
-index 1229e06..be6e272 100644
---- a/src/3rdparty/chromium/base/debug/profiler.h
-+++ b/src/3rdparty/chromium/base/debug/profiler.h
-@@ -6,6 +6,7 @@
- #define BASE_DEBUG_PROFILER_H_
-
- #include <stddef.h>
-+#include <cstdint>
-
- #include <string>
-
-diff --git a/src/3rdparty/chromium/base/debug/stack_trace.h b/src/3rdparty/chromium/base/debug/stack_trace.h
-index 60c3c5c..6c8021c 100644
---- a/src/3rdparty/chromium/base/debug/stack_trace.h
-+++ b/src/3rdparty/chromium/base/debug/stack_trace.h
-@@ -7,6 +7,7 @@
-
- #include <stddef.h>
-
-+#include <cstdint>
- #include <iosfwd>
- #include <string>
-
-diff --git a/src/3rdparty/chromium/cc/trees/target_property.cc b/src/3rdparty/chromium/cc/trees/target_property.cc
-index 96f8c3b..eba2b20 100644
---- a/src/3rdparty/chromium/cc/trees/target_property.cc
-+++ b/src/3rdparty/chromium/cc/trees/target_property.cc
-@@ -2,6 +2,8 @@
- // Use of this source code is governed by a BSD-style license that can be
- // found in the LICENSE file.
-
-+#include <cstdint>
-+
- #include "cc/trees/target_property.h"
-
- #include "ui/gfx/animation/keyframe/target_property.h"
-diff --git a/src/3rdparty/chromium/components/metrics/psi_memory_parser.h b/src/3rdparty/chromium/components/metrics/psi_memory_parser.h
-index c1384dd..da6b5fd 100644
---- a/src/3rdparty/chromium/components/metrics/psi_memory_parser.h
-+++ b/src/3rdparty/chromium/components/metrics/psi_memory_parser.h
-@@ -5,6 +5,8 @@
- #ifndef COMPONENTS_METRICS_PSI_MEMORY_PARSER_H_
- #define COMPONENTS_METRICS_PSI_MEMORY_PARSER_H_
-
-+#include <cstdint>
-+
- #include <string>
-
- #include "base/gtest_prod_util.h"
-diff --git a/src/3rdparty/chromium/components/viz/common/shared_element_resource_id.h b/src/3rdparty/chromium/components/viz/common/shared_element_resource_id.h
-index 2aba73e..2e028fd 100644
---- a/src/3rdparty/chromium/components/viz/common/shared_element_resource_id.h
-+++ b/src/3rdparty/chromium/components/viz/common/shared_element_resource_id.h
-@@ -5,6 +5,7 @@
- #ifndef COMPONENTS_VIZ_COMMON_SHARED_ELEMENT_RESOURCE_ID_H_
- #define COMPONENTS_VIZ_COMMON_SHARED_ELEMENT_RESOURCE_ID_H_
-
-+#include <cstdint>
- #include <string>
- #include <vector>
-
-diff --git a/src/3rdparty/chromium/content/public/browser/browsing_data_remover_delegate.h b/src/3rdparty/chromium/content/public/browser/browsing_data_remover_delegate.h
-index 3069c85..f4614b7 100644
---- a/src/3rdparty/chromium/content/public/browser/browsing_data_remover_delegate.h
-+++ b/src/3rdparty/chromium/content/public/browser/browsing_data_remover_delegate.h
-@@ -5,6 +5,7 @@
- #ifndef CONTENT_PUBLIC_BROWSER_BROWSING_DATA_REMOVER_DELEGATE_H_
- #define CONTENT_PUBLIC_BROWSER_BROWSING_DATA_REMOVER_DELEGATE_H_
-
-+#include <cstdint>
- #include <string>
- #include <vector>
- #include "base/callback_forward.h"
-diff --git a/src/3rdparty/chromium/device/base/synchronization/one_writer_seqlock.h b/src/3rdparty/chromium/device/base/synchronization/one_writer_seqlock.h
-index 6a3eeda..5253013 100644
---- a/src/3rdparty/chromium/device/base/synchronization/one_writer_seqlock.h
-+++ b/src/3rdparty/chromium/device/base/synchronization/one_writer_seqlock.h
-@@ -6,6 +6,7 @@
- #define DEVICE_BASE_SYNCHRONIZATION_ONE_WRITER_SEQLOCK_H_
-
- #include <atomic>
-+#include <cstdint>
-
- #include "base/atomicops.h"
- #include "base/check.h"
-diff --git a/src/3rdparty/chromium/device/bluetooth/public/cpp/bluetooth_uuid.h b/src/3rdparty/chromium/device/bluetooth/public/cpp/bluetooth_uuid.h
-index 3cf2914..4b05524 100644
---- a/src/3rdparty/chromium/device/bluetooth/public/cpp/bluetooth_uuid.h
-+++ b/src/3rdparty/chromium/device/bluetooth/public/cpp/bluetooth_uuid.h
-@@ -5,6 +5,7 @@
- #ifndef DEVICE_BLUETOOTH_PUBLIC_CPP_BLUETOOTH_UUID_H_
- #define DEVICE_BLUETOOTH_PUBLIC_CPP_BLUETOOTH_UUID_H_
-
-+#include <cstdint>
- #include <ostream>
- #include <string>
- #include <vector>
-diff --git a/src/3rdparty/chromium/extensions/common/constants.h b/src/3rdparty/chromium/extensions/common/constants.h
-index 9ac68e2..fef102c 100644
---- a/src/3rdparty/chromium/extensions/common/constants.h
-+++ b/src/3rdparty/chromium/extensions/common/constants.h
-@@ -5,6 +5,8 @@
- #ifndef EXTENSIONS_COMMON_CONSTANTS_H_
- #define EXTENSIONS_COMMON_CONSTANTS_H_
-
-+#include <cstdint>
-+
- #include "base/files/file_path.h"
- #include "base/strings/string_piece_forward.h"
- #include "build/chromeos_buildflags.h"
-diff --git a/src/3rdparty/chromium/extensions/renderer/bindings/api_invocation_errors.h b/src/3rdparty/chromium/extensions/renderer/bindings/api_invocation_errors.h
-index 4ba8de8..6352b90 100644
---- a/src/3rdparty/chromium/extensions/renderer/bindings/api_invocation_errors.h
-+++ b/src/3rdparty/chromium/extensions/renderer/bindings/api_invocation_errors.h
-@@ -5,6 +5,7 @@
- #ifndef EXTENSIONS_RENDERER_BINDINGS_API_INVOCATION_ERRORS_H_
- #define EXTENSIONS_RENDERER_BINDINGS_API_INVOCATION_ERRORS_H_
-
-+#include <cstdint>
- #include <set>
- #include <string>
-
-diff --git a/src/3rdparty/chromium/gpu/config/gpu_feature_info.h b/src/3rdparty/chromium/gpu/config/gpu_feature_info.h
-index 027f1a5..70759b2 100644
---- a/src/3rdparty/chromium/gpu/config/gpu_feature_info.h
-+++ b/src/3rdparty/chromium/gpu/config/gpu_feature_info.h
-@@ -5,6 +5,7 @@
- #ifndef GPU_CONFIG_GPU_FEATURE_INFO_H_
- #define GPU_CONFIG_GPU_FEATURE_INFO_H_
-
-+#include <cstdint>
- #include <string>
- #include <vector>
-
-diff --git a/src/3rdparty/chromium/net/base/parse_number.h b/src/3rdparty/chromium/net/base/parse_number.h
-index 4e49ab7..8655ff1 100644
---- a/src/3rdparty/chromium/net/base/parse_number.h
-+++ b/src/3rdparty/chromium/net/base/parse_number.h
-@@ -5,6 +5,8 @@
- #ifndef NET_BASE_PARSE_NUMBER_H_
- #define NET_BASE_PARSE_NUMBER_H_
-
-+#include <cstdint>
-+
- #include "base/strings/string_piece.h"
- #include "net/base/net_export.h"
-
-diff --git a/src/3rdparty/chromium/net/cookies/cookie_inclusion_status.h b/src/3rdparty/chromium/net/cookies/cookie_inclusion_status.h
-index 2e9c319..4d723d1 100644
---- a/src/3rdparty/chromium/net/cookies/cookie_inclusion_status.h
-+++ b/src/3rdparty/chromium/net/cookies/cookie_inclusion_status.h
-@@ -6,6 +6,7 @@
- #define NET_COOKIES_COOKIE_INCLUSION_STATUS_H_
-
- #include <bitset>
-+#include <cstdint>
- #include <ostream>
- #include <string>
- #include <vector>
-diff --git a/src/3rdparty/chromium/net/third_party/quiche/src/quiche/quic/core/crypto/quic_hkdf.h b/src/3rdparty/chromium/net/third_party/quiche/src/quiche/quic/core/crypto/quic_hkdf.h
-index 6a300ed..3e30f1c 100644
---- a/src/3rdparty/chromium/net/third_party/quiche/src/quiche/quic/core/crypto/quic_hkdf.h
-+++ b/src/3rdparty/chromium/net/third_party/quiche/src/quiche/quic/core/crypto/quic_hkdf.h
-@@ -5,6 +5,7 @@
- #ifndef QUICHE_QUIC_CORE_CRYPTO_QUIC_HKDF_H_
- #define QUICHE_QUIC_CORE_CRYPTO_QUIC_HKDF_H_
-
-+#include <cstdint>
- #include <vector>
-
- #include "absl/strings/string_view.h"
-diff --git a/src/3rdparty/chromium/net/third_party/quiche/src/quiche/quic/core/quic_connection_id.h b/src/3rdparty/chromium/net/third_party/quiche/src/quiche/quic/core/quic_connection_id.h
-index 52f1501..db4d310 100644
---- a/src/3rdparty/chromium/net/third_party/quiche/src/quiche/quic/core/quic_connection_id.h
-+++ b/src/3rdparty/chromium/net/third_party/quiche/src/quiche/quic/core/quic_connection_id.h
-@@ -5,6 +5,7 @@
- #ifndef QUICHE_QUIC_CORE_QUIC_CONNECTION_ID_H_
- #define QUICHE_QUIC_CORE_QUIC_CONNECTION_ID_H_
-
-+#include <cstdint>
- #include <string>
- #include <vector>
-
-diff --git a/src/3rdparty/chromium/pdf/document_attachment_info.h b/src/3rdparty/chromium/pdf/document_attachment_info.h
-index 138ca2e..08f06e7 100644
---- a/src/3rdparty/chromium/pdf/document_attachment_info.h
-+++ b/src/3rdparty/chromium/pdf/document_attachment_info.h
-@@ -5,6 +5,7 @@
- #ifndef PDF_DOCUMENT_ATTACHMENT_INFO_H_
- #define PDF_DOCUMENT_ATTACHMENT_INFO_H_
-
-+#include <cstdint>
- #include <string>
-
-
-diff --git a/src/3rdparty/chromium/sandbox/linux/syscall_broker/broker_file_permission.h b/src/3rdparty/chromium/sandbox/linux/syscall_broker/broker_file_permission.h
-index 0aad3ac..3571b8a 100644
---- a/src/3rdparty/chromium/sandbox/linux/syscall_broker/broker_file_permission.h
-+++ b/src/3rdparty/chromium/sandbox/linux/syscall_broker/broker_file_permission.h
-@@ -6,6 +6,7 @@
- #define SANDBOX_LINUX_SYSCALL_BROKER_BROKER_FILE_PERMISSION_H_
-
- #include <bitset>
-+#include <cstdint>
- #include <string>
-
- #include "sandbox/sandbox_export.h"
-diff --git a/src/3rdparty/chromium/third_party/abseil-cpp/absl/strings/internal/str_format/extension.h b/src/3rdparty/chromium/third_party/abseil-cpp/absl/strings/internal/str_format/extension.h
-index c47536d..55e8ac8 100644
---- a/src/3rdparty/chromium/third_party/abseil-cpp/absl/strings/internal/str_format/extension.h
-+++ b/src/3rdparty/chromium/third_party/abseil-cpp/absl/strings/internal/str_format/extension.h
-@@ -19,6 +19,7 @@
- #include <limits.h>
-
- #include <cstddef>
-+#include <cstdint>
- #include <cstring>
- #include <ostream>
-
-diff --git a/src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderVars.h b/src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderVars.h
-index 18175e1..9edfd8f 100644
---- a/src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderVars.h
-+++ b/src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderVars.h
-@@ -12,6 +12,7 @@
-
- #include <algorithm>
- #include <array>
-+#include <cstdint>
- #include <string>
- #include <vector>
-
-diff --git a/src/3rdparty/chromium/third_party/blink/public/common/bluetooth/web_bluetooth_device_id.h b/src/3rdparty/chromium/third_party/blink/public/common/bluetooth/web_bluetooth_device_id.h
-index 1fc53a3..3143003 100644
---- a/src/3rdparty/chromium/third_party/blink/public/common/bluetooth/web_bluetooth_device_id.h
-+++ b/src/3rdparty/chromium/third_party/blink/public/common/bluetooth/web_bluetooth_device_id.h
-@@ -6,6 +6,7 @@
- #define THIRD_PARTY_BLINK_PUBLIC_COMMON_BLUETOOTH_WEB_BLUETOOTH_DEVICE_ID_H_
-
- #include <array>
-+#include <cstdint>
- #include <string>
-
- #include "third_party/blink/public/common/common_export.h"
-diff --git a/src/3rdparty/chromium/third_party/blink/public/common/origin_trials/origin_trial_public_key.h b/src/3rdparty/chromium/third_party/blink/public/common/origin_trials/origin_trial_public_key.h
-index c63049b..82b2783 100644
---- a/src/3rdparty/chromium/third_party/blink/public/common/origin_trials/origin_trial_public_key.h
-+++ b/src/3rdparty/chromium/third_party/blink/public/common/origin_trials/origin_trial_public_key.h
-@@ -6,6 +6,7 @@
- #define THIRD_PARTY_BLINK_PUBLIC_COMMON_ORIGIN_TRIALS_ORIGIN_TRIAL_PUBLIC_KEY_H_
-
- #include <array>
-+#include <cstdint>
-
- namespace blink {
-
-diff --git a/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/paint/effect_paint_property_node.h b/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/paint/effect_paint_property_node.h
-index 80b3150..dc14d2c 100644
---- a/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/paint/effect_paint_property_node.h
-+++ b/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/paint/effect_paint_property_node.h
-@@ -116,7 +116,7 @@
-
- // An identifier for a document transition shared element. `id.valid()`
- // returns true if this has been set, and false otherwise.
-- DocumentTransitionSharedElementId document_transition_shared_element_id;
-+ blink::DocumentTransitionSharedElementId document_transition_shared_element_id;
-
- // An identifier to tag shared element resources generated and cached in the
- // Viz process. This generated resource can be used as content for other
-diff --git a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/minidump_descriptor.h b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/minidump_descriptor.h
-index c7e4f2b..e491a1f 100644
---- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/minidump_descriptor.h
-+++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/minidump_descriptor.h
-@@ -33,6 +33,7 @@
- #include <assert.h>
- #include <sys/types.h>
-
-+#include <cstdint>
- #include <string>
-
- #include "client/linux/handler/microdump_extra_info.h"
-diff --git a/src/3rdparty/chromium/third_party/dawn/src/dawn/native/CacheKey.h b/src/3rdparty/chromium/third_party/dawn/src/dawn/native/CacheKey.h
-index 2d58d76..a0e0216 100644
---- a/src/3rdparty/chromium/third_party/dawn/src/dawn/native/CacheKey.h
-+++ b/src/3rdparty/chromium/third_party/dawn/src/dawn/native/CacheKey.h
-@@ -19,6 +19,7 @@
- #include "dawn/common/ityp_array.h"
-
- #include <bitset>
-+#include <cstdint>
- #include <iostream>
- #include <limits>
- #include <string>
-diff --git a/src/3rdparty/chromium/third_party/dawn/src/tint/reader/spirv/entry_point_info.h b/src/3rdparty/chromium/third_party/dawn/src/tint/reader/spirv/entry_point_info.h
-index 374bd83..0884eb2 100644
---- a/src/3rdparty/chromium/third_party/dawn/src/tint/reader/spirv/entry_point_info.h
-+++ b/src/3rdparty/chromium/third_party/dawn/src/tint/reader/spirv/entry_point_info.h
-@@ -15,6 +15,7 @@
- #ifndef SRC_TINT_READER_SPIRV_ENTRY_POINT_INFO_H_
- #define SRC_TINT_READER_SPIRV_ENTRY_POINT_INFO_H_
-
-+#include <cstdint>
- #include <string>
- #include <vector>
-
-diff --git a/src/3rdparty/chromium/third_party/dawn/src/tint/reader/spirv/namer.h b/src/3rdparty/chromium/third_party/dawn/src/tint/reader/spirv/namer.h
-index fa5fc3a..6cec934 100644
---- a/src/3rdparty/chromium/third_party/dawn/src/tint/reader/spirv/namer.h
-+++ b/src/3rdparty/chromium/third_party/dawn/src/tint/reader/spirv/namer.h
-@@ -15,6 +15,7 @@
- #ifndef SRC_TINT_READER_SPIRV_NAMER_H_
- #define SRC_TINT_READER_SPIRV_NAMER_H_
-
-+#include <cstdint>
- #include <string>
- #include <unordered_map>
- #include <vector>
-diff --git a/src/3rdparty/chromium/third_party/dawn/src/tint/reader/wgsl/token.h b/src/3rdparty/chromium/third_party/dawn/src/tint/reader/wgsl/token.h
-index 7b5b675..62b1ca7 100644
---- a/src/3rdparty/chromium/third_party/dawn/src/tint/reader/wgsl/token.h
-+++ b/src/3rdparty/chromium/third_party/dawn/src/tint/reader/wgsl/token.h
-@@ -15,6 +15,7 @@
- #ifndef SRC_TINT_READER_WGSL_TOKEN_H_
- #define SRC_TINT_READER_WGSL_TOKEN_H_
-
-+#include <cstdint>
- #include <string>
- #include <string_view>
- #include <variant> // NOLINT: cpplint doesn't recognise this
-diff --git a/src/3rdparty/chromium/third_party/dawn/src/tint/writer/spirv/operand.h b/src/3rdparty/chromium/third_party/dawn/src/tint/writer/spirv/operand.h
-index 46a5deb..4c3080f 100644
---- a/src/3rdparty/chromium/third_party/dawn/src/tint/writer/spirv/operand.h
-+++ b/src/3rdparty/chromium/third_party/dawn/src/tint/writer/spirv/operand.h
-@@ -15,6 +15,7 @@
- #ifndef SRC_TINT_WRITER_SPIRV_OPERAND_H_
- #define SRC_TINT_WRITER_SPIRV_OPERAND_H_
-
-+#include <cstdint>
- #include <string>
- #include <vector>
-
-diff --git a/src/3rdparty/chromium/third_party/libgav1/src/src/utils/threadpool.cc b/src/3rdparty/chromium/third_party/libgav1/src/src/utils/threadpool.cc
-index a3099e1..4072cfb 100644
---- a/src/3rdparty/chromium/third_party/libgav1/src/src/utils/threadpool.cc
-+++ b/src/3rdparty/chromium/third_party/libgav1/src/src/utils/threadpool.cc
-@@ -23,6 +23,7 @@
- #if defined(__ANDROID__) || defined(__GLIBC__)
- #include <sys/types.h>
- #include <unistd.h>
-+#include <cstdio>
- #endif
- #include <algorithm>
- #include <cassert>
-diff --git a/src/3rdparty/chromium/third_party/pdfium/constants/annotation_flags.h b/src/3rdparty/chromium/third_party/pdfium/constants/annotation_flags.h
-index d2731da..46bc87e 100644
---- a/src/3rdparty/chromium/third_party/pdfium/constants/annotation_flags.h
-+++ b/src/3rdparty/chromium/third_party/pdfium/constants/annotation_flags.h
-@@ -5,6 +5,8 @@
- #ifndef CONSTANTS_ANNOTATION_FLAGS_H_
- #define CONSTANTS_ANNOTATION_FLAGS_H_
-
-+#include <cstdint>
-+
- namespace pdfium {
- namespace annotation_flags {
-
-diff --git a/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/uuid.h b/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/uuid.h
-index 1b4c538..472042f 100644
---- a/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/uuid.h
-+++ b/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/uuid.h
-@@ -18,6 +18,7 @@
- #define INCLUDE_PERFETTO_EXT_BASE_UUID_H_
-
- #include <array>
-+#include <cstdint>
- #include <string>
-
- #include "perfetto/ext/base/optional.h"
-diff --git a/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/importers/proto/proto_importer_module.h b/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/importers/proto/proto_importer_module.h
-index c56f034..bc2386e 100644
---- a/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/importers/proto/proto_importer_module.h
-+++ b/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/importers/proto/proto_importer_module.h
-@@ -17,6 +17,8 @@
- #ifndef SRC_TRACE_PROCESSOR_IMPORTERS_PROTO_PROTO_IMPORTER_MODULE_H_
- #define SRC_TRACE_PROCESSOR_IMPORTERS_PROTO_PROTO_IMPORTER_MODULE_H_
-
-+#include <cstdint>
-+
- #include "perfetto/ext/base/optional.h"
- #include "perfetto/trace_processor/status.h"
-
-diff --git a/src/3rdparty/chromium/third_party/vulkan_memory_allocator/include/vk_mem_alloc.h b/src/3rdparty/chromium/third_party/vulkan_memory_allocator/include/vk_mem_alloc.h
-index b7c586b..9e073d4 100644
---- a/src/3rdparty/chromium/third_party/vulkan_memory_allocator/include/vk_mem_alloc.h
-+++ b/src/3rdparty/chromium/third_party/vulkan_memory_allocator/include/vk_mem_alloc.h
-@@ -2393,6 +2393,10 @@
- #include <cstring>
- #include <utility>
-
-+#if VMA_STATS_STRING_ENABLED
-+#include <cstdio>
-+#endif // VMA_STATS_STRING_ENABLED
-+
- #if VMA_RECORDING_ENABLED
- #include <chrono>
- #if defined(_WIN32)
-diff --git a/src/3rdparty/chromium/third_party/webrtc/rtc_base/third_party/base64/base64.h b/src/3rdparty/chromium/third_party/webrtc/rtc_base/third_party/base64/base64.h
-index ca24954..534214d 100644
---- a/src/3rdparty/chromium/third_party/webrtc/rtc_base/third_party/base64/base64.h
-+++ b/src/3rdparty/chromium/third_party/webrtc/rtc_base/third_party/base64/base64.h
-@@ -12,6 +12,7 @@
- #ifndef RTC_BASE_THIRD_PARTY_BASE64_BASE64_H_
- #define RTC_BASE_THIRD_PARTY_BASE64_BASE64_H_
-
-+#include <cstdint>
- #include <string>
- #include <vector>
-
-diff --git a/src/3rdparty/chromium/ui/base/prediction/kalman_filter.h b/src/3rdparty/chromium/ui/base/prediction/kalman_filter.h
-index 5a0047b..6a76850 100644
---- a/src/3rdparty/chromium/ui/base/prediction/kalman_filter.h
-+++ b/src/3rdparty/chromium/ui/base/prediction/kalman_filter.h
-@@ -5,6 +5,8 @@
- #ifndef UI_BASE_PREDICTION_KALMAN_FILTER_H_
- #define UI_BASE_PREDICTION_KALMAN_FILTER_H_
-
-+#include <cstdint>
-+
- #include "base/component_export.h"
- #include "ui/gfx/geometry/matrix3_f.h"
-
-diff --git a/src/3rdparty/chromium/ui/events/types/scroll_types.h b/src/3rdparty/chromium/ui/events/types/scroll_types.h
-index 7ff15f0..136cebc 100644
---- a/src/3rdparty/chromium/ui/events/types/scroll_types.h
-+++ b/src/3rdparty/chromium/ui/events/types/scroll_types.h
-@@ -5,6 +5,8 @@
- #ifndef UI_EVENTS_TYPES_SCROLL_TYPES_H_
- #define UI_EVENTS_TYPES_SCROLL_TYPES_H_
-
-+#include <cstdint>
-+
- namespace ui {
-
- enum class ScrollGranularity : uint8_t {
-diff --git a/src/3rdparty/chromium/ui/gfx/geometry/linear_gradient.h b/src/3rdparty/chromium/ui/gfx/geometry/linear_gradient.h
-index 1ad025f..bb74ea3 100644
---- a/src/3rdparty/chromium/ui/gfx/geometry/linear_gradient.h
-+++ b/src/3rdparty/chromium/ui/gfx/geometry/linear_gradient.h
-@@ -6,6 +6,7 @@
- #define UI_GFX_LINEAR_GRADIENT_H_
-
- #include <array>
-+#include <cstdint>
- #include <string>
-
- #include "ui/gfx/geometry/geometry_skia_export.h"
-diff --git a/src/3rdparty/chromium/v8/src/base/logging.h b/src/3rdparty/chromium/v8/src/base/logging.h
-index fdac44e..a752dba 100644
---- a/src/3rdparty/chromium/v8/src/base/logging.h
-+++ b/src/3rdparty/chromium/v8/src/base/logging.h
-@@ -5,6 +5,7 @@
- #ifndef V8_BASE_LOGGING_H_
- #define V8_BASE_LOGGING_H_
-
-+#include <cstdint>
- #include <cstring>
- #include <sstream>
- #include <string>
-diff --git a/src/3rdparty/chromium/v8/src/inspector/v8-string-conversions.h b/src/3rdparty/chromium/v8/src/inspector/v8-string-conversions.h
-index c1d69c1..eb33c68 100644
---- a/src/3rdparty/chromium/v8/src/inspector/v8-string-conversions.h
-+++ b/src/3rdparty/chromium/v8/src/inspector/v8-string-conversions.h
-@@ -5,6 +5,7 @@
- #ifndef V8_INSPECTOR_V8_STRING_CONVERSIONS_H_
- #define V8_INSPECTOR_V8_STRING_CONVERSIONS_H_
-
-+#include <cstdint>
- #include <string>
-
- // Conversion routines between UT8 and UTF16, used by string-16.{h,cc}. You may
diff --git a/debian/patches/series b/debian/patches/series
index 837b129..1c7f8c7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,8 +1,3 @@
-# Use system libraries, fixed upstream in 6.5
-#system-openjpeg2.patch
-
-# GCC-13 fixed upstream in 6.6
-#gcc-13.patch
# Don't do shift optimisation in ffmpeg, fails on x86
ffmpeg-x86-optimization.patch
diff --git a/debian/patches/system-openjpeg2.patch b/debian/patches/system-openjpeg2.patch
deleted file mode 100644
index 8d3e2de..0000000
--- a/debian/patches/system-openjpeg2.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Description: Use system libopenjpeg2
-Author: Soren Stoutner <soren at stoutner.com>
-Forwarded: https://bugreports.qt.io/browse/QTBUG-63889
-Last-Update: 2023-02-14
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/configure.cmake
-+++ b/configure.cmake
-@@ -336,6 +336,10 @@
- LABEL "libopenjpeg2"
- CONDITION UNIX AND LIBOPENJP2_FOUND
- )
-+qt_feature("webengine-system-libopenjpeg2" PRIVATE
-+ LABEL "libopenjpeg2"
-+ CONDITION UNIX AND LIBOPENJP2_FOUND
-+)
- qt_feature("webengine-system-opus" PRIVATE
- LABEL "opus"
- CONDITION UNIX AND OPUS_FOUND
---- a/src/pdf/CMakeLists.txt
-+++ b/src/pdf/CMakeLists.txt
-@@ -150,6 +150,10 @@
- ARGS use_system_libopenjpeg2
- CONDITION QT_FEATURE_webengine_system_libopenjpeg2
- )
-+ extend_gn_list(gnArgArg
-+ ARGS use_system_libopenjpeg2
-+ CONDITION QT_FEATURE_webengine_system_libopenjpeg2
-+ )
- endif()
- if(MACOS)
- list(APPEND gnArgArg angle_enable_vulkan=false)
More information about the Neon-commits
mailing list