summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJavier Jardón <jjardon@gnome.org>2016-02-15 21:15:00 +0000
committerJavier Jardón <jjardon@gnome.org>2016-02-18 15:46:07 +0000
commit642d35be89dfd9561dd49ff282a9e18658a23211 (patch)
tree53058c16546fc49a4d6d0bcdffe6b3bdb0354b79
parent9c4f6bf548b7568e38d6354c82558654150872f9 (diff)
downloaddefinitions-642d35be89dfd9561dd49ff282a9e18658a23211.tar.gz
More WebKitGtk1 to its own stratum
Change-Id: I7b5abc9db0f7d065ca76ea1ab4ecfae8747f051b
-rw-r--r--strata/WebKitGtk1-common.morph19
-rw-r--r--strata/WebKitGtk1-common/WebKitGtk1.morph (renamed from strata/gnome/WebKitGtk1.morph)0
-rw-r--r--strata/gnome.morph8
-rw-r--r--systems/gnome-system-armv7lhf-jetson.morph2
-rw-r--r--systems/gnome-system-x86_64.morph2
5 files changed, 24 insertions, 7 deletions
diff --git a/strata/WebKitGtk1-common.morph b/strata/WebKitGtk1-common.morph
new file mode 100644
index 00000000..bf92e354
--- /dev/null
+++ b/strata/WebKitGtk1-common.morph
@@ -0,0 +1,19 @@
+name: WebKitGtk1-common
+kind: stratum
+description: WebKitGtk1 stratum (deprecated WebKitGtk API)
+build-depends:
+- morph: strata/geolocation.morph
+- morph: strata/gtk2.morph
+- morph: strata/gtk3.morph
+- morph: strata/libsoup-common.morph
+- morph: strata/multimedia-gstreamer.morph
+- morph: strata/mesa-common.morph
+- morph: strata/ruby.morph
+- morph: strata/secret-service.morph
+- morph: strata/spell-checking.morph
+chunks:
+- name: WebKitGtk1
+ morph: strata/WebKitGtk1-common/WebKitGtk1.morph
+ repo: upstream:WebKitGtk-tarball
+ ref: 41386e9cb918eed93b3f13648cbef387e371e451
+ unpetrify-ref: webkitgtk-2.4.9
diff --git a/strata/gnome/WebKitGtk1.morph b/strata/WebKitGtk1-common/WebKitGtk1.morph
index b723248d..b723248d 100644
--- a/strata/gnome/WebKitGtk1.morph
+++ b/strata/WebKitGtk1-common/WebKitGtk1.morph
diff --git a/strata/gnome.morph b/strata/gnome.morph
index a911b2fe..53ed5f7f 100644
--- a/strata/gnome.morph
+++ b/strata/gnome.morph
@@ -23,6 +23,7 @@ build-depends:
- morph: strata/spell-checking.morph
- morph: strata/cups.morph
- morph: strata/docutils.morph
+- morph: strata/WebKitGtk1-common.morph
chunks:
- name: dconf
morph: strata/gnome/dconf.morph
@@ -311,11 +312,6 @@ chunks:
repo: upstream:gnome/librest
ref: 08f1fc35e3c77aecedacf08aa510e82c91ac7f2a
unpetrify-ref: 0.7.93
-- name: WebKitGtk1
- morph: strata/gnome/WebKitGtk1.morph
- repo: upstream:WebKitGtk-tarball
- ref: 41386e9cb918eed93b3f13648cbef387e371e451
- unpetrify-ref: webkitgtk-2.4.9
- name: WebKitGtk
morph: strata/gnome/WebKitGtk.morph
repo: upstream:WebKitGtk-tarball
@@ -958,7 +954,6 @@ chunks:
- telepathy-glib
- telepathy-logger
- telepathy-mission-control
- - WebKitGtk1
- yelp-tools
- name: gnome-contacts
repo: upstream:gnome/gnome-contacts
@@ -1042,5 +1037,4 @@ chunks:
- libgdata
- libgweather
- libnotify
- - WebKitGtk1
- yelp-tools
diff --git a/systems/gnome-system-armv7lhf-jetson.morph b/systems/gnome-system-armv7lhf-jetson.morph
index 47ddd341..b177375d 100644
--- a/systems/gnome-system-armv7lhf-jetson.morph
+++ b/systems/gnome-system-armv7lhf-jetson.morph
@@ -75,6 +75,8 @@ strata:
morph: strata/spell-checking.morph
- name: cups
morph: strata/cups.morph
+- name: WebKitGtk1-common
+ morph: strata/WebKitGtk1-common.morph
configuration-extensions:
- extensions/set-hostname
- extensions/add-config-files
diff --git a/systems/gnome-system-x86_64.morph b/systems/gnome-system-x86_64.morph
index f31f8f25..72753024 100644
--- a/systems/gnome-system-x86_64.morph
+++ b/systems/gnome-system-x86_64.morph
@@ -81,6 +81,8 @@ strata:
morph: strata/spell-checking.morph
- name: cups
morph: strata/cups.morph
+- name: WebKitGtk1-common
+ morph: strata/WebKitGtk1-common.morph
configuration-extensions:
- extensions/set-hostname
- extensions/add-config-files