[jhbuild/desrt/master: 9/23] 3.16: turn polkit into a system module

[Ryan Lortie <desrt src gnome org>]

commit 8e144d1651c6b12d13677280ec5fcd8cae3b59cb
Author: Ryan Lortie <desrt desrt ca>
Date:   Fri Jan 2 20:36:06 2015 -0500

    3.16: turn polkit into a system module
    
    polkit depends on spidermonkey, which is API unstable.  There is no
    version of spidermoney which polkit can use which is available in all of
    the distributions that we care about supporting, which means that we
    have trouble with sysdeps.
    
    Fortunately, every distribution that we care about already has polkit
    for itself.  polkit itself is very inactive these days -- the highest
    dependency that any GNOME module has on it is for a version that was
    released in 2011.  Additionally, we are not actually interested in
    building polkit itself, but really only need the libraries.  It would be
    better if we used the system ones.
    
    A survey of the configure.ac files of components that declare a
    dependency on polkit shows:
    
     - udisks: depends on polkit-gobject and polkit-agent 0.102
     - gnome-control-center, gnome-settings-daemon: polkit-gobject 0.103
     - colord: polkit-gobject 0.103
     - accountsservice: polkit-gobject
     - NetworkManager: polkit-agent 0.97
     - ModemManager polkit-gobject 0.97
     - PackageKit polkit-gobject 0.98
     - gnome-shell: polkit-agent 0.100
     - pulseaudio, gnome-session: no longer actually depend on it
    
    So let's get rid of the polkit module and add two new system modules:
    one for each .pc file.  We must have at least polkit-agent 0.102 and
    polkit-gobject 0.103.

 modulesets/gnome-suites-core-3.16.modules      |   38 +++++-------------------
 modulesets/gnome-suites-core-deps-3.16.modules |    4 +-
 modulesets/gnome-sysdeps-3.16.modules          |   16 ++++++----
 3 files changed, 20 insertions(+), 38 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-3.16.modules b/modulesets/gnome-suites-core-3.16.modules
index 50175a0..cf3e6bc 100644
--- a/modulesets/gnome-suites-core-3.16.modules
+++ b/modulesets/gnome-suites-core-3.16.modules
@@ -145,7 +145,7 @@
       <dep package="libnotify"/>
       <dep package="libpwquality"/>
       <dep package="libxml2"/>
-      <dep package="polkit"/>
+      <dep package="polkit-gobject"/>
       <dep package="pulseaudio"/>
       <dep package="smbclient"/>
       <dep package="sound-theme-freedesktop"/>
@@ -252,9 +252,6 @@
       <dep package="sm"/>
       <dep package="xtrans"/>
     </dependencies>
-    <suggests>
-      <dep package="polkit"/>
-    </suggests>
   </autotools>
 
   <autotools id="gnome-settings-daemon">
@@ -275,7 +272,7 @@
       <dep package="libgweather"/>
       <dep package="libnotify"/>
       <dep package="PackageKit"/>
-      <dep package="polkit"/>
+      <dep package="polkit-gobject"/>
       <dep package="pulseaudio"/>
       <dep package="upower"/>
       <dep package="ibus"/>
@@ -317,7 +314,7 @@
       <dep package="libcroco"/>
       <dep package="libsoup"/>
       <dep package="mutter"/>
-      <dep package="polkit"/>
+      <dep package="polkit-agent"/>
       <dep package="pulseaudio"/>
       <dep package="startup-notification"/>
       <dep package="telepathy-glib"/>
@@ -484,9 +481,6 @@
         <dep package="sbc"/>
       </if>
     </dependencies>
-    <after>
-      <dep package="polkit"/>
-    </after>
   </autotools>
 
   <!-- mc 5.16 doesn't build against upower 1.0 -->
@@ -905,7 +899,7 @@
     <dependencies>
       <dep package="glib"/>
       <dep package="gobject-introspection"/>
-      <dep package="polkit"/>
+      <dep package="polkit-gobject"/>
     </dependencies>
   </autotools>
 
@@ -967,7 +961,7 @@
       <dep package="libgcrypt"/>
       <dep package="libuuid"/>
       <dep package="gtk-doc"/>
