GNOME.org
 

[jhbuild/wip/conditions: 4/4] 3.12: conditionalise some linux-specific features

commit 16342bac8919e541cbc13727479ee167cecb084b
Author: Ryan Lortie <desrt desrt ca>
Date:   Mon Mar 3 13:33:10 2014 -0500

    3.12: conditionalise some linux-specific features
    
    Turn some features off if the 'linux' condition is not set.
    
    Bonus: enable the 'ports' backend on PackageKit if 'bsd' is set.

 modulesets/gnome-apps-3.12.modules             |    8 ++-
 modulesets/gnome-suites-core-3.12.modules      |   90 ++++++++++++++++++------
 modulesets/gnome-suites-core-deps-3.12.modules |   38 ++++++++---
 modulesets/gnome-world-3.12.modules            |   16 +++-
 4 files changed, 116 insertions(+), 36 deletions(-)
---
diff --git a/modulesets/gnome-apps-3.12.modules b/modulesets/gnome-apps-3.12.modules
index 307abea..275361c 100644
--- a/modulesets/gnome-apps-3.12.modules
+++ b/modulesets/gnome-apps-3.12.modules
@@ -478,7 +478,6 @@
       <dep package="gst-plugins-bad"/>
       <dep package="gst-plugins-base"/>
       <dep package="gst-plugins-good"/>
-      <dep package="gudev"/>
       <dep package="clutter-gst"/>
       <dep package="clutter-gtk"/>
       <dep package="libcanberra"/>
@@ -486,6 +485,9 @@
       <dep package="gnome-video-effects"/>
       <dep package="librsvg"/>
       <dep package="gnome-desktop"/>
+      <if condition-set="linux">
+        <dep package="gudev"/>
+      </if>
     </dependencies>
   </autotools>
 
@@ -580,9 +582,11 @@
       <dep package="gtk+"/>
       <dep package="spice-gtk"/>
       <dep package="vala"/>
-      <dep package="gudev"/>
       <dep package="tracker"/>
       <dep package="gnome-themes-standard"/>
+      <if condition-set="linux">
+        <dep package="gudev"/>
+      </if>
     </dependencies>
   </autotools>
 
diff --git a/modulesets/gnome-suites-core-3.12.modules b/modulesets/gnome-suites-core-3.12.modules
index 499ce20..0a2ddc1 100644
--- a/modulesets/gnome-suites-core-3.12.modules
+++ b/modulesets/gnome-suites-core-3.12.modules
@@ -153,12 +153,14 @@
       <dep package="cups"/>
       <dep package="cheese"/>
       <dep package="gstreamer"/>
-      <dep package="NetworkManager"/>
       <dep package="network-manager-applet"/>
-      <dep package="ModemManager"/>
       <dep package="ibus-pinyin"/>
       <dep package="ibus-anthy"/>
       <dep package="ibus-hangul"/>
+      <if condition-set="linux">
+        <dep package="ModemManager"/>
+        <dep package="NetworkManager"/>
+      </if>
     </suggests>
   </autotools>
 
@@ -241,7 +243,9 @@
       <dep package="gnome-control-center"/>
     </dependencies>
     <suggests>
-      <dep package="gudev"/>
+      <if condition-set="linux">
+        <dep package="gudev"/>
+      </if>
     </suggests>
   </autotools>
 
@@ -266,6 +270,9 @@
   </autotools>
 
   <autotools id="gnome-settings-daemon">
+    <if condition-unset="linux">
+      <autogenargs value="--disable-rfkill --disable-gudev"/>
+    </if>
     <branch/>
     <dependencies>
       <dep package="colord"/>
@@ -275,20 +282,22 @@
       <dep package="gnome-desktop"/>
       <dep package="gsettings-desktop-schemas"/>
       <dep package="gtk+"/>
-      <dep package="gudev"/>
       <dep package="intltool"/>
       <dep package="libcanberra"/>
       <dep package="libgweather"/>
       <dep package="libnotify"/>
       <dep package="librsvg"/>
-      <dep package="libwacom"/>
       <dep package="PackageKit"/>
       <dep package="polkit"/>
       <dep package="pulseaudio"/>
       <dep package="upower"/>
       <dep package="ibus"/>
-      <dep package="xorg-wacom"/>
       <dep package="cups"/>
