From 0a18327487431b3c32618b08e582b47e8a262dfd Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Feb 23 2017 13:14:07 +0000 Subject: Fix FTBFS (#1423570) --- diff --git a/fontconfig-freetype-2.7.1.patch b/fontconfig-freetype-2.7.1.patch new file mode 100644 index 0000000..3f995e2 --- /dev/null +++ b/fontconfig-freetype-2.7.1.patch @@ -0,0 +1,19 @@ +diff --git a/test/out.expected b/test/out.expected +index 39634c5..f3a8856 100644 +--- a/test/out.expected ++++ b/test/out.expected +@@ -1,8 +1,8 @@ +-Fixed:pixelsize=16 +-Fixed:pixelsize=6 ++Misc Fixed:pixelsize=16 ++Sony Fixed:pixelsize=6 + = +-Fixed:pixelsize=16 +-Fixed:pixelsize=6 ++Misc Fixed:pixelsize=16 ++Sony Fixed:pixelsize=6 + = +-Fixed:pixelsize=16 +-Fixed:pixelsize=6 ++Misc Fixed:pixelsize=16 ++Sony Fixed:pixelsize=6 diff --git a/fontconfig.spec b/fontconfig.spec index fd8127f..7235dcc 100644 --- a/fontconfig.spec +++ b/fontconfig.spec @@ -17,6 +17,7 @@ Source1: 25-no-bitmap-fedora.conf Patch0: %{name}-sleep-less.patch Patch1: %{name}-glibc-limits.patch Patch2: %{name}-gperf-3.1.patch +Patch3: %{name}-freetype-2.7.1.patch BuildRequires: expat-devel BuildRequires: freetype-devel >= %{freetype_version} @@ -63,6 +64,7 @@ which is useful for developing applications that uses fontconfig. %patch0 -p1 -b .sleep-less %patch1 -p1 -b .glibc-limits %patch2 -p1 -b .gperf +%patch3 -p1 -b .freetype %build # We don't want to rebuild the docs, but we want to install the included ones.