From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mirko=20G=C3=BCnther?= <renegart@gmx.de>
Date: Sun, 8 Nov 2026 12:04:18 +0100
Subject: [PATCH] src/CMakeLists.txt: locate portal interfaces and xmlstarlet
 properly

Take the interface directory from xdg-desktop-portal's pkg-config file
instead of hardcoding /usr/share/dbus-1/interfaces, look up xmlstarlet
with find_program() and fail at configure time if preprocessing an
interface file fails. Previously a missing xmlstarlet silently produced
an empty XML file and qdbusxml2cpp failed later with an obscure error.
---
 src/CMakeLists.txt | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 5774953..758fcc7 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -4,6 +4,12 @@
 
 # src/CMakeLists.txt
 find_package(Qt6 REQUIRED COMPONENTS Core DBus Gui)
+find_package(PkgConfig REQUIRED)
+pkg_get_variable(PORTAL_INTERFACES_DIR xdg-desktop-portal interfaces_dir)
+if(NOT PORTAL_INTERFACES_DIR)
+    message(FATAL_ERROR "xdg-desktop-portal interface files not found")
+endif()
+find_program(XMLSTARLET_EXECUTABLE xmlstarlet REQUIRED)
 
 add_library(lomiri-portal-api INTERFACE)
 target_include_directories(lomiri-portal-api INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})
@@ -22,10 +28,14 @@ function(add_portal NAME)
     # qtdbusxml2cpp emits C++ keywords as arg names; rename the "namespace" arg with xmlstarlet first.
     set(xmlOut ${CMAKE_CURRENT_BINARY_DIR}/org.freedesktop.impl.portal.${NAME}.xml)
     execute_process(
-        COMMAND xmlstarlet ed -u "//arg[@name=\"namespace\"]/@name" -v ns
-                /usr/share/dbus-1/interfaces/org.freedesktop.impl.portal.${NAME}.xml
+        COMMAND ${XMLSTARLET_EXECUTABLE} ed -u "//arg[@name=\"namespace\"]/@name" -v ns
+                ${PORTAL_INTERFACES_DIR}/org.freedesktop.impl.portal.${NAME}.xml
         OUTPUT_FILE ${xmlOut}
+        RESULT_VARIABLE xmlResult
     )
+    if(NOT xmlResult EQUAL 0)
+        message(FATAL_ERROR "Failed to preprocess org.freedesktop.impl.portal.${NAME}.xml")
+    endif()
 
     set(gen)
     qt_add_dbus_adaptor(gen
@@ -65,7 +75,7 @@ file(GENERATE OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/static_portals.cpp CONTENT "${i
 # The Request interface is shared by every portal; generate its adaptor from the xdg-provided XML
 # (no "namespace" arg to rename, so no xmlstarlet pass needed).
 qt_add_dbus_adaptor(request_adaptor_src
-    /usr/share/dbus-1/interfaces/org.freedesktop.impl.portal.Request.xml
+    ${PORTAL_INTERFACES_DIR}/org.freedesktop.impl.portal.Request.xml
     ${CMAKE_CURRENT_SOURCE_DIR}/request.h
     Request
     request_adaptor
