rpm/texlive
SHA256
1
0
Fork 0
forked from pool/texlive
Code Pull Requests Activity

Accepting request 605070 from home:namtrac:branches:Publishing:TeXLive

Browse Source 
- Add freetype-use-pkg-config.patch to fix build with new Freetype:
  use pkgconfig to find Freetype libraries.

OBS-URL: https://build.opensuse.org/request/show/605070
OBS-URL: https://build.opensuse.org/package/show/Publishing:TeXLive/texlive?expand=0&rev=298
This commit is contained in:
Dr. Werner Fink 2018-05-07 10:49:55 +00:00 committed by Git OBS Bridge
parent 9b70acbb52
commit 7a78856e06
3 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
freetype-use-pkg-config.patch Normal file
View File

@ -0,0 +1,20 @@
---
m4/kpse-freetype2-flags.m4 | 4 ++++
1 file changed, 4 insertions(+)
--- texlive-bin.orig/m4/kpse-freetype2-flags.m4
+++ texlive-bin/m4/kpse-freetype2-flags.m4
@@ -28,9 +28,13 @@
AC_DEFUN([KPSE_FREETYPE2_SYSTEM_FLAGS], [dnl
AC_REQUIRE([AC_CANONICAL_HOST])[]dnl
AC_CHECK_TOOL([FT2_CONFIG], [freetype-config], [false])[]dnl
+AC_CHECK_TOOL([PKG_CONFIG], [pkg-config], [false])[]dnl
if $FT2_CONFIG --ftversion >/dev/null 2>&1; then
FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags`
FREETYPE2_LIBS=`$FT2_CONFIG --libs`
+elif $PKG_CONFIG --libs freetype2 >/dev/null 2>&1; then
+ FREETYPE2_INCLUDES=`$PKG_CONFIG --cflags freetype2`
+ FREETYPE2_LIBS=`$PKG_CONFIG --libs freetype2`
elif test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then
AC_MSG_ERROR([did not find freetype-config required for system freetype2 library])
fi

6
texlive.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon May 7 10:16:26 UTC 2018 - idonmez@suse.com
- Add freetype-use-pkg-config.patch to fix build with new Freetype:
use pkgconfig to find Freetype libraries.
-------------------------------------------------------------------
Fri May 4 07:09:02 UTC 2018 - werner@suse.de

5
texlive.spec
View File

@ -275,6 +275,8 @@ Patch44: biber-certs.dif
Patch47: biber-perl-5.18.2.dif
# PATCH-FIX-SUSE https://sourceforge.net/p/xetex/bugs/151/ -- Fix OOB access when generating alpha mask for 1/2/4-bit indexed PNGs
Patch50: source-dvipdfm-x.dif
# PATCH-FIX-SUSE Use pkg-config to find freetype2
Patch51: freetype-use-pkg-config.patch
Prefix: %{_bindir}
Provides: pdfjam = %{version}
Obsoletes: pdfjam < %{version}
@ -3572,6 +3574,7 @@ rm -vf t/*.fastsort
popd
%endif
%patch50 -p0 -b .dvipdfm-x
%patch51 -p1
# Correct FHS paths
paths=$(find -name cnf-to-paths.awk)
@ -3612,6 +3615,8 @@ popd
LD_LIBRARY_PATH=${prefix}/lib:${world}/texk/kpathsea/.libs:${world}/texk/ptexenc/.libs
export LD_LIBRARY_PATH
# This is for freetype2 pkg-config change (patch51)
./reautoconf . libs/gd texk/dvipng texk/dvisvgm texk/ttf2pk2 texk/xdvik
# We have an other autoconf/automake version
./reautoconf libs/icu/dummy texk/dvipdfm-x texk/web2c texk/web2c/web2c