fix fedora-base with xenocara font-config.

from matthieu@, okay sturm@
This commit is contained in:
espie 2007-03-30 14:27:24 +00:00
parent 5bc25e411a
commit 781e926d58
3 changed files with 21 additions and 5 deletions

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.5 2006/10/18 16:04:07 sturm Exp $
# $OpenBSD: Makefile,v 1.6 2007/03/30 14:27:24 espie Exp $
COMMENT= "Linux compatibility package based on Fedora Core 4"
PKGNAME= fedora_base-4.0p2
PKGNAME= fedora_base-4.0p3
# clean up after make plist:
# - perl -pi -e "s,^\@lib ,," pkg/PLIST
# - change the 2nd LIBXaw_version to LIBXaw7_version in pkg/PLIST
@ -101,7 +101,7 @@ RPMS= atk-1.9.1-1.i386.rpm \
zlib-1.2.2.2-5.fc4.i386.rpm:0
REMOVE_DIRS= usr/X11R6/man /usr/doc /usr/info /usr/man /usr/share/doc \
/usr/share/man /usr/share/zoneinfo /etc/fonts
/usr/share/man /usr/share/zoneinfo
REMOVE_FILES= /etc/localtime
PATCH_LIST=
@ -147,7 +147,9 @@ do-install:
rm ${FEDORADIR}/lib/libpthread*
mv ${FEDORADIR}/lib/obsolete/linuxthreads/* ${FEDORADIR}/lib
rm -fr ${FEDORADIR}/lib/obsolete
# fix fontconfig search path
cd ${FEDORADIR}/etc/fonts && ${PATCH} -p0 --forward --quiet -E < \
${PATCHDIR}/patch-etc_fonts_fonts_conf
# better safe than sorry
find ${FEDORADIR} -perm -4000 | xargs -r chmod u-s
find ${FEDORADIR} \( -user 37 -o -user 5041 -o -group 37 \) -print | \

View File

@ -0,0 +1,10 @@
$OpenBSD: patch-etc_fonts_fonts_conf,v 1.1 2007/03/30 14:27:24 espie Exp $
--- fonts.conf.orig Thu Mar 29 21:39:47 2007
+++ fonts.conf Thu Mar 29 21:39:47 2007
@@ -24,6 +24,7 @@
<dir>/usr/share/fonts</dir>
<dir>/usr/X11R6/lib/X11/fonts/Type1</dir> <dir>/usr/X11R6/lib/X11/fonts/OTF</dir>
+ <dir>/usr/X11R6/lib/X11/fonts/TTF</dir>
<dir>~/.fonts</dir>
<!--

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.4 2006/10/18 16:04:07 sturm Exp $
@comment $OpenBSD: PLIST,v 1.5 2007/03/30 14:27:24 espie Exp $
@conflict redhat_base-*
emul/
emul/fedora/
@ -17,6 +17,10 @@ emul/fedora/dev/tty5
emul/fedora/etc/
emul/fedora/etc/default/
emul/fedora/etc/default/nss
emul/fedora/etc/fonts/
emul/fedora/etc/fonts/fonts.conf
emul/fedora/etc/fonts/fonts.dtd
emul/fedora/etc/fonts/local.conf
emul/fedora/etc/gtk/
emul/fedora/etc/gtk-2.0/
emul/fedora/etc/gtk-2.0/${MACHINE_ARCH}-redhat-linux-gnu/