haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-23 12:10:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

fontconfig: bump version.

Browse Source 
* remove old recipes.
This commit is contained in:
Jerome Duval
2015-10-12 22:39:35 +00:00
parent 59093a7f68
commit 9a3e41dba6
5 changed files with 41 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
media-libs/fontconfig/fontconfig-2.10.0.recipe
View File

@@ -1,39 +0,0 @@
DESCRIPTION="Fontconfig is a library for font customization and configuration."
HOMEPAGE="http://www.freedesktop.org/wiki/Software/fontconfig"
SOURCE_URI="http://www.freedesktop.org/software/fontconfig/release/fontconfig-2.10.0.tar.bz2"
CHECKSUM_MD5="3950e82cf5885b41cba8a2bf466aa6f9"
REVISION="1"
STATUS_HAIKU="stable"
DEPEND="dev-util/pkgconfig >= 0.23
media-libs/freetype >= 2.4.9"
BUILD()
{
cd fontconfig-2.10.0
mkdir -p `finddir B_USER_CACHE_DIRECTORY`
libtoolize --force --copy --install
aclocal
autoconf
automake
FONTS_DIR=`finddir B_SYSTEM_FONTS_DIRECTORY`
FONTS_DIR2=`finddir B_COMMON_FONTS_DIRECTORY`
FONTS_DIR3=`finddir B_BEOS_FONTS_DIRECTORY`
FONTS_DIR4=`finddir B_USER_FONTS_DIRECTORY`
CACHE_DIR=`finddir B_USER_CACHE_DIRECTORY`
DOCS_DIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`
DATA_DIR=`finddir B_COMMON_DATA_DIRECTORY`
./configure --prefix=`finddir B_COMMON_DIRECTORY` \
--enable-libxml2 \
--with-default-fonts=${FONTS_DIR} \
--with-add-fonts=${FONTS_DIR2},${FONTS_DIR3},${FONTS_DIR4} \
--with-cache-dir=${CACHE_DIR} \
--mandir=${DOCS_DIR}/man \
--docdir=${DOCS_DIR}/doc \
--datarootdir=${DATA_DIR}
make
}
INSTALL()
{
cd fontconfig-2.10.0
make install
}

39
media-libs/fontconfig/fontconfig-2.10.2.recipe
View File

@@ -1,39 +0,0 @@
DESCRIPTION="Fontconfig is a library for font customization and configuration."
HOMEPAGE="http://www.freedesktop.org/wiki/Software/fontconfig"
SOURCE_URI="http://www.freedesktop.org/software/fontconfig/release/fontconfig-2.10.2.tar.bz2"
CHECKSUM_MD5="2f239690057d1438aa282e051f721d08"
REVISION="1"
STATUS_HAIKU="stable"
DEPEND="dev-util/pkgconfig >= 0.23
media-libs/freetype >= 2.4.9"
BUILD()
{
cd fontconfig-2.10.2
mkdir -p `finddir B_USER_CACHE_DIRECTORY`
libtoolize --force --copy --install
aclocal
autoconf
automake
FONTS_DIR=`finddir B_SYSTEM_FONTS_DIRECTORY`
FONTS_DIR2=`finddir B_COMMON_FONTS_DIRECTORY`
FONTS_DIR3=`finddir B_BEOS_FONTS_DIRECTORY`
FONTS_DIR4=`finddir B_USER_FONTS_DIRECTORY`
CACHE_DIR=`finddir B_USER_CACHE_DIRECTORY`
DOCS_DIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`
DATA_DIR=`finddir B_COMMON_DATA_DIRECTORY`
./configure --prefix=`finddir B_COMMON_DIRECTORY` \
--enable-libxml2 \
--with-default-fonts=${FONTS_DIR} \
--with-add-fonts=${FONTS_DIR2},${FONTS_DIR3},${FONTS_DIR4} \
--with-cache-dir=${CACHE_DIR} \
--mandir=${DOCS_DIR}/man \
--docdir=${DOCS_DIR}/doc \
--datarootdir=${DATA_DIR}
make
}
INSTALL()
{
cd fontconfig-2.10.2
make install
}

57
media-libs/fontconfig/fontconfig-2.11.0.recipe → media-libs/fontconfig/fontconfig-2.11.94.recipe
View File

