diff options
Diffstat (limited to 'meta/recipes-gnome/gtk+')
-rw-r--r-- | meta/recipes-gnome/gtk+/gtk+.inc | 7 | ||||
-rw-r--r-- | meta/recipes-gnome/gtk+/gtk+_2.24.14.bb | 2 |
2 files changed, 2 insertions, 7 deletions
diff --git a/meta/recipes-gnome/gtk+/gtk+.inc b/meta/recipes-gnome/gtk+/gtk+.inc index 97d3650b06..3a40409ae0 100644 --- a/meta/recipes-gnome/gtk+/gtk+.inc +++ b/meta/recipes-gnome/gtk+/gtk+.inc | |||
@@ -14,14 +14,9 @@ X11DEPENDS = "virtual/libx11 libxext libxcursor libxrandr libxdamage libxrender | |||
14 | DEPENDS = "glib-2.0 pango atk jpeg libpng 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)}" |
18 | ${@base_contains('DISTRO_FEATURES', 'gtk-directfb', 'gtk-directfb', '', d)}" | ||
19 | 18 | ||
20 | # for gtk+ 2.x, have to pick either x11 or directfb not both | ||
21 | # for gtk+ 3.x, PACKAGECONFIG[gtk-directfb] should be removed because directfb will not be support as | ||
22 | # a backend. | ||
23 | PACKAGECONFIG[x11] = "--with-x=yes --with-gdktarget=x11,--with-x=no,${X11DEPENDS}" | 19 | PACKAGECONFIG[x11] = "--with-x=yes --with-gdktarget=x11,--with-x=no,${X11DEPENDS}" |
24 | PACKAGECONFIG[gtk-directfb] = "--with-gdktarget=directfb,,directfb" | ||
25 | 20 | ||
26 | inherit autotools gtk-doc pkgconfig update-alternatives | 21 | inherit autotools gtk-doc pkgconfig update-alternatives |
27 | 22 | ||
diff --git a/meta/recipes-gnome/gtk+/gtk+_2.24.14.bb b/meta/recipes-gnome/gtk+/gtk+_2.24.14.bb index d794840bfc..fab360dc0c 100644 --- a/meta/recipes-gnome/gtk+/gtk+_2.24.14.bb +++ b/meta/recipes-gnome/gtk+/gtk+_2.24.14.bb | |||
@@ -29,7 +29,7 @@ SRC_URI = "http://download.gnome.org/sources/gtk+/2.24/gtk+-${PV}.tar.xz \ | |||
29 | # file://combo-arrow-size.patch;striplevel=0 | 29 | # file://combo-arrow-size.patch;striplevel=0 |
30 | # file://configurefix.patch | 30 | # file://configurefix.patch |
31 | 31 | ||
32 | PR = "r0" | 32 | PR = "r1" |
33 | 33 | ||
34 | SRC_URI[md5sum] = "e2c16f119ed624893ecfc3775930ae4c" | 34 | SRC_URI[md5sum] = "e2c16f119ed624893ecfc3775930ae4c" |
35 | SRC_URI[sha256sum] = "8bd1b8b511a3004e8972badf467ce829e6855cdff15540b9344dc934c68008ac" | 35 | SRC_URI[sha256sum] = "8bd1b8b511a3004e8972badf467ce829e6855cdff15540b9344dc934c68008ac" |