diff --git a/U_use-recommended-freetype-include.patch b/U_use-recommended-freetype-include.patch deleted file mode 100644 index d1c372b..0000000 --- a/U_use-recommended-freetype-include.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 4acfdaf95adb0a05c2a25550bdde036c865902f4 Mon Sep 17 00:00:00 2001 -From: Julien Cristau -Date: Mon, 02 Dec 2013 15:26:24 +0000 -Subject: Use FT_*_H macros instead of including - -freetype moved its headers around in 2.5.1. - -Signed-off-by: Julien Cristau ---- -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 --#include -+#include FT_OUTLINE_H -+#include FT_LCD_FILTER_H - --#include -+#include FT_SYNTHESIS_H - - /* - * Validate the memory info for a font --- -cgit v0.9.0.2-2-gbebe diff --git a/libXft-2.3.1.tar.bz2 b/libXft-2.3.1.tar.bz2 deleted file mode 100644 index dbf55fc..0000000 --- a/libXft-2.3.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:85b2e7a0148b2b25ab09c50250e83728f3821526e0deb5a4474ec66b2eac9433 -size 41930 diff --git a/libXft-2.3.2.tar.bz2 b/libXft-2.3.2.tar.bz2 new file mode 100644 index 0000000..97b4ecd --- /dev/null +++ b/libXft-2.3.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f5a3c824761df351ca91827ac221090943ef28b248573486050de89f4bfcdc4c +size 335495 diff --git a/libXft.changes b/libXft.changes index 43ea23f..855b861 100644 --- a/libXft.changes +++ b/libXft.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Fri Jun 6 10:52:07 UTC 2014 - sndirsch@suse.com + +- Update to version 2.3.2 + * This release fixes a build issue with FreeType 2.5.1 & later, + and fixes the prototypes in the man page for XftDrawString8 & + XftDrawRect. + * supersedes U_use-recommended-freetype-include.patch + ------------------------------------------------------------------- Wed Dec 11 18:23:52 UTC 2013 - hrvoje.senjan@gmail.com diff --git a/libXft.spec b/libXft.spec index 807013d..9976f36 100644 --- a/libXft.spec +++ b/libXft.spec @@ -1,7 +1,7 @@ # # spec file for package libXft # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +18,7 @@ Name: libXft %define lname libXft2 -Version: 2.3.1 +Version: 2.3.2 Release: 0 Summary: X FreeType library License: MIT @@ -28,9 +28,7 @@ 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 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 @@ -72,7 +70,6 @@ in %lname. %prep %setup -q -%patch0 -p1 %build autoreconf -fi