[jhbuild] Migrate to gitlab.fd.o/upstreams

[Ernestas Kulik <ernestask src gnome org>]

commit 4bf995099f5858d453844b02106cb94217e4270b
Author: Ernestas Kulik <ekulik redhat com>
Date:   Sun Jun 2 17:29:22 2019 +0200

    Migrate to gitlab.fd.o/upstreams
    
    The freedesktop.org cgit instance is a bit iffy, so this commit moves
    the bulk of modules to use the GitLab repos or upstream repos.

 modulesets/gnome-suites-core-deps-latest.modules | 56 +++++++++++++++---------
 modulesets/gnome-suites-core-latest.modules      | 17 +++----
 modulesets/gnome-world.modules                   | 17 +++----
 3 files changed, 50 insertions(+), 40 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-deps-latest.modules 
b/modulesets/gnome-suites-core-deps-latest.modules
index 9605e146..edc122ef 100644
--- a/modulesets/gnome-suites-core-deps-latest.modules
+++ b/modulesets/gnome-suites-core-deps-latest.modules
@@ -8,8 +8,6 @@
     href="https://gitlab.gnome.org/"/>
 <repository type="git" name="gitlab.gnome.org/GNOME" default="yes"
     href="https://gitlab.gnome.org/GNOME/"/>
-<repository type="git" name="git.freedesktop.org"
-    href="https://anongit.freedesktop.org/git/"/>
 <repository type="git" name="gitlab.freedesktop.org"
     href="https://gitlab.freedesktop.org/"/>
 <repository type="git" name="gitlab.com"
@@ -146,7 +144,9 @@
     <if condition-set="quartz">
       <autogenargs value="--enable-quartz --disable-gl"/>
     </if>
-    <branch repo="git.freedesktop.org" module="cairo"/>
+    <branch repo="gitlab.freedesktop.org"
+            module="cairo/cairo.git"
+            checkoutdir="cairo"/>
     <dependencies>
       <if condition-unset="quartz">
         <dep package="fontconfig"/>
@@ -177,7 +177,9 @@
   </autotools>
 
   <autotools id="cairomm">
-    <branch repo="git.freedesktop.org" module="cairomm"/>
+    <branch repo="gitlab.freedesktop.org"
+            module="cairo/cairomm.git"
+            checkoutdir="cairomm"/>
     <dependencies>
        <dep package="cairo"/>
        <dep package="libsigcplusplus"/>
@@ -534,7 +536,9 @@
     <if condition-set="macos">
       <mesonargs value="-Dnmea-source=false"/>
     </if>
-    <branch repo="git.freedesktop.org"/>
+    <branch repo="gitlab.freedesktop.org"
+            module="geoclue/geoclue.git"
+            checkoutdir="geoclue"/>
     <dependencies>
       <dep package="avahi"/>
       <dep package="libnotify"/>
@@ -1413,7 +1417,9 @@
   </cmake>
 
   <meson id="libinput" mesonargs="-Ddocumentation=false">
-    <branch repo="git.freedesktop.org" checkoutdir="libinput" module="wayland/libinput.git" />
+    <branch repo="gitlab.freedesktop.org"
+            checkoutdir="libinput"
+            module="libinput/libinput.git" />
     <dependencies>
       <dep package="check"/>
       <dep package="libevdev"/>
@@ -1425,8 +1431,9 @@
   </meson>
 
   <autotools id="libmbim">
-    <branch repo="git.freedesktop.org"
-            module="libmbim/libmbim.git"/>
+    <branch repo="gitlab.freedesktop.org"
+            module="mobile-broadband/libmbim.git"/
+            checkoutdir="libmbim">
     <dependencies>
       <dep package="glib"/>
       <dep package="gtk-doc"/>
@@ -1500,7 +1507,9 @@
   </autotools>
 
   <autotools id="libqmi">
