[jhbuild/wip/chergert/gtksourceview-4] gtksourceview: handle 4-8 branching and GTK 4 transition

[Christian Hergert <chergert src gnome org>]

commit bac90db3ff012cfc57700892eaf5d5da37a707bc
Author: Christian Hergert <chergert redhat com>
Date:   Mon Sep 21 16:50:04 2020 -0700

    gtksourceview: handle 4-8 branching and GTK 4 transition

 modulesets/gnome-apps-latest.modules             |  4 ++--
 modulesets/gnome-suites-core-deps-latest.modules | 11 ++++++++++-
 modulesets/gnome-suites-core-latest.modules      |  8 ++++----
 modulesets/gnome-world.modules                   | 11 ++++++++++-
 4 files changed, 26 insertions(+), 8 deletions(-)
---
diff --git a/modulesets/gnome-apps-latest.modules b/modulesets/gnome-apps-latest.modules
index 66a90307..f51ddb8d 100644
--- a/modulesets/gnome-apps-latest.modules
+++ b/modulesets/gnome-apps-latest.modules
@@ -272,7 +272,7 @@
       <dep package="gtk+-3"/>
       <dep package="glib"/>
       <dep package="gobject-introspection"/>
-      <dep package="gtksourceview"/>
+      <dep package="gtksourceview-4"/>
       <dep package="gsettings-desktop-schemas"/>
       <dep package="json-glib"/>
       <dep package="libgee"/>
@@ -323,7 +323,7 @@
       <dep package="gnome-code-assistance"/>
       <dep package="gspell"/>
       <dep package="gtk+-3"/>
-      <dep package="gtksourceview"/>
+      <dep package="gtksourceview-4"/>
       <dep package="jsonrpc-glib"/>
       <dep package="libclang"/>
       <dep package="libdazzle"/>
diff --git a/modulesets/gnome-suites-core-deps-latest.modules 
b/modulesets/gnome-suites-core-deps-latest.modules
index bd9ee7f0..dcfbccea 100644
--- a/modulesets/gnome-suites-core-deps-latest.modules
+++ b/modulesets/gnome-suites-core-deps-latest.modules
@@ -1062,6 +1062,15 @@
   </meson>
 
   <meson id="gtksourceview">
+    <branch/>
+    <dependencies>
+      <dep package="libxml2"/>
+      <dep package="shared-mime-info"/>
+      <dep package="gtk+"/>
+    </dependencies>
+  </meson>
+
+  <meson id="gtksourceview-4">
     <branch/>
     <dependencies>
       <dep package="libxml2"/>
@@ -2058,7 +2067,7 @@
     <branch/>
     <dependencies>
       <dep package="amtk"/>
-      <dep package="gtksourceview"/>
+      <dep package="gtksourceview-4"/>
     </dependencies>
   </meson>
 
diff --git a/modulesets/gnome-suites-core-latest.modules b/modulesets/gnome-suites-core-latest.modules
index ed4153bb..13129342 100644
--- a/modulesets/gnome-suites-core-latest.modules
+++ b/modulesets/gnome-suites-core-latest.modules
@@ -795,7 +795,7 @@
       <dep package="libpeas"/>
       <dep package="yelp-tools"/>
       <dep package="gspell"/>
-      <dep package="gtksourceview"/>
+      <dep package="gtksourceview-4"/>
       <dep package="tepl"/>
       <dep package="gsettings-desktop-schemas"/>
       <dep package="python3-devel"/>
@@ -835,7 +835,7 @@
       <dep package="appstream-glib"/>
       <dep package="glib"/>
       <dep package="gtk+-3"/>
-      <dep package="gtksourceview"/>
+      <dep package="gtksourceview-4"/>
       <dep package="libsoup"/>
       <dep package="libxml2"/>
       <dep package="mpc"/>
@@ -1191,7 +1191,7 @@
       <dep package="clutter"/>
       <dep package="clutter-gtk"/>
       <dep package="clutter-gst"/>
-      <dep package="gtksourceview"/>
+      <dep package="gtksourceview-4"/>
       <dep package="WebKit"/>
       <dep package="gstreamer"/>
       <dep package="gst-plugins-base"/>
@@ -1480,7 +1480,7 @@
            but are not depended on by utilities or core apps yet.
       -->
       <dep package="gtk+"/>
-      <dep package="gtksourceview"/>
+      <dep package="gtksourceview-4"/>
       <dep package="atkmm"/>
       <dep package="gtkmm"/>
       <dep package="cairomm"/>
diff --git a/modulesets/gnome-world.modules b/modulesets/gnome-world.modules
index 8b3df758..959ec318 100644
--- a/modulesets/gnome-world.modules
+++ b/modulesets/gnome-world.modules
@@ -392,6 +392,15 @@
     </dependencies>
   </autotools>
 
+  <meson id="gtksourceview-4">
+    <branch checkoutdir="gtksourceview-4" module="gtksourceview" revision="gtksourceview-4-8"/>
+    <dependencies>
+      <dep package="libxml2"/>
+      <dep package="shared-mime-info"/>
+      <dep package="gtk+-3"/>
+    </dependencies>
+  </meson>
+
   <distutils id="meld" python3="1">
     <branch/>
     <dependencies>
@@ -3259,7 +3268,7 @@
  <autotools id="gtksourceviewmm">
     <branch/>
     <dependencies>
-      <dep package="gtksourceview"/>
+      <dep package="gtksourceview-4"/>
       <dep package="gtkmm"/>
     </dependencies>
   </autotools>