[neon/qt/qtwebengine/Neon/release_jammy] debian: Refresh debian/patches/system-openjpeg2.patch.

Dmitry Shachnev null at kde.org
Wed Aug 21 09:44:48 BST 2024


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

Refresh debian/patches/system-openjpeg2.patch.

M  +1    -0    debian/changelog
M  +4    -4    debian/patches/system-openjpeg2.patch

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

diff --git a/debian/changelog b/debian/changelog
index b71f2d3..75ca1fb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ qtwebengine-opensource-src (5.15.17+dfsg-1) UNRELEASED; urgency=medium
     - ffmpeg-x86-optimization.patch
     - icu74.patch
   * Also drop part of python3.12-imp.patch which was applied upstream.
+  * Refresh debian/patches/system-openjpeg2.patch.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 30 Jun 2024 15:40:06 +0300
 
diff --git a/debian/patches/system-openjpeg2.patch b/debian/patches/system-openjpeg2.patch
index 91c65ed..e80dee8 100644
--- a/debian/patches/system-openjpeg2.patch
+++ b/debian/patches/system-openjpeg2.patch
@@ -6,7 +6,7 @@ Last-Update: 2023-01-28
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/src/buildtools/configure.json
 +++ b/src/buildtools/configure.json
-@@ -114,6 +114,12 @@
+@@ -115,6 +115,12 @@
                  "-ljpeg"
              ]
          },
@@ -19,7 +19,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
          "webengine-libevent": {
              "label": "libevent",
              "sources": [
-@@ -632,6 +638,11 @@
+@@ -633,6 +639,11 @@
              "condition": "config.unix && features.system-jpeg && libs.webengine-jpeglib",
              "output": [ "privateFeature" ]
          },
@@ -31,7 +31,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
          "webengine-qt-jpeg" : {
             "label": "qtlibjpeg",
             "condition": "config.static && !features.system-jpeg && features.jpeg",
-@@ -845,6 +856,7 @@
+@@ -846,6 +857,7 @@
                          "webengine-system-lcms2",
                          "webengine-system-png",
                          "webengine-system-jpeg",
@@ -41,7 +41,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
                       ]
 --- a/src/buildtools/config/linux.pri
 +++ b/src/buildtools/config/linux.pri
-@@ -164,6 +164,11 @@
+@@ -164,6 +164,11 @@ host_build {
      } else {
          gn_args += use_system_libjpeg=false
      }



More information about the Neon-commits mailing list