Hello community, here is the log from the commit of package libXft for openSUSE:Factory checked in at 2013-12-13 11:58:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libXft (Old) and /work/SRC/openSUSE:Factory/.libXft.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libXft" Changes: -------- --- /work/SRC/openSUSE:Factory/libXft/libXft.changes 2013-03-22 11:55:33.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libXft.new/libXft.changes 2013-12-13 11:58:22.000000000 +0100 @@ -1,0 +2,8 @@ +Wed Dec 11 18:23:52 UTC 2013 - [email protected] + +- Added U_use-recommended-freetype-include.patch -- Freetype upstream + recommends using their macros together with ft2build include. + Positive sideeffect is that this patch makes it build with both + freetype2 2.5.1, and older version + +------------------------------------------------------------------- New: ---- U_use-recommended-freetype-include.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libXft.spec ++++++ --- /var/tmp/diff_new_pack.jXObyu/_old 2013-12-13 11:58:23.000000000 +0100 +++ /var/tmp/diff_new_pack.jXObyu/_new 2013-12-13 11:58:23.000000000 +0100 @@ -28,6 +28,9 @@ #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 U_use-recommended-freetype-include.patch -- Freetype upstream recommends using their macros together with +# ft2build include. Positive sideeffect is that this patch makes it build with both freetype2 2.5.1, and older versions +Patch0: U_use-recommended-freetype-include.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf >= 2.60 @@ -69,6 +72,7 @@ %prep %setup -q +%patch0 -p1 %build autoreconf -fi ++++++ U_use-recommended-freetype-include.patch ++++++ >From 4acfdaf95adb0a05c2a25550bdde036c865902f4 Mon Sep 17 00:00:00 2001 From: Julien Cristau <[email protected]> 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 <[email protected]> --- 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 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
