Small upgrades around the GNOME stack
cover Small upgrades around the GNOME stack
The following changes since commit d0d260b0b85790ceb136dd6b0445e8e33d038f5e:
u-boot/beaglebone: Select Beaglebone Black target specifically. (2016-12-17 09:57:37 +0000)
are available in the git repository at:
git://git.yoctoproject.org/poky-contrib jku/gtk-etc
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=jku/gtk-etc
Jussi Kukkonen (8):
gtk+3: Upgrade 3.22.1 -> 3.22.5
gsettings-desktop-schemas: Upgrade 3.20.0 -> 3.22.0 glib-2.0: Upgrade 2.50.1 -> 2.50.2
gdk-pixbuf: Upgrade 2.36.0 -> 2.36.1
cairo: Upgrade 1.14.6 -> 1.14.8 clutter-gst-3.0: Upgrade 3.0.20 -> 3.0.22 cogl-1.0: Upgrade 1.22.0 -> 1.22.2 mirrors.bbclass: Fix gnutls mirror directory
meta/classes/mirrors.bbclass | 2 +-
.../{glib-2.0_2.50.1.bb => glib-2.0_2.50.2.bb} | 4 +--
.../{gdk-pixbuf_2.36.0.bb => gdk-pixbuf_2.36.1.bb} | 8 ++++--
...20.0.bb => gsettings-desktop-schemas_3.22.0.bb} | 4 +--
.../gtk+/{gtk+3_3.22.1.bb => gtk+3_3.22.5.bb} | 4 +--
...e_3.22.1.bb => gtk-icon-utils-native_3.22.5.bb} | 4 +--
.../cairo/{cairo_1.14.6.bb => cairo_1.14.8.bb} | 4 +--
...gst-3.0_3.0.20.bb => clutter-gst-3.0_3.0.22.bb} | 4 +--
...Fix-an-incorrect-preprocessor-conditional.patch | 32 ++++++++++++++++++++++
meta/recipes-graphics/cogl/cogl-1.0_1.22.0.bb | 7 -----
meta/recipes-graphics/cogl/cogl-1.0_1.22.2.bb | 8 ++++++
11 files changed, 58 insertions(+), 23 deletions(-)
rename meta/recipes-core/glib-2.0/{glib-2.0_2.50.1.bb => glib-2.0_2.50.2.bb} (86%)
rename meta/recipes-gnome/gdk-pixbuf/{gdk-pixbuf_2.36.0.bb => gdk-pixbuf_2.36.1.bb} (92%)
rename meta/recipes-gnome/gsettings-desktop-schemas/{gsettings-desktop-schemas_3.20.0.bb => gsettings-desktop-schemas_3.22.0.bb} (70%)
rename meta/recipes-gnome/gtk+/{gtk+3_3.22.1.bb => gtk+3_3.22.5.bb} (84%)
rename meta/recipes-gnome/gtk+/{gtk-icon-utils-native_3.22.1.bb => gtk-icon-utils-native_3.22.5.bb} (93%)
rename meta/recipes-graphics/cairo/{cairo_1.14.6.bb => cairo_1.14.8.bb} (92%)
rename meta/recipes-graphics/clutter/{clutter-gst-3.0_3.0.20.bb => clutter-gst-3.0_3.0.22.bb} (58%)
create mode 100644 meta/recipes-graphics/cogl/cogl-1.0/0001-Fix-an-incorrect-preprocessor-conditional.patch
delete mode 100644 meta/recipes-graphics/cogl/cogl-1.0_1.22.0.bb
create mode 100644 meta/recipes-graphics/cogl/cogl-1.0_1.22.2.bbSignature · 1 line
2.1.4
PATCH 1/8 gtk+3: Upgrade 3.22.1 -> 3.22.5
---
meta/recipes-gnome/gtk+/{gtk+3_3.22.1.bb => gtk+3_3.22.5.bb} | 4 ++--
...tk-icon-utils-native_3.22.1.bb => gtk-icon-utils-native_3.22.5.bb} | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
rename meta/recipes-gnome/gtk+/{gtk+3_3.22.1.bb => gtk+3_3.22.5.bb} (84%)
rename meta/recipes-gnome/gtk+/{gtk-icon-utils-native_3.22.1.bb => gtk-icon-utils-native_3.22.5.bb} (93%)meta/recipes-gnome/gtk+/gtk+3_3.22.5.bb renamed from meta/recipes-gnome/gtk+/gtk+3_3.22.1.bb +2 -2
@@ -8,8 +8,8 @@ SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar file://0003-Add-disable-opengl-configure-option.patch \ file://0004-configure.ac-Fix-wayland-protocols-path.patch \ " -SRC_URI[md5sum] = "ebfa5e52167f2b8a4ec6024d51d86f1f" -SRC_URI[sha256sum] = "127c8c5cfc32681f9ab3cb542eb0d5c16c1c02faba68bf8fcac9a3cf278ef471" +SRC_URI[md5sum] = "55e0198f100db98f31d1b0f9dc403794" +SRC_URI[sha256sum] = "693fa0ac643c59ccd51db99cabe476b4e0a41fd4f0c3c8b3e3ef38f94b2e7334" S = "${WORKDIR}/gtk+-${PV}"
meta/recipes-gnome/gtk+/gtk-icon-utils-native_3.22.5.bb renamed from meta/recipes-gnome/gtk+/gtk-icon-utils-native_3.22.1.bb +2 -2
@@ -10,8 +10,8 @@ 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://Remove-Gdk-dependency-from-gtk-encode-symbolic-svg.patch" -SRC_URI[md5sum] = "ebfa5e52167f2b8a4ec6024d51d86f1f" -SRC_URI[sha256sum] = "127c8c5cfc32681f9ab3cb542eb0d5c16c1c02faba68bf8fcac9a3cf278ef471" +SRC_URI[md5sum] = "55e0198f100db98f31d1b0f9dc403794" +SRC_URI[sha256sum] = "693fa0ac643c59ccd51db99cabe476b4e0a41fd4f0c3c8b3e3ef38f94b2e7334" LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2 \ file://gtk/gtk.h;endline=25;md5=1d8dc0fccdbfa26287a271dce88af737 \
Signature · 1 line
2.1.4
PATCH 2/8 gsettings-desktop-schemas: Upgrade 3.20.0 -> 3.22.0
In reply to Jussi Kukkonen---
...-desktop-schemas_3.20.0.bb => gsettings-desktop-schemas_3.22.0.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-gnome/gsettings-desktop-schemas/{gsettings-desktop-schemas_3.20.0.bb => gsettings-desktop-schemas_3.22.0.bb} (70%)meta/recipes-gnome/gsettings-desktop-schemas/gsettings-desktop-schemas_3.22.0.bb renamed from meta/recipes-gnome/gsettings-desktop-schemas/gsettings-desktop-schemas_3.20.0.bb +2 -2
@@ -9,5 +9,5 @@ DEPENDS = "glib-2.0 intltool-native" inherit gnomebase gsettings gettext gobject-introspection upstream-version-is-even -SRC_URI[archive.md5sum] = "c5d87ea480aa9bf66b134ddb5b8ea0f8" -SRC_URI[archive.sha256sum] = "55a41b533c0ab955e0a36a84d73829451c88b027d8d719955d8f695c35c6d9c1" +SRC_URI[archive.md5sum] = "5b9056ab6eff42a0117f2912edff5f20" +SRC_URI[archive.sha256sum] = "0f06c7ba34c3a99e4d58b10889496133c9aaad6698ea2d8405d481c7f1a7eae1"
Signature · 1 line
2.1.4
PATCH 3/8 glib-2.0: Upgrade 2.50.1 -> 2.50.2
In reply to Jussi Kukkonen---
meta/recipes-core/glib-2.0/{glib-2.0_2.50.1.bb => glib-2.0_2.50.2.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-core/glib-2.0/{glib-2.0_2.50.1.bb => glib-2.0_2.50.2.bb} (86%)meta/recipes-core/glib-2.0/glib-2.0_2.50.2.bb renamed from meta/recipes-core/glib-2.0/glib-2.0_2.50.1.bb +2 -2
@@ -21,5 +21,5 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \ SRC_URI_append_class-native = " file://glib-gettextize-dir.patch \ file://relocate-modules.patch" -SRC_URI[md5sum] = "6baee4d7e3b1ec791b4ced93976365ee" -SRC_URI[sha256sum] = "2ef87a78f37c1eb5b95f4cc95efd5b66f69afad9c9c0899918d04659cf6df7dd" +SRC_URI[md5sum] = "5eeb2bfaf78a07be59585e8b6e80b1d6" +SRC_URI[sha256sum] = "be68737c1f268c05493e503b3b654d2b7f43d7d0b8c5556f7e4651b870acfbf5"
Signature · 1 line
2.1.4
PATCH 4/8 gdk-pixbuf: Upgrade 2.36.0 -> 2.36.1
In reply to Jussi KukkonenNew binary gdk-pixbuf-thumbnailer packaged in ${PN}-bin.
---
.../gdk-pixbuf/{gdk-pixbuf_2.36.0.bb => gdk-pixbuf_2.36.1.bb} | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
rename meta/recipes-gnome/gdk-pixbuf/{gdk-pixbuf_2.36.0.bb => gdk-pixbuf_2.36.1.bb} (92%)meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.36.1.bb renamed from meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.36.0.bb +5 -3
@@ -19,10 +19,10 @@ SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \ file://fatal-loader.patch \ " -SRC_URI[md5sum] = "1a3baf91956c7923dab49ee3de100ce1" -SRC_URI[sha256sum] = "85ab52ce9f2c26327141b3dcf21cca3da6a3f8de84b95fa1e727d8871a23245c" +SRC_URI[md5sum] = "fe30b0420e013f2c4590ae6226d895d4" +SRC_URI[sha256sum] = "9d5ba72070460c1b5b74115d395a3e33daeb7b7b67fb256cdccc9d7187c42a38" -inherit autotools pkgconfig gettext pixbufcache ptest-gnome upstream-version-is-even gobject-introspection gtk-doc +inherit autotools pkgconfig gettext pixbufcache ptest-gnome upstream-version-is-even gobject-introspection gtk-doc lib_package LIBV = "2.10.0"
@@ -48,6 +48,8 @@ ALLOW_EMPTY_${PN}-xlib = "1" FILES_${PN} += "${libdir}/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders" +FILES_${PN}-bin += "${datadir}/thumbnailers/gdk-pixbuf-thumbnailer.thumbnailer" + FILES_${PN}-dev += " \ ${bindir}/gdk-pixbuf-csource \ ${bindir}/gdk-pixbuf-pixdata \
Signature · 1 line
2.1.4
PATCH 5/8 cairo: Upgrade 1.14.6 -> 1.14.8
In reply to Jussi KukkonenSmall bug fix release.
---
meta/recipes-graphics/cairo/{cairo_1.14.6.bb => cairo_1.14.8.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-graphics/cairo/{cairo_1.14.6.bb => cairo_1.14.8.bb} (92%)meta/recipes-graphics/cairo/cairo_1.14.8.bb renamed from meta/recipes-graphics/cairo/cairo_1.14.6.bb +2 -2
@@ -4,8 +4,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=e73e999e0c72b5ac9012424fa157ad77" SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.xz" -SRC_URI[md5sum] = "23a0b2f0235431d35238df1d3a517fdb" -SRC_URI[sha256sum] = "613cb38447b76a93ff7235e17acd55a78b52ea84a9df128c3f2257f8eaa7b252" +SRC_URI[md5sum] = "4ef0db2eacb271c74f8a3fd87822aa98" +SRC_URI[sha256sum] = "d1f2d98ae9a4111564f6de4e013d639cf77155baf2556582295a0f00a9bc5e20" PACKAGES =+ "cairo-gobject cairo-script-interpreter cairo-perf-utils"
Signature · 1 line
2.1.4
PATCH 6/8 clutter-gst-3.0: Upgrade 3.0.20 -> 3.0.22
In reply to Jussi KukkonenBug fix release.
---
.../clutter/{clutter-gst-3.0_3.0.20.bb => clutter-gst-3.0_3.0.22.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-graphics/clutter/{clutter-gst-3.0_3.0.20.bb => clutter-gst-3.0_3.0.22.bb} (58%)meta/recipes-graphics/clutter/clutter-gst-3.0_3.0.22.bb renamed from meta/recipes-graphics/clutter/clutter-gst-3.0_3.0.20.bb +2 -2
@@ -3,5 +3,5 @@ require clutter-gst-3.0.inc LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ file://clutter-gst/clutter-gst.h;beginline=1;endline=24;md5=95baacba194e814c110ea3bdf25ddbf4" -SRC_URI[archive.md5sum] = "e6de3afcf82fcddab8193665f1a1667e" -SRC_URI[archive.sha256sum] = "a0011787ed2a2dafe914f973c1ede283d40b8eb75123f4a7b608ae6d1cc066c9" +SRC_URI[archive.md5sum] = "88eea2dd5fc4357b5b18f1dfeed56c62" +SRC_URI[archive.sha256sum] = "f1fc57fb32ea7e3d9234b58db35eb9ef3028cf0b266d85235f959edc0fe3dfd4"
Signature · 1 line
2.1.4
PATCH 7/8 cogl-1.0: Upgrade 1.22.0 -> 1.22.2
In reply to Jussi KukkonenBug fix release. Backport a build fixing patch.
--- ...Fix-an-incorrect-preprocessor-conditional.patch | 32 ++++++++++++++++++++++ meta/recipes-graphics/cogl/cogl-1.0_1.22.0.bb | 7 ----- meta/recipes-graphics/cogl/cogl-1.0_1.22.2.bb | 8 ++++++ 3 files changed, 40 insertions(+), 7 deletions(-) create mode 100644 meta/recipes-graphics/cogl/cogl-1.0/0001-Fix-an-incorrect-preprocessor-conditional.patch delete mode 100644 meta/recipes-graphics/cogl/cogl-1.0_1.22.0.bb create mode 100644 meta/recipes-graphics/cogl/cogl-1.0_1.22.2.bb
meta/recipes-graphics/cogl/cogl-1.0/0001-Fix-an-incorrect-preprocessor-conditional.patch new file +32 -0
@@ -0,0 +1,32 @@ +Signed-off-by: Jussi Kukkonen <[email protected]> +Upstream-Status: Backport + + +Original upstream commit follows: + +From b583e21d8698dbd58013320cfb47739102efdea7 Mon Sep 17 00:00:00 2001 +From: Kalev Lember <[email protected]> +Date: Wed, 19 Oct 2016 23:38:28 +0200 +Subject: [PATCH] Fix an incorrect preprocessor conditional + +This fixes the build with wayland wayland egl server support disabled. +--- + cogl/winsys/cogl-winsys-egl.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/cogl/winsys/cogl-winsys-egl.c b/cogl/winsys/cogl-winsys-egl.c +index 39bfd884..4a9f3aa6 100644 +--- a/cogl/winsys/cogl-winsys-egl.c ++++ b/cogl/winsys/cogl-winsys-egl.c +@@ -1029,7 +1029,7 @@ _cogl_egl_create_image (CoglContext *ctx, + egl_ctx = EGL_NO_CONTEXT; + else + #endif +-#if COGL_HAS_WAYLAND_EGL_SERVER_SUPPORT ++#ifdef COGL_HAS_WAYLAND_EGL_SERVER_SUPPORT + /* The WL_bind_wayland_display spec states that EGL_NO_CONTEXT is to be used + * in conjunction with the EGL_WAYLAND_BUFFER_WL target */ + if (target == EGL_WAYLAND_BUFFER_WL) +-- +2.11.0 +
meta/recipes-graphics/cogl/cogl-1.0_1.22.0.bb deleted +0 -7
@@ -1,7 +0,0 @@ -require cogl-1.0.inc - -SRC_URI += "file://test-backface-culling.c-fix-may-be-used-uninitialize.patch" - -LIC_FILES_CHKSUM = "file://COPYING;md5=1b1a508d91d25ca607c83f92f3e31c84" -SRC_URI[archive.md5sum] = "ab684ec96848d79d22757fb3064820c8" -SRC_URI[archive.sha256sum] = "689dfb5d14fc1106e9d2ded0f7930dcf7265d0bc84fa846b4f03941633eeaa91"
meta/recipes-graphics/cogl/cogl-1.0_1.22.2.bb new file +8 -0
@@ -0,0 +1,8 @@ +require cogl-1.0.inc + +SRC_URI += "file://test-backface-culling.c-fix-may-be-used-uninitialize.patch \ + file://0001-Fix-an-incorrect-preprocessor-conditional.patch" +SRC_URI[archive.md5sum] = "d53b708ca7c4af03d7254e46945d6b33" +SRC_URI[archive.sha256sum] = "39a718cdb64ea45225a7e94f88dddec1869ab37a21b339ad058a9d898782c00d" + +LIC_FILES_CHKSUM = "file://COPYING;md5=1b1a508d91d25ca607c83f92f3e31c84"
Signature · 1 line
2.1.4
PATCH 8/8 mirrors.bbclass: Fix gnutls mirror directory
In reply to Jussi Kukkonen--- meta/classes/mirrors.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/classes/mirrors.bbclass +1 -1
@@ -27,7 +27,7 @@ ${GNUPG_MIRROR} ftp://mirrors.dotsrc.org/gcrypt \n \ ftp://dante.ctan.org/tex-archive ftp://ftp.fu-berlin.de/tex/CTAN \n \ ftp://dante.ctan.org/tex-archive http://sunsite.sut.ac.jp/pub/archives/ctan/ \n \ ftp://dante.ctan.org/tex-archive http://ctan.unsw.edu.au/ \n \ -ftp://ftp.gnutls.org/gcrypt/gnutls ${GNUPG_MIRROR} \n \ +ftp://ftp.gnutls.org/gcrypt/gnutls ${GNUPG_MIRROR}/gnutls \n \ http://ftp.info-zip.org/pub/infozip/src/ http://mirror.switch.ch/ftp/mirror/infozip/src/ \n \ http://ftp.info-zip.org/pub/infozip/src/ ftp://sunsite.icm.edu.pl/pub/unix/archiving/info-zip/src/ \n \ ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/ ftp://ftp.cerias.purdue.edu/pub/tools/unix/sysutils/lsof/ \n \
Signature · 1 line
2.1.4
Re: [PATCH 8/8] mirrors.bbclass: Fix gnutls mirror directory
Quoted 2 lines · Jussi Kukkonen
Signed-off-by Jussi Kukkonen <[email protected]>
This commit message is a little terse: I believe I just got the mirror path wrong originally -- at least currently this new version finds the right directory.
Jussi
Quoted 26 lines
--- meta/classes/mirrors.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)meta/classes/mirrors.bbclass +1
-1@@ -27,7 +27,7 @@ ${GNUPG_MIRROR} ftp://mirrors.dotsrc.org/gcrypt \n \ ftp://dante.ctan.org/tex-archive ftp://ftp.fu-berlin.de/tex/CTAN \n \ ftp://dante.ctan.org/tex-archive http://sunsite.sut.ac.jp/pub/ archives/ctan/ \n \ ftp://dante.ctan.org/tex-archive http://ctan.unsw.edu.au/ \n \ -ftp://ftp.gnutls.org/gcrypt/gnutls ${GNUPG_MIRROR} \n \ +ftp://ftp.gnutls.org/gcrypt/gnutls ${GNUPG_MIRROR}/gnutls \n \ http://ftp.info-zip.org/pub/infozip/src/ http://mirror.switch.ch/ftp/mirror/infozip/src/ \n \
http://ftp.info-zip.org/pub/infozip/src/ ftp://sunsite.icm.edu.pl/pub/
unix/archiving/info-zip/src/ \n \
ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/
ftp://ftp.cerias.purdue.edu/pub/tools/unix/sysutils/lsof/ \n \
--
2.1.4