[arch-commits] Commit in texlive-bin/trunk (3 files)

[Rémy Oudompheng]

    Date: Saturday, May 26, 2018 @ 22:45:17
  Author: remy
Revision: 325042

upgpkg: texlive-bin 2018.47465-2

Fix build with freetype using pkg-config.
Fix missing synctex_version.h header (FS#58403)

Added:
  texlive-bin/trunk/freetype-pkgconfig.patch
  texlive-bin/trunk/synctex-missing-header.patch
Modified:
  texlive-bin/trunk/PKGBUILD

------------------------------+
 PKGBUILD                     |   17 ++++++++++++++---
 freetype-pkgconfig.patch     |   22 ++++++++++++++++++++++
 synctex-missing-header.patch |   12 ++++++++++++
 3 files changed, 48 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-05-26 22:45:00 UTC (rev 325041)
+++ PKGBUILD	2018-05-26 22:45:17 UTC (rev 325042)
@@ -4,7 +4,7 @@
 
 pkgname=('texlive-bin' 'libsynctex')
 pkgver=2018.47465
-pkgrel=1
+pkgrel=2
 license=('GPL')
 arch=('x86_64')
 makedepends=('cairo' 'pixman' 'graphite' 't1lib' 'gd' 'poppler'
@@ -13,13 +13,24 @@
          'perl' 'clisp' 'ffcall')
 url='http://tug.org/texlive/'
 source=("https://sources.archlinux.org/other/texlive/texlive-bin-source-${pkgver}.tar.xz"
-        "texlive-poppler-0.64.patch")
+        "texlive-poppler-0.64.patch"
+        "freetype-pkgconfig.patch"
+        "synctex-missing-header.patch")
 sha256sums=('06d7a1c939cf7d6035850cefca1d01898ae51a879e20db684a202fd507a0cae5'
-            '1c444526e3967f82d68a003526b332e0401db7825e22b5542e6cd04f0e688310')
+            '1c444526e3967f82d68a003526b332e0401db7825e22b5542e6cd04f0e688310'
+            'bed44f4ccda369410e90eac527cf44b8c1afda7d987ae521b4fd5edb425eef3e'
+            'b6c81eb091b5910226e0359768edd178680debee56b63ab0a3753c3429c28ab0')
 
 prepare() {
     cd "$srcdir/source"
 
+    # Synctex "make install" misses synctex_version.h
+    patch -Np1 -i "${srcdir}/synctex-missing-header.patch"
+
+    # Freetype2 2.9.1 package no longer has freetype-config
+    patch -Np1 -i "${srcdir}/freetype-pkgconfig.patch"
+    ./reautoconf
+
     # t4ht expects to be un /usr/share/texmf/bin/t4ht (FS#27251)
     sed -i s/SELFAUTOPARENT/TEXMFROOT/ texk/tex4htk/t4ht.c
 

Added: freetype-pkgconfig.patch
===================================================================
--- freetype-pkgconfig.patch	                        (rev 0)
+++ freetype-pkgconfig.patch	2018-05-26 22:45:17 UTC (rev 325042)
@@ -0,0 +1,22 @@
+--- source/m4/kpse-freetype2-flags.m4.orig	2015-06-16 01:27:13.292945838 +0200
++++ source/m4/kpse-freetype2-flags.m4	2018-05-26 23:51:50.567080501 +0200
+@@ -21,17 +21,9 @@
+ 
+ # KPSE_FREETYPE2_OPTIONS([WITH-SYSTEM])
+ # -------------------------------------
+-AC_DEFUN([KPSE_FREETYPE2_OPTIONS], [_KPSE_LIB_OPTIONS([freetype2], [$1], [freetype-config])])
++AC_DEFUN([KPSE_FREETYPE2_OPTIONS], [_KPSE_LIB_OPTIONS([freetype2], [$1], [pkg-config])])
+ 
+ # KPSE_FREETYPE2_SYSTEM_FLAGS
+ # ---------------------------
+ AC_DEFUN([KPSE_FREETYPE2_SYSTEM_FLAGS], [dnl
+-AC_REQUIRE([AC_CANONICAL_HOST])[]dnl
+-AC_CHECK_TOOL([FT2_CONFIG], [freetype-config], [false])[]dnl
+-if $FT2_CONFIG --ftversion >/dev/null 2>&1; then
+-  FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags`
+-  FREETYPE2_LIBS=`$FT2_CONFIG --libs`
+-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
+-]) # KPSE_FREETYPE2_SYSTEM_FLAGS
++_KPSE_PKG_CONFIG_FLAGS([freetype2], [freetype2], [])])

Added: synctex-missing-header.patch
===================================================================
--- synctex-missing-header.patch	                        (rev 0)
+++ synctex-missing-header.patch	2018-05-26 22:45:17 UTC (rev 325042)
@@ -0,0 +1,12 @@
+--- source.orig/texk/web2c/synctexdir/am/synctex.am	2016-05-08 19:08:26.231570952 +0200
++++ source/texk/web2c/synctexdir/am/synctex.am	2018-05-27 00:14:26.011125669 +0200
+@@ -55,7 +55,8 @@
+ if SYNCTEX
+ syncinclude_HEADERS = \
+ 	synctexdir/synctex_parser.h \
+-	synctexdir/synctex_parser_utils.h
++	synctexdir/synctex_parser_utils.h \
++	synctexdir/synctex_version.h
+ 
+ pkgconfig_DATA = synctexdir/synctex.pc
+ endif SYNCTEX