diff options
Diffstat (limited to 'meta')
| -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 DEPENDS = "glib-2.0 pango atk jpeg libpng gdk-pixbuf-native docbook-utils-native \ libgcrypt cairo gdk-pixbuf" -PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ - ${@base_contains('DISTRO_FEATURES', 'gtk-directfb', 'gtk-directfb', '', d)}" +PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" -# for gtk+ 2.x, have to pick either x11 or directfb not both -# for gtk+ 3.x, PACKAGECONFIG[gtk-directfb] should be removed because directfb will not be support as -# a backend. PACKAGECONFIG[x11] = "--with-x=yes --with-gdktarget=x11,--with-x=no,${X11DEPENDS}" -PACKAGECONFIG[gtk-directfb] = "--with-gdktarget=directfb,,directfb" inherit autotools gtk-doc pkgconfig update-alternatives 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 \ # file://combo-arrow-size.patch;striplevel=0 # file://configurefix.patch -PR = "r0" +PR = "r1" SRC_URI[md5sum] = "e2c16f119ed624893ecfc3775930ae4c" SRC_URI[sha256sum] = "8bd1b8b511a3004e8972badf467ce829e6855cdff15540b9344dc934c68008ac" |