diff --git a/freetype-2.8-multilib.patch b/freetype-2.8-multilib.patch new file mode 100644 index 0000000..4f40a80 --- /dev/null +++ b/freetype-2.8-multilib.patch @@ -0,0 +1,65 @@ +--- freetype-2.8/builds/unix/freetype-config.in ++++ freetype-2.8/builds/unix/freetype-config.in +@@ -13,45 +13,25 @@ LC_ALL=C + export LC_ALL + + +-# if `pkg-config' is available, use values from `freetype2.pc' +-pkg-config --version >/dev/null 2>&1 +-if test $? -eq 0 ; then +- # note that option `--variable' is not affected by the +- # PKG_CONFIG_SYSROOT_DIR environment variable +- if test "x$SYSROOT" != "x" ; then +- PKG_CONFIG_SYSROOT_DIR="$SYSROOT" +- export PKG_CONFIG_SYSROOT_DIR +- fi +- +- prefix=`pkg-config --variable prefix freetype2` +- exec_prefix=`pkg-config --variable exec_prefix freetype2` +- +- includedir=`pkg-config --variable includedir freetype2` +- libdir=`pkg-config --variable libdir freetype2` +- +- version=`pkg-config --modversion freetype2` +- +- cflags=`pkg-config --cflags freetype2` +- dynamic_libs=`pkg-config --libs freetype2` +- static_libs=`pkg-config --static --libs freetype2` +-else +- prefix="%prefix%" +- exec_prefix="%exec_prefix%" +- +- includedir="%includedir%" +- libdir="%libdir%" +- +- version=%ft_version% +- +- cflags="-I${SYSROOT}$includedir/freetype2" +- dynamic_libs="-lfreetype" +- static_libs="%LIBSSTATIC_CONFIG%" +- if test "${SYSROOT}$libdir" != "/usr/lib" && +- test "${SYSROOT}$libdir" != "/usr/lib64" ; then +- libs_L="-L${SYSROOT}$libdir" +- fi ++# note that option `--variable' is not affected by the ++# PKG_CONFIG_SYSROOT_DIR environment variable ++if test "x$SYSROOT" != "x" ; then ++ PKG_CONFIG_SYSROOT_DIR="$SYSROOT" ++ export PKG_CONFIG_SYSROOT_DIR + fi + ++prefix=`pkg-config --variable prefix freetype2` ++exec_prefix=`pkg-config --variable exec_prefix freetype2` ++ ++includedir=`pkg-config --variable includedir freetype2` ++libdir=`pkg-config --variable libdir freetype2` ++ ++version=`pkg-config --modversion freetype2` ++ ++cflags=`pkg-config --cflags freetype2` ++dynamic_libs=`pkg-config --libs freetype2` ++static_libs=`pkg-config --static --libs freetype2` ++ + orig_prefix=$prefix + orig_exec_prefix=$exec_prefix + diff --git a/freetype.spec b/freetype.spec index 8c80832..317e82d 100644 --- a/freetype.spec +++ b/freetype.spec @@ -7,7 +7,7 @@ Summary: A free and portable font rendering engine Name: freetype Version: 2.8 -Release: 6%{?dist} +Release: 7%{?dist} License: (FTL or GPLv2+) and BSD and MIT and Public Domain and zlib with acknowledgement Group: System Environment/Libraries URL: http://www.freetype.org @@ -32,6 +32,8 @@ Patch5: freetype-2.8-loop-counter.patch Patch6: 0077-truetype-Fix-loading-of-named-instances.patch Patch7: 0079-src-truetype-ttgxvar.c-TT_Get_MM_Var-Fix-thinko.patch +Patch8: freetype-2.8-multilib.patch + BuildRequires: libX11-devel BuildRequires: libpng-devel BuildRequires: zlib-devel @@ -67,6 +69,7 @@ small utilities showing various capabilities of the FreeType library. Summary: FreeType development libraries and header files Group: Development/Libraries Requires: %{name} = %{version}-%{release} +Requires: pkgconf%{?_isa} %description devel The freetype-devel package includes the static libraries and header files @@ -94,6 +97,7 @@ popd %patch5 -p1 -b .loop-counter %patch6 -p1 -b .named-instances %patch7 -p1 -b .named-instances2 +%patch8 -p1 -b .multilib %build @@ -207,6 +211,10 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.{a,la} %{_mandir}/man1/* %changelog +* Mon Oct 9 2017 Marek Kasik - 2.8-7 +- Require pkgconf so we can make freetype-config multilib compatible again +- Resolves: #1497443 + * Thu Sep 21 2017 Marek Kasik - 2.8-6 - Fix loading of named instances (TrueType)