[gnome-build-meta/mcatanzaro/build: 2/2] sdk: upgrade gcr.bst to gcr-4, and add gcr-3.bst

[Michael Catanzaro <mcatanzaro src gnome org>]

commit e2e1059d08a750f81c18aace2d3b3f61744bdb46
Author: Michael Catanzaro <mcatanzaro redhat com>
Date:   Mon Jun 27 11:56:39 2022 -0500

    sdk: upgrade gcr.bst to gcr-4, and add gcr-3.bst
    
    gcr-4 is the new API version of gcr.

 elements/core-deps/evolution-data-server.bst |  1 +
 elements/core-deps/gnome-online-accounts.bst |  2 +-
 elements/core-deps/libgdata.bst              |  2 +-
 elements/core-deps/libnma.bst                |  2 +-
 elements/core/epiphany.bst                   |  2 +-
 elements/core/gnome-keyring.bst              |  2 +-
 elements/core/gnome-settings-daemon.bst      |  2 +-
 elements/core/gnome-shell.bst                |  2 +-
 elements/core/gvfs-daemon.bst                |  2 +-
 elements/sdk-deps/gvfs.bst                   |  2 +-
 elements/sdk-platform.bst                    |  1 +
 elements/sdk/gcr-3.bst                       | 37 ++++++++++++++++++++++++++++
 elements/sdk/gcr.bst                         | 12 ++++-----
 elements/sdk/pinentry.bst                    |  2 +-
 elements/vm/NetworkManager-openconnect.bst   |  2 +-
 elements/world/evolution.bst                 |  2 +-
 elements/world/geary.bst                     |  2 +-
 elements/world/phosh.bst                     |  2 +-
 elements/world/seahorse.bst                  |  2 +-
 19 files changed, 60 insertions(+), 21 deletions(-)
---
diff --git a/elements/core-deps/evolution-data-server.bst b/elements/core-deps/evolution-data-server.bst
index 48d0faf5e..ac2e14cec 100644
--- a/elements/core-deps/evolution-data-server.bst
+++ b/elements/core-deps/evolution-data-server.bst
@@ -36,3 +36,4 @@ variables:
     -DWITH_GWEATHER4=ON
     -DWITH_LIBDB=OFF
     -DENABLE_GOOGLE=OFF
+    -DENABLE_OAUTH2_WEBKITGTK4=OFF
diff --git a/elements/core-deps/gnome-online-accounts.bst b/elements/core-deps/gnome-online-accounts.bst
index 8bdda8682..e2f6a999c 100644
--- a/elements/core-deps/gnome-online-accounts.bst
+++ b/elements/core-deps/gnome-online-accounts.bst
@@ -12,7 +12,7 @@ build-depends:
 
 depends:
 - core-deps/librest.bst
-- sdk/gcr.bst
+- sdk/gcr-3.bst
 - sdk/gtk+-3.bst
 - sdk/json-glib.bst
 - sdk/libsecret.bst
diff --git a/elements/core-deps/libgdata.bst b/elements/core-deps/libgdata.bst
index 65cde10ec..1412b24b3 100644
--- a/elements/core-deps/libgdata.bst
+++ b/elements/core-deps/libgdata.bst
@@ -12,7 +12,7 @@ depends:
 - core-deps/gnome-online-accounts.bst
 - core-deps/liboauth.bst
 - core-deps/uhttpmock.bst
-- sdk/gcr.bst
+- sdk/gcr-3.bst
 - sdk/glib.bst
 - sdk/json-glib.bst
 - sdk/libsoup-2.4.bst
diff --git a/elements/core-deps/libnma.bst b/elements/core-deps/libnma.bst
index 4a0af8346..a1ee718cd 100644
--- a/elements/core-deps/libnma.bst
+++ b/elements/core-deps/libnma.bst
@@ -15,7 +15,7 @@ depends:
 - core-deps/NetworkManager.bst
 - core-deps/mobile-broadband-provider-info.bst
 - sdk/adwaita-icon-theme.bst
-- sdk/gcr.bst
+- sdk/gcr-3.bst
 - sdk/glib.bst
 - sdk/gtk+-3.bst
 - sdk/gtk.bst
diff --git a/elements/core/epiphany.bst b/elements/core/epiphany.bst
index 2da3c92cc..6ee1341d4 100644
--- a/elements/core/epiphany.bst
+++ b/elements/core/epiphany.bst
@@ -14,7 +14,7 @@ depends:
 - core-deps/libdazzle.bst
 - core-deps/libportal.bst
 - sdk/adwaita-icon-theme.bst
-- sdk/gcr.bst
+- sdk/gcr-3.bst
 - sdk/gdk-pixbuf.bst
 - sdk/glib-networking.bst
 - sdk/glib.bst
