Accepting request 124038 from X11:XOrg

- Update to version 2.3.1
- Remove the libXft-fix-bold-fonts.patch (fixed in this release)

OBS-URL: https://build.opensuse.org/request/show/124038
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libXft?expand=0&rev=3

libXft-2.3.0.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3426393ad72a5c47006536d474e396c7a21c33131bb28f495578e05a5858b044
-size 325561

libXft-2.3.1.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:85b2e7a0148b2b25ab09c50250e83728f3821526e0deb5a4474ec66b2eac9433
+size 41930

libXft-fix-bold-fonts.patch

@@ -1,43 +0,0 @@
-From 84b8b5b46773f9b686d57f28092824b86bffed9d Mon Sep 17 00:00:00 2001
-From: Mikael Magnusson <mikachu@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@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

libXft.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Jun  6 22:36:59 UTC 2012 - tobias.johannes.klausmann@mni.thm.de
+
+- Update to version 2.3.1
+- Remove the libXft-fix-bold-fonts.patch (fixed in this release)
+
 -------------------------------------------------------------------
 Thu Apr 12 06:44:16 UTC 2012 - vuntz@opensuse.org
 

libXft.spec

@@ -18,7 +18,7 @@
 
 Name:           libXft
 %define lname	libXft2
-Version:        2.3.0
+Version:        2.3.1
 Release:        0
 Summary:        X FreeType library
 License:        MIT
@@ -28,10 +28,11 @@ Url:            http://xorg.freedesktop.org/
 #Git-Clone:	git://anongit.freedesktop.org/xorg/lib/libXft
 #Git-Web:	http://cgit.freedesktop.org/xorg/lib/libXft/
 Source:         http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
-# PATCH-FIX-UPSTREAM libXft-fix-bold-fonts.patch vuntz@opensuse.org -- Taken from git, fix regression that broke bold fonts
-Patch1:         libXft-fix-bold-fonts.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-#git#BuildRequires:	autoconf >= 2.60, automake, libtool
+
+BuildRequires:  autoconf >= 2.60
+BuildRequires:  automake
+BuildRequires:  libtool
 BuildRequires:  pkgconfig
 BuildRequires:  pkgconfig(fontconfig) >= 2.5.92
 BuildRequires:  pkgconfig(freetype2) >= 2.1.6
@@ -68,9 +69,9 @@ in %lname.
 
 %prep
 %setup -q
-%patch -P 1 -p1
 
 %build
+autoreconf -fi
 %configure --disable-static
 make %{?_smp_mflags}