+      <if condition-set="linux">
+        <dep package="libwacom"/>
+        <dep package="xorg-wacom"/>
+        <dep package="gudev"/>
+      </if>
     </dependencies>
     <suggests>
       <!-- <dep package="xkbfile"/> -->
@@ -296,6 +305,9 @@
   </autotools>
 
   <autotools id="gnome-shell" autogenargs="--enable-compile-warnings=maximum">
+    <if condition-unset="linux">
+      <autogenargs value="--disable-networkmanager"/>
+    </if>
     <branch/>
     <dependencies>
       <dep package="accountsservice"/>
@@ -318,7 +330,6 @@
       <dep package="libcroco"/>
       <dep package="libsoup"/>
       <dep package="mutter"/>
-      <dep package="NetworkManager"/>
       <dep package="network-manager-applet"/>
       <dep package="polkit"/>
       <dep package="pulseaudio"/>
@@ -327,6 +338,9 @@
       <dep package="telepathy-logger"/>
       <dep package="upower"/>
       <dep package="gcr"/>
+      <if condition-set="linux">
+        <dep package="NetworkManager"/>
+      </if>
     </dependencies>
     <suggests>
       <dep package="gstreamer"/>
@@ -367,11 +381,15 @@
       <dep package="glib"/>
       <dep package="dbus"/>
       <dep package="libsoup"/>
-      <dep package="udisks"/>
+      <if condition-set="linux">
+        <dep package="udisks"/>
+      </if>
     </dependencies>
     <suggests>
-      <dep package="gudev"/>
       <dep package="libgphoto2"/>
+      <if condition-set="linux">
+        <dep package="gudev"/>
+      </if>
     </suggests>
   </autotools>
 
@@ -461,6 +479,9 @@
 
   <autotools id="pulseaudio"
              autogenargs="--disable-hal --disable-oss-output --disable-esound --disable-gconf --disable-gtk3 
--enable-bluez5">
+    <if condition-unset="linux">
+      <autogenargs value="--disable-bluez4 --disable-bluez5"/>
+    </if>
     <branch repo="pulseaudio.freedesktop.org"/>
     <dependencies>
       <dep package="alsa"/>
@@ -471,10 +492,12 @@
       <dep package="libcap"/>
       <dep package="libsndfile"/>
       <dep package="libtool-ltdl"/>
-      <dep package="libudev"/>
       <dep package="glib"/>
-      <dep package="sbc"/>
       <dep package="speex"/>
+      <if condition-set="linux">
+        <dep package="libudev"/>
+        <dep package="sbc"/>
+      </if>
     </dependencies>
     <after>
       <dep package="polkit"/>
@@ -489,9 +512,11 @@
       <dep package="dbus-glib"/>
       <dep package="glib"/>
       <dep package="gtk-doc"/>
-      <dep package="NetworkManager"/>
       <dep package="libxslt"/>
       <dep package="telepathy-glib"/>
+      <if condition-set="linux">
+        <dep package="NetworkManager"/>
+      </if>
     </dependencies>
   </autotools>
 
@@ -543,10 +568,12 @@
       <dep package="enchant"/>
       <dep package="geoclue"/>
       <dep package="geocode-glib"/>
-      <dep package="gudev"/>
       <dep package="iso-codes"/>
       <dep package="libchamplain"/>
-      <dep package="NetworkManager"/>
+      <if condition-set="linux">
+        <dep package="NetworkManager"/>
+        <dep package="gudev"/>
+      </if>
     </suggests>
   </autotools>
 
@@ -840,6 +867,9 @@
   </autotools>
 
   <autotools id="gnome-user-share">
+    <if condition-unset="linux">
+      <autogenargs value="--disable-bluetooth"/>
+    </if>
     <branch/>
     <dependencies>
       <dep package="avahi"/>
@@ -944,6 +974,13 @@
   </autotools>
 
   <autotools id="PackageKit" autogenargs="--disable-tests --disable-qt --disable-browser-plugin" 
makeargs="CFLAGS=-Wno-error">
+    <if condition-unset="linux">
+      <autogenargs value="--disable-systemd --disable-systemd-updates"/>
+    </if>
+    <if condition-set="bsd">
+      <autogenargs value="--enable-ports"/>
+    </if>
+
     <branch repo="packagekit.gitorious.org" checkoutdir="PackageKit" module="packagekit.git"/>
     <dependencies>
       <dep package="glib"/>
