[patch] Proposed patch to add gtk+ dependency optional

gnome-keyring-42.1-disable-gtk.patch (text/plain), 1.69 KB, created by Jocelyn Mayer on 2022-10-19 03:15:23 UTC

--- gnome-keyring-42.1/configure.ac	2022-10-18 08:05:02.111526038 +0200
+++ gnome-keyring-42.1/configure.ac	2022-10-18 08:26:49.800419807 +0200
@@ -208,8 +208,20 @@ fi
 # GCR and GCK libraries
 
 PKG_CHECK_MODULES(GCK, gck-1 >= $GCK_REQ)
-PKG_CHECK_MODULES(GCR, gcr-3 >= $GCR_REQ)
 PKG_CHECK_MODULES(GCR_BASE, gcr-base-3 >= $GCR_REQ)
+AC_ARG_ENABLE(gtk,
+	    AC_HELP_STRING([--disable-gtk],
+	    [Build gtk+ GUI backend]))
+gtk_status="no"
+if test "$enable_gtk" != "no"; then
+	PKG_CHECK_MODULES(GCR, gcr-3 >= $GCR_REQ, gtk_status="yes")
+	if test "$enable_gtk" = "yes" -a "$gtk_status" = "no"; then
+		AC_MSG_ERROR(The GCR headers for GTK+ support are missing)
+	fi
+else
+	GCR_CFLAGS="$GCR_BASE_CFLAGS"
+	GCR_LIBS="$GCR_BASE_LIBS"
+fi
 
 DAEMON_CFLAGS="$DAEMON_CFLAGS $GCK_CFLAGS $GCR_BASE_CFLAGS"
 DAEMON_LIBS="$DAEMON_LIBS $GCK_LIBS $GCR_BASE_LIBS"
@@ -683,6 +695,7 @@ po/Makefile.in
 
 echo
 echo "OPTIONAL DEPENDENCIES"
+echo "  Gtk+:                 $gtk_status"
 echo "  PAM:                  $pam_status"
 echo "  Linux capabilities:   $libcapng_status"
 echo "  SELinux:              $selinux_status"
--- gnome-keyring-42.1/tool/gkr-tool-trust.c	2020-06-01 13:37:11.000000000 +0200
+++ gnome-keyring-42.1/tool/gkr-tool-trust.c	2022-08-25 09:02:35.411635253 +0200
@@ -25,7 +25,7 @@
 #include "gkr-tool.h"
 
 #include <gck/gck.h>
-#include <gcr/gcr.h>
+#include <gcr/gcr-base.h>
 
 #include "egg/egg-hex.h"
 
--- gnome-keyring-42.1/tool/gkr-tool-import.c	2020-06-01 13:37:11.000000000 +0200
+++ gnome-keyring-42.1/tool/gkr-tool-import.c	2022-08-25 09:02:13.562374289 +0200
@@ -25,7 +25,7 @@
 #include "gkr-tool.h"
 
 #include <gck/gck.h>
-#include <gcr/gcr.h>
+#include <gcr/gcr-base.h>
 
 #include "egg/egg-hex.h"