summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJavier Jardón <jjardon@gnome.org>2015-09-04 12:47:54 (GMT)
committerBaserock Gerrit <gerrit@baserock.org>2015-09-07 12:47:57 (GMT)
commit18242ab38f8514eb36852b29e2dd676f605ae523 (patch)
tree5a1e53099d37259ed8396b993527dfa84704a955
parent3cbaf2d351d74d8bc15bc9ca0990c68020e50ff1 (diff)
downloaddefinitions-18242ab38f8514eb36852b29e2dd676f605ae523.tar.gz
Move libcroco/librsvg to gtk-deps
This is a dependency of xfce and GNOME, probably other desktops Also, its expected to have a svg loader in a GTK+ installation Change-Id: If0f3f12a797fe20b964b98a28de7a30e9e3ef17b
-rw-r--r--strata/gtk-deps.morph14
-rw-r--r--strata/xfce.morph12
-rw-r--r--strata/xfce/librsvg.morph6
3 files changed, 14 insertions, 18 deletions
diff --git a/strata/gtk-deps.morph b/strata/gtk-deps.morph
index 8ecaa93..b400b30 100644
--- a/strata/gtk-deps.morph
+++ b/strata/gtk-deps.morph
@@ -39,3 +39,17 @@ chunks:
build-depends:
- at-spi2-core
- atk
+- name: libcroco
+ repo: upstream:libcroco
+ ref: 9207f349d1c97618ab38e6b095207bbd8184d844
+ unpetrify-ref: 0.6.8-30-g9207f34
+ build-system: autotools
+- name: librsvg
+ repo: upstream:librsvg
+ ref: 25d5f8b7076535fecb972d6454807ba56452991a
+ unpetrify-ref: 2.40.10
+ build-system: autotools
+ build-depends:
+ - gdk-pixbuf
+ - libcroco
+ - pango
diff --git a/strata/xfce.morph b/strata/xfce.morph
index f885fd7..552cbd8 100644
--- a/strata/xfce.morph
+++ b/strata/xfce.morph
@@ -5,18 +5,6 @@ build-depends:
- morph: strata/gtk2.morph
- morph: strata/audio-bluetooth.morph
chunks:
-- name: libcroco
- repo: upstream:libcroco
- ref: 611f624a6e15065792b41eb5ce14811293f3fb0a
- unpetrify-ref: baserock/morph
- build-system: autotools
-- name: librsvg
- morph: strata/xfce/librsvg.morph
- repo: upstream:librsvg
- ref: 61171ca59d02b58b7da1697ca1d924bff93e66cb
- unpetrify-ref: baserock/morph
- build-depends:
- - libcroco
- name: xfce-dev-tools
repo: upstream:xfce/xfce4-dev-tools
ref: 9244250ac0c15ba160688758c5dccf97f3f160ef
diff --git a/strata/xfce/librsvg.morph b/strata/xfce/librsvg.morph
deleted file mode 100644
index f4d880e..0000000
--- a/strata/xfce/librsvg.morph
+++ /dev/null
@@ -1,6 +0,0 @@
-name: librsvg
-kind: chunk
-build-system: autotools
-configure-commands:
-- NOCONFIGURE=1 ./autogen.sh
-- ./configure --prefix="$PREFIX" --disable-gtk-theme