[jhbuild] core-latest: WebKit looks for system OpenJPEG only

[Patrick Griffis <pgriffis src gnome org>]

commit 782ca82200d7851102ff9e641cdde851ff0b37c0
Author: Sebastian Wick <sebastian wick redhat com>
Date:   Tue Apr 5 15:14:11 2022 +0200

    core-latest: WebKit looks for system OpenJPEG only

 modulesets/gnome-suites-core-deps-latest.modules | 10 +---------
 modulesets/gnome-sysdeps-latest.modules          |  6 ++++++
 2 files changed, 7 insertions(+), 9 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-deps-latest.modules 
b/modulesets/gnome-suites-core-deps-latest.modules
index 91f0883a..552082f3 100644
--- a/modulesets/gnome-suites-core-deps-latest.modules
+++ b/modulesets/gnome-suites-core-deps-latest.modules
@@ -2405,14 +2405,6 @@
     </dependencies>
   </meson>
 
-  <cmake id="openjpeg">
-    <branch repo="github-tar"
-            module="uclouvain/openjpeg/archive/v${version}.tar.gz"
-            checkoutdir="openjpeg-${version}"
-            version="2.3.1"
-            hash="sha256:63f5a4713ecafc86de51bfad89cc07bb788e9bba24ebbf0c4ca637621aadb6a9"/>
-  </cmake>
-
   <cmake id="WebKit" cmakeargs="-DPORT=GTK -DCMAKE_BUILD_TYPE=RelWithDebInfo -DUSE_SOUP2=ON">
     <if condition-unset="x11">
       <cmakeargs value="-DENABLE_X11_TARGET=OFF"/>
@@ -2444,7 +2436,6 @@
       <dep package="lcms2"/>
       <dep package="libicu"/>
       <dep package="libjpeg"/>
-      <dep package="openjpeg"/>
       <dep package="libnotify"/>
       <dep package="libpng"/>
       <dep package="libsecret"/>
@@ -2454,6 +2445,7 @@
       <dep package="libxslt"/>
       <!-- Either libGL or libGLES is required. -->
       <dep package="mesa-libGLES"/>
+      <dep package="openjpeg"/>
       <dep package="pango"/>
       <dep package="ruby"/>
       <dep package="sqlite3"/>
diff --git a/modulesets/gnome-sysdeps-latest.modules b/modulesets/gnome-sysdeps-latest.modules
index 815244b3..bc969f6e 100644
--- a/modulesets/gnome-sysdeps-latest.modules
+++ b/modulesets/gnome-sysdeps-latest.modules
@@ -1066,6 +1066,12 @@
             version="1.1.1"/>
   </systemmodule>
 
+  <systemmodule id="openjpeg">
+    <pkg-config>libopenjp2.pc</pkg-config>
+    <branch repo="system"
+            version="2.2.0"/>
+  </systemmodule>
+
   <systemmodule id="openldap">
     <branch repo="system"/>
     <systemdependencies>