From 16b0c4d449a6aeabcb495a8707ff9cfd2a627529 Mon Sep 17 00:00:00 2001 From: Jussi Kukkonen Date: Thu, 6 Aug 2015 11:41:57 +0300 Subject: gtk+3: Upgrade 3.16.4 -> 3.16.6 Remove a backported patch. Signed-off-by: Jussi Kukkonen Signed-off-by: Richard Purdie --- meta/recipes-gnome/gtk+/gtk+3/wayland-pango.patch | 28 ----------------------- meta/recipes-gnome/gtk+/gtk+3_3.16.4.bb | 19 --------------- meta/recipes-gnome/gtk+/gtk+3_3.16.6.bb | 18 +++++++++++++++ 3 files changed, 18 insertions(+), 47 deletions(-) delete mode 100644 meta/recipes-gnome/gtk+/gtk+3/wayland-pango.patch delete mode 100644 meta/recipes-gnome/gtk+/gtk+3_3.16.4.bb create mode 100644 meta/recipes-gnome/gtk+/gtk+3_3.16.6.bb (limited to 'meta') diff --git a/meta/recipes-gnome/gtk+/gtk+3/wayland-pango.patch b/meta/recipes-gnome/gtk+/gtk+3/wayland-pango.patch deleted file mode 100644 index 1d6f12b452..0000000000 --- a/meta/recipes-gnome/gtk+/gtk+3/wayland-pango.patch +++ /dev/null @@ -1,28 +0,0 @@ -Upstream-Status: Backport -Signed-off-by: Ross Burton - -From 802b006b3768ddc8c8cdf0af27428e7042c36509 Mon Sep 17 00:00:00 2001 -From: nick -Date: Mon, 29 Jun 2015 20:37:26 +0100 -Subject: settings: Include pangofc-fontmap.h header on Wayland - -In case the X11 backend is not enabled, we still need to include the -pangofc-fontmap.h header file, as we use the Pango/FontConfig API in -both the X11 and Wayland case. - -https://bugzilla.gnome.org/show_bug.cgi?id=751625 - -diff --git a/gtk/gtksettings.c b/gtk/gtksettings.c -index 327faf5..a40cb84 100644 ---- a/gtk/gtksettings.c -+++ b/gtk/gtksettings.c -@@ -41,6 +41,7 @@ - - #ifdef GDK_WINDOWING_WAYLAND - #include "wayland/gdkwayland.h" -+#include - #endif - - #ifdef GDK_WINDOWING_BROADWAY --- -cgit v0.10.2 diff --git a/meta/recipes-gnome/gtk+/gtk+3_3.16.4.bb b/meta/recipes-gnome/gtk+/gtk+3_3.16.4.bb deleted file mode 100644 index 4bb6b0c959..0000000000 --- a/meta/recipes-gnome/gtk+/gtk+3_3.16.4.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://wayland-pango.patch \ - " - -SRC_URI[md5sum] = "c7497aaf6730524a127597b768a73bd7" -SRC_URI[sha256sum] = "1ee5dbd7a4cb81a91eaa1b7ae64ba5a3eab6a3c0a764155583ab96524590fc8e" - -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.16.6.bb b/meta/recipes-gnome/gtk+/gtk+3_3.16.6.bb new file mode 100644 index 0000000000..1d736a4326 --- /dev/null +++ b/meta/recipes-gnome/gtk+/gtk+3_3.16.6.bb @@ -0,0 +1,18 @@ +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 \ + " + +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" -- cgit 1.2.3-korg