summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean Whitton <spwhitton@spwhitton.name>2021-02-15 16:19:17 -0700
committerSean Whitton <spwhitton@spwhitton.name>2021-02-15 16:19:17 -0700
commite6d956e3b49e4dbb88437a00893a1f0c191475f2 (patch)
treee5aca610d0c3ff7d0a7f23e2fcfc3ac5dad18660
parent68113f3cd914edcaca620ab0631c9676de324df5 (diff)
downloadxfce4-session-e6d956e3b49e4dbb88437a00893a1f0c191475f2.tar.gz
Commit Debian 3.0 (quilt) metadatadebian/4.16.0-1+athena1athena/bullseye
[dgit (9.12) 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 4e5fc24..a121636 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
0001-Update-locker-list-in-xflock4.patch
0002-use-xscreensaver-through-the-wrapper-it-ships.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..d96d71f
--- /dev/null
+++ b/debian/patches/start-gnome-keyring-daemon-with---compon.patch
@@ -0,0 +1,29 @@
+From: Sean Whitton <spwhitton@spwhitton.name>
+Date: Mon, 15 Feb 2021 16:18:41 -0700
+X-Dgit-Generated: 4.16.0-1+athena1 68113f3cd914edcaca620ab0631c9676de324df5
+Subject: Start gnome-keyring-daemon with --components=pkcs11,secrets
+
+
+---
+
+--- xfce4-session-4.16.0.orig/xfce4-session/xfsm-compat-gnome.c
++++ xfce4-session-4.16.0/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,