diff options
author | Ross Burton <ross.burton@intel.com> | 2012-07-19 15:58:37 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-07-22 11:42:18 +0100 |
commit | 9036331c4cd98106a41d8c2087ad14fb07fe564f (patch) | |
tree | 4fc8ddc9087454e79c538779e03e7a0e2a041758 /meta | |
parent | 4b84a877889f7cf3e4b29c6f2bf816df82a29d40 (diff) | |
download | poky-9036331c4cd98106a41d8c2087ad14fb07fe564f.tar.gz |
gtk+: cleanup thanks to new gtk-doc.bbclass
(From OE-Core rev: 7402d0346a02501cd3882cfa8623fbf30d592291)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-gnome/gtk+/gtk+.inc | 4 | ||||
-rw-r--r-- | meta/recipes-gnome/gtk+/gtk+_2.12.7.bb | 2 | ||||
-rw-r--r-- | meta/recipes-gnome/gtk+/gtk+_2.16.6.bb | 2 | ||||
-rw-r--r-- | meta/recipes-gnome/gtk+/gtk+_2.24.8.bb | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/meta/recipes-gnome/gtk+/gtk+.inc b/meta/recipes-gnome/gtk+/gtk+.inc index 4e03670d50..c6d235f66a 100644 --- a/meta/recipes-gnome/gtk+/gtk+.inc +++ b/meta/recipes-gnome/gtk+/gtk+.inc | |||
@@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7" | |||
11 | SECTION = "libs" | 11 | SECTION = "libs" |
12 | 12 | ||
13 | X11DEPENDS = "virtual/libx11 libxext libxcursor libxrandr libxdamage libxrender libxcomposite" | 13 | X11DEPENDS = "virtual/libx11 libxext libxcursor libxrandr libxdamage libxrender libxcomposite" |
14 | DEPENDS = "glib-2.0 pango atk jpeg libpng gtk-doc-native gdk-pixbuf-native docbook-utils-native \ | 14 | DEPENDS = "glib-2.0 pango atk jpeg libpng gdk-pixbuf-native docbook-utils-native \ |
15 | libgcrypt cairo gdk-pixbuf" | 15 | libgcrypt cairo gdk-pixbuf" |
16 | 16 | ||
17 | PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ | 17 | PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ |
@@ -23,7 +23,7 @@ PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ | |||
23 | PACKAGECONFIG[x11] = "--with-x=yes --with-gdktarget=x11,--with-x=no,${X11DEPENDS}" | 23 | PACKAGECONFIG[x11] = "--with-x=yes --with-gdktarget=x11,--with-x=no,${X11DEPENDS}" |
24 | PACKAGECONFIG[gtk-directfb] = "--with-gdktarget=directfb,,directfb" | 24 | PACKAGECONFIG[gtk-directfb] = "--with-gdktarget=directfb,,directfb" |
25 | 25 | ||
26 | inherit autotools pkgconfig | 26 | inherit autotools gtk-doc pkgconfig |
27 | 27 | ||
28 | PACKAGES += "libgail gtk-demo" | 28 | PACKAGES += "libgail gtk-demo" |
29 | 29 | ||
diff --git a/meta/recipes-gnome/gtk+/gtk+_2.12.7.bb b/meta/recipes-gnome/gtk+/gtk+_2.12.7.bb index 1d4121c563..ac4e0cdc4d 100644 --- a/meta/recipes-gnome/gtk+/gtk+_2.12.7.bb +++ b/meta/recipes-gnome/gtk+/gtk+_2.12.7.bb | |||
@@ -1,6 +1,6 @@ | |||
1 | require gtk+.inc | 1 | require gtk+.inc |
2 | 2 | ||
3 | PR = "r14" | 3 | PR = "r15" |
4 | 4 | ||
5 | SRC_URI = "http://download.gnome.org/sources/gtk+/2.12/gtk+-${PV}.tar.bz2 \ | 5 | SRC_URI = "http://download.gnome.org/sources/gtk+/2.12/gtk+-${PV}.tar.bz2 \ |
6 | file://xsettings.patch \ | 6 | file://xsettings.patch \ |
diff --git a/meta/recipes-gnome/gtk+/gtk+_2.16.6.bb b/meta/recipes-gnome/gtk+/gtk+_2.16.6.bb index 16aa6931c9..0b989daa79 100644 --- a/meta/recipes-gnome/gtk+/gtk+_2.16.6.bb +++ b/meta/recipes-gnome/gtk+/gtk+_2.16.6.bb | |||
@@ -1,6 +1,6 @@ | |||
1 | require gtk+.inc | 1 | require gtk+.inc |
2 | 2 | ||
3 | PR = "r10" | 3 | PR = "r11" |
4 | 4 | ||
5 | SRC_URI = "http://download.gnome.org/sources/gtk+/2.16/gtk+-${PV}.tar.bz2 \ | 5 | SRC_URI = "http://download.gnome.org/sources/gtk+/2.16/gtk+-${PV}.tar.bz2 \ |
6 | file://xsettings.patch \ | 6 | file://xsettings.patch \ |
diff --git a/meta/recipes-gnome/gtk+/gtk+_2.24.8.bb b/meta/recipes-gnome/gtk+/gtk+_2.24.8.bb index 3b857599b3..529f8e129d 100644 --- a/meta/recipes-gnome/gtk+/gtk+_2.24.8.bb +++ b/meta/recipes-gnome/gtk+/gtk+_2.24.8.bb | |||
@@ -27,7 +27,7 @@ SRC_URI = "http://download.gnome.org/sources/gtk+/2.24/gtk+-${PV}.tar.bz2 \ | |||
27 | # file://combo-arrow-size.patch;striplevel=0 | 27 | # file://combo-arrow-size.patch;striplevel=0 |
28 | # file://configurefix.patch | 28 | # file://configurefix.patch |
29 | 29 | ||
30 | PR = "r4" | 30 | PR = "r5" |
31 | 31 | ||
32 | SRC_URI[md5sum] = "0413187f7e596aef00ccd1b54776ff03" | 32 | SRC_URI[md5sum] = "0413187f7e596aef00ccd1b54776ff03" |
33 | SRC_URI[sha256sum] = "ac2325a65312922a6722a7c02a389f3f4072d79e13131485cc7b7226e2537043" | 33 | SRC_URI[sha256sum] = "ac2325a65312922a6722a7c02a389f3f4072d79e13131485cc7b7226e2537043" |