From 6cae1c911d1eedb64aa37ece5e4c6a6760cf6d93 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 9 Jan 2012 17:30:16 +0100 Subject: [PATCH] plymouth: install dejavu fonts in correct dir in the initramfs-tools hook. --- srcpkgs/plymouth/files/plymouth.hook | 6 +++--- srcpkgs/plymouth/template | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/srcpkgs/plymouth/files/plymouth.hook b/srcpkgs/plymouth/files/plymouth.hook index f281b1e7149..17452446eff 100644 --- a/srcpkgs/plymouth/files/plymouth.hook +++ b/srcpkgs/plymouth/files/plymouth.hook @@ -73,11 +73,11 @@ case "$(basename ${THEME} .plymouth)" in cp /usr/share/plymouth/xbps-logo.png "${DESTDIR}/usr/share/plymouth" # copy files for font rendering - mkdir -p "${DESTDIR}/usr/share/fonts/truetype/ttf-dejavu" + mkdir -p "${DESTDIR}/usr/share/fonts/TTF" mkdir -p "${DESTDIR}/etc/fonts/conf.d" mkdir -p "${DESTDIR}/var/cache/fontconfig" - cp -a /usr/share/fonts/TTF/DejaVuSerif.ttf "${DESTDIR}/usr/share/fonts/truetype/ttf-dejavu" - cp -a /usr/share/fonts/TTF/DejaVuSans.ttf "${DESTDIR}/usr/share/fonts/truetype/ttf-dejavu" + cp -a /usr/share/fonts/TTF/DejaVuSerif.ttf "${DESTDIR}/usr/share/fonts/TTF" + cp -a /usr/share/fonts/TTF/DejaVuSans.ttf "${DESTDIR}/usr/share/fonts/TTF" cp -a /etc/fonts/fonts.conf "${DESTDIR}/etc/fonts" cp -rL /etc/fonts/conf.d/60-latin.conf "${DESTDIR}/etc/fonts/conf.d" if [ -d /usr/lib/pango/1.6.0 ]; then diff --git a/srcpkgs/plymouth/template b/srcpkgs/plymouth/template index 7d70fab5639..5bd3d90c291 100644 --- a/srcpkgs/plymouth/template +++ b/srcpkgs/plymouth/template @@ -1,7 +1,7 @@ # Template file for 'plymouth' pkgname=plymouth version=0.8.3 -revision=2 +revision=3 patch_args="-Np1" homepage="http://cgit.freedesktop.org/plymouth" distfiles="${homepage}/snapshot/$pkgname-$version.tar.bz2" @@ -24,7 +24,6 @@ long_desc=" subpackages="libplymouth ${pkgname}-x11 ${pkgname}-drm ${pkgname}-devel" conf_files="/etc/plymouth/plymouthd.conf" - Add_dependency build automake Add_dependency build pkg-config Add_dependency build gtk+-devel