fontconfig, remove old recipes/patches, mark x86_gcc2 broken on latest version (#8277)

This commit is contained in:
Schrijvers Luc
2023-04-04 16:19:26 +02:00
committed by GitHub
parent 1fc292256e
commit 4fe9972bc4
6 changed files with 3 additions and 442 deletions

View File

@@ -1,129 +0,0 @@
SUMMARY="A library for font customization and configuration"
DESCRIPTION="
Fontconfig is a library for font customization and configuration.
"
HOMEPAGE="http://www.freedesktop.org/wiki/Software/fontconfig"
COPYRIGHT="2000-2005, 2006-2007 Keith Packard
2005 Patrick Lam
2009 Roozbeh Pournader
2008-2009 Red Hat, Inc.
2008 Danilo Segan
2012 Google, Inc.
"
LICENSE="MIT"
REVISION="3"
SOURCE_URI="http://www.freedesktop.org/software/fontconfig/release/fontconfig-$portVersion.tar.bz2"
CHECKSUM_SHA256="dc62447533bca844463a3c3fd4083b57c90f18a70506e7a9f4936b5a1e516a99"
PATCHES="fontconfig-2.11.1.patchset"
ARCHITECTURES="all"
SECONDARY_ARCHITECTURES="x86_gcc2 x86"
GLOBAL_WRITABLE_FILES="
settings/fonts/conf.d directory keep-old
settings/fonts/fonts.conf auto-merge
"
PROVIDES="
fontconfig$secondaryArchSuffix = $portVersion compat >= 2
cmd:fc_cache$secondaryArchSuffix
cmd:fc_cat$secondaryArchSuffix
cmd:fc_list$secondaryArchSuffix
cmd:fc_match$secondaryArchSuffix
cmd:fc_pattern$secondaryArchSuffix
cmd:fc_query$secondaryArchSuffix
cmd:fc_scan$secondaryArchSuffix
cmd:fc_validate$secondaryArchSuffix
lib:libfontconfig$secondaryArchSuffix = 1.8.0 compat >= 1
"
REQUIRES="
haiku$secondaryArchSuffix
lib:libbz2$secondaryArchSuffix
lib:libfreetype$secondaryArchSuffix
lib:libpng$secondaryArchSuffix
lib:libxml2$secondaryArchSuffix
lib:libz$secondaryArchSuffix
"
PROVIDES_devel="
fontconfig${secondaryArchSuffix}_devel = $portVersion compat >= 2.1
devel:libfontconfig$secondaryArchSuffix = 1.8.0 compat >= 1
"
REQUIRES_devel="
fontconfig$secondaryArchSuffix == $portVersion base
devel:libfreetype$secondaryArchSuffix
devel:libxml2$secondaryArchSuffix
"
BUILD_REQUIRES="
devel:libbz2$secondaryArchSuffix
devel:libfreetype$secondaryArchSuffix
devel:libpng$secondaryArchSuffix
devel:libxml2$secondaryArchSuffix
devel:libz$secondaryArchSuffix
"
BUILD_PREREQUIRES="
haiku${secondaryArchSuffix}_devel
cmd:aclocal
cmd:autoconf
cmd:automake
cmd:gcc$secondaryArchSuffix
cmd:gperf
cmd:ld$secondaryArchSuffix
cmd:libtool
cmd:make
cmd:pkg_config$secondaryArchSuffix
"
BUILD()
{
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_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},${FONTS_DIR4} \
--with-cache-dir=${CACHE_DIR}
make $jobArgs
}
INSTALL()
{
make install RUN_FC_CACHE_TEST=false
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
packageEntries devel \
$developDir \
$manDir \
$docDir
}

View File

