aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2014-08-21 08:25:10 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2014-08-21 08:25:19 +0000
commitda5b85fc5e5e2e571547955020001bdd8bf90fad (patch)
treed827f1e3ef1d1611a792fad315844f3cc3447a76
parentc8555be01bbadf789455a31bb810d88c90685a44 (diff)
downloadaports-da5b85fc5e5e2e571547955020001bdd8bf90fad.tar.bz2
aports-da5b85fc5e5e2e571547955020001bdd8bf90fad.tar.xz
main/libxfont: upgrade to 1.5.0
-rw-r--r--main/libxfont/APKBUILD14
-rw-r--r--main/libxfont/patcache.patch20
2 files changed, 5 insertions, 29 deletions
diff --git a/main/libxfont/APKBUILD b/main/libxfont/APKBUILD
index 5754b33c1b..8bd1d4d946 100644
--- a/main/libxfont/APKBUILD
+++ b/main/libxfont/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libxfont
-pkgver=1.4.7
+pkgver=1.5.0
pkgrel=0
pkgdesc="X11 font rasterisation library"
url="http://xorg.freedesktop.org/"
@@ -11,8 +11,7 @@ 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
- patcache.patch"
+source="http://xorg.freedesktop.org/archive/individual/lib/libXfont-$pkgver.tar.bz2"
_builddir="$srcdir"/libXfont-$pkgver
prepare() {
@@ -41,9 +40,6 @@ package() {
rm "$pkgdir"/usr/lib/*.la || return 1
install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
}
-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"
+md5sums="664629bfa7cdf8b984155019fd395dcb libXfont-1.5.0.tar.bz2"
+sha256sums="3a3c52c4adf9352b2160f07ff0596af17ab14f91d6509564e606678a1261c25f libXfont-1.5.0.tar.bz2"
+sha512sums="466ecebe27ef4b8dbe2ff1cae0e111d4c449cb29a240477ac53ccb415ee74bb5d51cfd5f41d9f84e9e444b9eca91853306978a3094b279033bf7dedfafba9f3e libXfont-1.5.0.tar.bz2"
diff --git a/main/libxfont/patcache.patch b/main/libxfont/patcache.patch
deleted file mode 100644
index 6555babc4c..0000000000
--- a/main/libxfont/patcache.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- ./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;