@@ -952,9 +989,11 @@
       <dep package="dbus-glib"/>
     </dependencies>
     <suggests>
-      <dep package="gudev"/>
-      <dep package="NetworkManager"/>
       <dep package="polkit"/>
+      <if condition-set="linux">
+        <dep package="gudev"/>
+        <dep package="NetworkManager"/>
+      </if>
     </suggests>
   </autotools>
 
@@ -989,7 +1028,9 @@
       <dep package="gobject-introspection"/>
     </dependencies>
     <suggests>
-      <dep package="gudev"/>
+      <if condition-set="linux">
+        <dep package="gudev"/>
+      </if>
     </suggests>
   </autotools>
 
@@ -1015,7 +1056,6 @@
       <dep package="gnome-calculator"/>
       <dep package="gnome-contacts"/>
       <dep package="gnome-dictionary"/>
-      <dep package="gnome-disk-utility"/>
       <dep package="gnome-font-viewer"/>
       <dep package="gnome-screenshot"/>
       <dep package="gnome-system-log"/>
@@ -1026,6 +1066,10 @@
       <dep package="sushi"/>
       <dep package="totem"/>
       <dep package="yelp"/>
+      <if condition-set="linux">
+        <!-- udisks dependency -->
+        <dep package="gnome-disk-utility"/>
+      </if>
     </dependencies>
   </metamodule>
 
@@ -1079,15 +1123,17 @@
       <dep package="ConsoleKit"/>
       <dep package="dbus"/>
       <dep package="gdm"/>
-      <dep package="NetworkManager"/>
       <dep package="PackageKit"/>
       <dep package="polkit"/>
       <dep package="upower"/>
-      <dep package="udisks"/>
       <dep package="cups"/>
       <!-- <dep package="systemd"/> -->
       <!-- <dep package="xorg-x11-server"/> -->
       <!-- <dep package="plymouth"/> -->
+      <if condition-set="linux">
+        <dep package="NetworkManager"/>
+        <dep package="udisks"/>
+      </if>
     </dependencies>
   </metamodule>
 
@@ -1124,7 +1170,6 @@
       <dep package="gstreamer"/>
       <dep package="libnotify"/>
       <dep package="libpeas"/>
-      <dep package="NetworkManager"/>
       <dep package="PackageKit"/>
       <dep package="polkit"/>
       <dep package="telepathy-glib"/>
@@ -1135,6 +1180,9 @@
       <dep package="gtkmm"/>
       <dep package="java-gnome"/>
       <dep package="seed"/>
+      <if condition-set="linux">
+        <dep package="NetworkManager"/>
+      </if>
     </dependencies>
   </metamodule>
 
diff --git a/modulesets/gnome-suites-core-deps-3.12.modules b/modulesets/gnome-suites-core-deps-3.12.modules
index 24e38ae..3db0c3d 100644
--- a/modulesets/gnome-suites-core-deps-3.12.modules
+++ b/modulesets/gnome-suites-core-deps-3.12.modules
@@ -119,6 +119,9 @@
   </autotools>
 
   <autotools id="geoclue">
+    <if condition-unset="linux">
+      <autogenargs value="--disable-3g-source --disable-modem-gps-source --disable-wifi-source"/>
+    </if>
     <branch repo="git.freedesktop.org"/>
     <dependencies>
       <dep package="glib"/>
@@ -126,8 +129,10 @@
       <dep package="json-glib"/>
       <dep package="libsoup"/>
       <dep package="libxml2"/>
-      <dep package="ModemManager"/>
-      <dep package="NetworkManager"/>
+      <if condition-set="linux">
+        <dep package="ModemManager"/>
+        <dep package="NetworkManager"/>
+      </if>
     </dependencies>
   </autotools>
 
@@ -352,7 +357,9 @@
     </dependencies>
     <suggests>
       <dep package="gdk-pixbuf"/>
-      <dep package="gudev"/>
+      <if condition-set="wayland">
+        <dep package="gudev"/>
+      </if>
     </suggests>
   </autotools>
 
@@ -677,7 +684,9 @@
       <dep package="iso-codes"/>
     </dependencies>
     <suggests>
