Skip to contentSkip to conversation

gnome-keyring: Upgrade to 42.1

PATCH New Khem Raj 1 participant 3 messages Aug 30, 2022 1 message not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

Khem Raj

author
#1 lore raw

PATCH 2/4 gnome-keyring: Upgrade to 42.1

Package systemd user unit files

---
 .../{gnome-keyring_40.0.bb => gnome-keyring_42.1.bb}           | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
 rename meta-gnome/recipes-gnome/gnome-keyring/{gnome-keyring_40.0.bb => gnome-keyring_42.1.bb} (92%)
meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_42.1.bb renamed from meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_40.0.bb +2 -1
similarity index 92%
rename from meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_40.0.bb
rename to meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_42.1.bb
index a30303cd8c..5937e74423 100644
@@ -21,7 +21,7 @@ inherit gnomebase gsettings features_check gettext
 
 ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
 
-SRC_URI[archive.sha256sum] = "a3d24db08ee2fdf240fbbf0971a98c8ee295aa0e1a774537f4ea938038a3b931"
+SRC_URI[archive.sha256sum] = "c7f4d040cc76a6b7fe67e08ef9106911c3c80d40fc88cbfc8e2684a4c946e3e6"
 SRC_URI += " \
     file://0001-Set-paths-to-ssh-agent-and-ssh-add-by-configure-opti.patch \
     file://musl.patch \
@@ -41,6 +41,7 @@ FILES:${PN} += " \
     ${datadir}/xdg-desktop-portal \
     ${base_libdir}/security/*${SOLIBSDEV} \
     ${libdir}/pkcs11/gnome-keyring-pkcs11.so \
+    ${systemd_user_unitdir} \
 "
 # fix | gnome-keyring-daemon: insufficient process capabilities, unsecure memory might get used
 pkg_postinst:${PN} () {
Signature · 1 line
2.37.2
author
#2 lore raw

PATCH 3/4 folks: Disable LTO and implicit-function-declaration as error

In reply to a message not in the archive

This helps in compiling with clang15

---
 meta-gnome/recipes-connectivity/folks/folks_0.15.5.bb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
meta-gnome/recipes-connectivity/folks/folks_0.15.5.bb +2 -1
index 51620bba8e..ad61ee610c 100644
@@ -8,8 +8,9 @@ DEPENDS = " \
 "
 
 GNOMEBASEBUILDCLASS = "meson"
-EXTRA_OEMESON += "-Dtests=false"
+EXTRA_OEMESON += "-Dtests=false -Db_lto=false "
 
+CFLAGS:append:toolchain-clang = " -Wno-error=implicit-function-declaration"
 # gobject-introspection is mandatory and cannot be configured
 REQUIRED_DISTRO_FEATURES = "gobject-introspection-data"
 GIR_MESON_OPTION = ""
Signature · 1 line
2.37.2
author
#3 lore raw

PATCH 4/4 libgtop: Fix build with clang

In reply to a message not in the archive

Backport a patch

---
 .../libgtop/0001-Pass-correct-parameter.patch | 29 +++++++++++++++++++
 .../recipes-gnome/libgtop/libgtop_2.40.0.bb   |  4 ++-
 2 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 meta-gnome/recipes-gnome/libgtop/libgtop/0001-Pass-correct-parameter.patch
meta-gnome/recipes-gnome/libgtop/libgtop/0001-Pass-correct-parameter.patch new file +29 -0
new file mode 100644
index 0000000000..5ea8eed516
@@ -0,0 +1,29 @@
+From e969ac59335d3fb1cd228f8e7c4f6c2dda4fa536 Mon Sep 17 00:00:00 2001
+From: Avinash Sonawane <[email protected]>
+Date: Mon, 20 Dec 2021 13:33:42 +0530
+Subject: [PATCH] Pass correct parameter
+
+Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libgtop/-/merge_requests/35]
+Signed-off-by: Khem Raj <[email protected]>
+---
+ src/daemon/main.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/daemon/main.c b/src/daemon/main.c
+index b51addf..eaee3b3 100644
+--- a/src/daemon/main.c
++++ b/src/daemon/main.c
+@@ -222,8 +222,9 @@ handle_parent_connection (int s)
+ 		       0, NULL);
+ 	    break;
+     case GLIBTOP_CMND_PROC_IO:
++        memcpy (&pid, parameter, sizeof (pid_t));
+ 	    glibtop_get_proc_io_l
+-		(server, &resp->u.data.proc_io, parameter);
++		(server, &resp->u.data.proc_io, pid);
+ 	    do_output (s, resp, _offset_data (proc_io),
+ 		       0, NULL);
+ 	    break;
+-- 
+2.37.2
+
meta-gnome/recipes-gnome/libgtop/libgtop_2.40.0.bb +3 -1
index 2e60264e04..fa95e0bee0 100644
@@ -6,7 +6,9 @@ inherit gnomebase lib_package gtk-doc gobject-introspection gettext upstream-ver
 
 ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
 
-SRC_URI += "file://0001-fix-compile-error-for-cross-compile.patch"
+SRC_URI += "file://0001-fix-compile-error-for-cross-compile.patch \
+            file://0001-Pass-correct-parameter.patch \
+            "
 
 SRC_URI[archive.sha256sum] = "78f3274c0c79c434c03655c1b35edf7b95ec0421430897fb1345a98a265ed2d4"
 
Signature · 1 line
2.37.2