diff --git a/0001-gvdb-Restore-permissions-on-changed-files.patch b/0001-gvdb-Restore-permissions-on-changed-files.patch deleted file mode 100644 index e23be2c..0000000 --- a/0001-gvdb-Restore-permissions-on-changed-files.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff --git a/gvdb/gvdb-builder.c b/gvdb/gvdb-builder.c -index 90ea50b..cf5f1f4 100644 ---- a/gvdb/gvdb-builder.c -+++ b/gvdb/gvdb-builder.c -@@ -21,6 +21,7 @@ - #include "gvdb-format.h" - - #include -+#include - #include - #if !defined(G_OS_WIN32) || !defined(_MSC_VER) - #include -@@ -509,13 +510,22 @@ gvdb_table_write_contents (GHashTable *table, - gboolean status; - FileBuilder *fb; - GString *str; -+ GStatBuf buf; -+ gint stat_ret; - - fb = file_builder_new (byteswap); - file_builder_add_hash (fb, table, &root); - str = file_builder_serialise (fb, root); - -+ stat_ret = g_stat (filename, &buf); -+ - status = g_file_set_contents (filename, str->str, str->len, error); - g_string_free (str, TRUE); - -+ if (stat_ret == 0) -+ g_chmod (filename, buf.st_mode); -+ else -+ g_chmod (filename, 0644); -+ - return status; - } diff --git a/dconf-0.34.0.tar.xz b/dconf-0.34.0.tar.xz deleted file mode 100644 index 6558cf7..0000000 --- a/dconf-0.34.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:943a94ab16121de5580ceaed2605b87444d1bca1c6cd8beefb778bcb0aa2da52 -size 112876 diff --git a/dconf-0.36.0.tar.xz b/dconf-0.36.0.tar.xz new file mode 100644 index 0000000..84f3e07 --- /dev/null +++ b/dconf-0.36.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9fe6bb22191fc2a036ad86fd8e7d165e9983c687b9fedccf85d46c799301da2d +size 114828 diff --git a/dconf-fix-meson.patch b/dconf-fix-meson.patch deleted file mode 100644 index d11c31f..0000000 --- a/dconf-fix-meson.patch +++ /dev/null @@ -1,35 +0,0 @@ -From cc32667c5d7d9ff95e65cc21f59905d8f9218394 Mon Sep 17 00:00:00 2001 -From: Diego Escalante Urrelo -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( --- -2.24.1 - diff --git a/dconf.changes b/dconf.changes index c3b8f90..22968bb 100644 --- a/dconf.changes +++ b/dconf.changes @@ -1,3 +1,22 @@ +------------------------------------------------------------------- +Tue Mar 10 19:46:25 UTC 2020 - bjorn.lie@gmail.com + +- Update to version 0.36.0: + + No changes, stable version update only. + +------------------------------------------------------------------- +Wed Feb 12 17:42:32 CET 2020 - dimstar@opensuse.org + +- Update to version 0.35.1: + + Writer service: avoid writing to disk and emitting changed + signals when write requests do not result in changes to the + database. + + build: Drop redundant `install` key from `configure_file()`. + + build: Update abicheck.sh script to work with GCC 9. + + build: Update use of link_whole for meson-0.52. +- Drop 0001-gvdb-Restore-permissions-on-changed-files.patch and + dconf-fix-meson.patch: fixed upstream. + ------------------------------------------------------------------- Tue Jan 14 21:41:11 UTC 2020 - Bjørn Lie @@ -8,7 +27,7 @@ Tue Jan 14 21:41:11 UTC 2020 - Bjørn Lie Thu Sep 12 14:28:34 CST 2019 - qkzhu@suse.com - Update to version 0.34.0: - + Increment version number following 0.34 release. + + Increment version number following 0.34 release. ------------------------------------------------------------------- Fri Aug 30 14:52:11 CDT 2019 - mgorse@suse.com diff --git a/dconf.spec b/dconf.spec index ed1c524..b55d6fd 100644 --- a/dconf.spec +++ b/dconf.spec @@ -17,19 +17,14 @@ Name: dconf -Version: 0.34.0 +Version: 0.36.0 Release: 0 Summary: Key-based configuration system License: LGPL-2.1-or-later Group: System/Libraries URL: https://live.gnome.org/dconf -Source0: https://download.gnome.org/sources/dconf/0.34/%{name}-%{version}.tar.xz +Source0: https://download.gnome.org/sources/dconf/0.36/%{name}-%{version}.tar.xz Source99: baselibs.conf -# PATCH-FIX-UPSTREAM 0001-gvdb-Restore-permissions-on-changed-files.patch bsc#1025721 bsc#971074 bgo#758066 fezhang@suse.com -- Restore permissions on files changed by dconf update. -Patch0: 0001-gvdb-Restore-permissions-on-changed-files.patch -# PATCH-FIX-UPSTREAM dconf-fix-meson.patch -- Fix build with new meson -Patch1: dconf-fix-meson.patch - BuildRequires: docbook-xsl-stylesheets BuildRequires: gtk-doc BuildRequires: meson