[arch-commits] Commit in libxft/trunk (PKGBUILD git_fixes.diff)

andyrtr at archlinux.org andyrtr at archlinux.org
Sat Jun 2 21:27:12 UTC 2012


    Date: Saturday, June 2, 2012 @ 17:27:12
  Author: andyrtr
Revision: 160628

upgpkg: libxft 2.3.1-1

upstream update 2.3.1

Modified:
  libxft/trunk/PKGBUILD
Deleted:
  libxft/trunk/git_fixes.diff

----------------+
 PKGBUILD       |   12 ++++--------
 git_fixes.diff |   43 -------------------------------------------
 2 files changed, 4 insertions(+), 51 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-06-02 21:15:26 UTC (rev 160627)
+++ PKGBUILD	2012-06-02 21:27:12 UTC (rev 160628)
@@ -2,8 +2,8 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=libxft
-pkgver=2.3.0
-pkgrel=2
+pkgver=2.3.1
+pkgrel=1
 pkgdesc="FreeType-based font drawing library for X"
 arch=('i686' 'x86_64')
 license=('custom')
@@ -11,15 +11,11 @@
 depends=('fontconfig' 'libxrender')
 makedepends=('pkgconfig')
 options=('!libtool')
-source=("${url}/releases/individual/lib/libXft-${pkgver}.tar.bz2"
-        git_fixes.diff)
-sha1sums=('687f38a810b9ae58e1169c295d9d438370235e23'
-          'a87a56f62905bfcd85469caf349d07f37f84a989')
+source=("${url}/releases/individual/lib/libXft-${pkgver}.tar.bz2")
+sha256sums=('7fce32b92dcb7b2869bed567af2abc7bbad0d5d6fcf471b8a3e137964a31bbbd')
 
 build() {
   cd "${srcdir}/libXft-${pkgver}"
-  # fix broken bold fonts in urxvt terinals - https://bugs.freedesktop.org/show_bug.cgi?id=47178 + https://bugs.freedesktop.org/show_bug.cgi?id=47196
-  patch -Np1 -i ${srcdir}/git_fixes.diff
   ./configure --prefix=/usr --sysconfdir=/etc --disable-static
   make
 }

Deleted: git_fixes.diff
===================================================================
--- git_fixes.diff	2012-06-02 21:15:26 UTC (rev 160627)
+++ git_fixes.diff	2012-06-02 21:27:12 UTC (rev 160628)
@@ -1,43 +0,0 @@
-From 84b8b5b46773f9b686d57f28092824b86bffed9d Mon Sep 17 00:00:00 2001
-From: Mikael Magnusson <mikachu at gmail.com>
-Date: Sun, 11 Mar 2012 01:41:55 +0000
-Subject: Fixup for 550b2f76401c2 which broke bold fonts
-
-The commit removed the line
-AC_CHECK_FUNCS(FT_Get_Next_Char FT_Get_BDF_Property FT_Get_PS_Font_Info FT_Has_PS_Glyph_Names FT_GlyphSlot_Embolden)
-but failed to remove the #if lines that this commit removes, resulting
-in that code never being executed.
-
-Fixes: https://bugs.freedesktop.org/attachment.cgi?id=58280
-
-Reviewed-by: Jeremy Huddleston <jeremyhu at apple.com>
----
-diff --git a/src/xftglyphs.c b/src/xftglyphs.c
-index 4a3b9d6..2f3dc5a 100644
---- a/src/xftglyphs.c
-+++ b/src/xftglyphs.c
-@@ -24,9 +24,7 @@
- #include <freetype/ftoutln.h>
- #include <freetype/ftlcdfil.h>
- 
--#if HAVE_FT_GLYPHSLOT_EMBOLDEN
- #include <freetype/ftsynth.h>
--#endif
- 
- /*
-  * Validate the memory info for a font
-@@ -434,12 +432,10 @@ XftFontLoadGlyphs (Display	    *dpy,
- 
- 	glyphslot = face->glyph;
- 
--#if HAVE_FT_GLYPHSLOT_EMBOLDEN
- 	/*
- 	 * Embolden if required
- 	 */
- 	if (font->info.embolden) FT_GlyphSlot_Embolden(glyphslot);
--#endif
- 
- 	/*
- 	 * Compute glyph metrics from FreeType information
---
-cgit v0.9.0.2-2-gbebe




More information about the arch-commits mailing list