Compare commits
10 Commits
75fd57e07c
...
5d0f01f0ea
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5d0f01f0ea | ||
|
|
5eedfdf5f6 | ||
|
|
8a08462925 | ||
|
|
ad09de3c8e | ||
|
|
46b332b692 | ||
|
|
1e005ad6d6 | ||
|
|
3c7ebc061d | ||
|
|
92baaa36ed | ||
|
|
841573899d | ||
|
|
67e7a686de |
Binary file not shown.
BIN
dconf-0.40.0.tar.xz
Normal file
BIN
dconf-0.40.0.tar.xz
Normal file
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);
|
|
||||||
|
|
||||||
30
dconf.spec
30
dconf.spec
@ -1,13 +1,14 @@
|
|||||||
Name: dconf
|
Name: dconf
|
||||||
Version: 0.36.0
|
Version: 0.40.0
|
||||||
Release: 1
|
Release: 3
|
||||||
Summary: Dconf provides a backend to the GSettings API in Glib
|
Summary: Dconf provides a backend to the GSettings API in Glib
|
||||||
|
|
||||||
License: LGPLv2+ and GPLv2+ and GPLv3+
|
License: LGPLv2+ and GPLv2+ and GPLv3+
|
||||||
URL: http://live.gnome.org/%{name}
|
URL: http://live.gnome.org/%{name}
|
||||||
Source0: http://download.gnome.org/sources/%{name}/0.36/%{name}-%{version}.tar.xz
|
Source0: http://download.gnome.org/sources/%{name}/0.40/%{name}-%{version}.tar.xz
|
||||||
|
|
||||||
|
Patch9000: memset-chunk-date-to-eliminate-discrepancy.patch
|
||||||
|
|
||||||
Patch0: dconf-override.patch
|
|
||||||
BuildRequires: bash-completion dbus-devel glib2-devel >= 2.44.0 gtk-doc meson vala libxslt
|
BuildRequires: bash-completion dbus-devel glib2-devel >= 2.44.0 gtk-doc meson vala libxslt
|
||||||
Requires: dbus glib2%{?_isa} >= 2.44.0
|
Requires: dbus glib2%{?_isa} >= 2.44.0
|
||||||
|
|
||||||
@ -35,6 +36,9 @@ This package contains some readme, man and other related files for dconf.
|
|||||||
%meson -Dgtk_doc=true
|
%meson -Dgtk_doc=true
|
||||||
%meson_build
|
%meson_build
|
||||||
|
|
||||||
|
%check
|
||||||
|
%meson_test
|
||||||
|
|
||||||
%install
|
%install
|
||||||
%meson_install
|
%meson_install
|
||||||
|
|
||||||
@ -70,6 +74,7 @@ dconf update
|
|||||||
%{_datadir}/bash-completion/completions/dconf
|
%{_datadir}/bash-completion/completions/dconf
|
||||||
%{_datadir}/dbus-1/services/ca.desrt.dconf.service
|
%{_datadir}/dbus-1/services/ca.desrt.dconf.service
|
||||||
%config(noreplace) %{_sysconfdir}/dconf/profile/user
|
%config(noreplace) %{_sysconfdir}/dconf/profile/user
|
||||||
|
%{_userunitdir}/dconf.service
|
||||||
|
|
||||||
%files devel
|
%files devel
|
||||||
%{_includedir}/dconf
|
%{_includedir}/dconf
|
||||||
@ -86,7 +91,22 @@ dconf update
|
|||||||
%{_mandir}/man7/dconf.7.gz
|
%{_mandir}/man7/dconf.7.gz
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Mon Jun 30 2020 wenzhanli <wenzhanli2@huawei.com> - 0.36.0-1
|
* 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
|
||||||
|
|
||||||
|
* Thu Dec 09 2021 liuyumeng <liuyumeng5@huawei.com> -0.40.0-1
|
||||||
|
- update to 0.40.0
|
||||||
|
|
||||||
|
* Sat Jan 30 2021 yanglu <yanglu60@huawei.com> - 0.38.0-1
|
||||||
|
- Type:bugfix
|
||||||
|
- ID:NA
|
||||||
|
- SUG:NA
|
||||||
|
- DESC:Upgrade to 0.38.0
|
||||||
|
|
||||||
|
* Tue Jun 30 2020 wenzhanli <wenzhanli2@huawei.com> - 0.36.0-1
|
||||||
- Type:bugfix
|
- Type:bugfix
|
||||||
- ID:NAr
|
- ID:NAr
|
||||||
- SUG:NAr
|
- SUG:NAr
|
||||||
|
|||||||
24
memset-chunk-date-to-eliminate-discrepancy.patch
Normal file
24
memset-chunk-date-to-eliminate-discrepancy.patch
Normal file
@ -0,0 +1,24 @@
|
|||||||
|
From e772e3047896fb72d4976e109ca579d567064050 Mon Sep 17 00:00:00 2001
|
||||||
|
From: yanan <yanan@huawei.com>
|
||||||
|
Date: Wed, 23 Feb 2022 11:33:48 +0800
|
||||||
|
Subject: [PATCH] dconf read random contents of memory causing discrepancy,initialize memory to eliminate discrepancy
|
||||||
|
|
||||||
|
---
|
||||||
|
gvdb/gvdb-builder.c | 1 +
|
||||||
|
1 file changed, 1 insertion(+)
|
||||||
|
|
||||||
|
diff --git a/gvdb/gvdb-builder.c b/gvdb/gvdb-builder.c
|
||||||
|
index 2383e60..31e2d8f 100644
|
||||||
|
--- a/gvdb/gvdb-builder.c
|
||||||
|
+++ b/gvdb/gvdb-builder.c
|
||||||
|
@@ -239,6 +239,7 @@ file_builder_allocate (FileBuilder *fb,
|
||||||
|
chunk->offset = fb->offset;
|
||||||
|
chunk->size = size;
|
||||||
|
chunk->data = g_malloc (size);
|
||||||
|
+ memset(chunk->data, 0, size);
|
||||||
|
|
||||||
|
pointer->start = guint32_to_le (fb->offset);
|
||||||
|
fb->offset += size;
|
||||||
|
--
|
||||||
|
2.27.0
|
||||||
|
|
||||||
Loading…
x
Reference in New Issue
Block a user