summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJavier Jardón <jjardon@gnome.org>2016-02-15 21:10:52 +0000
committerJavier Jardón <jjardon@gnome.org>2016-02-18 15:45:21 +0000
commitf1e518fb9c85e76ad570ad31b753c397f40c0398 (patch)
treebf58caf6720b6e2f03187679228841369957dd2a
parentfca465232368bb50f1efd49063b4991073824370 (diff)
downloaddefinitions-f1e518fb9c85e76ad570ad31b753c397f40c0398.tar.gz
Create secret-service stratum
Move gnome-keyring (secret service) and the API to access it (libsecret) Change-Id: I576bd4e772250a7c496bedd06ae1a0eb5243db5b
-rw-r--r--strata/gnome.morph32
-rw-r--r--strata/secret-service.morph27
-rw-r--r--strata/secret-service/gnome-keyring.morph (renamed from strata/gnome/gnome-keyring.morph)0
-rw-r--r--strata/secret-service/libsecret.morph (renamed from strata/gnome/libsecret.morph)0
-rw-r--r--systems/gnome-system-armv7lhf-jetson.morph2
-rw-r--r--systems/gnome-system-x86_64.morph2
6 files changed, 32 insertions, 31 deletions
diff --git a/strata/gnome.morph b/strata/gnome.morph
index 28935efc..faa630f0 100644
--- a/strata/gnome.morph
+++ b/strata/gnome.morph
@@ -19,6 +19,7 @@ build-depends:
- morph: strata/wayland-generic.morph
- morph: strata/ruby.morph
- morph: strata/samba.morph
+- morph: strata/secret-service.morph
- morph: strata/cups.morph
- morph: strata/docutils.morph
chunks:
@@ -269,11 +270,6 @@ chunks:
ref: 07237ff25d6171e1b548118442ddba4259a53ba5
unpetrify-ref: master
build-system: autotools
-- name: gcr
- repo: upstream:gnome/gcr
- ref: 289ba4859fd170285f51e6bbfe91f2aac3b9170d
- unpetrify-ref: 3.18.0
- build-system: autotools
- name: libxkbcommon-x11
repo: upstream:xorg-lib-libxkbcommon
ref: c43c3c866eb9d52cd8f61e75cbef1c30d07f3a28
@@ -309,11 +305,6 @@ chunks:
build-depends:
- clutter
- libxklavier
-- name: libsecret
- morph: strata/gnome/libsecret.morph
- repo: upstream:gnome/libsecret
- ref: 4d76cf7dd8e55d93bb58164a1fff38113ba97af5
- unpetrify-ref: master
- name: librest
morph: strata/gnome/librest.morph
repo: upstream:gnome/librest
@@ -336,7 +327,6 @@ chunks:
unpetrify-ref: webkitgtk-2.4.9
build-depends:
- enchant
- - libsecret
- name: WebKitGtk
morph: strata/gnome/WebKitGtk.morph
repo: upstream:WebKitGtk-tarball
@@ -346,7 +336,6 @@ chunks:
- enchant
- hyphen
- libnotify
- - libsecret
- name: gnome-online-accounts
morph: strata/gnome/gnome-online-accounts.morph
repo: upstream:gnome/gnome-online-accounts
@@ -367,7 +356,6 @@ chunks:
ref: ed52192fcd3cde2c0d7f0ab0d9e300fcdbc373a8
unpetrify-ref: baserock/LIBGDATA_0_17_3-16-ged52192
build-depends:
- - gcr
- gnome-online-accounts
- liboauth
- name: krb5
@@ -381,12 +369,10 @@ chunks:
ref: 658d6e37796984bf05e275413726ad3b71083ccf
unpetrify-ref: EVOLUTION_DATA_SERVER_3_18_3
build-depends:
- - gcr
- gnome-online-accounts
- krb5
- libgdata
- libgweather
- - libsecret
- name: raptor
morph: strata/gnome/raptor.morph
repo: upstream:raptor
@@ -438,7 +424,6 @@ chunks:
build-system: autotools
build-depends:
- iso-codes
- - libsecret
- libnotify
- name: gnome-shell
morph: strata/gnome/gnome-shell.morph
@@ -449,7 +434,6 @@ chunks:
- caribou
- clutter
- evolution-data-server
- - gcr
- gjs
- libcanberra
- mutter
@@ -470,20 +454,12 @@ chunks:
unpetrify-ref: master
build-depends:
- yelp-tools
-- name: gnome-keyring
- morph: strata/gnome/gnome-keyring.morph
- repo: upstream:gnome-keyring
- ref: eb16c037431da14d4f1c396357f82f2b35e76e23
- unpetrify-ref: baserock/3.18.3-5-geb16c03
- build-depends:
- - gcr
- name: gvfs
morph: strata/gnome/gvfs.morph
repo: upstream:gvfs
ref: d037b5fd56cae878ed7bb5269a40e4bd046551d7
unpetrify-ref: master
build-depends:
- - gcr
- udisks
- name: accountsservice
morph: strata/gnome/accountsservice.morph
@@ -851,7 +827,6 @@ chunks:
- cheese
- gdm
- gnome-desktop
- - gnome-keyring
- gnome-online-accounts
- ibus
- iso-codes
@@ -899,12 +874,10 @@ chunks:
build-depends:
- appstream-glib
- enchant
- - gcr
- gnome-desktop
- iso-codes
- libcanberra
- libnotify
- - libsecret
- libwnck
- startup-notification
- WebKitGtk
@@ -991,14 +964,12 @@ chunks:
- enchant
- farstream
- folks
- - gcr
- gnome-online-accounts
- gsettings-desktop-schemas
- iso-codes
- libcanberra
- libchamplain
- libnotify
- - libsecret
- telepathy-farstream
- telepathy-glib
- telepathy-logger
@@ -1079,7 +1050,6 @@ chunks:
build-depends:
- enchant
- evolution-data-server
- - gcr
- clutter-gtk
- gnome-desktop
- gnome-online-accounts
diff --git a/strata/secret-service.morph b/strata/secret-service.morph
new file mode 100644
index 00000000..b6f9e896
--- /dev/null
+++ b/strata/secret-service.morph
@@ -0,0 +1,27 @@
+name: secret-service
+kind: stratum
+description: Service implementing the DBus Secret Service API
+build-depends:
+- morph: strata/foundation.morph
+- morph: strata/glib-common.morph
+- morph: strata/gtk3.morph
+- morph: strata/network-security.morph
+- morph: strata/vala-common.morph
+chunks:
+- name: gcr
+ repo: upstream:gnome/gcr
+ ref: 289ba4859fd170285f51e6bbfe91f2aac3b9170d
+ unpetrify-ref: 3.18.0
+ build-system: autotools
+- name: gnome-keyring
+ morph: strata/secret-service/gnome-keyring.morph
+ repo: upstream:gnome-keyring
+ ref: eb16c037431da14d4f1c396357f82f2b35e76e23
+ unpetrify-ref: baserock/3.18.3-5-geb16c03
+ build-depends:
+ - gcr
+- name: libsecret
+ morph: strata/secret-service/libsecret.morph
+ repo: upstream:gnome/libsecret
+ ref: 4d76cf7dd8e55d93bb58164a1fff38113ba97af5
+ unpetrify-ref: master
diff --git a/strata/gnome/gnome-keyring.morph b/strata/secret-service/gnome-keyring.morph
index 73fe5298..73fe5298 100644
--- a/strata/gnome/gnome-keyring.morph
+++ b/strata/secret-service/gnome-keyring.morph
diff --git a/strata/gnome/libsecret.morph b/strata/secret-service/libsecret.morph
index b8af29b1..b8af29b1 100644
--- a/strata/gnome/libsecret.morph
+++ b/strata/secret-service/libsecret.morph
diff --git a/systems/gnome-system-armv7lhf-jetson.morph b/systems/gnome-system-armv7lhf-jetson.morph
index 0a5073a7..567920cf 100644
--- a/systems/gnome-system-armv7lhf-jetson.morph
+++ b/systems/gnome-system-armv7lhf-jetson.morph
@@ -69,6 +69,8 @@ strata:
morph: strata/icu-common.morph
- name: samba
morph: strata/samba.morph
+- name: secret-service
+ morph: strata/secret-service.morph
- name: cups
morph: strata/cups.morph
configuration-extensions:
diff --git a/systems/gnome-system-x86_64.morph b/systems/gnome-system-x86_64.morph
index e3e2e5a6..263d1587 100644
--- a/systems/gnome-system-x86_64.morph
+++ b/systems/gnome-system-x86_64.morph
@@ -75,6 +75,8 @@ strata:
morph: strata/icu-common.morph
- name: samba
morph: strata/samba.morph
+- name: secret-service
+ morph: strata/secret-service.morph
- name: cups
morph: strata/cups.morph
configuration-extensions: