[arch-commits] Commit in libxft/trunk (PKGBUILD freetype_header.patch)
Andreas Radke
andyrtr at nymeria.archlinux.org
Fri Jun 6 21:44:52 UTC 2014
Date: Friday, June 6, 2014 @ 23:44:52
Author: andyrtr
Revision: 214334
upgpkg: libxft 2.3.2-1
upstream update 2.3.2
Modified:
libxft/trunk/PKGBUILD
Deleted:
libxft/trunk/freetype_header.patch
-----------------------+
PKGBUILD | 13 +++++--------
freetype_header.patch | 30 ------------------------------
2 files changed, 5 insertions(+), 38 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2014-06-06 21:41:41 UTC (rev 214333)
+++ PKGBUILD 2014-06-06 21:44:52 UTC (rev 214334)
@@ -1,9 +1,10 @@
# $Id$
+# Maintainer: Andreas Radke <andyrtr at archlinux.org>
# Maintainer: Jan de Groot <jgc at archlinux.org>
pkgname=libxft
-pkgver=2.3.1
-pkgrel=2
+pkgver=2.3.2
+pkgrel=1
pkgdesc="FreeType-based font drawing library for X"
arch=('i686' 'x86_64')
license=('custom')
@@ -10,15 +11,11 @@
url="http://xorg.freedesktop.org/"
depends=('fontconfig' 'libxrender')
makedepends=('pkgconfig')
-source=("${url}/releases/individual/lib/libXft-${pkgver}.tar.bz2"
- freetype_header.patch)
-sha256sums=('7fce32b92dcb7b2869bed567af2abc7bbad0d5d6fcf471b8a3e137964a31bbbd'
- '991c91998e61e83061c6c08218a2e6ac5643f16183750f73ee74f29fdd440be9')
+source=(${url}/releases/individual/lib/libXft-${pkgver}.tar.bz2)
+sha256sums=('f5a3c824761df351ca91827ac221090943ef28b248573486050de89f4bfcdc4c')
build() {
cd "${srcdir}/libXft-${pkgver}"
- # fix build for freetype header moved - http://cgit.freedesktop.org/xorg/lib/libXft/patch/?id=4acfdaf95adb0a05c2a25550bdde036c865902f4
- patch -Np1 -i ${srcdir}/freetype_header.patch
./configure --prefix=/usr --sysconfdir=/etc --disable-static
make
}
Deleted: freetype_header.patch
===================================================================
--- freetype_header.patch 2014-06-06 21:41:41 UTC (rev 214333)
+++ freetype_header.patch 2014-06-06 21:44:52 UTC (rev 214334)
@@ -1,30 +0,0 @@
-From 4acfdaf95adb0a05c2a25550bdde036c865902f4 Mon Sep 17 00:00:00 2001
-From: Julien Cristau <jcristau at debian.org>
-Date: Mon, 02 Dec 2013 15:26:24 +0000
-Subject: Use FT_*_H macros instead of including <freetype/*.h>
-
-freetype moved its headers around in 2.5.1.
-
-Signed-off-by: Julien Cristau <jcristau at debian.org>
----
-diff --git a/src/xftglyphs.c b/src/xftglyphs.c
-index 2f3dc5a..4b5fb82 100644
---- a/src/xftglyphs.c
-+++ b/src/xftglyphs.c
-@@ -21,10 +21,10 @@
- */
-
- #include "xftint.h"
--#include <freetype/ftoutln.h>
--#include <freetype/ftlcdfil.h>
-+#include FT_OUTLINE_H
-+#include FT_LCD_FILTER_H
-
--#include <freetype/ftsynth.h>
-+#include FT_SYNTHESIS_H
-
- /*
- * Validate the memory info for a font
---
-cgit v0.9.0.2-2-gbebe
-
More information about the arch-commits
mailing list