configmgr/source/dconf.cxx | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 4cf54b8616fb6be26f02bd06c0158c3e69fde0db
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Tue Mar 9 16:40:56 2021 +0100
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Tue Mar 9 22:21:06 2021 +0100
Mark workaround as fixed upstream
Change-Id: I808f0b26916eece2d4fae3c7d1e73c847905adf8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112208
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/configmgr/source/dconf.cxx b/configmgr/source/dconf.cxx
index 75c0bb360ce3..1c0711ff1927 100644
--- a/configmgr/source/dconf.cxx
+++ b/configmgr/source/dconf.cxx
@@ -17,8 +17,11 @@
#include <vector>
extern "C" {
- // <https://bugzilla.gnome.org/show_bug.cgi?id=754245>
- // "common/dconf-changeset.h etc. lack extern "C" wrapper for C++"
+ //TODO: <https://bugzilla.gnome.org/show_bug.cgi?id=754245>
+ // "common/dconf-changeset.h etc. lack extern "C" wrapper for C++", fixed
on current dconf
+ // master (towards 0.40?) now with
+ //
<https://gitlab.gnome.org/GNOME/dconf/-/commit/db3d4df6d1a763698f27b013dc42da8d4ae02639>
+ // "Merge branch 'wip/issue-23' into 'master'"
#include <dconf/dconf.h>
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