@@ -1,130 +0,0 @@
SUMMARY="A library for font customization and configuration"
DESCRIPTION="
Fontconfig is a library for font customization and configuration.
"
HOMEPAGE="http://www.freedesktop.org/wiki/Software/fontconfig"
COPYRIGHT="2000-2005, 2006-2007 Keith Packard
2005 Patrick Lam
2009 Roozbeh Pournader
2008-2009 Red Hat, Inc.
2008 Danilo Segan
2012 Google, Inc.
"
LICENSE="MIT"
REVISION="1"
SOURCE_URI="http://www.freedesktop.org/software/fontconfig/release/fontconfig-$portVersion.tar.bz2"
CHECKSUM_SHA256="7b165eee7aa22dcc1557db56f58d905b6a14b32f9701c79427452474375b4c89"
PATCHES="fontconfig-2.11.1.patchset"
ARCHITECTURES="all"
SECONDARY_ARCHITECTURES="x86_gcc2 x86"
GLOBAL_WRITABLE_FILES="
settings/fonts/conf.d directory keep-old
settings/fonts/fonts.conf auto-merge
"
PROVIDES="
fontconfig$secondaryArchSuffix = $portVersion compat >= 2
cmd:fc_cache$secondaryArchSuffix
cmd:fc_cat$secondaryArchSuffix
cmd:fc_list$secondaryArchSuffix
cmd:fc_match$secondaryArchSuffix
cmd:fc_pattern$secondaryArchSuffix
cmd:fc_query$secondaryArchSuffix
cmd:fc_scan$secondaryArchSuffix
cmd:fc_validate$secondaryArchSuffix
lib:libfontconfig$secondaryArchSuffix = 1.9.1 compat >= 1
"
REQUIRES="
haiku$secondaryArchSuffix
lib:libbz2$secondaryArchSuffix
lib:libfreetype$secondaryArchSuffix
lib:libpng$secondaryArchSuffix
lib:libxml2$secondaryArchSuffix
lib:libz$secondaryArchSuffix
"
PROVIDES_devel="
fontconfig${secondaryArchSuffix}_devel = $portVersion compat >= 2.1
devel:libfontconfig$secondaryArchSuffix = 1.9.1 compat >= 1
"
REQUIRES_devel="
fontconfig$secondaryArchSuffix == $portVersion base
devel:libfreetype$secondaryArchSuffix
devel:libxml2$secondaryArchSuffix
"
BUILD_REQUIRES="
devel:libbz2$secondaryArchSuffix
devel:libfreetype$secondaryArchSuffix
devel:libpng$secondaryArchSuffix
devel:libxml2$secondaryArchSuffix
devel:libz$secondaryArchSuffix
"
BUILD_PREREQUIRES="
haiku${secondaryArchSuffix}_devel
cmd:aclocal
cmd:autoconf
cmd:automake
cmd:gcc$secondaryArchSuffix
cmd:gperf
cmd:ld$secondaryArchSuffix
cmd:libtool
cmd:make
cmd:pkg_config$secondaryArchSuffix
cmd:python
"
BUILD()
{
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_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},${FONTS_DIR4} \
--with-cache-dir=${CACHE_DIR}
make $jobArgs
}
INSTALL()
{
make install RUN_FC_CACHE_TEST=false
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
packageEntries devel \
$developDir \
$manDir \
$docDir
}

View File

