haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-05-05 14:38:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

fontconfig: fixes from munchausen.

Browse Source 
And a few more from me, including directory fixes for PM.
This commit is contained in:
Augustin Cavalier
2014-09-23 13:15:13 -04:00
parent bd57cbb1ca
commit ddc6224614
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
media-libs/fontconfig/fontconfig-2.11.1.recipe
View File

@@ -11,8 +11,8 @@ COPYRIGHT="2000-2005, 2006-2007 Keith Packard
2009 Roozbeh Pournader 2009 Roozbeh Pournader
2008-2009 Red Hat, Inc. 2008-2009 Red Hat, Inc.
2008 Danilo Segan 2008 Danilo Segan
2012 Google, Inc." 2012 Google, Inc.
"
REVISION="2" REVISION="2"
ARCHITECTURES="x86_gcc2 x86 x86_64" ARCHITECTURES="x86_gcc2 x86 x86_64"
@@ -70,36 +70,35 @@ GLOBAL_WRITABLE_FILES="
BUILD() BUILD()
{ {
export PKG_CONFIG_PATH=`finddir B_SYSTEM_DEVELOP_DIRECTORY`/lib$secondaryArchSubDir/pkgconfig
mkdir -p `finddir B_USER_CACHE_DIRECTORY` mkdir -p `finddir B_USER_CACHE_DIRECTORY`
libtoolize --force --copy --install libtoolize --force --copy --install
aclocal aclocal
autoconf autoconf
automake automake
FONTS_DIR=`finddir B_SYSTEM_FONTS_DIRECTORY` FONTS_DIR=`finddir B_SYSTEM_FONTS_DIRECTORY`
FONTS_DIR2=`finddir B_BEOS_FONTS_DIRECTORY` FONTS_DIR2=`finddir B_SYSTEM_NONPACKAGED_FONTS_DIRECTORY`
FONTS_DIR3=`finddir B_USER_FONTS_DIRECTORY` FONTS_DIR3=`finddir B_USER_FONTS_DIRECTORY`
FONTS_DIR4=`finddir B_USER_NONPACKAGED_FONTS_DIRECTORY`
CACHE_DIR=`finddir B_USER_CACHE_DIRECTORY` CACHE_DIR=`finddir B_USER_CACHE_DIRECTORY`
runConfigure ./configure \ runConfigure ./configure \
--enable-libxml2 \ --enable-libxml2 \
--with-default-fonts=${FONTS_DIR} \ --with-default-fonts=${FONTS_DIR} \
--with-add-fonts=${FONTS_DIR2},${FONTS_DIR3} \ --with-add-fonts=${FONTS_DIR2},${FONTS_DIR3},${FONTS_DIR4} \
--with-cache-dir=${CACHE_DIR} --with-cache-dir=${CACHE_DIR}
make $jobArgs make $jobArgs
} }
INSTALL() INSTALL()
{ {
make install make install RUN_FC_CACHE_TEST=false
prepareInstalledDevelLibs libfontconfig prepareInstalledDevelLibs \
libfontconfig
fixPkgconfig fixPkgconfig
#devel package
packageEntries devel \ packageEntries devel \
$developDir \ $developDir \
$manDir/man3 \ $manDir \
$docDir $docDir
} }