From e7e57bb012d4d0e5d4bcbef1c0c78a6fe3432d3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Tue, 24 Feb 2015 12:46:48 +0000 Subject: Move librsvg to gtk-deps stratum So we have SVG support --- strata/gtk-deps.morph | 15 +++++++++++++++ strata/xfce.morph | 11 ----------- strata/xfce/librsvg.morph | 6 ------ 3 files changed, 15 insertions(+), 17 deletions(-) delete mode 100644 strata/xfce/librsvg.morph diff --git a/strata/gtk-deps.morph b/strata/gtk-deps.morph index f1141fcd..e48e6bc4 100644 --- a/strata/gtk-deps.morph +++ b/strata/gtk-deps.morph @@ -28,6 +28,21 @@ chunks: ref: b86959aa16e9d49ec6e286bc57d36c5249578c59 unpetrify-ref: 2.30.8 build-depends: [] +- name: libcroco + repo: upstream:libcroco + ref: 21b3a35292e16448ab5b36b2ab25777eb8e30e50 + unpetrify-ref: master + build-depends: + - gnome-common +- name: librsvg + repo: upstream:librsvg + ref: aadbf6968df5fa93e182b7e7c93dc5cc076d44ce + unpetrify-ref: 2.40.7 + build-depends: + - gdk-pixbuf + - gnome-common + - libcroco + - pango - name: atk repo: upstream:atk ref: 2fb9411c3f32adb7ee421b59e36d2e0aa2f30253 diff --git a/strata/xfce.morph b/strata/xfce.morph index 5678c1fc..fc6d3733 100644 --- a/strata/xfce.morph +++ b/strata/xfce.morph @@ -5,17 +5,6 @@ build-depends: - morph: strata/gtk2.morph - morph: strata/x-generic.morph chunks: -- name: libcroco - repo: upstream:libcroco - ref: 611f624a6e15065792b41eb5ce14811293f3fb0a - unpetrify-ref: baserock/morph - build-depends: [] -- name: librsvg - morph: strata/xfce/librsvg.morph - repo: upstream:librsvg - ref: 61171ca59d02b58b7da1697ca1d924bff93e66cb - unpetrify-ref: baserock/morph - build-depends: [] - 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 f4d880ed..00000000 --- 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 -- cgit v1.2.1