diff options
Diffstat (limited to 'poky/meta/recipes-gnome')
-rw-r--r-- | poky/meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Don-t-use-AC_CANONICAL_HOST.patch | 6 | ||||
-rw-r--r-- | poky/meta/recipes-gnome/gnome/adwaita-icon-theme_3.36.1.bb (renamed from poky/meta/recipes-gnome/gnome/adwaita-icon-theme_3.34.3.bb) | 4 | ||||
-rw-r--r-- | poky/meta/recipes-gnome/gtk+/gtk+3.inc | 1 | ||||
-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.20.bb (renamed from poky/meta/recipes-gnome/gtk+/gtk+3_3.24.14.bb) | 7 | ||||
-rw-r--r-- | poky/meta/recipes-gnome/gtk-doc/gtk-doc_1.32.bb | 2 | ||||
-rw-r--r-- | poky/meta/recipes-gnome/librsvg/librsvg_2.40.20.bb | 2 |
7 files changed, 11 insertions, 30 deletions
diff --git a/poky/meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Don-t-use-AC_CANONICAL_HOST.patch b/poky/meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Don-t-use-AC_CANONICAL_HOST.patch index 372f144be..5da3fbf6d 100644 --- a/poky/meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Don-t-use-AC_CANONICAL_HOST.patch +++ b/poky/meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Don-t-use-AC_CANONICAL_HOST.patch @@ -1,4 +1,4 @@ -From 4409423752885f76326d05c1266698155f47c5f9 Mon Sep 17 00:00:00 2001 +From 0a867caa8803a78f7cf3a204c4c358bc63daaf28 Mon Sep 17 00:00:00 2001 From: Jussi Kukkonen <jussi.kukkonen@intel.com> Date: Tue, 30 May 2017 14:55:49 +0300 Subject: [PATCH] Don't use AC_CANONICAL_HOST @@ -14,12 +14,12 @@ Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> 1 file changed, 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 4a84501..52dbb8e 100644 +index e749112..58790e8 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,6 @@ AC_PREREQ(2.53) - AC_INIT([adwaita-icon-theme], [3.34.3], + AC_INIT([adwaita-icon-theme], [3.36.1], [http://bugzilla.gnome.org/enter_bug.cgi?product=adwaita-icon-theme]) -AC_CANONICAL_HOST AC_CONFIG_MACRO_DIR([m4]) diff --git a/poky/meta/recipes-gnome/gnome/adwaita-icon-theme_3.34.3.bb b/poky/meta/recipes-gnome/gnome/adwaita-icon-theme_3.36.1.bb index 3a2727b70..473e1fc0b 100644 --- a/poky/meta/recipes-gnome/gnome/adwaita-icon-theme_3.34.3.bb +++ b/poky/meta/recipes-gnome/gnome/adwaita-icon-theme_3.36.1.bb @@ -14,8 +14,8 @@ SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \ file://0001-Run-installation-commands-as-shell-jobs.patch \ " -SRC_URI[md5sum] = "9aea4ad9bc002aacad155ee0748b357f" -SRC_URI[sha256sum] = "e7c2d8c259125d5f35ec09522b88c8fe7ecf625224ab0811213ef0a95d90b908" +SRC_URI[md5sum] = "c61ca9d6b3ce70a9ab66dcff945923ff" +SRC_URI[sha256sum] = "e498518627044dfd7db7d79a5b3d437848caf1991ef4ef036a2d3a2ac2c1f14d" DEPENDS += "librsvg-native" diff --git a/poky/meta/recipes-gnome/gtk+/gtk+3.inc b/poky/meta/recipes-gnome/gtk+/gtk+3.inc index 615415400..e1ecf504a 100644 --- a/poky/meta/recipes-gnome/gtk+/gtk+3.inc +++ b/poky/meta/recipes-gnome/gtk+/gtk+3.inc @@ -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 \ 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.20.bb index ab1f87c22..e5744a4b0 100644 --- a/poky/meta/recipes-gnome/gtk+/gtk+3_3.24.14.bb +++ b/poky/meta/recipes-gnome/gtk+/gtk+3_3.24.20.bb @@ -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}" diff --git a/poky/meta/recipes-gnome/gtk-doc/gtk-doc_1.32.bb b/poky/meta/recipes-gnome/gtk-doc/gtk-doc_1.32.bb index b508e6274..1eaf370ab 100644 --- a/poky/meta/recipes-gnome/gtk-doc/gtk-doc_1.32.bb +++ b/poky/meta/recipes-gnome/gtk-doc/gtk-doc_1.32.bb @@ -40,7 +40,7 @@ do_install_append () { # configure values for python3 and pkg-config encoded in scripts for fn in ${bindir}/gtkdoc-depscan \ ${bindir}/gtkdoc-mkhtml2 \ - ${datadir}/gtk-doc/python/gtkdoc/config.py; do + ${datadir}/gtk-doc/python/gtkdoc/config.py; do sed -e 's,${RECIPE_SYSROOT_NATIVE}/usr/bin/pkg-config,${bindir}/pkg-config,' \ -e 's,${HOSTTOOLS_DIR}/python3,${bindir}/python3,' \ -i ${D}$fn diff --git a/poky/meta/recipes-gnome/librsvg/librsvg_2.40.20.bb b/poky/meta/recipes-gnome/librsvg/librsvg_2.40.20.bb index 6dd0533a5..337299ff6 100644 --- a/poky/meta/recipes-gnome/librsvg/librsvg_2.40.20.bb +++ b/poky/meta/recipes-gnome/librsvg/librsvg_2.40.20.bb @@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ SECTION = "x11/utils" DEPENDS = "cairo gdk-pixbuf glib-2.0 libcroco libxml2 pango" -BBCLASSEXTEND = "native" +BBCLASSEXTEND = "native nativesdk" inherit gnomebase gtk-doc pixbufcache upstream-version-is-even gobject-introspection |