glib-2.0: upgrade to version 2.54.3
PATCH 1/4 glib-2.0: upgrade to version 2.54.3
2.54.2 -> 2.54.3
Remove upstreamed patch:
1. glib-mkenums-replace-and-warn-decoding.patch
Signed-off-by Maxin B. John <[email protected]>
---
.../glib-mkenums-replace-and-warn-decoding.patch | 104 ---------------------
.../{glib-2.0_2.54.2.bb => glib-2.0_2.54.3.bb} | 5 +-
2 files changed, 2 insertions(+), 107 deletions(-)
delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/glib-mkenums-replace-and-warn-decoding.patch
rename meta/recipes-core/glib-2.0/{glib-2.0_2.54.2.bb => glib-2.0_2.54.3.bb} (81%)meta/recipes-core/glib-2.0/glib-2.0/glib-mkenums-replace-and-warn-decoding.patch deleted +0 -104
@@ -1,104 +0,0 @@ -From ba043ef4f2c713662f89425aed70dfd78e3955ee Mon Sep 17 00:00:00 2001 -From: Patrick Welche <[email protected]> -Date: Mon, 23 Oct 2017 13:59:58 +0100 -Subject: [PATCH] glib-mkenums: best effort attempt on non-utf8 encoded files. - -Some source files aren't valid utf-8 containing for example -iso8859-1 accented characters in author's names. -Replace invalid data with a replacement '?' character and print a -warning to keep things working. -Based on a patch from Christoph Reiter in -https://bugzilla.gnome.org/show_bug.cgi?id=785113#c20 - -Upstream-Status: Submitted [https://bug785113.bugzilla-attachments.gnome.org/attachment.cgi?id=362098] - -Author: Patrick Welche <[email protected]> - -Signed-off-by: Jackie Huang <[email protected]> ---- - gobject/glib-mkenums.in | 41 ++++++++++++++++++++++++++++++----------- - 1 file changed, 30 insertions(+), 11 deletions(-) - -diff --git a/gobject/glib-mkenums.in b/gobject/glib-mkenums.in -index 7cc55053c..9790a65a2 100755 ---- a/gobject/glib-mkenums.in -+++ b/gobject/glib-mkenums.in -@@ -26,14 +26,6 @@ the GNU General Public License which can be found in the - GLib source package. Sources, examples and contact - information are available at http://www.gtk.org''' - --# Python 2 defaults to ASCII in case stdout is redirected. --# This should make it match Python 3, which uses the locale encoding. --if sys.stdout.encoding is None: -- output_stream = codecs.getwriter( -- locale.getpreferredencoding())(sys.stdout) --else: -- output_stream = sys.stdout -- - # pylint: disable=too-few-public-methods - class Color: - '''ANSI Terminal colors''' -@@ -81,6 +73,31 @@ def write_output(output): - global output_stream - print(output, file=output_stream) - -+ -+# Python 2 defaults to ASCII in case stdout is redirected. -+# This should make it match Python 3, which uses the locale encoding. -+if sys.stdout.encoding is None: -+ output_stream = codecs.getwriter( -+ locale.getpreferredencoding())(sys.stdout) -+else: -+ output_stream = sys.stdout -+ -+ -+# Some source files aren't utf-8 and the old perl version didn't care. -+# Replace invalid data with a replacement character to keep things working. -+# https://bugzilla.gnome.org/show_bug.cgi?id=785113#c20 -+decoding_errors = "replace_and_warn" -+ -+def replace_and_warn(err): -+ # 7 characters of context either side of the offending character -+ print_warning('UnicodeWarning: {} at {} ({})'.format( -+ err.reason, err.start, -+ err.object[err.start - 7:err.end + 7])) -+ return ('?', err.end) -+ -+codecs.register_error('replace_and_warn', replace_and_warn) -+ -+ - # glib-mkenums.py - # Information about the current enumeration - flags = None # Is enumeration a bitmask? -@@ -157,7 +174,8 @@ def parse_entries(file, file_name): - m = re.match(r'\#include\s*<([^>]*)>', line) - if m: - newfilename = os.path.join("..", m.group(1)) -- newfile = io.open(newfilename, encoding="utf-8") -+ newfile = io.open(newfilename, encoding="utf-8", -+ errors=decoding_errors) - - if not parse_entries(newfile, newfilename): - return False -@@ -253,7 +271,7 @@ def read_template_file(file): - } - in_ = 'junk' - -- ifile = io.open(file, encoding="utf-8") -+ ifile = io.open(file, encoding="utf-8", errors=decoding_errors) - for line in ifile: - m = re.match(r'\/\*\*\*\s+(BEGIN|END)\s+([\w-]+)\s+\*\*\*\/', line) - if m: -@@ -408,7 +426,8 @@ def process_file(curfilename): - firstenum = True - - try: -- curfile = io.open(curfilename, encoding="utf-8") -+ curfile = io.open(curfilename, encoding="utf-8", -+ errors=decoding_errors) - except IOError as e: - if e.errno == errno.ENOENT: - print_warning('No file "{}" found.'.format(curfilename)) --- -2.14.2 -
meta/recipes-core/glib-2.0/glib-2.0_2.54.3.bb renamed from meta/recipes-core/glib-2.0/glib-2.0_2.54.2.bb +2 -3
@@ -16,10 +16,9 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \ file://0001-Do-not-ignore-return-value-of-write.patch \ file://0001-Test-for-pthread_getname_np-before-using-it.patch \ file://0010-Do-not-hardcode-python-path-into-various-tools.patch \ - file://glib-mkenums-replace-and-warn-decoding.patch \ " SRC_URI_append_class-native = " file://relocate-modules.patch" -SRC_URI[md5sum] = "50f83e08f080f99b1e2f0ad2b760fb81" -SRC_URI[sha256sum] = "bb89e5c5aad33169a8c7f28b45671c7899c12f74caf707737f784d7102758e6c" +SRC_URI[md5sum] = "16e886ad677bf07b7d48eb8188bcf759" +SRC_URI[sha256sum] = "963fdc6685dc3da8e5381dfb9f15ca4b5709b28be84d9d05a9bb8e446abac0a8"
Signature · 1 line
2.4.0
PATCH 2/4 gtk+3: upgrade to version 3.22.28
3.22.26 -> 3.22.28
Bug-fix release
Signed-off-by Maxin B. John <[email protected]>
---
meta/recipes-gnome/gtk+/{gtk+3_3.22.26.bb => gtk+3_3.22.28.bb} | 4 ++--
...-icon-utils-native_3.22.26.bb => gtk-icon-utils-native_3.22.28.bb} | 0
2 files changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-gnome/gtk+/{gtk+3_3.22.26.bb => gtk+3_3.22.28.bb} (83%)
rename meta/recipes-gnome/gtk+/{gtk-icon-utils-native_3.22.26.bb => gtk-icon-utils-native_3.22.28.bb} (100%)meta/recipes-gnome/gtk+/gtk+3_3.22.28.bb renamed from meta/recipes-gnome/gtk+/gtk+3_3.22.26.bb +2 -2
@@ -7,8 +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 \ " -SRC_URI[md5sum] = "eeeb8038fe0d386c7516fa46cd4fff6b" -SRC_URI[sha256sum] = "61eef0d320e541976e2dfe445729f12b5ade53050ee9de6184235cb60cd4b967" +SRC_URI[md5sum] = "8c1f5ab987ddc7dab3e59660f89dcd9b" +SRC_URI[sha256sum] = "d299612b018cfed7b2c689168ab52b668023708e17c335eb592260d186f15e1f" S = "${WORKDIR}/gtk+-${PV}"
meta/recipes-gnome/gtk+/gtk-icon-utils-native_3.22.28.bb renamed from meta/recipes-gnome/gtk+/gtk-icon-utils-native_3.22.26.bb +0 -0
Signature · 1 line
2.4.0
PATCH 3/4 gtk-icon-utils-native: upgrade to version 3.22.28
In reply to Maxin B. John3.22.26 -> 3.22.28
Signed-off-by Maxin B. John <[email protected]>
--- meta/recipes-gnome/gtk+/gtk-icon-utils-native_3.22.28.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
meta/recipes-gnome/gtk+/gtk-icon-utils-native_3.22.28.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] = "eeeb8038fe0d386c7516fa46cd4fff6b" -SRC_URI[sha256sum] = "61eef0d320e541976e2dfe445729f12b5ade53050ee9de6184235cb60cd4b967" +SRC_URI[md5sum] = "8c1f5ab987ddc7dab3e59660f89dcd9b" +SRC_URI[sha256sum] = "d299612b018cfed7b2c689168ab52b668023708e17c335eb592260d186f15e1f" LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2 \ file://gtk/gtk.h;endline=25;md5=1d8dc0fccdbfa26287a271dce88af737 \
Signature · 1 line
2.4.0
PATCH 4/4 librsvg: provide RECIPE_NO_UPDATE_REASON
In reply to Maxin B. JohnRustification of librsvg from version 2.41.0 onwards creates the need for Rust compiler to build it. We need to push the upgrade of librsvg until we have Rust support in oe-core.
Signed-off-by Maxin B. John <[email protected]>
--- meta/recipes-gnome/librsvg/librsvg_2.40.20.bb | 2 ++ 1 file changed, 2 insertions(+)
meta/recipes-gnome/librsvg/librsvg_2.40.20.bb +2 -0
@@ -2,6 +2,8 @@ SUMMARY = "Library for rendering SVG files" HOMEPAGE = "http://ftp.gnome.org/pub/GNOME/sources/librsvg/" BUGTRACKER = "https://bugzilla.gnome.org/" +RECIPE_NO_UPDATE_REASON = "Versions from 2.41.0 requires Rust compiler to build it" + LICENSE = "LGPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ file://rsvg.h;beginline=3;endline=24;md5=20b4113c4909bbf0d67e006778302bc6"
Signature · 1 line
2.4.0