From fe5630511e8a490739f63d5b6a674d527bf29b02 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Mon, 5 Aug 2013 08:39:17 +0200
Subject: [PATCH] fontconfig: add systemd support, move userfont dir setup to
 xbmc

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/mediacenter/xbmc/package.mk          |  2 ++
 .../xbmc/scripts/xbmc-userfonts}              | 20 +++++--------------
 .../xbmc/system.d/xbmc-userfonts.service      | 11 ++++++++++
 packages/x11/other/fontconfig/package.mk      |  4 ++++
 .../fontconfig/system.d/fc-cache.service      | 11 ++++++++++
 5 files changed, 33 insertions(+), 15 deletions(-)
 rename packages/{x11/other/fontconfig/init.d/35_fontconfig => mediacenter/xbmc/scripts/xbmc-userfonts} (79%)
 mode change 100644 => 100755
 create mode 100644 packages/mediacenter/xbmc/system.d/xbmc-userfonts.service
 create mode 100644 packages/x11/other/fontconfig/system.d/fc-cache.service

diff --git a/packages/mediacenter/xbmc/package.mk b/packages/mediacenter/xbmc/package.mk
index 381b52c273..73c30094b8 100644
--- a/packages/mediacenter/xbmc/package.mk
+++ b/packages/mediacenter/xbmc/package.mk
@@ -466,6 +466,7 @@ post_makeinstall_target() {
     cp $PKG_DIR/scripts/xbmc-config $INSTALL/usr/lib/xbmc
     cp $PKG_DIR/scripts/xbmc-hacks $INSTALL/usr/lib/xbmc
     cp $PKG_DIR/scripts/xbmc-sources $INSTALL/usr/lib/xbmc
+    cp $PKG_DIR/scripts/xbmc-userfonts $INSTALL/usr/lib/xbmc
 
   mkdir -p $INSTALL/usr/bin
     cp $PKG_DIR/scripts/cputemp $INSTALL/usr/bin
@@ -552,5 +553,6 @@ post_install() {
   enable_service xbmc-halt.service
   enable_service xbmc-poweroff.service
   enable_service xbmc-reboot.service
+  enable_service xbmc-userfonts.service
   enable_service xbmc.service
 }
diff --git a/packages/x11/other/fontconfig/init.d/35_fontconfig b/packages/mediacenter/xbmc/scripts/xbmc-userfonts
old mode 100644
new mode 100755
similarity index 79%
rename from packages/x11/other/fontconfig/init.d/35_fontconfig
rename to packages/mediacenter/xbmc/scripts/xbmc-userfonts
index 639deeda32..45781b8f3a
--- a/packages/x11/other/fontconfig/init.d/35_fontconfig
+++ b/packages/mediacenter/xbmc/scripts/xbmc-userfonts
@@ -1,6 +1,7 @@
+#!/bin/sh
 ################################################################################
-#      Copyright (C) 2009-2010 OpenELEC.tv
-#      http://www.openelec.tv
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
 #
 #  This Program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -18,15 +19,11 @@
 #  http://www.gnu.org/copyleft/gpl.html
 ################################################################################
 
-# start Avahi Daemon
-#
-# runlevels: openelec, textmode
+. /etc/profile
 
-
-FC_CACHE_DIRS="/usr/share/fonts/ /usr/share/xbmc/media/Fonts/"
+SUBFONTS="/storage/.xbmc/userdata/fonts"
 
 # hack to support user installed fonts
-  SUBFONTS="/storage/.xbmc/userdata/fonts"
   if [ -d "$SUBFONTS" ]; then
     files=$(ls $SUBFONTS/*.[tT][tT][fF] 2>/dev/null | wc -l)
     if [ "$files" = "0" ]; then
@@ -34,10 +31,3 @@ FC_CACHE_DIRS="/usr/share/fonts/ /usr/share/xbmc/media/Fonts/"
     fi
       mount --bind $SUBFONTS /usr/share/xbmc/media/Fonts/
   fi
-
-
-(
-  progress "Creating fontconfig cache"
-    fc-cache $FC_CACHE_DIRS
-)&
-
diff --git a/packages/mediacenter/xbmc/system.d/xbmc-userfonts.service b/packages/mediacenter/xbmc/system.d/xbmc-userfonts.service
new file mode 100644
index 0000000000..d442514153
--- /dev/null
+++ b/packages/mediacenter/xbmc/system.d/xbmc-userfonts.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=XBMC user fonts setup
+Before=xbmc.service
+
+[Service]
+Type=oneshot
+ExecStart=/usr/lib/xbmc/xbmc-userfonts
+RemainAfterExit=yes
+
+[Install]
+WantedBy=xbmc.service
diff --git a/packages/x11/other/fontconfig/package.mk b/packages/x11/other/fontconfig/package.mk
index 4e69f1d120..221325113b 100644
--- a/packages/x11/other/fontconfig/package.mk
+++ b/packages/x11/other/fontconfig/package.mk
@@ -57,3 +57,7 @@ post_makeinstall_target() {
   rm -rf $INSTALL/usr/bin/fc-scan
   rm -rf $INSTALL/usr/bin/fc-validate
 }
+
+post_install() {
+  enable_service fc-cache.service
+}
diff --git a/packages/x11/other/fontconfig/system.d/fc-cache.service b/packages/x11/other/fontconfig/system.d/fc-cache.service
new file mode 100644
index 0000000000..b9e4e482bd
--- /dev/null
+++ b/packages/x11/other/fontconfig/system.d/fc-cache.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Fontconfig caching
+Before=graphical.target
+
+[Service]
+Type=oneshot
+ExecStart=/usr/bin/fc-cache /usr/share/fonts/ /usr/share/xbmc/media/Fonts/
+RemainAfterExit=yes
+
+[Install]
+WantedBy=graphical.target