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



commit bbd4964b61c078607e5c6e3e7bf3bd7533d12368
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             |   17 +++-
 modulesets/gnome-suites-core-3.12.modules      |  118 +++++++++++++++++------
 modulesets/gnome-suites-core-deps-3.12.modules |   42 +++++++--
 modulesets/gnome-world-3.12.modules            |   16 +++-
 4 files changed, 145 insertions(+), 48 deletions(-)
---
diff --git a/modulesets/gnome-apps-3.12.modules b/modulesets/gnome-apps-3.12.modules
index 7666760..55956a2 100644
--- a/modulesets/gnome-apps-3.12.modules
+++ b/modulesets/gnome-apps-3.12.modules
@@ -479,7 +479,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"/>
@@ -487,6 +486,9 @@
       <dep package="gnome-video-effects"/>
       <dep package="librsvg"/>
       <dep package="gnome-desktop"/>
+      <if condition-set="linux">
+        <dep package="gudev"/>
+      </if>
     </dependencies>
   </autotools>
 
@@ -581,9 +583,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>
 
@@ -615,8 +619,10 @@
       <dep package="iso-codes"/>
       <dep package="libgweather"/>
       <dep package="libpwquality"/>
-      <dep package="network-manager-applet"/>
-      <dep package="NetworkManager"/>
+      <if condition-set="linux">
+        <dep package="network-manager-applet"/>
+        <dep package="NetworkManager"/>
+      </if>
     </dependencies>
     <suggests>
       <dep package="upower"/>
@@ -1026,6 +1032,9 @@
   </autotools>
 
   <autotools id="brasero">
+    <if condition-unset="linux">
+      <autogenargs value="--disable-inotify"/>
+    </if>
     <branch/>
     <dependencies>
       <dep package="glib"/>
diff --git a/modulesets/gnome-suites-core-3.12.modules b/modulesets/gnome-suites-core-3.12.modules
index 33457cc..3416763 100644
--- a/modulesets/gnome-suites-core-3.12.modules
+++ b/modulesets/gnome-suites-core-3.12.modules
@@ -126,7 +126,6 @@
       <dep package="gdk-pixbuf"/>
       <dep package="glib"/>
       <dep package="gtk+"/>
-      <dep package="gnome-bluetooth"/>
       <dep package="gnome-desktop"/>
       <dep package="gnome-menus"/>
       <dep package="gnome-online-accounts"/>
@@ -139,26 +138,31 @@
       <dep package="libgtop"/>
       <dep package="libnotify"/>
       <dep package="libpwquality"/>
-      <dep package="libwacom"/>
       <dep package="libxml2"/>
-      <dep package="network-manager-applet"/>
       <dep package="polkit"/>
       <dep package="pulseaudio"/>
       <dep package="smbclient"/>
       <dep package="sound-theme-freedesktop"/>
       <dep package="upower"/>
       <dep package="grilo"/>
+      <if condition-set="linux">
+        <dep package="gnome-bluetooth"/>
+        <dep package="network-manager-applet"/>
+        <dep package="libwacom"/>
+      </if>
     </dependencies>
     <suggests>
       <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="network-manager-applet"/>
+        <dep package="ModemManager"/>
+        <dep package="NetworkManager"/>
+      </if>
     </suggests>
   </autotools>
 
@@ -241,7 +245,9 @@
       <dep package="gnome-control-center"/>
     </dependencies>
     <suggests>
-      <dep package="gudev"/>
+      <if condition-set="linux">
+        <dep package="gudev"/>
+      </if>
     </suggests>
   </autotools>
 
@@ -266,6 +272,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 +284,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 +307,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"/>
@@ -305,7 +319,6 @@
       <dep package="gdm"/> <!-- runtime dependency on Gdm-1.0.typelib-->
       <dep package="gjs"/>
       <dep package="glib"/>
-      <dep package="gnome-bluetooth"/>
       <dep package="gnome-desktop"/>
       <dep package="gnome-icon-theme"/>
       <dep package="gnome-icon-theme-symbolic"/>
@@ -318,8 +331,6 @@
       <dep package="libcroco"/>
       <dep package="libsoup"/>
       <dep package="mutter"/>
-      <dep package="NetworkManager"/>
-      <dep package="network-manager-applet"/>
       <dep package="polkit"/>
       <dep package="pulseaudio"/>
       <dep package="startup-notification"/>
@@ -327,6 +338,11 @@
       <dep package="telepathy-logger"/>
       <dep package="upower"/>
       <dep package="gcr"/>
+      <if condition-set="linux">
+        <dep package="gnome-bluetooth"/>
+        <dep package="NetworkManager"/>
+        <dep package="network-manager-applet"/>
+      </if>
     </dependencies>
     <suggests>
       <dep package="gstreamer"/>
@@ -367,11 +383,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,20 +481,25 @@
 
   <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"/>
       <dep package="avahi"/>
-      <dep package="bluez"/>
       <dep package="dbus"/>
       <dep package="json"/>
       <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="bluez"/>
+        <dep package="libudev"/>
+        <dep package="sbc"/>
+      </if>
     </dependencies>
     <after>
       <dep package="polkit"/>
