ElektraInitiative · flo91 · Jan 2, 2023 · Jun 14, 2022 · Jun 14, 2022 · Jun 20, 2022
diff --git a/.cirrus.yml b/.cirrus.yml
@@ -53,11 +53,15 @@ task:
       pkg install -y
       bison
       cmake
+      dbus
       flex
+      gcc12
       git
       libgit2
       llvm12
       ninja
+      pkgconf
+      xfce4-conf
       yajl
       yaml-cpp
 
@@ -82,6 +86,7 @@ task:
   tests_script:
     # Work around stalled process plugin and library problems on FreeBSD: https://issues.libelektra.org/2323
     - sudo mount -t fdescfs fdesc /dev/fd
+    - export $(dbus-launch) # Some libraries such as xfconf require a running dbus instance
     - *run_tests
 
 task:
@@ -97,7 +102,7 @@ task:
       env:
         BUILD_FULL: ON
         BUILD_SHARED: OFF
-        PLUGINS: ALL;-curlget # The curlget tests fail: https://github.com/ElektraInitiative/libelektra/issues/3382
+        PLUGINS: ALL;-curlget;-xfconf # The curlget tests fail: https://github.com/ElektraInitiative/libelektra/issues/3382 xfce4 is uncommon on macOS
 
   install_script:
     - | # Install Homebrew formulas
@@ -239,6 +244,7 @@ task:
     - export PATH=$PATH:"$CIRRUS_WORKING_DIR/install/bin"
     - export LUA_CPATH="${CIRRUS_WORKING_DIR}/install/lib/lua/5.2/?.so;"
     - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:"$CIRRUS_WORKING_DIR/install/lib"
+    - export $(dbus-launch) # Some libraries such as xfconf require a running dbus instance
     - *run_tests
 
 task:

diff --git a/.github/workflows/macOS.yml b/.github/workflows/macOS.yml
@@ -27,25 +27,26 @@ jobs:
        include:
          # The following plugins have been disabled due to problems:
          # Yamlcpp fails to compile on macOS with GCC due to problems with the macOS SDK
+         # it does not make sense to test the xfconf plugin on macOS as xfce is very uncommon on macOS
          - name: GCC 11
            CC: gcc-11
            CXX: g++-11
-           PLUGINS: ALL;-xerces;-yamlcpp
+           PLUGINS: ALL;-xerces;-yamlcpp;-xfconf
            BINDINGS: ALL;-rust
          - name: Clang
            CC: clang
            CXX: clang++
            ENABLE_LOGGER: ON
            TOOLS: NODEP
-           PLUGINS: ALL
+           PLUGINS: ALL;-xfconf
            BINDINGS: ALL;-rust
          - name: Clang ASAN
            CC: clang
            CXX: clang++
            ASAN_OPTIONS: detect_leaks=1
            ENABLE_ASAN: ON
            TOOLS: kdb
-           PLUGINS: ALL
+           PLUGINS: ALL;-xfconf
            BINDINGS: ALL;-rust
          #- name: MMap
          #  KDB_DEFAULT_STORAGE: mmapstorage

diff --git a/doc/man/man7/elektra-plugins.7 b/doc/man/man7/elektra-plugins.7
@@ -1,6 +1,6 @@
 .\" generated with Ronn-NG/v0.10.1
 .\" http://github.com/apjanke/ronn-ng/tree/0.10.1.pre1
-.TH "ELEKTRA\-PLUGINS" "7" "November 2022" ""
+.TH "ELEKTRA\-PLUGINS" "7" "August 2022" ""
 .SH "NAME"
 \fBelektra\-plugins\fR \- plugins overview
 .P
@@ -90,6 +90,8 @@ line \fIline/\fR reads/writes any file line by line
 yajl \fIyajl/\fR reads/writes JSON\.
 .IP "\(bu" 4
 augeas \fIaugeas/\fR reads/writes many different configuration files using the Augeas library
+.IP "\(bu" 4
+xfconf \fIxfconf/\fR reads/writes to arbitrary xfconf channels
 .IP "" 0
 .P
 Using semi\-structured data for config files, mainly suitable for spec\-namespace (put a focus on having nice syntax for metadata):

