!23 enable tests,remove redundant files
From: @liuyumeng1 Reviewed-by: @zzm_567, @t_feng Signed-off-by: @t_feng
This commit is contained in:
commit
f9b8ddfcb7
Binary file not shown.
@ -1,23 +0,0 @@
|
||||
diff --git a/engine/dconf-engine-source-user.c b/engine/dconf-engine-source-user.c
|
||||
index 1657875..e4f8786 100644
|
||||
--- a/engine/dconf-engine-source-user.c
|
||||
+++ b/engine/dconf-engine-source-user.c
|
||||
@@ -39,11 +39,17 @@ dconf_engine_source_user_open_gvdb (const gchar *name)
|
||||
{
|
||||
GvdbTable *table;
|
||||
gchar *filename;
|
||||
+ const gchar *override;
|
||||
+
|
||||
+ override = g_getenv ("DCONF_USER_CONFIG_DIR");
|
||||
+ if (override == NULL)
|
||||
+ filename = g_build_filename (g_get_user_config_dir (), "dconf", name, NULL);
|
||||
+ else
|
||||
+ filename = g_build_filename (g_get_home_dir (), override, name, NULL);
|
||||
|
||||
/* This can fail in the normal case of the user not having any
|
||||
* settings. That's OK and it shouldn't be considered as an error.
|
||||
*/
|
||||
- filename = g_build_filename (g_get_user_config_dir (), "dconf", name, NULL);
|
||||
table = gvdb_table_new (filename, FALSE, NULL);
|
||||
g_free (filename);
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
Name: dconf
|
||||
Version: 0.40.0
|
||||
Release: 2
|
||||
Release: 3
|
||||
Summary: Dconf provides a backend to the GSettings API in Glib
|
||||
|
||||
License: LGPLv2+ and GPLv2+ and GPLv3+
|
||||
@ -36,6 +36,9 @@ This package contains some readme, man and other related files for dconf.
|
||||
%meson -Dgtk_doc=true
|
||||
%meson_build
|
||||
|
||||
%check
|
||||
%meson_test
|
||||
|
||||
%install
|
||||
%meson_install
|
||||
|
||||
@ -88,6 +91,9 @@ dconf update
|
||||
%{_mandir}/man7/dconf.7.gz
|
||||
|
||||
%changelog
|
||||
* Thu Apr 7 2022 liuyumeng <liuyumeng@h-partners.com> -0.40.0-3
|
||||
- enable tests,remove redundant files
|
||||
|
||||
* Tue Jan 18 2022 liuyumeng <liuyumeng5@huawei.com> - 0.40.0-2
|
||||
- add patch:dconf read random contents of memory causing discrepancy,initialize memory to eliminate discrepancy
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user