pool/libXft
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 210659 from openSUSE:Factory:Staging:freetype2

Browse Source 
Added use-recommended-freetype-include.patch -- needed for freetype2 2.5.1. I've validated it builds, but disabled build so the whole staging doesn't get retriggered

OBS-URL: https://build.opensuse.org/request/show/210659
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/libXft?expand=0&rev=11
This commit is contained in:
Stefan Dirsch 2013-12-12 13:18:52 +00:00 committed by Git OBS Bridge
parent f27ccf61f5
commit 7ef7a8627a
3 changed files with 41 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
U_use-recommended-freetype-include.patch Normal file
View File

@ -0,0 +1,29 @@
From 4acfdaf95adb0a05c2a25550bdde036c865902f4 Mon Sep 17 00:00:00 2001
From: Julien Cristau <jcristau@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@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

8
libXft.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Wed Dec 11 18:23:52 UTC 2013 - hrvoje.senjan@gmail.com
- 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
-------------------------------------------------------------------
Sun Feb 17 17:21:53 UTC 2013 - jengelh@inai.de

4
libXft.spec
View File

@ -28,6 +28,9 @@ 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
@ -69,6 +72,7 @@ in %lname.
%prep
%setup -q
%patch0 -p1
%build
autoreconf -fi