diff --git a/doc/news/_preparation_next_release.md b/doc/news/_preparation_next_release.md
@@ -174,9 +174,9 @@ The following text lists news about the [plugins](https://www.libelektra.org/plu
 - <<TODO>>
 - <<TODO>>
 
-### <<Plugin>>
+### xfconf
 
-- <<TODO>>
+- Add xfconf storage plugin with the ability to read and write to xfconf channels _(Richard Stöckl @Eiskasten)_
 - <<TODO>>
 - <<TODO>>
 

diff --git a/examples/codegen/econf/pkgconfig/Makefile b/examples/codegen/econf/pkgconfig/Makefile
@@ -1,7 +1,7 @@
 KDB ?= kdb
 
 application:../src/application.c genelektra.c
-	gcc ../src/application.c genelektra.c -std=c99 `pkg-config --cflags --libs elektra-codegen` -I. -o application -Wl,-rpath `pkg-config --variable=libdir elektra-codegen`
+	$(CC) ../src/application.c genelektra.c -std=c99 `pkg-config --cflags --libs elektra-codegen` -I. -o application -Wl,-rpath `pkg-config --variable=libdir elektra-codegen`
 
 genelektra.c:../spec.ini
 	$(KDB) gen -F ni=../spec.ini highlevel spec:/sw/example/econf/#0/current genelektra
@@ -10,4 +10,4 @@ clean:
 	rm -f genelektra.c
 	rm -f genelektra.h
 	rm -f genelektra.mount.sh
-	rm -f application
+	rm -f application
diff --git a/examples/codegen/menu/pkgconfig/Makefile b/examples/codegen/menu/pkgconfig/Makefile
@@ -1,7 +1,7 @@
 KDB ?= kdb
 
 application:../src/application.c genelektra.c
-	gcc ../src/application.c genelektra.c -std=c99 `pkg-config --cflags --libs elektra-codegen` -I. -o application -Wl,-rpath `pkg-config --variable=libdir elektra-codegen`
+	$(CC) ../src/application.c genelektra.c -std=c99 `pkg-config --cflags --libs elektra-codegen` -I. -o application -Wl,-rpath `pkg-config --variable=libdir elektra-codegen`
 
 genelektra.c:../spec.ini
 	$(KDB) gen -F ni=../spec.ini highlevel spec:/sw/example/menu/#0/current genelektra
@@ -10,4 +10,4 @@ clean:
 	rm -f genelektra.c
 	rm -f genelektra.h
 	rm -f genelektra.mount.sh
-	rm -f application
+	rm -f application
diff --git a/examples/codegen/tree/pkgconfig/Makefile b/examples/codegen/tree/pkgconfig/Makefile
@@ -1,7 +1,7 @@
 KDB ?= kdb
 
 application:../src/application.c genelektra.c
-	gcc ../src/application.c genelektra.c -std=c99 `pkg-config --cflags --libs elektra-codegen` -I. -o application -Wl,-rpath `pkg-config --variable=libdir elektra-codegen`
+	$(CC) ../src/application.c genelektra.c -std=c99 `pkg-config --cflags --libs elektra-codegen` -I. -o application -Wl,-rpath `pkg-config --variable=libdir elektra-codegen`
 
 genelektra.c:../spec.ini
 	$(KDB) gen -F ni=../spec.ini highlevel spec:/sw/example/tree/#0/current genelektra
@@ -10,4 +10,4 @@ clean:
 	rm -f genelektra.c
 	rm -f genelektra.h
 	rm -f genelektra.mount.sh
-	rm -f application
+	rm -f application
diff --git a/examples/external/pkgconfig/Makefile b/examples/external/pkgconfig/Makefile
@@ -1,2 +1,2 @@
 application:application.c
-	gcc application.c `pkg-config --cflags --libs elektra` -o application -Wl,-rpath `pkg-config --variable=libdir elektra`
+	$(CC) application.c `pkg-config --cflags --libs elektra` -o application -Wl,-rpath `pkg-config --variable=libdir elektra`
diff --git a/examples/highlevel/pkgconfig/Makefile b/examples/highlevel/pkgconfig/Makefile
@@ -1,2 +1,2 @@
 application:application.c
-	gcc application.c `pkg-config --cflags --libs elektra-highlevel` -o application -Wl,-rpath `pkg-config --variable=libdir elektra-highlevel`
+	$(CC) application.c `pkg-config --cflags --libs elektra-highlevel` -o application -Wl,-rpath `pkg-config --variable=libdir elektra-highlevel`
diff --git a/scripts/cmake/Modules/FindXfconf.cmake b/scripts/cmake/Modules/FindXfconf.cmake
@@ -0,0 +1,81 @@
+# ~~~
+# Find the libxfconf includes and library
+#
+#  XFCONF_INCLUDE_DIR  - Where to find libxfconf include sub-directory.
+#  XFCONF_LIBRARY      - Path to libxfconf library.
+#  XFCONF_FOUND        - True if libxfconf found.
+# ~~~
+
+if (XFCONF_INCLUDE_DIR) # Already in cache, be silent.
+	set (XFCONF_FIND_QUIETLY TRUE)
+endif (XFCONF_INCLUDE_DIR)
+
+find_package (PkgConfig QUIET)
+
+if (NOT PkgConfig_FOUND)
+	message ("PkgConfig is required to locate xfconf")
+	return ()
+endif ()
+
+pkg_search_module (GLIB QUIET glib-2.0)
+
+if (NOT GLIB_FOUND)
+	message ("glib-2.0 is required to xfconf")
+	return ()
+endif ()
+
+pkg_search_module (GOBJECT QUIET gobject-2.0)
+
+if (NOT GOBJECT_FOUND)
+	message ("gobject-2.0 is required to xfconf")
+	return ()
+endif ()
+
+find_path (
+	XFCONF_INCLUDE_DIR
+	NAMES xfconf
+	PATHS /usr/include/xfce4/xfconf-0 /usr/local/include/xfce4/xfconf-0)
+
+if (XFCONF_INCLUDE_DIR-NOTFOUND)
+	message ("xfconf headers cannot be found")
+	return ()
+endif ()
+
+find_library (
+	XFCONF_LIBRARY
+	NAMES xfconf-0
+	PATHS /usr/lib /usr/lib64 /usr/local/lib)
+
+if (XFCONF_LIBRARY-NOTFOUND)
+	message ("xfconf library cannot be found")
+	return ()
+endif ()
+
+find_library (
+	GLIB_LIBRARY
+	NAMES glib-2.0
+	PATHS "${GLIB_LIBDIR}")
+
+if (GLIB_LIBRARY-NOTFOUND)
+	message ("glib library cannot be found")
+	return ()
+endif ()
+
+find_library (
+	GOBJECT_LIBRARY
+	NAMES gobject-2.0
+	PATHS "${GOBJECT_LIBDIR}")
+
+if (GOBJECT_LIBRARY-NOTFOUND)
+	message ("gobject library cannot be found")
+	return ()
+endif ()
+
+file (GLOB XFCONF_INCLUDE_DIRS "${XFCONF_INCLUDE_DIR}" "${GLIB_INCLUDEDIR}/glib-2.0" "${GLIB_LIBDIR}/glib-2.0/include")
+file (GLOB XFCONF_LIBRARIES "${XFCONF_LIBRARY}" "${GLIB_LIBRARY}" "${GOBJECT_LIBRARY}")
+
+# Handle the QUIETLY and REQUIRED arguments and set XFCONF_FOUND to TRUE if all listed variables are TRUE.
+include (FindPackageHandleStandardArgs)
+find_package_handle_standard_args (Xfconf DEFAULT_MSG GLIB_LIBDIR GLIB_INCLUDEDIR XFCONF_LIBRARY XFCONF_INCLUDE_DIR)
+
+mark_as_advanced (GLIB_LIBDIR GLIB_INCLUDEDIR XFCONF_LIBRARY XFCONF_INCLUDE_DIR)
diff --git a/scripts/docker/cirrus/arch/Dockerfile b/scripts/docker/cirrus/arch/Dockerfile
@@ -15,6 +15,7 @@ RUN pacman -Sy --noconfirm \
     rubygems \
     texlive-most \
     wget \
+    xfconf \
     yajl \
     python-pip
 

diff --git a/scripts/docker/cirrus/fedora/Dockerfile b/scripts/docker/cirrus/fedora/Dockerfile
@@ -7,6 +7,7 @@ RUN dnf upgrade --refresh -y && dnf install -y \
         cmake \
         curl \
         dbus-devel \
+    	dbus-x11 \
         diffutils \
         file \
         findutils \
@@ -43,6 +44,7 @@ RUN dnf upgrade --refresh -y && dnf install -y \
         wget \
         which \
         xerces-c-devel \
+        xfconf-devel \
         yajl-devel \
         yaml-cpp-devel \
         zlib-devel \

diff --git a/scripts/docker/debian/bullseye/Dockerfile b/scripts/docker/debian/bullseye/Dockerfile
@@ -13,6 +13,7 @@ RUN apt-get update && apt-get -y install \
         clang-11 \
         cmake \
         curl \
+    	dbus-x11 \
         debsigs \
         default-jdk \
         devscripts \
@@ -52,6 +53,7 @@ RUN apt-get update && apt-get -y install \
         libsystemd-dev \
         libuv1-dev \
         libxerces-c-dev \
+        libxfconf-0-dev \
         libyajl-dev \
         libyaml-cpp-dev \
         libzmq3-dev \

diff --git a/scripts/docker/debian/bullseye/release.Dockerfile b/scripts/docker/debian/bullseye/release.Dockerfile
@@ -33,6 +33,7 @@ RUN --mount=type=tmpfs,target=/tmp \
     --mount=type=tmpfs,target=/etc/kdb \
     --mount=type=tmpfs,target=/root/.cache/elektra \
     --mount=type=tmpfs,target=/root/.config \
+    export $(dbus-launch); \
     kdb run_all
 
 RUN echo "%sudo ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers

diff --git a/scripts/docker/debian/buster/Dockerfile b/scripts/docker/debian/buster/Dockerfile
@@ -13,6 +13,7 @@ RUN apt-get update && apt-get -y install \
         clang-7 \
         cmake \
         curl \
+    	dbus-x11 \
         debsigs \
         default-jdk \
         devscripts \
@@ -52,6 +53,7 @@ RUN apt-get update && apt-get -y install \
         libsystemd-dev \
         libuv1-dev \
         libxerces-c-dev \
+        libxfconf-0-dev \
         libyajl-dev \
         libyaml-cpp-dev \
         libzmq3-dev \

diff --git a/scripts/docker/debian/buster/release.Dockerfile b/scripts/docker/debian/buster/release.Dockerfile
@@ -33,6 +33,7 @@ RUN --mount=type=tmpfs,target=/tmp \
     --mount=type=tmpfs,target=/etc/kdb \
     --mount=type=tmpfs,target=/root/.cache/elektra \
     --mount=type=tmpfs,target=/root/.config \
+    export $(dbus-launch); \
     kdb run_all
 
 RUN echo "%sudo ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers

diff --git a/scripts/docker/debian/sid/Dockerfile b/scripts/docker/debian/sid/Dockerfile
@@ -15,6 +15,7 @@ RUN apt-get update && apt-get -y install \
         clang-format-13 \
         cmake \
         curl \
+    	dbus-x11 \
         dh-lua \
         ed \
         flex \
@@ -42,6 +43,7 @@ RUN apt-get update && apt-get -y install \
         libsystemd-dev \
         libuv1-dev \
         libxerces-c-dev \
+        libxfconf-0-dev \
         libyajl-dev \
         libyaml-cpp-dev \
         libzmq3-dev \

diff --git a/scripts/docker/fedora/31/Dockerfile b/scripts/docker/fedora/31/Dockerfile
@@ -7,6 +7,7 @@ RUN dnf upgrade -y && dnf install -y \
         cmake \
         curl \
         dbus-devel \
+    	dbus-x11 \
         diffutils \
         dnf-plugins-core \
         file \
@@ -44,6 +45,7 @@ RUN dnf upgrade -y && dnf install -y \
         wget \
         which \
         xerces-c-devel \
+        xfconf-devel \
         yajl-devel \
         yaml-cpp-devel \
         zlib-devel \

diff --git a/scripts/docker/fedora/32/Dockerfile b/scripts/docker/fedora/32/Dockerfile
@@ -7,6 +7,7 @@ RUN dnf upgrade -y && dnf install -y \
         cmake \
         curl \
         dbus-devel \
+    	dbus-x11 \
         diffutils \
         dnf-plugins-core \
         file \
@@ -44,6 +45,7 @@ RUN dnf upgrade -y && dnf install -y \
         wget \
         which \
         xerces-c-devel \
+        xfconf-devel \
         yajl-devel \
         yaml-cpp-devel \
         zlib-devel \

diff --git a/scripts/docker/fedora/33/Dockerfile b/scripts/docker/fedora/33/Dockerfile
@@ -7,6 +7,7 @@ RUN dnf upgrade --refresh -y && dnf install -y \
         cmake \
         curl \
         dbus-devel \
+    	dbus-x11 \
         devscripts \
         diffutils \
         discount \
@@ -55,6 +56,7 @@ RUN dnf upgrade --refresh -y && dnf install -y \
         wget \
         which \
         xerces-c-devel \
+        xfconf-devel \
         yajl-devel \
         yaml-cpp-devel \
         zeromq-devel \

diff --git a/scripts/docker/fedora/34/Dockerfile b/scripts/docker/fedora/34/Dockerfile
@@ -7,6 +7,7 @@ RUN dnf upgrade --refresh -y && dnf install -y \
         cmake \
         curl \
         dbus-devel \
+    	dbus-x11 \
         devscripts \
         diffutils \
         discount \
@@ -55,6 +56,7 @@ RUN dnf upgrade --refresh -y && dnf install -y \
         wget \
         which \
         xerces-c-devel \
+        xfconf-devel \
         yajl-devel \
         yaml-cpp-devel \
         zeromq-devel \