[jhbuild] 3.28: Replace gudev with libgudev and move them to udev condition

[Ting-Wei Lan <lantw src gnome org>]

commit 62007e0e5181bbefd5fc67f7bf6e8469345abd43
Author: Ting-Wei Lan <lantw src gnome org>
Date:   Tue Jan 9 12:04:14 2018 +0800

    3.28: Replace gudev with libgudev and move them to udev condition
    
    We are going to allow udev dependency on FreeBSD.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=792379

 modulesets/gnome-apps-3.28.modules             |    2 +-
 modulesets/gnome-suites-core-3.28.modules      |   31 +++++++++++++++++------
 modulesets/gnome-suites-core-deps-3.28.modules |    4 +-
 3 files changed, 26 insertions(+), 11 deletions(-)
---
diff --git a/modulesets/gnome-apps-3.28.modules b/modulesets/gnome-apps-3.28.modules
index 70f0abf..71b6e56 100644
--- a/modulesets/gnome-apps-3.28.modules
+++ b/modulesets/gnome-apps-3.28.modules
@@ -118,7 +118,7 @@
     <dependencies>
       <dep package="glib"/>
       <dep package="gobject-introspection"/>
-      <dep package="gudev"/>
+      <dep package="libgudev"/>
       <dep package="libevdev"/>
     </dependencies>
   </meson>
diff --git a/modulesets/gnome-suites-core-3.28.modules b/modulesets/gnome-suites-core-3.28.modules
index c52913c..e771b3e 100644
--- a/modulesets/gnome-suites-core-3.28.modules
+++ b/modulesets/gnome-suites-core-3.28.modules
@@ -303,7 +303,10 @@
 
   <autotools id="gnome-settings-daemon">
     <if condition-unset="linux">
-      <autogenargs value="--disable-rfkill --disable-gudev --disable-network-manager"/>
+      <autogenargs value="--disable-rfkill --disable-network-manager"/>
+    </if>
+    <if condition-unset="udev">
+      <autogenargs value="--disable-gudev"/>
     </if>
     <branch/>
     <dependencies>
@@ -328,9 +331,11 @@
         <dep package="librsvg"/>
         <dep package="libwacom"/>
         <dep package="xorg-wacom"/>
-        <dep package="libgudev"/>
         <dep package="NetworkManager"/>
       </if>
+      <if condition-set="udev">
+        <dep package="libgudev"/>
+      </if>
     </dependencies>
     <suggests>
       <!-- <dep package="xkbfile"/> -->
@@ -448,6 +453,9 @@
     <if condition-unset="systemd">
       <mesonargs value="-Dlogind=false"/>
     </if>
+    <if condition-unset="udev">
+      <mesonargs value="-Dgudev=false -Dcdda=false"/>
+    </if>
     <!-- FreeBSD's libusb doesn't implement libusb_interrupt_event_handler
          https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=224454 -->
     <if condition-set="freebsd">
@@ -461,7 +469,6 @@
       <dep package="glib"/>
       <dep package="gcr"/>
       <dep package="gnome-online-accounts"/>
-      <dep package="libgudev"/>
       <dep package="libarchive"/>
       <dep package="libbluray"/>
       <dep package="libcap"/>
@@ -484,6 +491,9 @@
       <if condition-set="systemd">
         <dep package="libsystemd"/>
       </if>
+      <if condition-set="udev">
+        <dep package="libgudev"/>
+      </if>
       <if condition-unset="freebsd">
         <dep package="libusb1"/>
       </if>
@@ -665,7 +675,7 @@
       <dep package="gnome-video-effects"/>
       <dep package="librsvg"/>
       <dep package="gnome-desktop"/>
-      <if condition-set="linux">
+      <if condition-set="udev">
         <dep package="libgudev"/>
       </if>
     </dependencies>
@@ -787,7 +797,7 @@
       <dep package="vala"/>
       <dep package="tracker"/>
       <dep package="tracker-miners"/>
-      <if condition-set="linux">
+      <if condition-set="udev">
         <dep package="libgudev"/>
       </if>
     </dependencies>
@@ -1022,7 +1032,10 @@
 
   <meson id="gnome-software" mesonargs="-Denable-rpm=false">
     <if condition-unset="linux">
-      <mesonargs value="-Denable-ostree=false -Denable-firmware=false -Denable-flatpak=false 
-Denable-gudev=false -Denable-fwupd=false"/>
+      <mesonargs value="-Denable-ostree=false -Denable-firmware=false -Denable-flatpak=false 
-Denable-fwupd=false"/>
+    </if>
+    <if condition-unset="udev">
+      <mesonargs value="-Denable-gudev=false"/>
     </if>
     <branch/>
     <dependencies>
@@ -1291,9 +1304,11 @@
     <suggests>
       <dep package="polkit-gobject"/>
       <if condition-set="linux">
-        <dep package="libgudev"/>
         <dep package="NetworkManager"/>
       </if>
+      <if condition-set="udev">
+        <dep package="libgudev"/>
+      </if>
     </suggests>
   </autotools>
 
@@ -1309,7 +1324,7 @@
       </if>
     </dependencies>
     <suggests>
-      <if condition-set="linux">
+      <if condition-set="udev">
         <dep package="libgudev"/>
       </if>
     </suggests>
diff --git a/modulesets/gnome-suites-core-deps-3.28.modules b/modulesets/gnome-suites-core-deps-3.28.modules
index 9d72f47..75ded24 100644
--- a/modulesets/gnome-suites-core-deps-3.28.modules
+++ b/modulesets/gnome-suites-core-deps-3.28.modules
@@ -750,7 +750,7 @@ the module and we will just change it to use a tarball anyway.
       <dep package="iso-codes"/>
     </dependencies>
     <suggests>
-      <if condition-set="linux">
+      <if condition-set="udev">
         <dep package="libgudev"/>
       </if>
     </suggests>
@@ -773,7 +773,7 @@ the module and we will just change it to use a tarball anyway.
     <suggests>
       <dep package="pulseaudio"/>
       <dep package="gdk-pixbuf"/>
-      <if condition-set="linux">
+      <if condition-set="udev">
         <dep package="libgudev"/>
       </if>
     </suggests>