Skip to contentSkip to conversation

libxml2: add missing Upstream-Status and SOB to a patch

PATCH New Alexander Kanavin 1 participant 3 messages Oct 29, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/3 libxml2: add missing Upstream-Status and SOB to a patch

---
 meta/recipes-core/libxml/libxml2/fix-python39.patch | 2 ++
 1 file changed, 2 insertions(+)
meta/recipes-core/libxml/libxml2/fix-python39.patch +2 -0
index 76a35d9f10..32590f9ddf 100644
@@ -10,6 +10,8 @@ expression before, but that's not API to rely on.
 Since Python 3.9.0a4 it needs to be parenthesized explicitly.
 
 Fixes https://gitlab.gnome.org/GNOME/libxml2/issues/149
+Upstream-Status: Backport
+Signed-off-by: Alexander Kanavin <[email protected]>
 ---
  python/libxml.c |  4 ++--
  python/types.c  | 12 ++++++------
Signature · 1 line
2.29.0
#1 lore raw

PATCH 2/3 libhandy: move PV to file name

---
 .../libhandy/{libhandy_git.bb => libhandy_1.0.0.bb}              | 1 -
 1 file changed, 1 deletion(-)
 rename meta/recipes-gnome/libhandy/{libhandy_git.bb => libhandy_1.0.0.bb} (97%)
meta/recipes-gnome/libhandy/libhandy_1.0.0.bb renamed from meta/recipes-gnome/libhandy/libhandy_git.bb +0 -1
similarity index 97%
rename from meta/recipes-gnome/libhandy/libhandy_git.bb
rename to meta/recipes-gnome/libhandy/libhandy_1.0.0.bb
index 01b932a528..3cdbfc820f 100644
@@ -5,7 +5,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
 SRC_URI = "git://gitlab.gnome.org/GNOME/${BPN}.git;protocol=https"
 SRCREV = "94313c206258860b2428712e7ece1d02c5177857"
 S = "${WORKDIR}/git"
-PV = "1.0.0"
 
 GIR_MESON_ENABLE_FLAG = 'enabled'
 GIR_MESON_DISABLE_FLAG = 'disabled'
Signature · 1 line
2.29.0
#2 lore raw

PATCH 3/3 glib-2.0: update 2.66.1 -> 2.66.2

In reply to Alexander Kanavin
---
 .../recipes-core/glib-2.0/glib-2.0/relocate-modules.patch | 8 ++++----
 .../glib-2.0/{glib-2.0_2.66.1.bb => glib-2.0_2.66.2.bb}   | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)
 rename meta/recipes-core/glib-2.0/{glib-2.0_2.66.1.bb => glib-2.0_2.66.2.bb} (95%)
meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch +4 -4
index 07e37acf7d..2b8e930511 100644
@@ -1,4 +1,4 @@
-From 75c0423e1dc34fa20de70bc9932625fd0de4a912 Mon Sep 17 00:00:00 2001
+From 85931fbb981b5aae38f1c1370d5d3c091cb862b8 Mon Sep 17 00:00:00 2001
 From: Ross Burton <[email protected]>
 Date: Fri, 11 Mar 2016 15:35:55 +0000
 Subject: [PATCH] glib-2.0: relocate the GIO module directory for native builds
@@ -19,10 +19,10 @@ Signed-off-by: Jussi Kukkonen <[email protected]>
  1 file changed, 11 insertions(+), 1 deletion(-)
 
 diff --git a/gio/giomodule.c b/gio/giomodule.c
-index c420260..a023745 100644
+index dc4d6d3..da46906 100644
 --- a/gio/giomodule.c
 +++ b/gio/giomodule.c
-@@ -47,6 +47,8 @@
+@@ -49,6 +49,8 @@
  #include "gmemorymonitordbus.h"
  #ifdef G_OS_WIN32
  #include "gregistrysettingsbackend.h"
@@ -31,7 +31,7 @@ index c420260..a023745 100644
  #endif
  #include <glib/gstdio.h>
  
-@@ -1158,7 +1160,15 @@ get_gio_module_dir (void)
+@@ -1163,7 +1165,15 @@ get_gio_module_dir (void)
                                       NULL);
        g_free (install_dir);
  #else
meta/recipes-core/glib-2.0/glib-2.0_2.66.2.bb renamed from meta/recipes-core/glib-2.0/glib-2.0_2.66.1.bb +1 -1
similarity index 95%
rename from meta/recipes-core/glib-2.0/glib-2.0_2.66.1.bb
rename to meta/recipes-core/glib-2.0/glib-2.0_2.66.2.bb
index c803dbcf90..1f83660856 100644
@@ -20,7 +20,7 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \
 
 SRC_URI_append_class-native = " file://relocate-modules.patch"
 
-SRC_URI[sha256sum] = "a269ffe69fbcc3a21ff1acb1b6146b2a5723499d6e2de33ae16ccb6d2438ef60"
+SRC_URI[sha256sum] = "ec390bed4e8dd0f89e918f385e8d4cfd7470b1ef7c1ce93ec5c4fc6e3c6a17c4"
 
 # Find any meson cross files in FILESPATH that are relevant for the current
 # build (using siteinfo) and add them to EXTRA_OEMESON.
Signature · 1 line
2.29.0