From 70f5b89cea329c1756f561152fa55f8d9cf46cf988c09c11d2bc037ea636b429 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 6 May 2015 06:58:18 +0000 Subject: [PATCH] Accepting request 305514 from home:fstrba:freetype2 Build cairo against freetype2-bootstrap (needs freetype2 from M17N) OBS-URL: https://build.opensuse.org/request/show/305514 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/cairo?expand=0&rev=93 --- cairo.changes | 5 +++++ cairo.spec | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/cairo.changes b/cairo.changes index 07fc72c..3a7ab63 100644 --- a/cairo.changes +++ b/cairo.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue May 5 08:39:26 UTC 2015 - fstrba@suse.com + +- Build cairo against the freetype2-bootstrap-devel package + ------------------------------------------------------------------- Sat Mar 14 12:30:22 UTC 2015 - opensuse@mirell.de diff --git a/cairo.spec b/cairo.spec index c3e3b5b..86c2d1f 100644 --- a/cairo.spec +++ b/cairo.spec @@ -37,10 +37,10 @@ Patch2: cairo-render-thin-lines.patch Patch3: cairo-xlib-endianness.patch BuildRequires: gtk-doc # Needed by patch0 +BuildRequires: freetype2-bootstrap-devel BuildRequires: libtool BuildRequires: pkg-config BuildRequires: pkgconfig(fontconfig) -BuildRequires: pkgconfig(freetype2) BuildRequires: pkgconfig(gobject-2.0) BuildRequires: pkgconfig(libpng) BuildRequires: pkgconfig(pixman-1) >= 0.30.0 @@ -58,6 +58,8 @@ BuildRequires: Mesa-devel BuildRequires: pkgconfig(xcb) BuildRequires: pkgconfig(xcb-shm) %endif +#!BuildIgnore: libfreetype6 +#!BuildIgnore: freetype2-devel %description Cairo is a vector graphics library with cross-device output support.