diff --git a/elements/core/gnome-keyring.bst b/elements/core/gnome-keyring.bst
index 442aa033d..024135929 100644
--- a/elements/core/gnome-keyring.bst
+++ b/elements/core/gnome-keyring.bst
@@ -8,7 +8,7 @@ build-depends:
 - freedesktop-sdk.bst:components/libxslt.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
 depends:
-- sdk/gcr.bst
+- sdk/gcr-3.bst
 - sdk/glib.bst
 - sdk/gtk+-3.bst
 - freedesktop-sdk.bst:components/linux-pam.bst
diff --git a/elements/core/gnome-settings-daemon.bst b/elements/core/gnome-settings-daemon.bst
index 43e9332cd..7f2868efa 100644
--- a/elements/core/gnome-settings-daemon.bst
+++ b/elements/core/gnome-settings-daemon.bst
@@ -22,7 +22,7 @@ depends:
 - core-deps/libgweather.bst
 - core-deps/upower.bst
 - core/gnome-desktop.bst
-- sdk/gcr.bst
+- sdk/gcr-3.bst
 - sdk/geoclue.bst
 - sdk/glib.bst
 - sdk/gsettings-desktop-schemas.bst
diff --git a/elements/core/gnome-shell.bst b/elements/core/gnome-shell.bst
index eda487fdc..30affa421 100644
--- a/elements/core/gnome-shell.bst
+++ b/elements/core/gnome-shell.bst
@@ -35,7 +35,7 @@ depends:
 - core/gnome-settings-daemon.bst
 - core/mutter.bst
 - sdk/adwaita-icon-theme.bst
-- sdk/gcr.bst
+- sdk/gcr-3.bst
 - sdk/gjs.bst
 - sdk/glib.bst
 - sdk/gobject-introspection.bst
diff --git a/elements/core/gvfs-daemon.bst b/elements/core/gvfs-daemon.bst
index 3d3a7e7a8..a2f260768 100644
--- a/elements/core/gvfs-daemon.bst
+++ b/elements/core/gvfs-daemon.bst
@@ -16,7 +16,7 @@ runtime-depends:
 - core-deps/plist.bst
 - core-deps/samba.bst
 - core-deps/udisks2.bst
-- sdk/gcr.bst
+- sdk/gcr-3.bst
 - sdk/glib.bst
 - sdk/gsettings-desktop-schemas.bst
 - sdk/libsecret.bst
diff --git a/elements/sdk-deps/gvfs.bst b/elements/sdk-deps/gvfs.bst
index 2727bf0e1..45b31911a 100644
--- a/elements/sdk-deps/gvfs.bst
+++ b/elements/sdk-deps/gvfs.bst
@@ -21,7 +21,7 @@ depends:
 - core-deps/plist.bst
 - core-deps/samba.bst
 - core-deps/udisks2.bst
-- sdk/gcr.bst
+- sdk/gcr-3.bst
 - sdk/glib.bst
 - sdk/gsettings-desktop-schemas.bst
 - sdk/libsecret.bst
diff --git a/elements/sdk-platform.bst b/elements/sdk-platform.bst
index dcbe165dd..aa910c4e3 100644
--- a/elements/sdk-platform.bst
+++ b/elements/sdk-platform.bst
@@ -14,6 +14,7 @@ depends:
 - sdk/fcitx5-gtk.bst
 - sdk/gcab.bst
 - sdk/gcr.bst
+- sdk/gcr-3.bst
 - sdk/gdk-pixbuf.bst
 - sdk/geoclue.bst
 - sdk/gjs.bst
diff --git a/elements/sdk/gcr-3.bst b/elements/sdk/gcr-3.bst
new file mode 100644
index 000000000..711035372
--- /dev/null
+++ b/elements/sdk/gcr-3.bst
@@ -0,0 +1,37 @@
+kind: meson
+
+sources:
+- kind: git_tag
+  url: gnome:gcr.git
+  track: gnome-41
+
+build-depends:
+- sdk/gobject-introspection.bst
+- sdk/gtk-doc.bst
+- sdk/vala.bst
+- freedesktop-sdk.bst:components/systemd.bst
+- freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
+
+depends:
+- sdk/glib.bst
+- sdk/gtk+-3.bst
+- sdk/libsecret.bst
+- freedesktop-sdk.bst:components/gnupg.bst
+- freedesktop-sdk.bst:components/openssh.bst
+- freedesktop-sdk.bst:components/p11-kit.bst
+- freedesktop-sdk.bst:components/systemd-libs.bst
+- freedesktop-sdk.bst:bootstrap-import.bst
+
+variables:
+  meson-local: >-
+    -Dssh_agent=false
+
+public:
+  bst:
+    split-rules:
+      devel:
+        (>):
+        - '%{libdir}/libgck-1.so'
+        - '%{libdir}/libgcr-3.so'
+        - '%{libdir}/libgcr-base-3.so'
+        - '%{libdir}/libgcr-ui-3.so'
diff --git a/elements/sdk/gcr.bst b/elements/sdk/gcr.bst
index e6052d9d9..3feccdf6d 100644
--- a/elements/sdk/gcr.bst
+++ b/elements/sdk/gcr.bst
@@ -3,12 +3,11 @@ kind: meson
 sources:
 - kind: git_tag
   url: gnome:gcr.git
