diff --git a/debian/changelog b/debian/changelog index b3cd21c..8cb3990 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +sudo (1.9.9-1ubuntu2.1) jammy; urgency=medium + + * Add XDG_CURRENT_DESKTOP to initial_keepenv_table for Qt to determine the + correct theme (LP: #1958055) + + -- Benjamin Drung Thu, 04 Aug 2022 12:35:21 +0200 + sudo (1.9.9-1ubuntu2) jammy; urgency=medium * d/t/control: skip 03-getroot-ldap autopkgtest on non-containers diff --git a/debian/patches/Add-XDG_CURRENT_DESKTOP-to-initial_keepenv_table.patch b/debian/patches/Add-XDG_CURRENT_DESKTOP-to-initial_keepenv_table.patch new file mode 100644 index 0000000..dfe28d6 --- /dev/null +++ b/debian/patches/Add-XDG_CURRENT_DESKTOP-to-initial_keepenv_table.patch @@ -0,0 +1,29 @@ +From: Benjamin Drung +Date: Fri, 29 Jul 2022 11:35:47 +0200 +Subject: Add XDG_CURRENT_DESKTOP to initial_keepenv_table + +Qt needs `XDG_CURRENT_DESKTOP` to be set to determine the correct theme. + +Since `DISPLAY` and `XAUTHORITY` are already in the default table of +variables to preserve in the environment, just add `XDG_CURRENT_DESKTOP` +to it. + +Bug: https://launchpad.net/bugs/1958055 +Forwarded: https://github.com/sudo-project/sudo/pull/165 +Signed-off-by: Benjamin Drung +--- + plugins/sudoers/env.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/plugins/sudoers/env.c b/plugins/sudoers/env.c +index f20515f..b1f47d1 100644 +--- a/plugins/sudoers/env.c ++++ b/plugins/sudoers/env.c +@@ -225,6 +225,7 @@ static const char *initial_keepenv_table[] = { + "PS2", + "XAUTHORITY", + "XAUTHORIZATION", ++ "XDG_CURRENT_DESKTOP", + NULL + }; + diff --git a/debian/patches/series b/debian/patches/series index a596915..56d9f4c 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ paths-in-samples.diff Whitelist-DPKG_COLORS-environment-variable.diff sudo-ldap-docs +Add-XDG_CURRENT_DESKTOP-to-initial_keepenv_table.patch