@@ -1,4 +1,4 @@
-From cf7df91cc8c3b4811235ef8aec144c5f0cf90bdb Mon Sep 17 00:00:00 2001
+From adeda9fffb7e27dcdede443fffecec243874a696 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Fri, 15 Feb 2019 11:17:27 +0100
Subject: [PATCH] Do not write $bindir into pkg-config files
@@ -1,4 +1,4 @@
-From b907a6681c4c24e5d3745538d9fcd471cf1c4c4a Mon Sep 17 00:00:00 2001
+From f24506838dd89e11514fe272bf9f06c8a170f432 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Sat, 15 Mar 2014 22:42:29 -0700
Subject: [PATCH] Fix DATADIRNAME on uclibc/Linux
@@ -1,4 +1,4 @@
-From 6e2ddcb5465d10618345b12e0b4471ead0f14304 Mon Sep 17 00:00:00 2001
+From bf65bc4317e18babafd5d8d0f7deb544b0dcfea2 Mon Sep 17 00:00:00 2001
From: Jussi Kukkonen <jussi.kukkonen@intel.com>
Date: Tue, 22 Mar 2016 15:14:58 +0200
Subject: [PATCH] Install gio-querymodules as libexec_PROGRAM
@@ -1,4 +1,4 @@
-From c8c223045821cac97f798cfa63f19853621a8a2a Mon Sep 17 00:00:00 2001
+From 543a25f3d7925134e4e498f94b8b67ab2269850f Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Fri, 12 Jun 2015 17:08:46 +0300
Subject: [PATCH] Remove the warning about deprecated paths in schemas
@@ -1,4 +1,4 @@
-From bafde4eedc0a22b45e73ee6183b9a11393a1e400 Mon Sep 17 00:00:00 2001
+From fdd06afcf6d68f56da1158231bd602582be844de Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Wed, 13 Feb 2019 15:32:05 +0100
Subject: [PATCH] Set host_machine correctly when building with mingw32
@@ -66,7 +66,7 @@ index d80c86e..5329cda 100644
glib_tests += {
'gpoll' : {
diff --git a/meson.build b/meson.build
-index f7e936e..122f8b5 100644
+index 813c9b7..6ee775e 100644
--- a/meson.build
+++ b/meson.build
@@ -54,6 +54,9 @@ else
@@ -1,4 +1,4 @@
-From 3f05b9418c88bbb83c08b57cc5529b006f26fff4 Mon Sep 17 00:00:00 2001
+From f67497ce754f24261c2048fb95b10804cc48426a Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Wed, 8 Jan 2020 18:22:46 +0100
Subject: [PATCH] gio/tests/resources.c: comment out a build host-only test
@@ -1,4 +1,4 @@
-From 17d718640ae6f953e5eea714c1bd64eeb6e4799f Mon Sep 17 00:00:00 2001
+From 285a237d902dec6b681e0bc34235f54a2a175bda Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Sat, 12 Oct 2019 17:46:26 -0700
Subject: [PATCH] meson: Run atomics test on clang as well
@@ -15,7 +15,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
-index 122f8b5..f055079 100644
+index 6ee775e..8bc5fa7 100644
--- a/meson.build
+++ b/meson.build
@@ -1938,7 +1938,7 @@ atomicdefine = '''
@@ -1,4 +1,4 @@
-From 7865d698b5d392aac3a3d32e9ebd5fea45017d15 Mon Sep 17 00:00:00 2001
+From 8398cdc2032ff450761b119d9a063460c0a04ffa Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex@linutronix.de>
Date: Sat, 16 Sep 2023 22:28:27 +0200
Subject: [PATCH] meson.build: do not enable pidfd features on native glib
@@ -15,7 +15,7 @@ Signed-off-by: Alexander Kanavin <alex@linutronix.de>
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
-index f055079..77d78aa 100644
+index 8bc5fa7..df1fa60 100644
--- a/meson.build
+++ b/meson.build
@@ -981,7 +981,8 @@ if cc.links('''#include <sys/syscall.h>
@@ -1,4 +1,4 @@
-From 53bcd4b6cd3fe3fe4246914462e6724761eecf51 Mon Sep 17 00:00:00 2001
+From 47484aae141645ace3278e8b49792106af57c130 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Tue, 3 Oct 2017 10:45:55 +0300
Subject: [PATCH] Do not hardcode python path into various tools
@@ -1,4 +1,4 @@
-From df7506918efc8748dac8b8398021e1b79d694ba4 Mon Sep 17 00:00:00 2001
+From abc54fa304e1ef73be75d0e011e989eb7ecd9e3a Mon Sep 17 00:00:00 2001
From: Philip Withnall <philip@tecnocode.co.uk>
Date: Tue, 23 Jan 2024 11:16:52 +0000
Subject: [PATCH] Merge branch '2887-memory-monitor-tests' into 'main'
@@ -14,6 +14,7 @@ https://bugzilla.yoctoproject.org/show_bug.cgi?id=15362
Upstream-Status: Backport
Signed-off-by: Ross Burton <ross.burton@arm.com>
+
---
gio/tests/memory-monitor-dbus.py.in | 64 +++++++++++++-------
gio/tests/memory-monitor-portal.py.in | 54 ++++++++++-------
@@ -22,7 +23,7 @@ Signed-off-by: Ross Burton <ross.burton@arm.com>
4 files changed, 113 insertions(+), 74 deletions(-)
diff --git a/gio/tests/memory-monitor-dbus.py.in b/gio/tests/memory-monitor-dbus.py.in
-index bf3291847..7aae01e70 100755
+index bf32918..7aae01e 100755
--- a/gio/tests/memory-monitor-dbus.py.in
+++ b/gio/tests/memory-monitor-dbus.py.in
@@ -16,7 +16,6 @@ import sys
@@ -130,7 +131,7 @@ index bf3291847..7aae01e70 100755
except ImportError as e:
@unittest.skip("Cannot import %s" % e.name)
diff --git a/gio/tests/memory-monitor-portal.py.in b/gio/tests/memory-monitor-portal.py.in
-index 748cee850..f570508f9 100755
+index 748cee8..f570508 100755
--- a/gio/tests/memory-monitor-portal.py.in
+++ b/gio/tests/memory-monitor-portal.py.in
@@ -16,7 +16,6 @@ import sys
@@ -222,7 +223,7 @@ index 748cee850..f570508f9 100755
except ImportError as e:
@unittest.skip("Cannot import %s" % e.name)
diff --git a/gio/tests/power-profile-monitor-dbus.py.in b/gio/tests/power-profile-monitor-dbus.py.in
-index 06e594f4a..f955afc80 100755
+index 06e594f..f955afc 100755
--- a/gio/tests/power-profile-monitor-dbus.py.in
+++ b/gio/tests/power-profile-monitor-dbus.py.in
@@ -16,7 +16,6 @@ import sys
@@ -295,7 +296,7 @@ index 06e594f4a..f955afc80 100755
except ImportError as e:
@unittest.skip("Cannot import %s" % e.name)
diff --git a/gio/tests/power-profile-monitor-portal.py.in b/gio/tests/power-profile-monitor-portal.py.in
-index 09e9a450d..ad2abf621 100755
+index 09e9a45..ad2abf6 100755
--- a/gio/tests/power-profile-monitor-portal.py.in
+++ b/gio/tests/power-profile-monitor-portal.py.in
@@ -16,7 +16,6 @@ import sys
@@ -359,6 +360,3 @@ index 09e9a450d..ad2abf621 100755
def test_power_profile_power_saver_enabled_portal_default(self):
'''power-saver-enabled property default value'''
-2.34.1
-
deleted file mode 100644
@@ -1,21 +0,0 @@
-docs/reference: depend on a native gtk-doc
-
-In a cross-compiled environment we don't need a target gtk-doc, but a
-native gtk-doc.
-
-Upstream-Status: Backport [f3ff370d1b24f8afb51cd4e865593d5b678188a9]
-Signed-off-by: Ross Burton <ross.burton@arm.com>
-
-diff --git a/docs/reference/meson.build b/docs/reference/meson.build
-index c417ffecb..67c1dda56 100644
---- a/docs/reference/meson.build
-+++ b/docs/reference/meson.build
-@@ -42,7 +42,7 @@ ignore_decorators = '|'.join(ignore_decorators)
- if get_option('gtk_doc')
- # Check we have the minimum gtk-doc version required. Older versions won't
- # generate correct documentation.
-- dependency('gtk-doc', version : '>=1.32.1',
-+ dependency('gtk-doc', version : '>=1.32.1', native: true,
- fallback : ['gtk-doc', 'dummy_dep'],
- default_options : ['tests=false'])
-
@@ -1,4 +1,4 @@
-From 03a069cb8066d3e8ef72a43f7b1db5c9625e9cc2 Mon Sep 17 00:00:00 2001
+From 90f06568444ea43da56efd62a805af89849468f9 Mon Sep 17 00:00:00 2001
From: Ross Burton <ross.burton@intel.com>
Date: Fri, 11 Mar 2016 15:35:55 +0000
Subject: [PATCH] glib-2.0: relocate the GIO module directory for native builds
similarity index 91%
rename from meta/recipes-core/glib-2.0/glib-2.0_2.78.3.bb
rename to meta/recipes-core/glib-2.0/glib-2.0_2.78.4.bb
@@ -15,13 +15,14 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \
file://0001-meson-Run-atomics-test-on-clang-as-well.patch \
file://0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch \
file://memory-monitor.patch \
- file://native-gtkdoc.patch \
+ file://relocate-modules.patch \
+ file://0001-meson.build-do-not-enable-pidfd-features-on-native-g.patch \
"
SRC_URI:append:class-native = " file://relocate-modules.patch \
file://0001-meson.build-do-not-enable-pidfd-features-on-native-g.patch \
"
-SRC_URI[sha256sum] = "609801dd373796e515972bf95fc0b2daa44545481ee2f465c4f204d224b2bc21"
+SRC_URI[sha256sum] = "24b8e0672dca120cc32d394bccb85844e732e04fe75d18bb0573b2dbc7548f63"
# Find any meson cross files in FILESPATH that are relevant for the current
# build (using siteinfo) and add them to EXTRA_OEMESON.
Hello, this email is a notification from the Auto Upgrade Helper that the automatic attempt to upgrade the recipe *glib-2.0* to *2.78.4* has Failed(do_compile). Detailed error information: do_compile failed Next steps: - apply the patch: git am 0001-glib-2.0-upgrade-2.78.3-2.78.4.patch - check the changes to upstream patches and summarize them in the commit message, - compile an image that contains the package - perform some basic sanity tests - amend the patch and sign it off: git commit -s --reset-author --amend - send it to the appropriate mailing list Alternatively, if you believe the recipe should not be upgraded at this time, you can fill RECIPE_NO_UPDATE_REASON in respective recipe file so that automatic upgrades would no longer be attempted. Please review the attached files for further information and build/update failures. Any problem please file a bug at https://bugzilla.yoctoproject.org/enter_bug.cgi?product=Automated%20Update%20Handler Regards, The Upgrade Helper -- >8 -- From 31249503e6a91d548991c791a1a1996e08cead01 Mon Sep 17 00:00:00 2001 From: Upgrade Helper <auh@yoctoproject.org> Date: Thu, 15 Feb 2024 06:01:31 +0000 Subject: [PATCH] glib-2.0: upgrade 2.78.3 -> 2.78.4 --- ...t-write-bindir-into-pkg-config-files.patch | 2 +- ...0001-Fix-DATADIRNAME-on-uclibc-Linux.patch | 2 +- ...-gio-querymodules-as-libexec_PROGRAM.patch | 2 +- ...ng-about-deprecated-paths-in-schemas.patch | 2 +- ...-correctly-when-building-with-mingw3.patch | 4 ++-- ...ces.c-comment-out-a-build-host-only-.patch | 2 +- ...on-Run-atomics-test-on-clang-as-well.patch | 4 ++-- ...ot-enable-pidfd-features-on-native-g.patch | 4 ++-- ...dcode-python-path-into-various-tools.patch | 2 +- .../glib-2.0/glib-2.0/memory-monitor.patch | 14 ++++++------- .../glib-2.0/glib-2.0/native-gtkdoc.patch | 21 ------------------- .../glib-2.0/glib-2.0/relocate-modules.patch | 2 +- ...{glib-2.0_2.78.3.bb => glib-2.0_2.78.4.bb} | 5 +++-- 13 files changed, 22 insertions(+), 44 deletions(-) delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/native-gtkdoc.patch rename meta/recipes-core/glib-2.0/{glib-2.0_2.78.3.bb => glib-2.0_2.78.4.bb} (91%)