From 3ae4398a0bc70f7baec01a984a063410792184b2 Mon Sep 17 00:00:00 2001
From: Thomas Holder <thomas@thomas-holder.de>
Date: Fri, 1 Jan 2021 17:54:23 +0100
Subject: [PATCH] Install themes to $prefix/share/themes

Add XDG_DATA_DIRS to AppRun for custom themes
---
 packaging/appimage/AppRun | 1 +
 share/CMakeLists.txt      | 1 +
 share/themes              | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/packaging/appimage/AppRun b/packaging/appimage/AppRun
index 8037cea7f7..722695bfa8 100644
--- a/packaging/appimage/AppRun
+++ b/packaging/appimage/AppRun
@@ -42,6 +42,7 @@ export PATH="${HERE}/usr/bin:${PATH}"
 
 if [ -e "$HERE/lib/x86_64-linux-gnu/ld-linux-x86-64.so.2" ] ; then
   echo "Run experimental bundle that bundles everything"
+  export XDG_DATA_DIRS="$HERE/usr/share/:/usr/local/share/:/usr/share/"
   export GCONV_PATH="$HERE/usr/lib/x86_64-linux-gnu/gconv"
   export FONTCONFIG_FILE="$HERE/etc/fonts/fonts.conf"
   export LIBRARY_PATH="$HERE/usr/lib":$LIBRARY_PATH
diff --git a/share/CMakeLists.txt b/share/CMakeLists.txt
index 8cb35ddea2..7d6f3e9e1f 100644
--- a/share/CMakeLists.txt
+++ b/share/CMakeLists.txt
@@ -16,6 +16,7 @@ add_subdirectory(pixmaps)
 add_subdirectory(tutorials)
 add_subdirectory(ui)
 add_subdirectory(doc)
+add_subdirectory(themes)
 
 install(DIRECTORY extensions DESTINATION ${INKSCAPE_SHARE_INSTALL}
     COMPONENT extensions
diff --git a/share/themes b/share/themes
index 77f8f048fc..5e1cdbb70e 160000
--- a/share/themes
+++ b/share/themes
@@ -1 +1 @@
-Subproject commit 77f8f048fc63532ce7c820a809bd3c2d24448fa6
+Subproject commit 5e1cdbb70e8cae23f8d15f47627ae410f20d1624
-- 
GitLab