Merge branch '3.0' into 3.1
This commit is contained in:
commit
cb7666fe7f
@ -1 +1 @@
|
||||
36934d00b00555eaacde9f091f392f97 fontsproto-2.1.3.tar.bz2
|
||||
c5f4f1fb4ba7766eedbc9489e81f3be2 fontsproto-2.1.2.tar.bz2
|
||||
|
@ -3,7 +3,7 @@
|
||||
# Maintainer: CRUX Xorg Team, xorg-ports at crux dot nu
|
||||
|
||||
name=xorg-fontsproto
|
||||
version=2.1.3
|
||||
version=2.1.2
|
||||
release=1
|
||||
source=(http://xorg.freedesktop.org/releases/individual/proto/fontsproto-$version.tar.bz2)
|
||||
|
||||
|
@ -1,2 +1 @@
|
||||
b21ee5739d5d2e5028b302fbf9fe630b libXfont-1.4.7.tar.bz2
|
||||
7c8a0fe77265af3a7c159fa2be9eecf7 xorg-libxfont-const.diff
|
||||
a7cbc4128c244d9c54fdf21cd517ac8c libXfont-1.4.8.tar.bz2
|
||||
|
@ -4,14 +4,12 @@
|
||||
# Depends on: freetype, xorg-xproto, xorg-xtrans, xorg-fontsproto, xorg-libfontenc
|
||||
|
||||
name=xorg-libxfont
|
||||
version=1.4.7
|
||||
version=1.4.8
|
||||
release=1
|
||||
source=(http://xorg.freedesktop.org/releases/individual/lib/libXfont-$version.tar.bz2 \
|
||||
$name-const.diff)
|
||||
source=(http://xorg.freedesktop.org/releases/individual/lib/libXfont-$version.tar.bz2)
|
||||
|
||||
build() {
|
||||
cd libXfont-$version
|
||||
patch -p1 -i $SRC/$name-const.diff
|
||||
|
||||
./configure --prefix=/usr
|
||||
|
||||
|
@ -1,21 +0,0 @@
|
||||
diff -urN libXfont-1.4.7.orig/src/util/patcache.c libXfont-1.4.7/src/util/patcache.c
|
||||
--- libXfont-1.4.7.orig/src/util/patcache.c 2014-01-07 10:25:08.000000000 -0600
|
||||
+++ libXfont-1.4.7/src/util/patcache.c 2014-04-19 13:28:51.509242842 -0500
|
||||
@@ -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;
|
Loading…
Reference in New Issue
Block a user