-    <branch repo="git.freedesktop.org" module="libqmi.git"/>
+    <branch repo="gitlab.freedesktop.org"
+            module="mobile-broadband/libqmi.git"
+            checkoutdir="libqmi"/>
     <dependencies>
       <dep package="glib"/>
       <dep package="gtk-doc"/>
@@ -1687,8 +1696,9 @@
 
   <autotools id="ModemManager"
              autogenargs="--with-udev-base-dir=${libdir}/udev --with-systemdsystemunitdir=no 
--disable-more-warnings">
-    <branch repo="git.freedesktop.org"
-           module="ModemManager/ModemManager.git" checkoutdir="ModemManager" />
+    <branch repo="gitlab.freedesktop.org"
+             module="mobile-broadband/ModemManager.git"
+             checkoutdir="ModemManager" />
     <dependencies>
       <dep package="glib"/>
       <dep package="dbus-glib"/>
@@ -1778,7 +1788,9 @@
   </meson>
 
   <autotools id="pixman" autogenargs="--disable-gtk">
-    <branch repo="git.freedesktop.org" module="pixman"/>
+    <branch repo="gitlab.freedesktop.org"
+            module="pixman/pixman.git"
+            checkoutdir="pixman"/>
   </autotools>
 
   <autotools id="pyatspi2" autogenargs="--with-python=python3" >
@@ -1876,8 +1888,9 @@
              supports-non-srcdir-builds="no"
              autogenargs="--enable-vala-bindings --disable-fatal-warnings">
     <pkg-config>telepathy-glib.pc</pkg-config>
-    <branch repo="git.freedesktop.org"
-            module="telepathy/telepathy-glib"/>
+    <branch repo="github.com"
+            module="TelepathyIM/telepathy-glib.git"
+            checkoutdir="telepathy-glib"/>
     <dependencies>
       <dep package="glib"/>
       <dep package="gobject-introspection"/>
@@ -1890,8 +1903,9 @@
 
   <autotools id="telepathy-logger" supports-non-srcdir-builds="no">
     <pkg-config>telepathy-logger-0.2.pc</pkg-config>
-    <branch repo="git.freedesktop.org"
-            module="telepathy/telepathy-logger"/>
+    <branch repo="github.com"
+            module="TelepathyIM/telepathy-logger"
+            checkoutdir="telepathy-logger"/>
     <dependencies>
       <dep package="dbus"/>
       <dep package="dbus-glib"/>
@@ -1988,8 +2002,9 @@
   </autotools>
 
   <autotools id="wayland-protocols">
-    <branch repo="git.freedesktop.org"
-            module="wayland/wayland-protocols"/>
+    <branch repo="gitlab.freedesktop.org"
+            module="wayland/wayland-protocols.git"
+            checkoutdir="wayland-protocols"/>
     <dependencies>
       <if condition-set="linux">
         <dep package="wayland"/>
@@ -1999,8 +2014,9 @@
 
   <autotools id="wayland"
              autogenargs="--disable-documentation">
-    <branch repo="git.freedesktop.org"
-            module="wayland/wayland"/>
+    <branch repo="gitlab.freedesktop.org"
+            module="wayland/wayland.git"
+            checkoutdir="wayland"/>
     <dependencies>
       <dep package="libffi"/>
       <dep package="doxygen"/>
diff --git a/modulesets/gnome-suites-core-latest.modules b/modulesets/gnome-suites-core-latest.modules
index 0748348a..a1dbfc61 100644
--- a/modulesets/gnome-suites-core-latest.modules
+++ b/modulesets/gnome-suites-core-latest.modules
@@ -9,8 +9,6 @@
       href="https://gitlab.gnome.org/"/>
   <repository type="git" name="gitlab.gnome.org/GNOME" default="yes"
       href="https://gitlab.gnome.org/GNOME/"/>
-  <repository type="git" name="git.freedesktop.org"
-      href="https://anongit.freedesktop.org/git/"/>
   <repository type="git" name="gitlab.freedesktop.org"
       href="https://gitlab.freedesktop.org/"/>
   <repository type="git" name="github.com"