-      <dep package="polkit"/>
+      <dep package="polkit-agent"/>
       <dep package="gudev"/>
       <dep package="gnutls"/>
       <dep package="ppp"/>
@@ -992,7 +986,7 @@
       <dep package="dbus-glib"/>
     </dependencies>
     <suggests>
-      <dep package="polkit"/>
+      <dep package="polkit-gobject"/>
       <if condition-set="linux">
         <dep package="gudev"/>
         <dep package="NetworkManager"/>
@@ -1000,28 +994,14 @@
     </suggests>
   </autotools>
 
-  <autotools id="polkit">
-    <if condition-unset="linux">
-      <autogenargs value="--disable-test"/>
-    </if>
-    <branch repo="git.freedesktop.org"/>
-    <dependencies>
-      <dep package="glib"/>
-      <dep package="gobject-introspection"/>
-      <dep package="expat"/>
-      <dep package="intltool"/>
-      <dep package="js17"/>
-      <dep package="pam"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="udisks">
     <pkg-config>udisks2.pc</pkg-config>
     <branch repo="git.freedesktop.org" module="udisks"/>
     <dependencies>
       <dep package="gudev"/>
       <dep package="libacl"/>
-      <dep package="polkit"/>
+      <dep package="polkit-gobject"/>
+      <dep package="polkit-agent"/>
       <dep package="libatasmart"/>
     </dependencies>
   </autotools>
@@ -1126,7 +1106,6 @@
       <dep package="dbus"/>
       <dep package="gdm"/>
       <dep package="PackageKit"/>
-      <dep package="polkit"/>
       <dep package="upower"/>
       <dep package="cups"/>
       <!-- <dep package="systemd"/> -->
@@ -1173,7 +1152,6 @@
       <dep package="libnotify"/>
       <dep package="libpeas"/>
       <dep package="PackageKit"/>
-      <dep package="polkit"/>
       <dep package="telepathy-glib"/>
       <dep package="upower"/>
       <dep package="WebKit"/>
diff --git a/modulesets/gnome-suites-core-deps-3.16.modules b/modulesets/gnome-suites-core-deps-3.16.modules
index bc835ff..02aec4b 100644
--- a/modulesets/gnome-suites-core-deps-3.16.modules
+++ b/modulesets/gnome-suites-core-deps-3.16.modules
@@ -291,7 +291,7 @@
       <dep package="glib"/>
       <dep package="dbus-glib"/>
       <dep package="gtk-doc"/>
-      <dep package="polkit"/>
+      <dep package="polkit-gobject"/>
       <dep package="gudev"/>
       <dep package="ppp"/>
       <dep package="libmbim"/>
@@ -1402,7 +1402,7 @@
       </if>
     </dependencies>
     <suggests>
-      <dep package="polkit"/>
+      <dep package="polkit-gobject"/>
     </suggests>
   </autotools>
 
diff --git a/modulesets/gnome-sysdeps-3.16.modules b/modulesets/gnome-sysdeps-3.16.modules
index d476987..900afb6 100644
--- a/modulesets/gnome-sysdeps-3.16.modules
+++ b/modulesets/gnome-sysdeps-3.16.modules
@@ -322,12 +322,6 @@
     </systemdependencies>
   </systemmodule>
 
-  <systemmodule id="js17">
-    <pkg-config>mozjs-17.0.pc</pkg-config>
-    <branch repo="system"
-            version="17.0.0"/>
-  </systemmodule>
-
   <systemmodule id="json">
     <pkg-config>json-c.pc</pkg-config>
     <branch repo="system"
@@ -759,6 +753,16 @@
             version="0.8.9"/>
   </systemmodule>
 
+  <systemmodule id="polkit-agent">
+    <pkg-config>polkit-agent-1.pc</pkg-config>
+    <branch repo="system" version="0.102"/>
+  </systemmodule>
+
+  <systemmodule id="polkit-gobject">
+    <pkg-config>polkit-gobject-1.pc</pkg-config>
+    <branch repo="system" version="0.103"/>
+  </systemmodule>
+
   <systemmodule id="poppler">
     <pkg-config>poppler-glib.pc</pkg-config>
     <branch repo="system"