From fca465232368bb50f1efd49063b4991073824370 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
Date: Mon, 15 Feb 2016 21:07:02 +0000
Subject: Create geolocation stratum

...and move geocode-glib and geoclue there

Change-Id: I023c3b15fce0ac173b8cc0dc99d0d8ce6e49441f
---
 strata/geolocation.morph                   | 18 ++++++++++++++++++
 strata/geolocation/geoclue.morph           | 13 +++++++++++++
 strata/gnome.morph                         | 23 +----------------------
 strata/gnome/geoclue.morph                 | 13 -------------
 systems/gnome-system-armv7lhf-jetson.morph |  2 ++
 systems/gnome-system-x86_64.morph          |  2 ++
 6 files changed, 36 insertions(+), 35 deletions(-)
 create mode 100644 strata/geolocation.morph
 create mode 100644 strata/geolocation/geoclue.morph
 delete mode 100644 strata/gnome/geoclue.morph

diff --git a/strata/geolocation.morph b/strata/geolocation.morph
new file mode 100644
index 00000000..f6d654fc
--- /dev/null
+++ b/strata/geolocation.morph
@@ -0,0 +1,18 @@
+name: geolocation
+kind: stratum
+description: libraries/services that provides location information
+build-depends:
+- morph: strata/glib-common.morph
+- morph: strata/libsoup-common.morph
+- morph: strata/NetworkManager-common.morph
+chunks:
+- name: geocode-glib
+  repo: upstream:gnome/geocode-glib
+  ref: a3e183e40053b4bd0fd0b25a070f60597270397a
+  unpetrify-ref: master
+  build-system: autotools
+- name: geoclue
+  morph: strata/geolocation/geoclue.morph
+  repo: upstream:geoclue
+  ref: ae8f7ab2f1e90f61931c652f2f65996c30c79e87
+  unpetrify-ref: 2.4.0
diff --git a/strata/geolocation/geoclue.morph b/strata/geolocation/geoclue.morph
new file mode 100644
index 00000000..3be946bb
--- /dev/null
+++ b/strata/geolocation/geoclue.morph
@@ -0,0 +1,13 @@
+name: geoclue
+kind: chunk
+build-system: autotools
+configure-commands:
+- |
+  ./autogen.sh --prefix="$PREFIX" --sysconfdir=/etc \
+               --disable-nmea-source \
+               --with-dbus-service-user=geoclue
+system-integration:
+  geoclue-misc:
+    00-add-geoclue-user:
+    - groupadd geoclue
+    - useradd -c "GeoClue Owner" -r -g geoclue -s /bin/false geoclue
diff --git a/strata/gnome.morph b/strata/gnome.morph
index 42332f30..28935efc 100644
--- a/strata/gnome.morph
+++ b/strata/gnome.morph
@@ -5,6 +5,7 @@ build-depends:
 - morph: strata/icu-common.morph
 - morph: strata/input-common.morph
 - morph: strata/vala-common.morph
+- morph: strata/geolocation.morph
 - morph: strata/gtk2.morph
 - morph: strata/gtk3.morph
 - morph: strata/audio-bluetooth.morph
@@ -205,22 +206,10 @@ chunks:
   build-system: autotools
   build-depends:
   - colord
-- name: geocode-glib
-  repo: upstream:gnome/geocode-glib
-  ref: a3e183e40053b4bd0fd0b25a070f60597270397a
-  unpetrify-ref: master
-  build-system: autotools
-- name: geoclue
-  morph: strata/gnome/geoclue.morph
-  repo: upstream:geoclue
-  ref: ae8f7ab2f1e90f61931c652f2f65996c30c79e87
-  unpetrify-ref: 2.4.0
 - name: libgweather
   repo: upstream:gnome/libgweather
   ref: 5b8aed611f24d03434eed35e438cea213b894b7c
   unpetrify-ref: master
-  build-depends:
-  - geocode-glib
   build-system: autotools
 - name: gnome-settings-daemon
   morph: strata/gnome/gnome-settings-daemon.morph
@@ -229,8 +218,6 @@ chunks:
   unpetrify-ref: baserock/3.18.0/disable_wacom
   build-depends:
   - colord
-  - geoclue
-  - geocode-glib
   - gnome-desktop
   - gsettings-desktop-schemas
   - ibus
@@ -349,7 +336,6 @@ chunks:
   unpetrify-ref: webkitgtk-2.4.9
   build-depends:
   - enchant
-  - geoclue
   - libsecret
 - name: WebKitGtk
   morph: strata/gnome/WebKitGtk.morph
@@ -358,7 +344,6 @@ chunks:
   unpetrify-ref: webkitgtk-2.10.2
   build-depends:
   - enchant
-  - geoclue
   - hyphen
   - libnotify
   - libsecret
@@ -1007,8 +992,6 @@ chunks:
   - farstream
   - folks
   - gcr
-  - geoclue
-  - geocode-glib
   - gnome-online-accounts
   - gsettings-desktop-schemas
   - iso-codes
@@ -1043,8 +1026,6 @@ chunks:
   build-depends:
   - folks
   - clutter-gtk
-  - geoclue
-  - geocode-glib
   - gjs
   - gnome-desktop
   - gnome-online-accounts
@@ -1099,8 +1080,6 @@ chunks:
   - enchant
   - evolution-data-server
   - gcr
-  - geoclue
-  - geocode-glib
   - clutter-gtk
   - gnome-desktop
   - gnome-online-accounts
diff --git a/strata/gnome/geoclue.morph b/strata/gnome/geoclue.morph
deleted file mode 100644
index 3be946bb..00000000
--- a/strata/gnome/geoclue.morph
+++ /dev/null
@@ -1,13 +0,0 @@
-name: geoclue
-kind: chunk
-build-system: autotools
-configure-commands:
-- |
-  ./autogen.sh --prefix="$PREFIX" --sysconfdir=/etc \
-               --disable-nmea-source \
-               --with-dbus-service-user=geoclue
-system-integration:
-  geoclue-misc:
-    00-add-geoclue-user:
-    - groupadd geoclue
-    - useradd -c "GeoClue Owner" -r -g geoclue -s /bin/false geoclue
diff --git a/systems/gnome-system-armv7lhf-jetson.morph b/systems/gnome-system-armv7lhf-jetson.morph
index b1fa2793..0a5073a7 100644
--- a/systems/gnome-system-armv7lhf-jetson.morph
+++ b/systems/gnome-system-armv7lhf-jetson.morph
@@ -15,6 +15,8 @@ strata:
   morph: strata/core.morph
 - name: foundation
   morph: strata/foundation.morph
+- name: geolocation
+  morph: strata/geolocation.morph
 - name: glib-common
   morph: strata/glib-common.morph
 - name: gnome
diff --git a/systems/gnome-system-x86_64.morph b/systems/gnome-system-x86_64.morph
index a51064ad..e3e2e5a6 100644
--- a/systems/gnome-system-x86_64.morph
+++ b/systems/gnome-system-x86_64.morph
@@ -15,6 +15,8 @@ strata:
   morph: strata/core.morph
 - name: foundation
   morph: strata/foundation.morph
+- name: geolocation
+  morph: strata/geolocation.morph
 - name: glib-common
   morph: strata/glib-common.morph
 - name: gnome
-- 
cgit v1.2.1