@@ -1,136 +0,0 @@
SUMMARY="A library for font customization and configuration"
DESCRIPTION="Fontconfig is a library for font customization and configuration."
HOMEPAGE="https://www.freedesktop.org/wiki/Software/fontconfig"
COPYRIGHT="2000-2005, 2006-2007 Keith Packard
2005 Patrick Lam
2009 Roozbeh Pournader
2008-2009 Red Hat, Inc.
2008 Danilo Segan
2012 Google, Inc."
LICENSE="MIT"
REVISION="2"
SOURCE_URI="https://www.freedesktop.org/software/fontconfig/release/fontconfig-$portVersion.tar.bz2"
CHECKSUM_SHA256="cf0c30807d08f6a28ab46c61b8dbd55c97d2f292cf88f3a07d3384687f31f017"
PATCHES="fontconfig-$portVersion.patchset"
ARCHITECTURES="all"
SECONDARY_ARCHITECTURES="x86_gcc2 x86"
GLOBAL_WRITABLE_FILES="
settings/fonts/conf.d directory keep-old
settings/fonts/fonts.conf auto-merge
"
PROVIDES="
fontconfig$secondaryArchSuffix = $portVersion compat >= 2
cmd:fc_cache$secondaryArchSuffix
cmd:fc_cat$secondaryArchSuffix
cmd:fc_list$secondaryArchSuffix
cmd:fc_match$secondaryArchSuffix
cmd:fc_pattern$secondaryArchSuffix
cmd:fc_query$secondaryArchSuffix
cmd:fc_scan$secondaryArchSuffix
cmd:fc_validate$secondaryArchSuffix
lib:libfontconfig$secondaryArchSuffix = 1.10.1 compat >= 1
"
REQUIRES="
haiku$secondaryArchSuffix
lib:libbz2$secondaryArchSuffix
lib:libfreetype$secondaryArchSuffix
lib:libxml2$secondaryArchSuffix
lib:libz$secondaryArchSuffix
"
PROVIDES_devel="
fontconfig${secondaryArchSuffix}_devel = $portVersion compat >= 2.1
devel:libfontconfig$secondaryArchSuffix = 1.10.1 compat >= 1
"
REQUIRES_devel="
fontconfig$secondaryArchSuffix == $portVersion base
devel:libfreetype$secondaryArchSuffix
devel:libxml2$secondaryArchSuffix
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
devel:libbz2$secondaryArchSuffix
devel:libfreetype$secondaryArchSuffix
devel:libpng$secondaryArchSuffix
devel:libxml2$secondaryArchSuffix
devel:libz$secondaryArchSuffix
"
BUILD_PREREQUIRES="
cmd:aclocal
cmd:autoconf
cmd:automake
cmd:gcc$secondaryArchSuffix
cmd:gperf
cmd:ld$secondaryArchSuffix
cmd:libtoolize$secondaryArchSuffix
cmd:make
cmd:pkg_config$secondaryArchSuffix
cmd:python
"
BUILD()
{
mkdir -p `finddir B_USER_CACHE_DIRECTORY`
libtoolize --force --copy --install
aclocal
autoconf
automake --add-missing
FONTS_DIR=`finddir B_SYSTEM_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},${FONTS_DIR4} \
--with-cache-dir=${CACHE_DIR}
make $jobArgs
}
INSTALL()
{
make install RUN_FC_CACHE_TEST=false
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
packageEntries devel \
$developDir \
$manDir \
$docDir
# Make symlinks relative
for i in $settingsDir/fonts/conf.d/*.conf; do
ln -f -r -s "`readlink "$i"`" "$i"
done
}
TEST()
{
make check
}

View File

@@ -8,13 +8,13 @@ COPYRIGHT="2000-2005, 2006-2007 Keith Packard
2008 Danilo Segan
2012 Google, Inc."
LICENSE="MIT"
REVISION="1"
REVISION="2"
SOURCE_URI="https://www.freedesktop.org/software/fontconfig/release/fontconfig-$portVersion.tar.xz"
CHECKSUM_SHA256="d816a920384aa91bc0ebf20c3b51c59c2153fdf65de0b5564bf9e8473443d637"
PATCHES="fontconfig-$portVersion.patchset"
ARCHITECTURES="all"
SECONDARY_ARCHITECTURES="?x86_gcc2 x86"
ARCHITECTURES="all !x86_gcc2"
SECONDARY_ARCHITECTURES="x86"
libVersion="1.12.0"
libVersionCompat="$libVersion compat >= ${libVersion%%.*}"

View File

@@ -1,22 +0,0 @@
From 59eff810d3a298cddd8283f02f64ae77bc74dfb1 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Tue, 10 Jun 2014 16:31:39 +0000
Subject: haiku patch
diff --git a/test/Makefile.am b/test/Makefile.am
index f270b50..ba4f0d7 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -27,7 +27,7 @@ endif
noinst_PROGRAMS = $(check_PROGRAMS)
if !OS_WIN32
-check_PROGRAMS += test-migration
+check_PROGRAMS +=
test_migration_LDADD = $(top_builddir)/src/libfontconfig.la
endif
--
1.8.3.4

View File

@@ -1,22 +0,0 @@
From 59eff810d3a298cddd8283f02f64ae77bc74dfb1 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Tue, 10 Jun 2014 16:31:39 +0000
Subject: haiku patch
diff --git a/test/Makefile.am b/test/Makefile.am
index 72923fa..77cb48d 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -34,7 +34,7 @@ TESTS += test-bz89617
noinst_PROGRAMS = $(check_PROGRAMS)
if !OS_WIN32
-check_PROGRAMS += test-migration
+check_PROGRAMS +=
test_migration_LDADD = $(top_builddir)/src/libfontconfig.la
endif
--
1.8.3.4