@@ -3,17 +3,17 @@ DESCRIPTION="
Fontconfig is a library for font customization and configuration.
"
HOMEPAGE="http://www.freedesktop.org/wiki/Software/fontconfig"
SOURCE_URI="http://www.freedesktop.org/software/fontconfig/release/fontconfig-2.11.0.tar.bz2"
CHECKSUM_SHA256="cb0e0ef6f03bc8568e95653840bb07d5859dc89d7ce2cade9d94fcccf8c1a467"
SOURCE_URI="http://www.freedesktop.org/software/fontconfig/release/fontconfig-$portVersion.tar.bz2"
CHECKSUM_SHA256="d763c024df434146f3352448bc1f4554f390c8a48340cef7aa9cc44716a159df"
LICENSE="MIT"
COPYRIGHT="2000-2005, 2006-2007 Keith Packard
2005 Patrick Lam
2009 Roozbeh Pournader
2008-2009 Red Hat, Inc.
2008 Danilo Segan
2012 Google, Inc."
REVISION="2"
2012 Google, Inc.
"
REVISION="1"
ARCHITECTURES="x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86_gcc2 x86"
@@ -28,7 +28,7 @@ PROVIDES="
cmd:fc_query$secondaryArchSuffix
cmd:fc_scan$secondaryArchSuffix
cmd:fc_validate$secondaryArchSuffix
lib:libfontconfig$secondaryArchSuffix = 1.8.0 compat >= 1
lib:libfontconfig$secondaryArchSuffix = 1.9.0 compat >= 1
"
REQUIRES="
@@ -55,12 +55,14 @@ BUILD_PREREQUIRES="
cmd:autoconf
cmd:automake
cmd:gcc$secondaryArchSuffix
cmd:gperf
cmd:ld$secondaryArchSuffix
cmd:make
cmd:pkg_config$secondaryArchSuffix
cmd:python
"
PATCHES="fontconfig-2.11.0.patch"
PATCHES="fontconfig-2.11.1.patchset"
GLOBAL_WRITABLE_FILES="
settings/fonts/conf.d directory keep-old
@@ -69,41 +71,64 @@ GLOBAL_WRITABLE_FILES="
BUILD()
{
export PKG_CONFIG_PATH=`finddir B_SYSTEM_DEVELOP_DIRECTORY`/lib$secondaryArchSubDir/pkgconfig
mkdir -p `finddir B_USER_CACHE_DIRECTORY`
libtoolize --force --copy --install
aclocal
autoconf
automake
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_DIR4=`finddir B_USER_NONPACKAGED_FONTS_DIRECTORY`
CACHE_DIR=`finddir B_USER_CACHE_DIRECTORY`
runConfigure ./configure \
--enable-libxml2 \
--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}
make $jobArgs
}
INSTALL()
{
make install
make install RUN_FC_CACHE_TEST=false
prepareInstalledDevelLibs libfontconfig
rm $libDir/*.la
prepareInstalledDevelLibs \
libfontconfig
fixPkgconfig
# The pkgconfig file reference other libraries using the wrong paths, which
# creates a lot of confusion. Fix them so correct paths are used.
local develPackageName="${portName}_devel-$portFullVersion"
local packageLinksDir=$(dirname $portPackageLinksDir)
local linksDir="$packageLinksDir/${develPackageName}/devel~libfreetype$secondaryArchSuffix/$relativeDevelopLibDir"
sed -i -e "s,^\(Libs.private.*\)-L.* \(-lfreetype.*\)$,\1-L$linksDir \2," \
$developLibDir/pkgconfig/fontconfig.pc
linksDir="$packageLinksDir/${develPackageName}/devel~libxml2$secondaryArchSuffix/$relativeDevelopLibDir"
sed -i -e "s,^\(Libs.private.*-lfreetype.*\) -L.* \(-lxml2.*\)$,\1-L$linksDir \2," \
$developLibDir/pkgconfig/fontconfig.pc
linksDir="$packageLinksDir/${develPackageName}/devel~libfreetype$secondaryArchSuffix/$relativeIncludeDir"
sed -i -e "s,^\(Cflags.*\)-I/packages.*\(/freetype2.*\)$,\1-I$linksDir\2," \
$developLibDir/pkgconfig/fontconfig.pc
linksDir="$packageLinksDir/${develPackageName}/devel~libxml2$secondaryArchSuffix/$relativeIncludeDir"
sed -i -e "s,^\(Cflags.*freetype2.*\)-I/packages.*\(/libxml2.*\)$,\1-I$linksDir\2," \
$developLibDir/pkgconfig/fontconfig.pc
#devel package
packageEntries devel \
$developDir
$developDir \
$manDir \
$docDir
}
PROVIDES_devel="
fontconfig${secondaryArchSuffix}_devel = $portVersion compat >= 2.1
devel:libfontconfig$secondaryArchSuffix = 1.8.0 compat >= 1
devel:libfontconfig$secondaryArchSuffix = 1.9.0 compat >= 1
"
REQUIRES_devel="
fontconfig$secondaryArchSuffix == $portVersion base
devel:libfreetype$secondaryArchSuffix
devel:libxml2$secondaryArchSuffix
"

12
media-libs/fontconfig/patches/fontconfig-2.10.0.patch
View File

@@ -1,12 +0,0 @@
diff -ur fontconfig-2.10.0/src/fcatomic.c fontconfig-2.10.0-haiku/src/fcatomic.c
--- fontconfig-2.10.0/src/fcatomic.c 2012-06-17 21:49:30.023855104 -0400
+++ fontconfig-2.10.0-haiku/src/fcatomic.c 2012-07-18 19:39:56.629145600 -0400
@@ -132,7 +132,7 @@
return FcFalse;
}
ret = link ((char *) atomic->tmp, (char *) atomic->lck);
- if (ret < 0 && errno == EPERM)
+ if (ret < 0 && (errno == EPERM || errno == B_UNSUPPORTED))
{
/* the filesystem where atomic->lck points to may not supports
* the hard link. so better try to fallback

22
media-libs/fontconfig/patches/fontconfig-2.11.0.patch
View File

@@ -1,22 +0,0 @@
diff --git a/test/Makefile.am b/test/Makefile.am
index 52c63dc..f270b50 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -16,7 +16,7 @@ TESTDATA=4x6.pcf 8x16.pcf out.expected fonts.conf.in
AM_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)
-check_PROGRAMS = test-migration
+check_PROGRAMS =
if HAVE_PTHREAD
check_PROGRAMS += test-pthread
test_pthread_LDADD = $(top_builddir)/src/libfontconfig.la
@@ -26,7 +26,8 @@ test_pthread_LDADD = $(top_builddir)/src/libfontconfig.la
endif
noinst_PROGRAMS = $(check_PROGRAMS)
+check_PROGRAMS +=
test_migration_LDADD = $(top_builddir)/src/libfontconfig.la
EXTRA_DIST=$(check_SCRIPTS) $(TESTDATA)