From 59498a8b4fa69a359e72225d14c554aae133571a Mon Sep 17 00:00:00 2001 From: Jussi Kukkonen Date: Fri, 6 Nov 2015 15:36:21 +0200 Subject: gtk+3: Upgrade 3.16.6 -> 3.18.2 * Package new development tool gtk-builder-tool. * Disable colord support (for explicitness, no functional change) Signed-off-by: Jussi Kukkonen Signed-off-by: Ross Burton --- meta/recipes-gnome/gtk+/gtk+3.inc | 5 ++++- meta/recipes-gnome/gtk+/gtk+3_3.16.6.bb | 19 ------------------- meta/recipes-gnome/gtk+/gtk+3_3.18.2.bb | 19 +++++++++++++++++++ 3 files changed, 23 insertions(+), 20 deletions(-) delete mode 100644 meta/recipes-gnome/gtk+/gtk+3_3.16.6.bb create mode 100644 meta/recipes-gnome/gtk+/gtk+3_3.18.2.bb (limited to 'meta/recipes-gnome') diff --git a/meta/recipes-gnome/gtk+/gtk+3.inc b/meta/recipes-gnome/gtk+/gtk+3.inc index e0c4ccb11b..cb091f4cc3 100644 --- a/meta/recipes-gnome/gtk+/gtk+3.inc +++ b/meta/recipes-gnome/gtk+/gtk+3.inc @@ -29,6 +29,7 @@ EXTRA_OECONF += " \ --enable-modules \ --disable-cups \ --disable-introspection \ + --disable-colord \ " PACKAGECONFIG ??= "${@bb.utils.contains("DISTRO_FEATURES", "x11", "x11", "", d)} \ @@ -79,7 +80,9 @@ FILES_${PN}-dev += " \ ${libdir}/gtk-3.0/${LIBV}/engines/*.la \ ${libdir}/gtk-3.0/modules/*.la \ ${bindir}/gtk-builder-convert \ - ${bindir}/gtk-encode-symbolic-svg" + ${bindir}/gtk-encode-symbolic-svg \ + ${bindir}/gtk-builder-tool \ + " FILES_${PN}-dbg += " \ ${libdir}/gtk-3.0/${LIBV}/loaders/.debug \ diff --git a/meta/recipes-gnome/gtk+/gtk+3_3.16.6.bb b/meta/recipes-gnome/gtk+/gtk+3_3.16.6.bb deleted file mode 100644 index 381e60750b..0000000000 --- a/meta/recipes-gnome/gtk+/gtk+3_3.16.6.bb +++ /dev/null @@ -1,19 +0,0 @@ -require gtk+3.inc - -MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" - -SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar.xz \ - file://hardcoded_libtool.patch \ - file://Dont-force-csd.patch \ - file://Do-not-try-to-initialize-GL-without-libGL.patch \ - " - -SRC_URI[md5sum] = "fc59e5c8b5a4585b60623dd708df400b" -SRC_URI[sha256sum] = "4d12726d0856a968b41802ae5c5971d7e9bac532717e309d3f81b9989da5ffbe" - -S = "${WORKDIR}/gtk+-${PV}" - -LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2 \ - file://gtk/gtk.h;endline=25;md5=1d8dc0fccdbfa26287a271dce88af737 \ - file://gdk/gdk.h;endline=25;md5=c920ce39dc88c6f06d3e7c50e08086f2 \ - file://tests/testgtk.c;endline=25;md5=cb732daee1d82af7a2bf953cf3cf26f1" diff --git a/meta/recipes-gnome/gtk+/gtk+3_3.18.2.bb b/meta/recipes-gnome/gtk+/gtk+3_3.18.2.bb new file mode 100644 index 0000000000..46f0cf9b0f --- /dev/null +++ b/meta/recipes-gnome/gtk+/gtk+3_3.18.2.bb @@ -0,0 +1,19 @@ +require gtk+3.inc + +MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" + +SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar.xz \ + file://hardcoded_libtool.patch \ + file://Dont-force-csd.patch \ + file://Do-not-try-to-initialize-GL-without-libGL.patch \ + " + +SRC_URI[md5sum] = "230fd78e42419d35ff790784b457e5f2" +SRC_URI[sha256sum] = "5dbec561c4a00070073bf9cf4cfdd61fab4a14c8ff5b15d700bd378f8185e152" + +S = "${WORKDIR}/gtk+-${PV}" + +LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2 \ + file://gtk/gtk.h;endline=25;md5=1d8dc0fccdbfa26287a271dce88af737 \ + file://gdk/gdk.h;endline=25;md5=c920ce39dc88c6f06d3e7c50e08086f2 \ + file://tests/testgtk.c;endline=25;md5=cb732daee1d82af7a2bf953cf3cf26f1" -- cgit 1.2.3-korg