1From 1007098e54f9449281f83516f0272afa5d20ec29 Mon Sep 17 00:00:00 2001
2From: Marek Kasik <mkasik@redhat.com>
3Date: Oct 09 2017 11:57:11 +0000
4Subject: Fix multilib conflict
5
6Require pkgconf so we can make freetype-config multilib compatible again
7
8Resolves: #1497443
9
10Conflict:NA
11Reference:https://src.fedoraproject.org/rpms/freetype/c/1007098e54f9449281f83516f0272afa5d20ec29?branch=rawhide
12
13--- freetype-2.9/builds/unix/freetype-config.in
14+++ freetype-2.9/builds/unix/freetype-config.in
15@@ -13,45 +13,25 @@ LC_ALL=C
16 export LC_ALL
17 
18 
19-# if `pkg-config' is available, use values from `freetype2.pc'
20-%PKG_CONFIG% --atleast-pkgconfig-version 0.24 >/dev/null 2>&1
21-if test $? -eq 0 ; then
22-  # note that option `--variable' is not affected by the
23-  # PKG_CONFIG_SYSROOT_DIR environment variable
24-  if test "x$SYSROOT" != "x" ; then
25-    PKG_CONFIG_SYSROOT_DIR="$SYSROOT"
26-    export PKG_CONFIG_SYSROOT_DIR
27-  fi
28-
29-  prefix=`%PKG_CONFIG% --variable prefix freetype2`
30-  exec_prefix=`%PKG_CONFIG% --variable exec_prefix freetype2`
31-
32-  includedir=`%PKG_CONFIG% --variable includedir freetype2`
33-  libdir=`%PKG_CONFIG% --variable libdir freetype2`
34-
35-  version=`%PKG_CONFIG% --modversion freetype2`
36-
37-  cflags=`%PKG_CONFIG% --cflags freetype2`
38-  dynamic_libs=`%PKG_CONFIG% --libs freetype2`
39-  static_libs=`%PKG_CONFIG% --static --libs freetype2`
40-else
41-  prefix="%prefix%"
42-  exec_prefix="%exec_prefix%"
43-
44-  includedir="%includedir%"
45-  libdir="%libdir%"
46-
47-  version=%ft_version%
48-
49-  cflags="-I${SYSROOT}$includedir/freetype2"
50-  dynamic_libs="-lfreetype"
51-  static_libs="%LIBSSTATIC_CONFIG%"
52-  if test "${SYSROOT}$libdir" != "/usr/lib"   &&
53-     test "${SYSROOT}$libdir" != "/usr/lib64" ; then
54-    libs_L="-L${SYSROOT}$libdir"
55-  fi
56+# note that option `--variable' is not affected by the
57+# PKG_CONFIG_SYSROOT_DIR environment variable
58+if test "x$SYSROOT" != "x" ; then
59+  PKG_CONFIG_SYSROOT_DIR="$SYSROOT"
60+  export PKG_CONFIG_SYSROOT_DIR
61 fi
62 
63+prefix=`pkgconf --variable prefix freetype2`
64+exec_prefix=`pkgconf --variable exec_prefix freetype2`
65+
66+includedir=`pkgconf --variable includedir freetype2`
67+libdir=`pkgconf --variable libdir freetype2`
68+
69+version=`pkgconf --modversion freetype2`
70+
71+cflags=`pkgconf --cflags freetype2`
72+dynamic_libs=`pkgconf --libs freetype2`
73+static_libs=`pkgconf --static --libs freetype2`
74+
75 orig_prefix=$prefix
76 orig_exec_prefix=$exec_prefix
77 
78