Dominique Leuenberger
287cb1c055
gdm-config building dconf database path (bsc#1232669). - Add -Ddistro=generic to make gdm-config work (bsc#1232669). OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdm?expand=0&rev=584
43 lines
1.4 KiB
Diff
43 lines
1.4 KiB
Diff
From bf711cfd86536971404974a48c4db7298bda0e06 Mon Sep 17 00:00:00 2001
|
|
From: Alynx Zhou <alynx.zhou@gmail.com>
|
|
Date: Tue, 1 Apr 2025 11:18:05 +0800
|
|
Subject: [PATCH] gdm-config: Add missing "/" when building dconf paths
|
|
|
|
Closes #978
|
|
---
|
|
meson.build | 2 +-
|
|
utils/gdm-config.c | 4 ++--
|
|
2 files changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/meson.build b/meson.build
|
|
index eaa93a652..63be01011 100644
|
|
--- a/meson.build
|
|
+++ b/meson.build
|
|
@@ -222,7 +222,7 @@ endif
|
|
# dconf paths, we should fix dconf.pc to provide us more real data though
|
|
if dconf_dep.found()
|
|
dconf_prefix = dconf_dep.get_variable(pkgconfig: 'prefix')
|
|
- dconf_sysconfig = (dconf_prefix == '/usr') ? '/etc' : dconf_prefix + '/etc/'
|
|
+ dconf_sysconfig = (dconf_prefix == '/usr') ? '/etc' : dconf_prefix + '/etc'
|
|
dconf_datadir = dconf_prefix / 'share'
|
|
else
|
|
dconf_sysconfig = gdm_prefix / get_option('sysconfdir')
|
|
diff --git a/utils/gdm-config.c b/utils/gdm-config.c
|
|
index 70d5d4de9..82051a1b1 100644
|
|
--- a/utils/gdm-config.c
|
|
+++ b/utils/gdm-config.c
|
|
@@ -34,8 +34,8 @@
|
|
|
|
#include "gdm-common.h"
|
|
|
|
-#define DCONF_SYSCONFIG_PROFILES_PATH DCONF_SYSCONFIG "dconf/profile"
|
|
-#define DCONF_SYSCONFIG_DB_PATH DCONF_SYSCONFIG "dconf/db"
|
|
+#define DCONF_SYSCONFIG_PROFILES_PATH DCONF_SYSCONFIG "/dconf/profile"
|
|
+#define DCONF_SYSCONFIG_DB_PATH DCONF_SYSCONFIG "/dconf/db"
|
|
#define DCONF_SYSTEM_DB_PREFIX "system-db:"
|
|
#define DCONF_SYSTEM_DB_DEFAULT_NAME "gdm_auth_config"
|
|
|
|
--
|
|
GitLab
|
|
|