-      <dep package="gudev"/>
+      <if condition-set="linux">
+        <dep package="gudev"/>
+      </if>
     </suggests>
   </autotools>
 
@@ -699,7 +708,9 @@
     <suggests>
       <dep package="pulseaudio"/>
       <dep package="gdk-pixbuf"/>
-      <dep package="gudev"/>
+      <if condition-set="linux">
+        <dep package="gudev"/>
+      </if>
     </suggests>
   </autotools>
 
@@ -785,7 +796,9 @@
     </dependencies>
     <suggests>
       <dep package="gobject-introspection"/>
-      <dep package="NetworkManager"/>
+      <if condition-set="linux">
+        <dep package="NetworkManager"/>
+      </if>
     </suggests>
   </autotools>
 
@@ -1137,7 +1150,6 @@
       <dep package="libsecret"/>
       <dep package="gstreamer"/>
       <dep package="gst-plugins-base"/>
-      <dep package="NetworkManager"/>
       <dep package="upower"/>
       <dep package="libgsf"/>
       <dep package="gdk-pixbuf"/>
@@ -1145,6 +1157,9 @@
       <dep package="totem-pl-parser"/>
       <dep package="dconf"/>
       <dep package="libosinfo"/>
+      <if condition-set="linux">
+        <dep package="NetworkManager"/>
+      </if>
     </suggests>
   </autotools>
 
@@ -1322,18 +1337,23 @@
   </autotools>
 
   <autotools id="colord" autogenargs="--disable-examples --disable-strict --disable-bash-completion">
+    <if condition-unset="linux">
+      <autogenargs value="--disable-gusb --disable-udev --with-systemdsystemunitdir=no 
--disable-systemd-login"/>
+    </if>
     <branch repo="github.com" checkoutdir="colord" module="hughsie/colord.git"/>
     <dependencies>
       <dep package="glib"/>
       <dep package="dbus"/>
-      <dep package="gudev"/>
       <dep package="libusb1"/>
-      <dep package="libgusb"/>
       <dep package="sqlite3"/>
       <dep package="lcms2"/>
       <dep package="gobject-introspection"/>
       <!-- and cups -->
       <!-- and sane -->
+      <if condition-set="linux">
+        <dep package="libgusb"/>
+        <dep package="gudev"/>
+      </if>
     </dependencies>
     <suggests>
       <dep package="polkit"/>
diff --git a/modulesets/gnome-world-3.12.modules b/modulesets/gnome-world-3.12.modules
index c0e259a..bf73cd4 100644
--- a/modulesets/gnome-world-3.12.modules
+++ b/modulesets/gnome-world-3.12.modules
@@ -2735,7 +2735,9 @@
       <dep package="gtk+"/>
     </dependencies>
     <suggests>
-      <dep package="gudev"/>
+      <if condition-set="linux">
+        <dep package="gudev"/>
+      </if>
     </suggests>
   </autotools>
 
@@ -2753,7 +2755,9 @@
     <suggests>
       <dep package="pulseaudio"/>
       <dep package="gdk-pixbuf"/>
-      <dep package="gudev"/>
+      <if condition-set="linux">
+        <dep package="gudev"/>
+      </if>
     </suggests>
   </autotools>
 
@@ -3057,8 +3061,10 @@
       <dep package="gdk-pixbuf"/>
       <dep package="glib"/>
       <dep package="gtk+"/>
-      <dep package="gudev"/>
       <dep package="vala"/>
+      <if condition-set="linux">
+        <dep package="gudev"/>
+      </if>
     </dependencies>
     <suggests>
       <dep package="colord"/>
@@ -3124,7 +3130,6 @@
       <dep package="grilo"/>
       <dep package="gst-plugins-base"/>
       <dep package="gtk+"/>
-      <dep package="gudev"/>
       <dep package="json-glib"/>
       <dep package="libnotify"/>
       <dep package="libpeas"/>
@@ -3133,6 +3138,9 @@
       <dep package="pygobject-python2"/>
       <dep package="totem-pl-parser"/>
       <dep package="yelp-tools"/>
+      <if condition-set="linux">
+        <dep package="gudev"/>
+      </if>
     </dependencies>
     <suggests>
       <dep package="avahi"/>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]