From 97465aefe88e7106246d5ccbda8079a345476e1b87bba1ad593c33f943e48066 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 18 May 2015 09:36:25 +0000 Subject: [PATCH] Revert freetype/harfbuzz cycle atempts OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/cairo?expand=0&rev=95 --- cairo.changes | 5 ----- cairo.spec | 4 +--- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/cairo.changes b/cairo.changes index eaa1c7c..a27fe54 100644 --- a/cairo.changes +++ b/cairo.changes @@ -3,11 +3,6 @@ Sat May 16 10:42:31 CEST 2015 - ro@suse.de - drop cairo-disable-lto.patch: lto was dropped upstream -------------------------------------------------------------------- -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 b4fb708..3c704cd 100644 --- a/cairo.spec +++ b/cairo.spec @@ -35,10 +35,10 @@ Patch1: cairo-render-thin-lines.patch Patch2: 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 @@ -56,8 +56,6 @@ 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.