Control: tags -1 -moreinfo Hi Sebastian!
On Tue, Mar 21, 2023 at 10:46:52PM +0100, Sebastian Ramacher wrote: > Do both reverse dependencies build fine with the new version of > qtwebengine-opensource-src? Yes. Just checked in an Ubuntu PPA: https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/4979/+packages > > I am attaching a git diff of my packaging and an upstream git diff. > > Upstream diff is large, but it's mostly security/CVE fixes, as can be > > seen in the commit messages (the relevant commits are starting from > > 2022-12-22): > > > > https://code.qt.io/cgit/qt/qtwebengine-chromium.git/log/?h=87-based > > > > I have also included a patch from bug #1005824 to build with pipewire > > support. If a new release is acceptable but that patch is not, I can > > remove it. > > We are past the point of adding new features. Please postpone this > change to trixie. Okay, reverted that change in debian/bullseye branch. Attaching the new diff for packaging. As I used 5.15.13+dfsg-1 for experimental upload, I changed the version in debian/bullseye branch to 5.15.13+dfsg-1~deb12u1. Does that work, or I should use some different version? -- Dmitry Shachnev
diff --git a/debian/changelog b/debian/changelog
index 9f4762d..b8da040 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+qtwebengine-opensource-src (5.15.13+dfsg-1~deb12u1) UNRELEASED; urgency=medium
+
+ [ Dmitry Shachnev ]
+ * New upstream release.
+ * Update SUBMODULE_COMMIT for the new release.
+ * Remove copyright section for debian/missing-sources/jszip-2.4.0.
+ * Bump ABI version to qtwebengine-abi-5-15-13.
+ * Drop gcc-12.patch, included in the new release.
+ * Refresh debian/patches/python3.patch.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-...@lists.debian.org> Sat, 11 Feb 2023 13:19:26 +0400
+
qtwebengine-opensource-src (5.15.12+dfsg-3) unstable; urgency=medium
* Add debian/90qtwebengine-dictionaries-path.conf.
diff --git a/debian/control b/debian/control
index 827e12c..ea8dc20 100644
--- a/debian/control
+++ b/debian/control
@@ -158,7 +158,7 @@ Description: Web content engine library for Qt
Package: libqt5webenginecore5
Architecture: amd64 arm64 armhf i386 mips64el mipsel
Multi-Arch: same
-Provides: qtwebengine-abi-5-15-12
+Provides: qtwebengine-abi-5-15-13
Depends: libqt5webengine-data (= ${source:Version}),
sse2-support [i386],
${misc:Depends},
diff --git a/debian/copyright b/debian/copyright
index 01fc92e..f8e99e9 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -120,10 +120,6 @@ Files: src/3rdparty/ninja/*
Copyright: 2011-2018 Google Inc.
License: Apache-2.0
-Files: debian/missing-sources/jszip-2.4.0/*
-Copyright: 2009-2014 Stuart Knightley, David Duponchel, Franz Buchinger, António Afonso
-License: MIT or GPL-3
-
## BEGIN AUTO GENERATED BLOCK
Files: examples/webengine/quicknanobrowser/icons/3rdparty/*
diff --git a/debian/libqt5webengine5.symbols b/debian/libqt5webengine5.symbols
index 2dcf53f..a555804 100644
--- a/debian/libqt5webengine5.symbols
+++ b/debian/libqt5webengine5.symbols
@@ -1,6 +1,6 @@
# SymbolsHelper-Confirmed: 5.15.5 amd64
libQt5WebEngine.so.5 libqt5webengine5 #MINVER#
-| libqt5webengine5 #MINVER#, qtwebengine-abi-5-15-12
+| libqt5webengine5 #MINVER#, qtwebengine-abi-5-15-13
* Build-Depends-Package: qtwebengine5-dev
Qt_5.0@Qt_5.0 5.7.1
Qt_5.10@Qt_5.10 5.10.1
diff --git a/debian/libqt5webenginecore5.symbols b/debian/libqt5webenginecore5.symbols
index 286c991..58e1462 100644
--- a/debian/libqt5webenginecore5.symbols
+++ b/debian/libqt5webenginecore5.symbols
@@ -1,6 +1,6 @@
# SymbolsHelper-Confirmed: 5.15.10 amd64 arm64 armhf i386 mips64el mipsel
libQt5WebEngineCore.so.5 libqt5webenginecore5 #MINVER#
-| libqt5webenginecore5 #MINVER#, qtwebengine-abi-5-15-12
+| libqt5webenginecore5 #MINVER#, qtwebengine-abi-5-15-13
* Build-Depends-Package: qtwebengine5-dev
(optional=gold)Qt_5.0@Qt_5.0 5.7.1
(optional=gold)Qt_5.10@Qt_5.10 5.10.1
diff --git a/debian/libqt5webenginewidgets5.symbols b/debian/libqt5webenginewidgets5.symbols
index ec9760b..4773255 100644
--- a/debian/libqt5webenginewidgets5.symbols
+++ b/debian/libqt5webenginewidgets5.symbols
@@ -1,6 +1,6 @@
# SymbolsHelper-Confirmed: 5.15.3 amd64 mips64el
libQt5WebEngineWidgets.so.5 libqt5webenginewidgets5 #MINVER#
-| libqt5webenginewidgets5 #MINVER#, qtwebengine-abi-5-15-12
+| libqt5webenginewidgets5 #MINVER#, qtwebengine-abi-5-15-13
* Build-Depends-Package: qtwebengine5-dev
Qt_5.0@Qt_5.0 5.7.1
Qt_5.10@Qt_5.10 5.10.1
diff --git a/debian/patches/gcc-12.patch b/debian/patches/gcc-12.patch
deleted file mode 100644
index c7f43fe..0000000
--- a/debian/patches/gcc-12.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: fix build with GCC 12
-Origin: upstream skia, https://chromium.googlesource.com/skia/+/cd397f3c4738beb6
-Last-Update: 2022-06-26
-
---- a/src/3rdparty/chromium/third_party/skia/src/utils/SkParseColor.cpp
-+++ b/src/3rdparty/chromium/third_party/skia/src/utils/SkParseColor.cpp
-@@ -8,6 +8,8 @@
-
- #include "include/utils/SkParse.h"
-
-+#include <iterator>
-+
- static constexpr const char* gColorNames[] = {
- "aliceblue",
- "antiquewhite",
diff --git a/debian/patches/python3.patch b/debian/patches/python3.patch
index 9837209..1ed6e4c 100644
--- a/debian/patches/python3.patch
+++ b/debian/patches/python3.patch
@@ -109,7 +109,7 @@ Forwarded: not-needed
return(true)
--- a/src/buildtools/configure.json
+++ b/src/buildtools/configure.json
-@@ -295,9 +295,9 @@
+@@ -301,9 +301,9 @@
"label": "system ninja",
"type": "detectNinja"
},
@@ -122,7 +122,7 @@ Forwarded: not-needed
"log": "location"
},
"webengine-winversion": {
-@@ -374,7 +374,7 @@
+@@ -380,7 +380,7 @@
&& features.webengine-gperf
&& features.webengine-bison
&& features.webengine-flex
@@ -131,7 +131,7 @@ Forwarded: not-needed
&& features.webengine-nodejs
&& (!config.sanitizer || features.webengine-sanitizer)
&& (!config.linux || features.pkg-config)
-@@ -400,7 +400,7 @@
+@@ -406,7 +406,7 @@
&& features.webengine-gperf
&& features.webengine-bison
&& features.webengine-flex
@@ -140,7 +140,7 @@ Forwarded: not-needed
&& (!config.sanitizer || features.webengine-sanitizer)
&& (!config.linux || features.pkg-config)
&& (!config.linux || features.webengine-host-pkg-config)
-@@ -423,12 +423,12 @@
+@@ -429,12 +429,12 @@
"autoDetect": "features.private_tests",
"output": [ "privateFeature" ]
},
diff --git a/debian/patches/series b/debian/patches/series
index 9b396af..71d3230 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -23,5 +23,4 @@ mips64el-bad-define.patch
mipsel-syscall-ranges.patch
mips64el-kernel_stat64.patch
armhf-no-thumb.patch
-gcc-12.patch
disable-catapult.patch
diff --git a/debian/rules b/debian/rules
index 0cbc395..21d6fea 100755
--- a/debian/rules
+++ b/debian/rules
@@ -200,7 +200,7 @@ get-orig-source:
@set -eux && \
TEMPDIR=$$(mktemp -d) && \
VERSION=${DEB_VERSION_UPSTREAM:+dfsg=} && \
- SUBMODULE_COMMIT=e0fd3a5d3ce79d43dee6e0bad16a71123d9a14b3 && \
+ SUBMODULE_COMMIT=e48df7803c7c98b0b2471c94057d32e44a301ad5 && \
echo "$${GET_FILES_EXCLUDED}" >$${TEMPDIR}/get_files_excluded.py && \
cd $${TEMPDIR} && \
wget https://github.com/qt/qtwebengine/archive/v$${VERSION}-lts.tar.gz && \
signature.asc
Description: PGP signature
