[gnome-weather] Fix xdg-app json to work on 3.18 runtime

[Giovanni Campagna <gcampagna src gnome org>]

commit f3316a9517e56ffc6cce0be447a6d3ea364f3453
Author: Giovanni Campagna <gcampagna src gnome org>
Date:   Mon Feb 15 12:44:41 2016 -0800

    Fix xdg-app json to work on 3.18 runtime
    
    3.20 runtime is not stable yet.

 org.gnome.Weather.xdg-app.json |   41 +++++++++++++++++++++++++++++----------
 1 files changed, 30 insertions(+), 11 deletions(-)
---
diff --git a/org.gnome.Weather.xdg-app.json b/org.gnome.Weather.xdg-app.json
index 7134a25..4a2e5d3 100644
--- a/org.gnome.Weather.xdg-app.json
+++ b/org.gnome.Weather.xdg-app.json
@@ -1,19 +1,14 @@
 {
     "app-id": "org.gnome.Weather",
     "runtime": "org.gnome.Platform",
-    "runtime-version": "master",
+    "runtime-version": "3.18",
     "sdk": "org.gnome.Sdk",
-    "command": "gnome-weather",
+    "command": "/lib/org.gnome.Weather/org.gnome.Weather.Application",
     "finish-args": [
-        /* X11 + XShm access */
         "--share=ipc", "--socket=x11",
-        /* Wayland access */
         "--socket=wayland",
-        /* Needs to talk to the network: */
         "--share=network",
-        /* Needed to get geo-positioning */
         "--system-talk-name=org.freedesktop.GeoClue2",
-        /* Needed for dconf to work (unfortunately needs homedir read access) */
         "--filesystem=home:ro", "--talk-name=ca.desrt.dconf", "--env=DCONF_USER_CONFIG_DIR=.config/dconf"
     ],
     "build-options" : {
@@ -26,12 +21,21 @@
     "cleanup": ["/include", "/lib/pkgconfig",
                 "/share/pkgconfig", "/share/aclocal",
                 "/man", "/share/man", "/share/gtk-doc",
-                "/share/vala",
+                "/share/vala", "/bin/gnome-weather",
                 "*.la", "*.a"],
-    "cleanup-commands": [ "desktop-file-edit \"--set-name=(Nightly) Weather\" 
/app/share/applications/org.gnome.Weather.Application.desktop" ],
     "modules": [
         {
+            "name": "m4-common",
+            "sources": [
+                {
+                    "type": "git",
+                    "url": "git://git.gnome.org/m4-common"
+                }
+            ]
+        },
+        {
             "name": "geocode-glib",
+            "config-opts": ["--disable-static"],
             "sources": [
                 {
                     "type": "git",
@@ -41,7 +45,7 @@
         },
         {
             "name": "libgweather",
-            "config-opts": ["--disable-vala"],
+            "config-opts": ["--disable-static", "--disable-vala"],
             "sources": [
                 {
                     "type": "git",
@@ -50,12 +54,27 @@
             ]
         },
         {
+            "name": "geoclue",
+            "config-opts": [ "--disable-static", "--disable-3g-source",
+                             "--disable-cdma-source", "--disable-modem-gps-source",
+                             "--disable-nmea-source" ],
+            "cleanup": [ "/share/dbus-1", "/share/applications",
+                         "/libexec", "/etc" ],
+            "sources": [
+                {
+                    "type": "git",
+                    "url": "git://anongit.freedesktop.org/geoclue"
+                }
+            ]
+        },
+        {
             "name": "gnome-desktop",
             "config-opts": ["--disable-debug-tools"],
             "sources": [
                 {
                     "type": "git",
-                    "url": "git://git.gnome.org/gnome-desktop"
+                    "url": "git://git.gnome.org/gnome-desktop",
+                    "branch": "gnome-3-18"
                 }
             ]
         },