summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean Whitton <spwhitton@spwhitton.name>2020-10-30 16:23:12 -0700
committerSean Whitton <spwhitton@spwhitton.name>2020-10-30 16:23:12 -0700
commitbf8f28484c44cde291df14481a5b7de59fb81d50 (patch)
tree13beb7a647b8d0146cbfe49566f53ef51dc048fc
parentf0899e792860b7bb7ee447b0c71c7c57555cd664 (diff)
downloadxfce4-session-athena/buster.tar.gz
Commit Debian 3.0 (quilt) metadatadebian/4.12.1-6+athena1athena/buster
[dgit (8.5) quilt-fixup]
-rw-r--r--debian/patches/series1
-rw-r--r--debian/patches/start-gnome-keyring-daemon-with---compon.patch29
2 files changed, 30 insertions, 0 deletions
diff --git a/debian/patches/series b/debian/patches/series
index a8f31b9..6dab8da 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
01_fix-xrdb-call.patch
03_xflock4-update-lockers-list.patch
04-use-debian-xscreensaver-wrapper.patch
+start-gnome-keyring-daemon-with---compon.patch
diff --git a/debian/patches/start-gnome-keyring-daemon-with---compon.patch b/debian/patches/start-gnome-keyring-daemon-with---compon.patch
new file mode 100644
index 0000000..0f18351
--- /dev/null
+++ b/debian/patches/start-gnome-keyring-daemon-with---compon.patch
@@ -0,0 +1,29 @@
+From: Sean Whitton <spwhitton@spwhitton.name>
+Date: Fri, 30 Oct 2020 16:22:40 -0700
+X-Dgit-Generated: 4.12.1-6+athena1 f0899e792860b7bb7ee447b0c71c7c57555cd664
+Subject: Start gnome-keyring-daemon with --components=pkcs11,secrets
+
+
+---
+
+--- xfce4-session-4.12.1.orig/xfce4-session/xfsm-compat-gnome.c
++++ xfce4-session-4.12.1/xfce4-session/xfsm-compat-gnome.c
+@@ -107,7 +107,7 @@ gnome_keyring_daemon_startup (void)
+ gint status;
+ glong pid;
+ gchar *end;
+- gchar *argv[3];
++ gchar *argv[4];
+ gchar *p;
+ gchar *name;
+ const gchar *value;
+@@ -122,7 +122,8 @@ gnome_keyring_daemon_startup (void)
+ error = NULL;
+ argv[0] = GNOME_KEYRING_DAEMON;
+ argv[1] = "--start";
+- argv[2] = NULL;
++ argv[2] = "--components=pkcs11,secrets";
++ argv[3] = NULL;
+ g_spawn_sync (NULL, argv, NULL,
+ G_SPAWN_SEARCH_PATH | G_SPAWN_LEAVE_DESCRIPTORS_OPEN,
+ child_setup, NULL,