-  track: gnome-41
+  track: master
 
 build-depends:
 - sdk-deps/gi-docgen.bst
 - sdk/gobject-introspection.bst
-- sdk/gtk-doc.bst
 - sdk/vala.bst
 - freedesktop-sdk.bst:components/systemd.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
@@ -16,6 +15,7 @@ build-depends:
 depends:
 - sdk/glib.bst
 - sdk/gtk+-3.bst
+- sdk/gtk.bst
 - sdk/libsecret.bst
 - freedesktop-sdk.bst:components/gnupg.bst
 - freedesktop-sdk.bst:components/openssh.bst
@@ -28,7 +28,7 @@ public:
     split-rules:
       devel:
         (>):
-        - '%{libdir}/libgck-1.so'
-        - '%{libdir}/libgcr-3.so'
-        - '%{libdir}/libgcr-base-3.so'
-        - '%{libdir}/libgcr-ui-3.so'
+        - '%{libdir}/libgck-2.so'
+        - '%{libdir}/libgcr-4.so'
+        - '%{libdir}/libgcr-4-gtk3.so'
+        - '%{libdir}/libgcr-4-gtk4.so'
diff --git a/elements/sdk/pinentry.bst b/elements/sdk/pinentry.bst
index 15486344b..eaccf34b7 100644
--- a/elements/sdk/pinentry.bst
+++ b/elements/sdk/pinentry.bst
@@ -8,7 +8,7 @@ build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
 
 depends:
-- sdk/gcr.bst
+- sdk/gcr-3.bst
 - sdk/libsecret.bst
 - freedesktop-sdk.bst:components/libgpg-error.bst
 - freedesktop-sdk.bst:components/libassuan.bst
diff --git a/elements/vm/NetworkManager-openconnect.bst b/elements/vm/NetworkManager-openconnect.bst
index cf8e95d7e..1cc1fb547 100644
--- a/elements/vm/NetworkManager-openconnect.bst
+++ b/elements/vm/NetworkManager-openconnect.bst
@@ -9,7 +9,7 @@ build-depends:
 - core-deps/intltool.bst
 
 depends:
-- sdk/gcr.bst
+- sdk/gcr-3.bst
 - sdk/gtk+-3.bst
 - core-deps/NetworkManager.bst
 - vm/openconnect.bst
diff --git a/elements/world/evolution.bst b/elements/world/evolution.bst
index 7c09b09fd..0d64c96f2 100644
--- a/elements/world/evolution.bst
+++ b/elements/world/evolution.bst
@@ -18,7 +18,7 @@ depends:
 - core-deps/libgweather.bst
 - core/gnome-desktop.bst
 - sdk/at-spi2-core.bst
-- sdk/gcr.bst
+- sdk/gcr-3.bst
 - sdk/gdk-pixbuf.bst
 - sdk/gsettings-desktop-schemas.bst
 - sdk/gtk+-3.bst
diff --git a/elements/world/geary.bst b/elements/world/geary.bst
index db6f5bae3..141d56d92 100644
--- a/elements/world/geary.bst
+++ b/elements/world/geary.bst
@@ -21,7 +21,7 @@ depends:
 - sdk/adwaita-icon-theme.bst
 - sdk/appstream-glib.bst
 - sdk/enchant-2.bst
-- sdk/gcr.bst
+- sdk/gcr-3.bst
 - sdk/glib.bst
 - sdk/gsettings-desktop-schemas.bst
 - sdk/gtk+-3.bst
diff --git a/elements/world/phosh.bst b/elements/world/phosh.bst
index ca7800ce5..1ebb6e51c 100644
--- a/elements/world/phosh.bst
+++ b/elements/world/phosh.bst
@@ -22,7 +22,7 @@ depends:
 - core-deps/feedbackd.bst
 - core-deps/upower.bst
 - core/gnome-desktop.bst
-- sdk/gcr.bst
+- sdk/gcr-3.bst
 - sdk/glib.bst
 - sdk/gsettings-desktop-schemas.bst
 - sdk/gtk+-3.bst
diff --git a/elements/world/seahorse.bst b/elements/world/seahorse.bst
index 4de307e5d..daf2f73a1 100644
--- a/elements/world/seahorse.bst
+++ b/elements/world/seahorse.bst
@@ -16,7 +16,7 @@ runtime-depends:
 
 depends:
 - core-deps/openldap.bst
-- sdk/gcr.bst
+- sdk/gcr-3.bst
 - sdk/glib.bst
 - sdk/gsettings-desktop-schemas.bst
 - sdk/gtk+-3.bst