gtk+: moved cairo dependency to common file

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4855 311d38ba-8fff-0310-9ca6-ca027cbcb966

diff --git a/meta/packages/gtk+/gtk+.inc b/meta/packages/gtk+/gtk+.inc
index 7f920dd28cfcd7690df71e0a741c891775c124c0..fca24e9b984db6d8077f5292cbd6ac6e9f79d5e7 100644 (file)
--- a/meta/packages/gtk+/gtk+.inc
+++ b/meta/packages/gtk+/gtk+.inc
@@ -5,7 +5,7 @@ SECTION = "libs"
 LICENSE = "LGPL"
 PRIORITY = "optional"
 DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor gtk-doc-native \
-           libgcrypt libxdamage libxrender libxcomposite"
+           libgcrypt libxdamage libxrender libxcomposite cairo"
 
 inherit autotools pkgconfig
 

diff --git a/meta/packages/gtk+/gtk+_2.10.14.bb b/meta/packages/gtk+/gtk+_2.10.14.bb
index 68d4e06a73a30c848cb567ef3e96204a614f0c19..2bc7217d492fc0e6bbc71151ab2284456f8e2211 100644 (file)
--- a/meta/packages/gtk+/gtk+_2.10.14.bb
+++ b/meta/packages/gtk+/gtk+_2.10.14.bb
@@ -1,6 +1,5 @@
 require gtk+.inc
 
-DEPENDS += "cairo"
 PR = "r20"
 
 SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.10/gtk+-${PV}.tar.bz2 \

diff --git a/meta/packages/gtk+/gtk+_2.12.7.bb b/meta/packages/gtk+/gtk+_2.12.7.bb
index c4adf6d3bd9aca82b335c74542b520cda31ab26d..98136e45de3caa28bba1077fb1c8ad51141b296f 100644 (file)
--- a/meta/packages/gtk+/gtk+_2.12.7.bb
+++ b/meta/packages/gtk+/gtk+_2.12.7.bb
@@ -1,6 +1,5 @@
 require gtk+.inc
 
-DEPENDS += "cairo"
 PR = "r9"
 
 SRC_URI = "http://download.gnome.org/sources/gtk+/2.12/gtk+-${PV}.tar.bz2 \

diff --git a/meta/packages/gtk+/gtk+_2.13.3.bb b/meta/packages/gtk+/gtk+_2.13.3.bb
index 10384c1b63bbc3ff48821b053b1b5b68a2d8e5b5..8797550597ca9f3bf44b489fa450e92f2a5e192e 100644 (file)
--- a/meta/packages/gtk+/gtk+_2.13.3.bb
+++ b/meta/packages/gtk+/gtk+_2.13.3.bb
@@ -1,6 +1,5 @@
 require gtk+.inc
 
-DEPENDS += "cairo"
 PR = "r1"
 
 SRC_URI = "http://download.gnome.org/sources/gtk+/2.13/gtk+-${PV}.tar.bz2 \