Re: [oe-core][PATCHv3] gcr3: update 3.40.0 -> 3.41.1

2023-01-06 Thread Markus Volk 

sorry, i don't know what happened. Hopefully v4 will apply

Am Fr, 6. Jan 2023 um 17:26:57 +0100 schrieb Alexandre Belloni via 
lists.openembedded.org 
:

Hello,

On 06/01/2023 14:33:00+0100, Markus Volk wrote:
 diff --git a/meta/recipes-gnome/gcr/gcr3_3.40.0.bb 
b/meta/recipes-gnome/gcr/gcr3_3.41.1.bb

 similarity index 63%
 rename from meta/recipes-gnome/gcr/gcr3_3.40.0.bb
 rename to meta/recipes-gnome/gcr/gcr3_3.41.1.bb
 index 5318768db6..6cbf8671f5 100644
 --- a/meta/recipes-gnome/gcr/gcr3_3.40.0.bb
 +++ b/meta/recipes-gnome/gcr/gcr3_3.41.1.bb
 @@ -17,27 +17,30 @@ CFLAGS += "-D_GNU_SOURCE"

  GNOMEBASEBUILDCLASS = "meson"
  GTKDOC_MESON_OPTION = "gtk_doc"
 -inherit gnomebase gtk-icon-cache gtk-doc features_check 
upstream-version-is-even vala gobject-introspection gettext mime 
mime-xdg
 +inherit gnomebase gtk-icon-cache gi-docgen features_check 
upstream-version-is-even vala gobject-introspection gettext mime 
mime-xdg
  UPSTREAM_CHECK_REGEX = 
"[^\d\.](?P\d+\.(?!9\d+)(\d*[02468])+(\.\d+)+)\.tar"


This part still doesn't apply on top of master, did you pull?

--
Alexandre Belloni, co-owner and COO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com 






-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#175614): 
https://lists.openembedded.org/g/openembedded-core/message/175614
Mute This Topic: https://lists.openembedded.org/mt/96093032/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [oe-core][PATCHv3] gcr3: update 3.40.0 -> 3.41.1

2023-01-06 Thread Alexandre Belloni via lists.openembedded.org 
Hello,

On 06/01/2023 14:33:00+0100, Markus Volk wrote:
> diff --git a/meta/recipes-gnome/gcr/gcr3_3.40.0.bb 
> b/meta/recipes-gnome/gcr/gcr3_3.41.1.bb
> similarity index 63%
> rename from meta/recipes-gnome/gcr/gcr3_3.40.0.bb
> rename to meta/recipes-gnome/gcr/gcr3_3.41.1.bb
> index 5318768db6..6cbf8671f5 100644
> --- a/meta/recipes-gnome/gcr/gcr3_3.40.0.bb
> +++ b/meta/recipes-gnome/gcr/gcr3_3.41.1.bb
> @@ -17,27 +17,30 @@ CFLAGS += "-D_GNU_SOURCE"
>  
>  GNOMEBASEBUILDCLASS = "meson"
>  GTKDOC_MESON_OPTION = "gtk_doc"
> -inherit gnomebase gtk-icon-cache gtk-doc features_check 
> upstream-version-is-even vala gobject-introspection gettext mime mime-xdg
> +inherit gnomebase gtk-icon-cache gi-docgen features_check 
> upstream-version-is-even vala gobject-introspection gettext mime mime-xdg
>  UPSTREAM_CHECK_REGEX = 
> "[^\d\.](?P\d+\.(?!9\d+)(\d*[02468])+(\.\d+)+)\.tar"

This part still doesn't apply on top of master, did you pull?

-- 
Alexandre Belloni, co-owner and COO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#175600): 
https://lists.openembedded.org/g/openembedded-core/message/175600
Mute This Topic: https://lists.openembedded.org/mt/96093032/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[oe-core][PATCHv3] gcr3: update 3.40.0 -> 3.41.1

2023-01-06 Thread Markus Volk 
 - remove unneded backport patches
 - partly import the patch to fix ssh_agent option from gcr4 recipe
 - convert from gtk-doc to gi-docgen

gcr 3.41.1:
- meson: Fix unknown kw argument in gnome.generate_gir [GNOME/gcr!68]
- gcr: Add G_SPAWN_CLOEXEC_PIPES flag to all the g_spawn commands
- docs: Port from gtk-doc to gi-docgen [GNOME/gcr!76]
- Unbreak build without systemd [GNOME/gcr!75]
- Several CI fixes
- Updated translations

