[neon/qt6/qt6-webengine/Neon/release] debian/patches: refresh patches

[Carlos De Maine]

Git commit 64f2457d7c680bf7759a60b36d679be89503f806 by Carlos De Maine.
Committed on 24/10/2023 at 04:42.
Pushed by carlosdem into branch 'Neon/release'.

refresh patches

M  +4    -4    debian/patches/ffmpeg-x86-optimization.patch
M  +1    -1    debian/patches/remove_catapult_3rdparty.patch
M  +3    -3    debian/patches/series
M  +6    -33   debian/patches/system-openjpeg2.patch

https://invent.kde.org/neon/qt6/qt6-webengine/-/commit/64f2457d7c680bf7759a60b36d679be89503f806

diff --git a/debian/patches/ffmpeg-x86-optimization.patch b/debian/patches/ffmpeg-x86-optimization.patch
index 5944189..335f585 100644
--- a/debian/patches/ffmpeg-x86-optimization.patch
+++ b/debian/patches/ffmpeg-x86-optimization.patch
@@ -27,8 +27,8 @@ Last-Update: 2023-07-20
 +        );
      return rt;
  }
-
-@@ -113,19 +121,31 @@ __asm__ volatile(\
+ 
+@@ -113,19 +121,31 @@
  // avoid +32 for shift optimization (gcc should do that ...)
  #define NEG_SSR32 NEG_SSR32
  static inline  int32_t NEG_SSR32( int32_t a, int8_t s){
@@ -45,7 +45,7 @@ Last-Update: 2023-07-20
 +        );
      return a;
  }
-
+ 
  #define NEG_USR32 NEG_USR32
  static inline uint32_t NEG_USR32(uint32_t a, int8_t s){
 +    if (__builtin_constant_p(s))
@@ -61,4 +61,4 @@ Last-Update: 2023-07-20
 +        );
      return a;
  }
-
+ 
diff --git a/debian/patches/remove_catapult_3rdparty.patch b/debian/patches/remove_catapult_3rdparty.patch
index 2a1d6a5..af76576 100644
--- a/debian/patches/remove_catapult_3rdparty.patch
+++ b/debian/patches/remove_catapult_3rdparty.patch
@@ -85,7 +85,7 @@ Forwarded: not-needed
      ]
 --- a/src/3rdparty/chromium/content/browser/BUILD.gn
 +++ b/src/3rdparty/chromium/content/browser/BUILD.gn
-@@ -3220,7 +3220,6 @@
+@@ -3230,7 +3230,6 @@
      deps += [
        "//components/vector_icons",
        "//content/browser/devtools:devtools_resources_extern",
diff --git a/debian/patches/series b/debian/patches/series
index 9078c67..837b129 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,8 +1,8 @@
 # Use system libraries, fixed upstream in 6.5
-system-openjpeg2.patch
+#system-openjpeg2.patch
 
-# GCC-13
-gcc-13.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
index 99f0b18..8d3e2de 100644
--- a/debian/patches/system-openjpeg2.patch
+++ b/debian/patches/system-openjpeg2.patch
@@ -6,17 +6,9 @@ Last-Update: 2023-02-14
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/configure.cmake
 +++ b/configure.cmake
-@@ -50,6 +50,7 @@
-     pkg_check_modules(OPUS opus>=1.3.1)
-     pkg_check_modules(VPX vpx>=1.10.0 IMPORTED_TARGET)
-     pkg_check_modules(LIBPCI libpci)
-+    pkg_check_modules(LIBOPENJP2 libopenjp2)
- endif()
- 
- if(Python3_EXECUTABLE)
-@@ -306,6 +307,10 @@
-     LABEL "libwebp, libwebpmux and libwebpdemux"
-     CONDITION UNIX AND WEBP_FOUND
+@@ -336,6 +336,10 @@
+     LABEL "libopenjpeg2"
+     CONDITION UNIX AND LIBOPENJP2_FOUND
  )
 +qt_feature("webengine-system-libopenjpeg2" PRIVATE
 +    LABEL "libopenjpeg2"
@@ -25,30 +17,11 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  qt_feature("webengine-system-opus" PRIVATE
      LABEL "opus"
      CONDITION UNIX AND OPUS_FOUND
-@@ -608,6 +613,7 @@
-     qt_configure_add_summary_entry(ARGS "webengine-system-libxml")
-     qt_configure_add_summary_entry(ARGS "webengine-system-lcms2")
-     qt_configure_add_summary_entry(ARGS "webengine-system-libpng")
-+    qt_configure_add_summary_entry(ARGS "webengine-system-libopenjpeg2")
-     qt_configure_add_summary_entry(ARGS "webengine-system-libjpeg")
-     qt_configure_add_summary_entry(ARGS "webengine-system-harfbuzz")
-     qt_configure_add_summary_entry(ARGS "webengine-system-freetype")
---- a/src/core/CMakeLists.txt
-+++ b/src/core/CMakeLists.txt
-@@ -386,7 +386,7 @@
-                 use_vaapi=false
-             )
-             set(systemLibs libjpeg libpng freetype harfbuzz libevent libwebp libxml
--                opus snappy libvpx icu ffmpeg re2 lcms2
-+                opus snappy libvpx icu ffmpeg re2 lcms2 libopenjpeg2
-             )
-             foreach(slib ${systemLibs})
-                 extend_gn_list(gnArgArg
 --- a/src/pdf/CMakeLists.txt
 +++ b/src/pdf/CMakeLists.txt
-@@ -120,6 +120,10 @@
-                 ARGS use_system_icu
-                 CONDITION QT_FEATURE_webengine_system_icu
+@@ -150,6 +150,10 @@
+                 ARGS use_system_libopenjpeg2
+                 CONDITION QT_FEATURE_webengine_system_libopenjpeg2
              )
 +            extend_gn_list(gnArgArg
 +                ARGS use_system_libopenjpeg2