main/libxfont: fix build with fontsproto-2.1.3

This commit is contained in:
Natanael Copa 2014-05-13 19:55:55 +00:00
parent eae9335f23
commit 0ef417df34
2 changed files with 40 additions and 6 deletions

View File

@ -11,10 +11,21 @@ depends=
install=
depends_dev="xproto fontsproto libfontenc-dev freetype-dev"
makedepends="$depends_dev xtrans zlib-dev"
source="http://xorg.freedesktop.org/archive/individual/lib/libXfont-$pkgver.tar.bz2"
source="http://xorg.freedesktop.org/archive/individual/lib/libXfont-$pkgver.tar.bz2
patcache.patch"
_builddir="$srcdir"/libXfont-$pkgver
prepare() {
cd "$_builddir"
for i in $source; do
case $i in
*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
esac
done
}
build() {
cd "$srcdir"/libXfont-$pkgver
cd "$_builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@ -25,11 +36,14 @@ build() {
}
package() {
cd "$srcdir"/libXfont-$pkgver
cd "$_builddir"
make DESTDIR="$pkgdir" install || return 1
rm "$pkgdir"/usr/lib/*.la || return 1
install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
}
md5sums="b21ee5739d5d2e5028b302fbf9fe630b libXfont-1.4.7.tar.bz2"
sha256sums="d16ea3541835d296b19cfb05d7e64fc62173d8e7eb93284402ec761b951d1543 libXfont-1.4.7.tar.bz2"
sha512sums="508e12fb5150b3a5c849b54e0ef9ece892c6c928a3dfd8e834e41c2475e5e14ce0d71dd507804abcb06349aa5e57c543791531fac3f82c54130da90c5fccdf99 libXfont-1.4.7.tar.bz2"
md5sums="b21ee5739d5d2e5028b302fbf9fe630b libXfont-1.4.7.tar.bz2
89625eef7b0d48b4246720c6954c3917 patcache.patch"
sha256sums="d16ea3541835d296b19cfb05d7e64fc62173d8e7eb93284402ec761b951d1543 libXfont-1.4.7.tar.bz2
e181ade4eec344917a8252779f973c45fc2540d5bd5ec170e538b1c2a6388518 patcache.patch"
sha512sums="508e12fb5150b3a5c849b54e0ef9ece892c6c928a3dfd8e834e41c2475e5e14ce0d71dd507804abcb06349aa5e57c543791531fac3f82c54130da90c5fccdf99 libXfont-1.4.7.tar.bz2
3af4e3f1705aac17c845b942332c005ee7b1ab362502433f00d94053a327ceb3b91ef9f35c4c58a85b35745da1b5a56e51b8733cc57ad7f2190c4197396de3fd patcache.patch"

View File

@ -0,0 +1,20 @@
--- ./src/util/patcache.c.orig
+++ ./src/util/patcache.c
@@ -128,7 +128,7 @@
/* add entry */
void
CacheFontPattern (FontPatternCachePtr cache,
- char *pattern,
+ const char *pattern,
int patlen,
FontPtr pFont)
{
@@ -174,7 +174,7 @@
/* find matching entry */
FontPtr
FindCachedFontPattern (FontPatternCachePtr cache,
- char *pattern,
+ const char *pattern,
int patlen)
{
int hash;