diff options
Diffstat (limited to 'poky/meta/recipes-gnome/gtk+')
| -rw-r--r-- | poky/meta/recipes-gnome/gtk+/gtk+3.inc | 9 | ||||
| -rw-r--r-- | poky/meta/recipes-gnome/gtk+/gtk+3/sort-resources.patch | 19 | ||||
| -rw-r--r-- | poky/meta/recipes-gnome/gtk+/gtk+3_3.24.22.bb (renamed from poky/meta/recipes-gnome/gtk+/gtk+3_3.24.14.bb) | 6 |
3 files changed, 11 insertions, 23 deletions
diff --git a/poky/meta/recipes-gnome/gtk+/gtk+3.inc b/poky/meta/recipes-gnome/gtk+/gtk+3.inc index 615415400..8d5edb7ee 100644 --- a/poky/meta/recipes-gnome/gtk+/gtk+3.inc +++ b/poky/meta/recipes-gnome/gtk+/gtk+3.inc @@ -1,3 +1,4 @@ + SUMMARY = "Multi-platform toolkit for creating GUIs" DESCRIPTION = "GTK+ is a multi-platform toolkit for creating graphical user interfaces. Offering a complete \ set of widgets, GTK+ is suitable for projects ranging from small one-off projects to complete application suites." @@ -31,6 +32,13 @@ do_configure_prepend() { ln -s ${TARGET_PREFIX}libtool libtool #delete a file that will get confused with generated one in ${B} rm -f ${S}/gtk/gtktypefuncs.c + + # These files are generated by wayland-scanner but will race over modification + # time between the copies in the sysroot from wayland-protocols and the copy + # in the source tree. Solve the race by deleting so they need to be regenerated. + # 3.24.22 will not be shipping these files so this can be deleted then: + # https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/2183 + rm -f ${S}/modules/input/text-input-unstable-v3*.[ch] } EXTRA_OECONF += " \ @@ -106,6 +114,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 \ diff --git a/poky/meta/recipes-gnome/gtk+/gtk+3/sort-resources.patch b/poky/meta/recipes-gnome/gtk+/gtk+3/sort-resources.patch deleted file mode 100644 index 7f87372c5..000000000 --- a/poky/meta/recipes-gnome/gtk+/gtk+3/sort-resources.patch +++ /dev/null @@ -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'?>" > $@; \ diff --git a/poky/meta/recipes-gnome/gtk+/gtk+3_3.24.14.bb b/poky/meta/recipes-gnome/gtk+/gtk+3_3.24.22.bb index ab1f87c22..6af2bd94c 100644 --- a/poky/meta/recipes-gnome/gtk+/gtk+3_3.24.14.bb +++ b/poky/meta/recipes-gnome/gtk+/gtk+3_3.24.22.bb @@ -7,10 +7,8 @@ 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[sha256sum] = "bf18a4a5dff28a7b02aaef1b949c2d09c96c18387eddab152bb4cd55a5b67dda" S = "${WORKDIR}/gtk+-${PV}" |