@@ -489,9 +514,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 +570,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>
 
@@ -843,6 +872,9 @@
   </autotools>
 
   <autotools id="gnome-user-share">
+    <if condition-unset="linux">
+      <autogenargs value="--disable-bluetooth"/>
+    </if>
     <branch/>
     <dependencies>
       <dep package="avahi"/>
@@ -850,8 +882,10 @@
       <dep package="dbus-glib"/>
       <dep package="libcanberra"/>
       <dep package="libnotify"/>
-      <dep package="gnome-bluetooth"/>
       <dep package="nautilus"/>
+      <if condition-set="linux">
+        <dep package="gnome-bluetooth"/>
+      </if>
     </dependencies>
   </autotools>
 
@@ -869,8 +903,10 @@
       <dep package="libgcrypt"/>
       <dep package="libnotify"/>
       <dep package="libsecret"/>
-      <dep package="NetworkManager"/>
       <dep package="telepathy-glib"/>
+      <if condition-set="linux">
+        <dep package="NetworkManager"/>
+      </if>
     </suggests>
   </autotools>
 
@@ -947,6 +983,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"/>
@@ -955,13 +998,18 @@
       <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>
 
   <autotools id="polkit">
+    <if condition-unset="linux">
+      <autogenargs value="--disable-test"/>
+    </if>
     <branch repo="git.freedesktop.org"/>
     <dependencies>
       <dep package="glib"/>
@@ -992,7 +1040,9 @@
       <dep package="gobject-introspection"/>
     </dependencies>
     <suggests>
-      <dep package="gudev"/>
+      <if condition-set="linux">
+        <dep package="gudev"/>
+      </if>
     </suggests>
   </autotools>
 
@@ -1018,7 +1068,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"/>
@@ -1029,6 +1078,10 @@
       <dep package="sushi"/>
       <dep package="totem"/>
       <dep package="yelp"/>
+      <if condition-set="linux">
+        <!-- udisks dependency -->
+        <dep package="gnome-disk-utility"/>
+      </if>
     </dependencies>
   </metamodule>
 
@@ -1039,7 +1092,6 @@
     <dependencies>
       <dep package="dconf"/>
       <dep package="evolution-data-server"/>
-      <dep package="gnome-bluetooth"/>
       <dep package="gnome-control-center"/>
       <dep package="gnome-icon-theme"/>
       <dep package="gnome-icon-theme-symbolic"/>
@@ -1082,15 +1134,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>
 
@@ -1127,7 +1181,6 @@
       <dep package="gstreamer"/>
       <dep package="libnotify"/>
       <dep package="libpeas"/>
-      <dep package="NetworkManager"/>
       <dep package="PackageKit"/>
       <dep package="polkit"/>
       <dep package="telepathy-glib"/>
@@ -1138,6 +1191,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 cac2962..e188734 100644
--- a/modulesets/gnome-suites-core-deps-3.12.modules
+++ b/modulesets/gnome-suites-core-deps-3.12.modules
@@ -117,6 +117,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"/>
@@ -124,8 +127,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>
 
@@ -336,7 +341,9 @@
     </dependencies>
     <suggests>
       <dep package="gdk-pixbuf"/>
-      <dep package="gudev"/>
+      <if condition-set="wayland">
+        <dep package="gudev"/>
+      </if>
     </suggests>
   </autotools>
 
@@ -669,7 +676,9 @@
       <dep package="iso-codes"/>
     </dependencies>
     <suggests>
-      <dep package="gudev"/>
+      <if condition-set="linux">
+        <dep package="gudev"/>
+      </if>
     </suggests>
   </autotools>
 
@@ -691,7 +700,9 @@
     <suggests>
       <dep package="pulseaudio"/>
       <dep package="gdk-pixbuf"/>
-      <dep package="gudev"/>
+      <if condition-set="linux">
+        <dep package="gudev"/>
+      </if>
     </suggests>
   </autotools>
 
@@ -777,7 +788,9 @@
     </dependencies>
     <suggests>
       <dep package="gobject-introspection"/>
-      <dep package="NetworkManager"/>
+      <if condition-set="linux">
+        <dep package="NetworkManager"/>
+      </if>
     </suggests>
   </autotools>
 
@@ -1129,7 +1142,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"/>
@@ -1137,6 +1149,9 @@
       <dep package="totem-pl-parser"/>
       <dep package="dconf"/>
       <dep package="libosinfo"/>
+      <if condition-set="linux">
+        <dep package="NetworkManager"/>
+      </if>
     </suggests>
   </autotools>
 
@@ -1314,18 +1329,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"/>
@@ -1353,6 +1373,10 @@
   </autotools>
 
   <autotools id="libpwquality">
+    <if condition-unset="linux">
+      <!-- uses PAM features not in XSSO spec -->
+      <autogenarg value="--disable-pam"/>
+    </if>
     <branch repo="libpwquality"
             module="https://fedorahosted.org/releases/l/i/libpwquality/libpwquality-1.2.2.tar.bz2"; 
version="1.2.2"
             hash="sha256:9689627283b43d20ca74ca822404ee486242e3e528fa95bf7016d37ff46e0696"
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]