From 829417676fe8af4f6b1cf81f356ce8917b3c9caa Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Fri, 22 Dec 2017 16:23:51 +0900 Subject: [PATCH] Update the required version of freetype and deps --- fontconfig-required-freetype-version.patch | 12 ++++++++++++ fontconfig.spec | 5 +++-- 2 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 fontconfig-required-freetype-version.patch diff --git a/fontconfig-required-freetype-version.patch b/fontconfig-required-freetype-version.patch new file mode 100644 index 0000000..6ed1e8f --- /dev/null +++ b/fontconfig-required-freetype-version.patch @@ -0,0 +1,12 @@ +diff -pruN fontconfig-2.12.91.orig/configure.ac fontconfig-2.12.91/configure.ac +--- fontconfig-2.12.91.orig/configure.ac 2017-12-14 15:44:20.000000000 +0900 ++++ fontconfig-2.12.91/configure.ac 2017-12-22 16:20:11.556717785 +0900 +@@ -314,7 +314,7 @@ AC_DEFINE_UNQUOTED(USE_ICONV,$use_iconv, + # Checks for FreeType + # + dnl See http://git.savannah.gnu.org/cgit/freetype/freetype2.git/tree/docs/VERSIONS.TXT for versioning in freetype +-PKG_CHECK_MODULES(FREETYPE, freetype2 >= 21.0.15) ++PKG_CHECK_MODULES(FREETYPE, freetype2 >= 20.0.14) + PKGCONFIG_REQUIRES="$PKGCONFIG_REQUIRES freetype2" + + AC_SUBST(FREETYPE_LIBS) diff --git a/fontconfig.spec b/fontconfig.spec index c5864ee..132aa5a 100644 --- a/fontconfig.spec +++ b/fontconfig.spec @@ -1,4 +1,4 @@ -%global freetype_version 2.8.1 +%global freetype_version 2.8-7 Summary: Font configuration and customization library Name: fontconfig @@ -16,6 +16,7 @@ Source2: fc-cache # https://bugzilla.redhat.com/show_bug.cgi?id=140335 Patch0: %{name}-sleep-less.patch +Patch1: %{name}-required-freetype-version.patch BuildRequires: expat-devel BuildRequires: freetype-devel >= %{freetype_version} @@ -24,7 +25,7 @@ BuildRequires: autoconf automake libtool gettext itstool BuildRequires: gperf Requires: fontpackages-filesystem freetype -Requires(pre): freetype +Requires(pre): freetype >= 2.8-7 Requires(post): grep coreutils Requires: font(:lang=en)