[neon/qt/qtwebengine/Neon/release_jammy] debian: Also drop part of python3.12-imp.patch which was applied upstream.

[Dmitry Shachnev]

Git commit eb9fd618fd1b30f580b83eddc328f28982516a52 by Dmitry Shachnev.
Committed on 30/06/2024 at 13:07.
Pushed by jriddell into branch 'Neon/release_jammy'.

Also drop part of python3.12-imp.patch which was applied upstream.

M  +1    -0    debian/changelog
M  +2    -28   debian/patches/python3.12-imp.patch

https://invent.kde.org/neon/qt/qtwebengine/-/commit/eb9fd618fd1b30f580b83eddc328f28982516a52

diff --git a/debian/changelog b/debian/changelog
index dbc6661..b71f2d3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ qtwebengine-opensource-src (5.15.17+dfsg-1) UNRELEASED; urgency=medium
     - python3.11.patch
     - ffmpeg-x86-optimization.patch
     - icu74.patch
+  * Also drop part of python3.12-imp.patch which was applied upstream.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 30 Jun 2024 15:40:06 +0300
 
diff --git a/debian/patches/python3.12-imp.patch b/debian/patches/python3.12-imp.patch
index 5214bfc..b879e3e 100644
--- a/debian/patches/python3.12-imp.patch
+++ b/debian/patches/python3.12-imp.patch
@@ -1,33 +1,7 @@
 Description: stop using imp module which was removed in Python 3.12
-Origin: upstream, commits
- https://chromium.googlesource.com/chromium/src/+/9e0c89a3b5638ba2
- https://chromium.googlesource.com/chromium/src/+/f5f6e361d037c316
-Last-Update: 2024-03-17
+Origin: upstream, https://chromium.googlesource.com/chromium/src/+/f5f6e361d037c316
+Last-Update: 2024-06-30
 
---- a/src/3rdparty/chromium/components/resources/protobufs/binary_proto_generator.py
-+++ b/src/3rdparty/chromium/components/resources/protobufs/binary_proto_generator.py
-@@ -9,7 +9,7 @@
- """
- from __future__ import print_function
- import abc
--import imp
-+from importlib import util as imp_util
- import optparse
- import os
- import re
-@@ -68,7 +68,11 @@ class GoogleProtobufModuleImporter:
-       raise ImportError(fullname)
- 
-     filepath = self._fullname_to_filepath(fullname)
--    return imp.load_source(fullname, filepath)
-+    spec = imp_util.spec_from_file_location(fullname, filepath)
-+    loaded = imp_util.module_from_spec(spec)
-+    spec.loader.exec_module(loaded)
-+
-+    return loaded
- 
- class BinaryProtoGenerator:
- 
 --- a/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/fileutil.py
 +++ b/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/fileutil.py
 @@ -3,7 +3,6 @@