Attachment 149304 Details for Bug 194957 – incomplete fix

[patch] incomplete fix

linux-fc-cache.diff (text/plain), 3.68 KB, created by Jan Beich on 2014-11-12 03:32:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2014-11-12 03:32:42 UTC

Size: 3.68 KB

patch

obsolete

>Index: Keywords/fc.ucl
>===================================================================
>--- Keywords/fc.ucl	(revision 372328)
>+++ Keywords/fc.ucl	(working copy)
>@@ -9,6 +9,7 @@ post-install: <<EOD
>   *) fontsdir="%D/%@" ;;
>   esac
>   fc-cache -s ${fontsdir} 2>/dev/null || true
>+  /compat/linux/usr/bin/fc-cache -s ${fontsdir} 2>/dev/null || true
> EOD
> post-deinstall: <<EOD
>   case "%@" in
>@@ -16,4 +17,5 @@ post-deinstall: <<EOD
>   *) fontsdir="%D/%@" ;;
>   esac
>   fc-cache -s ${fontsdir} 2>/dev/null || true
>+  /compat/linux/usr/bin/fc-cache -s ${fontsdir} 2>/dev/null || true
> EOD
>Index: Keywords/fcfontsdir.ucl
>===================================================================
>--- Keywords/fcfontsdir.ucl	(revision 372328)
>+++ Keywords/fcfontsdir.ucl	(working copy)
>@@ -9,6 +9,7 @@ post-install: <<EOD
>   *) fontsdir="%D/%@" ;;
>   esac
>   fc-cache -s ${fontsdir} 2>/dev/null || true
>+  /compat/linux/usr/bin/fc-cache -s ${fontsdir} 2>/dev/null || true
>   mkfontscale ${fontsdir} 2>/dev/null || true
>   mkfontdir ${fontsdir} 2>/dev/null || true
> EOD
>@@ -18,6 +19,7 @@ post-deinstall: <<EOD
>   *) fontsdir="%D/%@" ;;
>   esac
>   fc-cache -s ${fontsdir} 2>/dev/null || true
>+  /compat/linux/usr/bin/fc-cache -s ${fontsdir} 2>/dev/null || true
>   mkfontscale ${fontsdir} 2>/dev/null || true
>   if [ -e ${fontsdir}/fonts.scale -a "`stat -f '%%z' ${fontsdir}/fonts.scale 2>/dev/null`" = '2' ]; then
>     rm ${fontsdir}/fonts.scale
>Index: x11-fonts/linux-c6-fontconfig/Makefile
>===================================================================
>--- x11-fonts/linux-c6-fontconfig/Makefile	(revision 372328)
>+++ x11-fonts/linux-c6-fontconfig/Makefile	(working copy)
>@@ -23,7 +23,6 @@ USE_LDCONFIG=	yes
> # Don't let the linux fc-cache mess up the native cache file
> post-extract:
> 		@${RM} -r ${WRKSRC}/etc ${WRKSRC}/usr/share/fonts ${WRKSRC}/var \
>-			${WRKSRC}/usr/bin/fc-cache \
> 			${WRKSRC}/usr/share/man/man1/fc-cache.1.gz
> 
> post-install:
>Index: x11-fonts/linux-c6-fontconfig/pkg-plist
>===================================================================
>--- x11-fonts/linux-c6-fontconfig/pkg-plist	(revision 372328)
>+++ x11-fonts/linux-c6-fontconfig/pkg-plist	(working copy)
>@@ -1,5 +1,6 @@
> @comment file listing
> etc/fonts
>+usr/bin/fc-cache
> usr/bin/fc-cat
> usr/bin/fc-list
> usr/bin/fc-match
>@@ -20,3 +21,5 @@ usr/share/man/man1/fc-scan.1.gz
> usr/share/man/man5/fonts-conf.5.gz
> @comment non-empty directory listing in revers order
> @dirrm usr/share/doc/fontconfig-2.8.0
>+@comment pre-seed like x11-fonts/fontconfig/files/pkg-install.in
>+@exec %D/usr/bin/fc-cache -s 2>/dev/null || true
>Index: x11-fonts/linux-f10-fontconfig/Makefile
>===================================================================
>--- x11-fonts/linux-f10-fontconfig/Makefile	(revision 372328)
>+++ x11-fonts/linux-f10-fontconfig/Makefile	(working copy)
>@@ -25,7 +25,6 @@ USE_LDCONFIG=	yes
> # Don't let the linux fc-cache mess up the native cache file
> post-extract:
> 		@${RM} -r ${WRKSRC}/etc ${WRKSRC}/usr/share/fonts ${WRKSRC}/var \
>-			${WRKSRC}/usr/bin/fc-cache \
> 			${WRKSRC}/usr/share/man/man1/fc-cache.1.gz
> 
> post-install:
>Index: x11-fonts/linux-f10-fontconfig/pkg-plist
>===================================================================
>--- x11-fonts/linux-f10-fontconfig/pkg-plist	(revision 372328)
>+++ x11-fonts/linux-f10-fontconfig/pkg-plist	(working copy)
>@@ -1,5 +1,6 @@
> @comment file listing
> etc/fonts
>+usr/bin/fc-cache
> usr/bin/fc-cat
> usr/bin/fc-list
> usr/bin/fc-match
>@@ -16,3 +17,5 @@ usr/share/man/man1/fc-match.1.gz
> usr/share/man/man5/fonts-conf.5.gz
> @comment non-empty directory listing in revers order
> @dirrm usr/share/doc/fontconfig-2.6.0
>+@comment pre-seed like x11-fonts/fontconfig/files/pkg-install.in
>+@exec %D/usr/bin/fc-cache -s 2>/dev/null || true

Actions: View | Diff

Attachments on bug 194957: 149304 | 149402 | 149403 | 149453