gcr 3.41.0:
- Port ssh-agent from gnome-keyring [GNOME/gcr!67]
- build: Fix parallel build failure due to missing marshal dependency 
[GNOME/gcr!68]
- Fix warnings by dropping `volatile` for g_once_init_inter locations 
[GNOME/gcr!69]
- tests: More robust against GTask unref race condition 
[GNOME/gcr!72,GNOME/gcr#84]
- Updated translations

Signed-off-by: Markus Volk 
---
 ...build-fix-one-parallel-build-failure.patch | 37 ---
 ...ectly-handle-disabled-ssh_agent-opti.patch | 36 +++
 ...1d02bb0148ca787ac4aead164d7c8ce2c4d8.patch | 61 ---
 .../gcr/{gcr3_3.40.0.bb => gcr3_3.41.1.bb}| 19 +++---
 4 files changed, 48 insertions(+), 105 deletions(-)
 delete mode 100644 
meta/recipes-gnome/gcr/gcr3/0001-gcr-meson.build-fix-one-parallel-build-failure.patch
 create mode 100644 
meta/recipes-gnome/gcr/gcr3/0001-meson.build-correctly-handle-disabled-ssh_agent-opti.patch
 delete mode 100644 
meta/recipes-gnome/gcr/gcr3/b3ca1d02bb0148ca787ac4aead164d7c8ce2c4d8.patch
 rename meta/recipes-gnome/gcr/{gcr3_3.40.0.bb => gcr3_3.41.1.bb} (63%)

diff --git 
a/meta/recipes-gnome/gcr/gcr3/0001-gcr-meson.build-fix-one-parallel-build-failure.patch
 
b/meta/recipes-gnome/gcr/gcr3/0001-gcr-meson.build-fix-one-parallel-build-failure.patch
deleted file mode 100644
index 81c4bdbbcc..00
--- 
a/meta/recipes-gnome/gcr/gcr3/0001-gcr-meson.build-fix-one-parallel-build-failure.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From cb3708bad88e713e4ccf705cb8c14c5996cd9d06 Mon Sep 17 00:00:00 2001
-From: Changqing Li 
-Date: Fri, 23 Apr 2021 16:32:38 +0800
-Subject: [PATCH] gcr/meson.build: fix one parallel build failure
-
-ui/gcr-live-search.c includes gcr/gcr-marshal.h. Because missing
-dependency, following error occurred intermittently during doing parallel
-build:
-
- -o ui/libgcr-ui-3.so.1.0.0.p/gcr-live-search.c.o -c 
../gcr-3.38.1/ui/gcr-live-search.c
-../gcr-3.38.1/ui/gcr-live-search.c:32:10: fatal error: gcr/gcr-marshal.h: No 
such file or directory
-   32 | #include "gcr/gcr-marshal.h"
-  |  ^~~
-compilation terminated.
-
-Upstream-Status: Submitted 
[https://gitlab.gnome.org/GNOME/gcr/-/merge_requests/68/diffs]
-
-Signed-off-by: Changqing Li 

- gcr/meson.build | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/gcr/meson.build b/gcr/meson.build
-index 06c3a63..d9d4b8f 100644
 a/gcr/meson.build
-+++ b/gcr/meson.build
-@@ -181,6 +181,7 @@ gcr_base_dep = declare_dependency(
-   sources: [
- gcr_enums_gen[1],
- gcr_oids[1],
-+gcr_marshal_gen[1],
-   ],
- )
- 
--- 
-2.17.1
-
diff --git 
a/meta/recipes-gnome/gcr/gcr3/0001-meson.build-correctly-handle-disabled-ssh_agent-opti.patch
 
b/meta/recipes-gnome/gcr/gcr3/0001-meson.build-correctly-handle-disabled-ssh_agent-opti.patch
new file mode 100644
index 00..d3c26d97ae
--- /dev/null
+++ 
b/meta/recipes-gnome/gcr/gcr3/0001-meson.build-correctly-handle-disabled-ssh_agent-opti.patch
@@ -0,0 +1,36 @@
+From 9b67bb18d8409e0e693cc6000507acbd73a30eab Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin 
+Date: Wed, 16 Nov 2022 11:27:24 +0100
+Subject: [PATCH 1/2] meson.build: correctly handle disabled ssh_agent option
+
+Existing code produces these errors:
+| gcr/meson.build:61:0: ERROR: Unable to get the path of a not-found external 
program
+| gcr/meson.build:101:5: ERROR: Unknown variable "ssh_add_path".
+
+Signed-off-by: Alexander Kanavin 
+
+Upstream-Status: Backport [ 
https://gitlab.gnome.org/GNOME/gcr/-/commit/9b67bb18d8409e0e693cc6000507acbd73a30eab
 ]
+---
+ meson.build | 12 
+ 1 file changed, 8 insertions(+), 4 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 3f35173..11d7fa7 100644
+--- a/meson.build
 b/meson.build
+@@ -96,8 +98,10 @@ conf.set('HAVE_TIMEGM', cc.has_function('timegm'))
+ conf.set('HAVE_MLOCK', cc.has_function('mlock'))
+ conf.set_quoted('GPG_EXECUTABLE', gpg_path)
+ conf.set_quoted('LIBGCRYPT_VERSION', libgcrypt_dep.version())
+-conf.set_quoted('SSH_ADD_EXECUTABLE', ssh_add_path)
+-conf.set_quoted('SSH_AGENT_EXECUTABLE', ssh_agent_path)
++if get_option('ssh_agent')
++  conf.set_quoted('SSH_ADD_EXECUTABLE', ssh_add_path)
++  conf.set_quoted('SSH_AGENT_EXECUTABLE', ssh_agent_path)
++endif
+ conf.set10('WITH_SYSTEMD', with_systemd)
+ config_file = configure_file(
+   output: 'config.h',
+-- 
+2.34.1
+
diff --git 
a/meta/recipes-gnome/gcr/gcr3/b3ca1d02bb0148ca787ac4aead164d7c8ce2c4d8.patch 
b/meta/recipes-gnome/gcr/gcr3/b3ca1d02bb0148ca787ac4aead164d7c8ce2c4d8.patch
deleted file mode 100644
index ae4e2ac1eb..00
---