@@ -618,9 +616,10 @@
   <autotools id="telepathy-mission-control"
              autogenargs="--disable-upower"
              supports-non-srcdir-builds="no">
-    <branch repo="git.freedesktop.org"
-            module="telepathy/telepathy-mission-control"
-            revision="telepathy-mission-control-5.16"/>
+    <branch repo="github.com"
+            module="TelepathyIM/telepathy-mission-control.git"
+            revision="telepathy-mission-control-5.16"
+            checkoutdir="telepathy-mission-control"/>
     <dependencies>
       <dep package="dbus"/>
       <dep package="dbus-glib"/>
@@ -1234,7 +1233,9 @@
 <!-- Core OS Services -->
 
   <meson id="accountsservice">
-    <branch repo="git.freedesktop.org" module="accountsservice"/>
+    <branch repo="gitlab.freedesktop.org"
+            module="accountsservice/accountsservice.git"
+            checkoutdir="accountsservice"/>
     <dependencies>
       <dep package="glib"/>
       <dep package="gobject-introspection"/>
@@ -1247,8 +1248,8 @@
 
   <autotools id="NetworkManager"
              autogenargs="PYTHON=python3 --with-udev-dir=${libdir}/udev --with-systemdsystemunitdir=no 
--with-crypto=gnutls --disable-more-warnings --disable-json-validation --disable-ovs">
-    <branch repo="git.freedesktop.org"
-                 module="NetworkManager/NetworkManager.git"
+    <branch repo="gitlab.freedesktop.org"
+            module="NetworkManager/NetworkManager.git"
             checkoutdir="NetworkManager"/>
     <dependencies>
       <dep package="libndp"/>
diff --git a/modulesets/gnome-world.modules b/modulesets/gnome-world.modules
index 5b8dfbe5..db714f57 100644
--- a/modulesets/gnome-world.modules
+++ b/modulesets/gnome-world.modules
@@ -10,12 +10,6 @@
       href="https://gitlab.gnome.org/GNOME/"/>
   <repository type="svn" name="svn.abisource.com"
       href="http://svn.abisource.com/"/>
-  <repository type="git" name="wayland.freedesktop.org"
-      href="git://anongit.freedesktop.org/git/wayland"/>
-  <repository type="git" name="gstreamer.freedesktop.org"
-      href="git://anongit.freedesktop.org/gstreamer/"/>
-  <repository type="git" name="fprint.freedesktop.org"
-      href="git://anongit.freedesktop.org/libfprint/"/>
   <repository type="cvs" name="elysium-project.sf.net"
       cvsroot=":pserver:anonymous elysium-project cvs sourceforge net:/cvsroot/elysium-project"
       password=""/>
@@ -82,8 +76,6 @@
       href="git://git.ardour.org/"/>
   <repository type="git" name="gitorious.org"
       href="https://gitorious.org/"/>
-  <repository type="git" name="telepathy.freedesktop.org"
-      href="git://anongit.freedesktop.org/telepathy/"/>
   <repository type="tarball" name="samba.org"
       href="https://ftp.samba.org/pub/"/>
   <repository type="tarball" name="sourceforge.net"
@@ -594,8 +586,9 @@
   </autotools>
 
   <autotools id="libva">
-    <branch repo="git.freedesktop.org"
-            module="vaapi/libva"/>
+    <branch repo="github.com"
+            module="intel/libva.git"
+            checkoutdir="libva"/>
   </autotools>
 
   <autotools id="gstreamer-vaapi">
@@ -609,9 +602,9 @@
   </autotools>
 
   <autotools id="libva-intel-driver">
-    <branch repo="git.freedesktop.org"
+    <branch repo="github.com"
             checkoutdir="libva-intel-driver"
-            module="vaapi/intel-driver"
+            module="intel/intel-vaapi-driver"
             revision="v1.0-branch"/>
     <dependencies>
       <dep package="libva"/>