[jhbuild/gtk4: 3/3] Rename "gtk+" to "gtk4"

[Emmanuele Bassi <ebassi src gnome org>]

commit 7d535aa6111e8a7e1694bf350e4bfcbd4ad1d46a
Author: Emmanuele Bassi <ebassi gnome org>
Date:   Mon Oct 5 18:54:39 2020 +0100

    Rename "gtk+" to "gtk4"
    
    We have multiple versions of GTK in our modulesets, but we should
    properly version them to ensure that maintainers can express the
    appropriate dependency. Additionally, the GTK project dropped the "plus"
    from its name and pkg-config files with version 4.0, so let's be
    consistent with their choice.

 modulesets/gnome-suites-core-deps-latest.modules | 8 ++++----
 modulesets/gnome-suites-core-latest.modules      | 4 ++--
 modulesets/gnome-world.modules                   | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-deps-latest.modules 
b/modulesets/gnome-suites-core-deps-latest.modules
index affa3d5c..12831851 100644
--- a/modulesets/gnome-suites-core-deps-latest.modules
+++ b/modulesets/gnome-suites-core-deps-latest.modules
@@ -878,7 +878,7 @@
     </suggests>
   </meson>
 
-  <meson id="gtk+" mesonargs="-Dbroadway-backend=true">
+  <meson id="gtk4" mesonargs="-Dbroadway-backend=true">
     <if condition-set="x11">
       <mesonargs value="-Dx11-backend=true"/>
     </if>
@@ -897,7 +897,7 @@
     <if condition-unset="quartz">
       <mesonargs value="-Dquartz-backend=false"/>
     </if>
-    <branch repo="gitlab.gnome.org" checkoutdir="gtk+" module="GNOME/gtk.git"/>
+    <branch repo="gitlab.gnome.org" checkoutdir="gtk" module="GNOME/gtk.git"/>
     <dependencies>
       <dep package="atk"/>
       <dep package="glib"/>
@@ -1046,7 +1046,7 @@
     <dependencies>
       <dep package="cairomm"/>
       <dep package="pangomm"/>
-      <dep package="gtk+"/>
+      <dep package="gtk4"/>
       <dep package="glib"/>
     </dependencies>
   </meson>
@@ -1067,7 +1067,7 @@
     <dependencies>
       <dep package="libxml2"/>
       <dep package="shared-mime-info"/>
-      <dep package="gtk+"/>
+      <dep package="gtk4"/>
     </dependencies>
   </meson>
 
diff --git a/modulesets/gnome-suites-core-latest.modules b/modulesets/gnome-suites-core-latest.modules
index 13129342..d10064c3 100644
--- a/modulesets/gnome-suites-core-latest.modules
+++ b/modulesets/gnome-suites-core-latest.modules
@@ -1104,7 +1104,7 @@
       <dep package="gnome-online-accounts"/>
       <dep package="evolution-data-server"/>
       <dep package="glib"/>
-      <dep package="gtk+"/>
+      <dep package="gtk4"/>
       <dep package="libpeas"/>
     </dependencies>
   </meson>
@@ -1479,7 +1479,7 @@
       <!-- Additional libraries that should be in the release,
            but are not depended on by utilities or core apps yet.
       -->
-      <dep package="gtk+"/>
+      <dep package="gtk4"/>
       <dep package="gtksourceview-4"/>
       <dep package="atkmm"/>
       <dep package="gtkmm"/>
diff --git a/modulesets/gnome-world.modules b/modulesets/gnome-world.modules
index b6820edc..ddbd457f 100644
--- a/modulesets/gnome-world.modules
+++ b/modulesets/gnome-world.modules
@@ -1522,7 +1522,7 @@
   <autotools id="goocanvas">
     <branch/>
     <dependencies>
-      <dep package="gtk+"/>
+      <dep package="gtk4"/>
     </dependencies>
   </autotools>
 
@@ -3538,7 +3538,7 @@
       <dep package="cairo"/>
       <dep package="glib"/>
       <dep package="gobject-introspection"/>
-      <dep package="gtk+"/>
+      <dep package="gtk4"/>
       <dep package="sqlite3"/>
       <dep package="vala"/>
     </dependencies>