Compare commits
10 Commits
9fec8ae7cd
...
082a890a7a
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
082a890a7a | ||
|
|
47572d33be | ||
|
|
6a7f13a967 | ||
|
|
5fd0cc8fd6 | ||
|
|
afdbc23b39 | ||
|
|
53912f76ce | ||
|
|
8d525189d6 | ||
|
|
fc57a5382b | ||
|
|
e59a5c2e6f | ||
|
|
307c26486d |
34
backport-Update-use-of-link_whole-for-meson.patch
Normal file
34
backport-Update-use-of-link_whole-for-meson.patch
Normal file
@ -0,0 +1,34 @@
|
||||
From cc32667c5d7d9ff95e65cc21f59905d8f9218394 Mon Sep 17 00:00:00 2001
|
||||
From: Diego Escalante Urrelo <diegoe@gnome.org>
|
||||
Date: Thu, 31 Oct 2019 05:51:22 -0500
|
||||
Subject: [PATCH] build: Update use of link_whole for meson-0.52
|
||||
|
||||
A regression in meson-0.52 caused uses of link_whole to expose scenarios
|
||||
where duplicate symbols issues could appear. In particular
|
||||
libdconf_client_dep was being link_whole'd to itself, which recursively
|
||||
already included libdconf_common which was also a link_whole.
|
||||
|
||||
This change does not modify the available symbols in libdconf.so, and is
|
||||
compatible with meson-0.52 and 0.51.
|
||||
|
||||
See: https://github.com/mesonbuild/meson/pull/6030
|
||||
Fixes: https://gitlab.gnome.org/GNOME/dconf/issues/59
|
||||
---
|
||||
client/meson.build | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/client/meson.build b/client/meson.build
|
||||
index f3b7122..de6387e 100644
|
||||
--- a/client/meson.build
|
||||
+++ b/client/meson.build
|
||||
@@ -28,7 +28,7 @@ libdconf_client = static_library(
|
||||
|
||||
libdconf_client_dep = declare_dependency(
|
||||
dependencies: gio_dep,
|
||||
- link_whole: libdconf_client,
|
||||
+ link_with: libdconf_client,
|
||||
)
|
||||
|
||||
libdconf = shared_library(
|
||||
--
|
||||
GitLab
|
||||
Binary file not shown.
BIN
dconf-0.34.0.tar.xz
Normal file
BIN
dconf-0.34.0.tar.xz
Normal file
Binary file not shown.
10
dconf-eliminate-difference.patch
Normal file
10
dconf-eliminate-difference.patch
Normal file
@ -0,0 +1,10 @@
|
||||
--- dconf-0.34.0/gvdb/gvdb-builder.c 2020-06-23 11:41:44.184000000 +0800
|
||||
+++ dconf-0.34.0.bak/gvdb/gvdb-builder.c 2020-06-23 11:42:07.508000000 +0800
|
||||
@@ -239,6 +239,7 @@ file_builder_allocate (FileBuilder
|
||||
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;
|
||||
@ -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);
|
||||
|
||||
31
dconf.spec
31
dconf.spec
@ -1,14 +1,14 @@
|
||||
Name: dconf
|
||||
Version: 0.30.0
|
||||
Release: 2
|
||||
Version: 0.34.0
|
||||
Release: 5
|
||||
Summary: Dconf provides a backend to the GSettings API in Glib
|
||||
|
||||
License: LGPLv2+ and GPLv2+ and GPLv3+
|
||||
URL: http://live.gnome.org/%{name}
|
||||
Source0: http://download.gnome.org/sources/%{name}/0.30/%{name}-%{version}.tar.xz
|
||||
|
||||
#this patch comes from fedora/redhat repository
|
||||
Patch0001: dconf-override.patch
|
||||
Patch6000: backport-Update-use-of-link_whole-for-meson.patch
|
||||
Patch9000: dconf-eliminate-difference.patch
|
||||
|
||||
BuildRequires: bash-completion dbus-devel glib2-devel >= 2.44.0 gtk-doc meson vala libxslt
|
||||
Requires: dbus glib2%{?_isa} >= 2.44.0
|
||||
@ -37,6 +37,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,24 @@ dconf update
|
||||
%{_mandir}/man7/dconf.7.gz
|
||||
|
||||
%changelog
|
||||
* Wed Sep 19 2019 yanzhihua <yanzhihua4@huawei.com> - 0.30.0-2
|
||||
* Sat Mar 11 2023 zhangpan <zhangpan103@h-partners.com> - 0.34.0-5
|
||||
- enable test
|
||||
|
||||
* Wed Jun 16 2021 zhanzhimin <zhanzhimin@huawei.com> - 0.34.0-4
|
||||
- add patch to fix compilation failed
|
||||
|
||||
* Tue Feb 9 2021 jinzhimin <jinzhimin2@huawei.com> - 0.34.0-3
|
||||
- rebuild dconf
|
||||
|
||||
* Mon Feb 8 2021 jinzhimin <jinzhimin2@huawei.com> - 0.34.0-2
|
||||
- add patch to Initialize the memory
|
||||
|
||||
* Thu Jan 9 2020 openEuler Buildteam <buildteam@openeuler.org> - 0.34.0-1
|
||||
- Type:enhancement
|
||||
- ID:NA
|
||||
- SUG:NA
|
||||
- DESC:upgrade to 0.34.0
|
||||
|
||||
* Thu Sep 19 2019 yanzhihua <yanzhihua4@huawei.com> - 0.30.0-2
|
||||
- Package init.
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user