libXfont: update to 1.5.0.
This commit is contained in:
parent
90cc131820
commit
d78caa59eb
|
@ -1,70 +0,0 @@
|
||||||
diff --git a/src/util/patcache.c b/src/util/patcache.c
|
|
||||||
index 9c05fa1..2101015 100644
|
|
||||||
--- src/util/patcache.c
|
|
||||||
+++ src/util/patcache.c
|
|
||||||
@@ -50,7 +50,7 @@ typedef unsigned char EntryPtr;
|
|
||||||
typedef struct _FontPatternCacheEntry {
|
|
||||||
struct _FontPatternCacheEntry *next, **prev;
|
|
||||||
short patlen;
|
|
||||||
- char *pattern;
|
|
||||||
+ const char *pattern;
|
|
||||||
int hash;
|
|
||||||
FontPtr pFont; /* associated font */
|
|
||||||
} FontPatternCacheEntryRec, *FontPatternCacheEntryPtr;
|
|
||||||
@@ -74,7 +74,7 @@ EmptyFontPatternCache (FontPatternCachePtr cache)
|
|
||||||
cache->entries[i].next = &cache->entries[i+1];
|
|
||||||
cache->entries[i].prev = 0;
|
|
||||||
cache->entries[i].pFont = 0;
|
|
||||||
- free (cache->entries[i].pattern);
|
|
||||||
+ free ((void *) cache->entries[i].pattern);
|
|
||||||
cache->entries[i].pattern = 0;
|
|
||||||
cache->entries[i].patlen = 0;
|
|
||||||
}
|
|
||||||
@@ -107,7 +107,7 @@ FreeFontPatternCache (FontPatternCachePtr cache)
|
|
||||||
int i;
|
|
||||||
|
|
||||||
for (i = 0; i < NENTRIES; i++)
|
|
||||||
- free (cache->entries[i].pattern);
|
|
||||||
+ free ((void *) cache->entries[i].pattern);
|
|
||||||
free (cache);
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -128,7 +128,7 @@ Hash (const char *string, int len)
|
|
||||||
/* add entry */
|
|
||||||
void
|
|
||||||
CacheFontPattern (FontPatternCachePtr cache,
|
|
||||||
- char *pattern,
|
|
||||||
+ const char *pattern,
|
|
||||||
int patlen,
|
|
||||||
FontPtr pFont)
|
|
||||||
{
|
|
||||||
@@ -154,7 +154,7 @@ CacheFontPattern (FontPatternCachePtr cache,
|
|
||||||
if (e->next)
|
|
||||||
e->next->prev = e->prev;
|
|
||||||
*e->prev = e->next;
|
|
||||||
- free (e->pattern);
|
|
||||||
+ free ((void *) e->pattern);
|
|
||||||
}
|
|
||||||
/* set pattern */
|
|
||||||
memcpy (newpat, pattern, patlen);
|
|
||||||
@@ -174,7 +174,7 @@ CacheFontPattern (FontPatternCachePtr cache,
|
|
||||||
/* find matching entry */
|
|
||||||
FontPtr
|
|
||||||
FindCachedFontPattern (FontPatternCachePtr cache,
|
|
||||||
- char *pattern,
|
|
||||||
+ const char *pattern,
|
|
||||||
int patlen)
|
|
||||||
{
|
|
||||||
int hash;
|
|
||||||
@@ -211,7 +211,7 @@ RemoveCachedFontPattern (FontPatternCachePtr cache,
|
|
||||||
*e->prev = e->next;
|
|
||||||
e->next = cache->free;
|
|
||||||
cache->free = e;
|
|
||||||
- free (e->pattern);
|
|
||||||
+ free ((void *) e->pattern);
|
|
||||||
e->pattern = 0;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
--
|
|
||||||
cgit v0.9.0.2-2-gbebe
|
|
||||||
|
|
|
@ -1,28 +1,23 @@
|
||||||
# Template build file for 'libXfont'.
|
# Template build file for 'libXfont'.
|
||||||
pkgname=libXfont
|
pkgname=libXfont
|
||||||
version=1.4.8
|
version=1.5.0
|
||||||
revision=1
|
revision=1
|
||||||
hostmakedepends="pkg-config"
|
hostmakedepends="pkg-config"
|
||||||
makedepends="xproto xtrans fontcacheproto fontsproto freetype-devel libfontenc-devel"
|
makedepends="xproto xtrans fontcacheproto fontsproto freetype-devel libfontenc-devel"
|
||||||
build_style=gnu-configure
|
build_style=gnu-configure
|
||||||
configure_args="--disable-devel-docs --disable-silent-rules"
|
|
||||||
short_desc="X font Library"
|
short_desc="X font Library"
|
||||||
maintainer="Juan RP <xtraeme@gmail.com>"
|
maintainer="Juan RP <xtraeme@gmail.com>"
|
||||||
homepage="http://xorg.freedesktop.org/"
|
homepage="http://xorg.freedesktop.org/"
|
||||||
license="MIT"
|
license="MIT"
|
||||||
distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
|
distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
|
||||||
checksum=5568d4febf790fb250fb8d4ecf1f389a428eb545a79fb2abe9c82f652d14d005
|
checksum=3a3c52c4adf9352b2160f07ff0596af17ab14f91d6509564e606678a1261c25f
|
||||||
|
|
||||||
pre_configure() {
|
|
||||||
sed -e 's,fontsproto < 2.1.3,fontsproto <= 2.1.3,g' -i configure
|
|
||||||
}
|
|
||||||
post_install() {
|
post_install() {
|
||||||
vinstall COPYING 644 usr/share/licenses/${pkgname}
|
vinstall COPYING 644 usr/share/licenses/${pkgname}
|
||||||
}
|
}
|
||||||
|
|
||||||
libXfont-devel_package() {
|
libXfont-devel_package() {
|
||||||
depends="xproto fontsproto zlib-devel libfontenc-devel freetype-devel
|
depends="${makedepends} libXfont>=${version}_${revision}"
|
||||||
libXfont>=${version}_${revision}"
|
|
||||||
short_desc+=" - development files"
|
short_desc+=" - development files"
|
||||||
pkg_install() {
|
pkg_install() {
|
||||||
vmove usr/include
|
vmove usr/include
|
||||||
|
|
Loading…
Reference in New Issue