Sync from SUSE:SLFO:1.1 gcr3 revision dff4af92fa90faef67089c6be6ab4e37

_service

@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<services>
-  <service name="obs_scm" mode="manual">
-    <param name="scm">git</param>
-    <param name="url">https://gitlab.gnome.org/GNOME/gcr.git</param>
-    <param name="revision">3.41.2</param>
-    <param name="versionformat">@PARENT_TAG@+@TAG_OFFSET@</param>
-    <param name="versionrewrite-pattern">v?(.*)\+0</param>
-    <param name="versionrewrite-replacement">\1</param>
-<!--    <param name="changesgenerate">enable</param> -->
-  </service>
-  <service name="tar" mode="buildtime"/>
-  <service name="recompress" mode="buildtime">
-    <param name="file">*.tar</param>
-    <param name="compression">zst</param>
-  </service>
-  <service name="set_version" mode="manual" />
-</services>
-

b3ca1d02bb0148ca787ac4aead164d7c8ce2c4d8.patch

@@ -0,0 +1,59 @@
+From b3ca1d02bb0148ca787ac4aead164d7c8ce2c4d8 Mon Sep 17 00:00:00 2001
+From: Jakub Jirutka <jakub@jirutka.cz>
+Date: Wed, 12 Jan 2022 00:24:20 +0100
+Subject: [PATCH] meson: Fix unknown kw argument in gnome.generate_gir
+
+This argument has been removed in Meson 0.61.0:
+
+    gck/meson.build:130:2: ERROR: gnome.generate_gir got unknown keyword arguments "packages"
+
+https://github.com/mesonbuild/meson/commit/f8fc5cb860465718fe7c79a1bf1fe00659f138de:
+
+> The packages argument to gnome.generate_gir was allowed, but never did anything, so stop passing it.
+
+Fixes #89
+---
+ gck/meson.build | 1 -
+ gcr/meson.build | 1 -
+ ui/meson.build  | 1 -
+ 3 files changed, 3 deletions(-)
+
+diff --git a/gck/meson.build b/gck/meson.build
+index 756b4866..a21a1e9d 100644
+--- a/gck/meson.build
++++ b/gck/meson.build
+@@ -131,7 +131,6 @@ if get_option('introspection')
+     sources: gck_gir_sources,
+     namespace: 'Gck',
+     nsversion: '@0@'.format(gck_major_version),
+-    packages: gck_deps,
+     export_packages: 'gck-@0@'.format(gck_major_version),
+     includes: [ 'GObject-2.0', 'Gio-2.0' ],
+     header: 'gck/gck.h',
+diff --git a/gcr/meson.build b/gcr/meson.build
+index 2233a445..c83641ba 100644
+--- a/gcr/meson.build
++++ b/gcr/meson.build
+@@ -190,7 +190,6 @@ if get_option('introspection')
+     sources: [ gcr_base_public_sources, gcr_base_headers ],
+     namespace: 'Gcr',
+     nsversion: '@0@'.format(gcr_major_version),
+-    packages: gcr_base_deps,
+     export_packages: 'gcr-base-@0@'.format(gcr_major_version),
+     includes: [
+       'GObject-2.0',
+diff --git a/ui/meson.build b/ui/meson.build
+index e656ea23..32ee057f 100644
+--- a/ui/meson.build
++++ b/ui/meson.build
+@@ -152,7 +152,6 @@ if get_option('introspection')
+     export_packages: 'gcr-ui-@0@'.format(gcr_major_version),
+     identifier_prefix: 'Gcr',
+     symbol_prefix: 'gcr',
+-    packages: gcr_ui_deps,
+     includes: [
+       'GObject-2.0',
+       'Gio-2.0',
+-- 
+GitLab
+

gcr.obsinfo

@@ -1,4 +0,0 @@
-name: gcr
-version: 3.41.2
-mtime: 1705259110
-commit: cd63e8a0378e13ba0aa15c2a68d1070fa62e6532

gcr3.changes

@@ -1,35 +1,3 @@
--------------------------------------------------------------------
-Mon Aug 19 11:29:42 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
-
-- BuildRequire gettext-devel instead of gettext: allow OBS to
-  shortcut through gettext-runtime-mini.
-
--------------------------------------------------------------------
-Thu Jan 18 16:49:26 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
-
-- Update to version 3.41.2:
-  + ui: Add gcr.gresource.xml back into the build.
-  + misc: Several memory leaks were fixed.
-  + ci: Several CI fixes.
-  + Updated translations.
-- Changes from version 3.41.1:
-  + meson: Fix unknown kw argument in gnome.generate_gir.
-  + gcr: Add G_SPAWN_CLOEXEC_PIPES flag to all the g_spawn
-    commands.
-  + docs: Port from gtk-doc to gi-docgen.
-  + Unbreak build without systemd.
-  + Several CI fixes.
-  + Updated translations.
-- Drop b3ca1d02bb0148ca787ac4aead164d7c8ce2c4d8.patch: fixed
-  upstream.
-- Replace gtk-doc buildRequires with pkgconfig(gi-docgen): follow
-  upstreams port of the documentation infrastructure.
-
--------------------------------------------------------------------
-Tue Nov 28 11:24:53 UTC 2023 - Dominique Leuenberger <dimstar@opensuse.org>
-
-- Use %patch -p N instead of deprecated %patchN.
-
 -------------------------------------------------------------------
 Tue Oct 25 12:37:26 UTC 2022 - Dominique Leuenberger <dimstar@opensuse.org>
 

gcr3.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package gcr3
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,26 +18,28 @@
 
 %define _name gcr
 Name:           gcr3
-Version:        3.41.2
+Version:        3.41.0
 Release:        0
 # FIXME: Verify if the requires in typelib-1_0-Gcr-3 is still correct and required (see bgo#725501).
 Summary:        Library for Crypto UI related tasks
 License:        LGPL-2.1-or-later
 Group:          Development/Libraries/GNOME
 URL:            http://www.gnome.org
-Source0:        %{_name}-%{version}.tar.zst
+Source0:        https://download.gnome.org/sources/gcr/3.41/%{_name}-%{version}.tar.xz
 Source1:        baselibs.conf
 # PATCH-FIX-SLE gcr-bsc932232-use-libgcrypt-allocators.patch bsc#932232 hpj@suse.com -- use libgcrypt allocators for FIPS mode
 Patch1:         gcr-bsc932232-use-libgcrypt-allocators.patch
+# PATCH-FIX-UPSTREAM b3ca1d02bb0148ca787ac4aead164d7c8ce2c4d8.patch -- Fix build with meson 060.0 and newer
+Patch2:         https://gitlab.gnome.org/GNOME/gcr/-/commit/b3ca1d02bb0148ca787ac4aead164d7c8ce2c4d8.patch
 
 # For directory ownership
 BuildRequires:  dbus-1
-BuildRequires:  gettext-devel >= 0.19.8
+BuildRequires:  gettext >= 0.19.8
 BuildRequires:  gobject-introspection-devel >= 1.34
-BuildRequires:  libgcrypt-devel >= 1.4.5
-BuildRequires:  meson >= 0.52
-BuildRequires:  pkgconfig(gi-docgen)
 # configure is looking for the gpg2 path
+BuildRequires:  gtk-doc
+BuildRequires:  libgcrypt-devel >= 1.4.5
+BuildRequires:  meson
 BuildRequires:  openssh-clients
 BuildRequires:  pkgconfig
 BuildRequires:  update-desktop-files
@@ -203,8 +205,9 @@ GCK is a library for accessing PKCS#11 modules like smart cards, in a
 %prep
 %setup -q -n %{_name}-%{version}
 %if 0%{?sle_version}
-%patch -P 1 -p1
+%patch1 -p1
 %endif
+%patch2 -p1
 
 %build
 %meson \
@@ -275,7 +278,7 @@ GCK is a library for accessing PKCS#11 modules like smart cards, in a
 %{_libdir}/girepository-1.0/GcrUi-3.typelib
 
 %files -n libgcr3-devel
-%doc %{_datadir}/doc/gcr*/
+%doc %{_datadir}/gtk-doc/html/gcr/
 %{_libdir}/libgcr-base-3.so
 %{_libdir}/libgcr-ui-3.so
 %{_libdir}/pkgconfig/gcr-3.pc
@@ -294,7 +297,7 @@ GCK is a library for accessing PKCS#11 modules like smart cards, in a
 %{_libdir}/girepository-1.0/Gck-1.typelib
 
 %files -n libgck1-devel
-%doc %{_datadir}/doc/gck*/
+%doc %{_datadir}/gtk-doc/html/gck/
 %{_libdir}/libgck-1.so
 %{_libdir}/pkgconfig/gck-1.pc
 %{_includedir}/gck-1/