gtk+3: upgrade 3.24.14 -> 3.24.20

(From OE-Core rev: e7f7d2c81aa0ce55906e0b4c9f76934d591d9e4b)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin
2020-05-31 17:52:12 +02:00
committed by Richard Purdie
parent 68db40a2d7
commit 2fe7b33832
3 changed files with 4 additions and 23 deletions

View File

@@ -106,6 +106,7 @@ FILES_${PN}_append = " ${bindir}/gtk-update-icon-cache-3.0 \
FILES_${PN}-dev += " \
${datadir}/gtk-3.0/gtkbuilder.rng \
${datadir}/gtk-3.0/include \
${datadir}/gtk-3.0/valgrind \
${datadir}/gettext/its \
${libdir}/gtk-3.0/include \
${libdir}/gtk-3.0/${LIBV}/loaders/*.la \

View File

@@ -1,19 +0,0 @@
If the resources file isn't sorted in some way then libgdk.so will differ
depending on the inode order of the resource files.
Upstream-Status: Pending
Signed-off-by: Ross Burton <ross.burton@intel.com>
diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index e25b57ba50..26f2d57c6e 100644
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -465,7 +465,7 @@ stamp-gc-h: $(top_builddir)/config.status
# Resources
#
-glsl_sources := $(wildcard $(srcdir)/resources/glsl/*.glsl)
+glsl_sources := $(sort $(wildcard $(srcdir)/resources/glsl/*.glsl))
gdk.gresource.xml: Makefile.am
$(AM_V_GEN) echo "<?xml version='1.0' encoding='UTF-8'?>" > $@; \

View File

@@ -7,10 +7,9 @@ SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar
file://0002-Do-not-try-to-initialize-GL-without-libGL.patch \
file://0003-Add-disable-opengl-configure-option.patch \
file://link_fribidi.patch \
file://sort-resources.patch \
"
SRC_URI[md5sum] = "62e39212fa0a84016a3392a9d291faf8"
SRC_URI[sha256sum] = "1c4d69f93ab884fd80c6b95115bfbc12d51ecd029178b6dad3672fdc5ff91e88"
"
SRC_URI[md5sum] = "b302acc0a4b42e2980ef18628f9ce951"
SRC_URI[sha256sum] = "2dac69f716e8d04ba7a95091589e2baaec95dcace932cb15839163db479b1df3"
S = "${WORKDIR}/gtk+-${PV}"