Fix extractbb.exe and related

See https://github.com/msys2/msys2-texlive/issues/18
This commit is contained in:
Naveen M K
2021-10-22 15:23:27 +05:30
parent 01fc3e77bf
commit 519f025fc5
2 changed files with 45 additions and 3 deletions

View File

@@ -0,0 +1,34 @@
From 41d467a60daabb971322f99bf087701ff5dce097 Mon Sep 17 00:00:00 2001
From: Naveen M K <naveen521kk@gmail.com>
Date: Fri, 22 Oct 2021 15:03:31 +0530
Subject: [PATCH] texk/dvipdfm-x: Don't copy libtool wrapper
Previously libtools wrapper was copied as `extractbb.exe`
and other which is not to be done. So, now use libtool to
copy the files rather than doing manually so that this
doesn't happen.
Signed-off-by: Naveen M K <naveen521kk@gmail.com>
---
texk/dvipdfm-x/Makefile.am | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/texk/dvipdfm-x/Makefile.am b/texk/dvipdfm-x/Makefile.am
index c738137d3d..6c845232ab 100644
--- a/texk/dvipdfm-x/Makefile.am
+++ b/texk/dvipdfm-x/Makefile.am
@@ -209,10 +209,10 @@ dist_cmapdata_DATA = data/EUC-UCS2
install-exec-hook: install-bin-links
if WIN32
- $(INSTALL_PROGRAM) call_xdvipdfmx$(EXEEXT) $(DESTDIR)$(bindir)/dvipdfm$(EXEEXT)
- $(INSTALL_PROGRAM) call_xdvipdfmx$(EXEEXT) $(DESTDIR)$(bindir)/dvipdfmx$(EXEEXT)
- $(INSTALL_PROGRAM) call_xdvipdfmx$(EXEEXT) $(DESTDIR)$(bindir)/ebb$(EXEEXT)
- $(INSTALL_PROGRAM) call_xdvipdfmx$(EXEEXT) $(DESTDIR)$(bindir)/extractbb$(EXEEXT)
+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) call_xdvipdfmx$(EXEEXT) "$(DESTDIR)$(bindir)/dvipdfm$(EXEEXT)"
+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) call_xdvipdfmx$(EXEEXT) "$(DESTDIR)$(bindir)/dvipdfmx$(EXEEXT)"
+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) call_xdvipdfmx$(EXEEXT) "$(DESTDIR)$(bindir)/ebb$(EXEEXT)"
+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) call_xdvipdfmx$(EXEEXT) "$(DESTDIR)$(bindir)/extractbb$(EXEEXT)"
endif WIN32
install-data-hook: install-man1-links

View File

@@ -4,7 +4,7 @@ pkgbase=mingw-w64-texlive-bin
pkgname=("${MINGW_PACKAGE_PREFIX}-texlive-bin" "${MINGW_PACKAGE_PREFIX}-libsynctex")
pkgver=2021.20210424
pkgdesc="TeX Live binaries (mingw-w64)"
pkgrel=9
pkgrel=10
license=('GPL')
arch=('any')
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
@@ -46,12 +46,14 @@ source=(
"0001-Remove-DLUASOCKET_INET_PTON-from-Makefile.patch"
"0002-fix-lauchers-mingw32.patch"
"0003-runscript-always-quote-args.patch"
"0004-mpxout-x64.patch")
"0004-mpxout-x64.patch"
"0005-texk-dvipdfm-x-Don-t-copy-libtool-wrapper.patch")
sha256sums=('f17bdf0fba64790151b39bcb1d6d4f0ee97da6bcf15b4c9282ff9056bb8da5ee'
'86ef2a99b2f0caed42777419837d9b539af1d1c8a101701e539e5467bb88662e'
'decff8db61302c2a1760cfd4b42aaf0e25fcb7d2b9621cea3ec3f4c2557976a1'
'0339fe12b2ec7537ce62d064fffd43e8ee02280ffac3dd012f07dc17a713acdc'
'574f04b9f41b579b283b6d86c1b1ee07f97f45b01a12d77953db5eca6572d3da')
'574f04b9f41b579b283b6d86c1b1ee07f97f45b01a12d77953db5eca6572d3da'
'b525e528d6da0c9e1ad7fa123ea62636a7811c5219b40e59d65f2385f0ca96fd')
apply_patch_with_msg() {
for _patch in "$@"
@@ -67,6 +69,8 @@ prepare() {
apply_patch_with_msg 0001-Remove-DLUASOCKET_INET_PTON-from-Makefile.patch
apply_patch_with_msg 0003-runscript-always-quote-args.patch
apply_patch_with_msg 0004-mpxout-x64.patch
apply_patch_with_msg 0005-texk-dvipdfm-x-Don-t-copy-libtool-wrapper.patch
# t4ht expects to be un /usr/share/texmf/bin/t4ht (FS#27251)
sed -i s/SELFAUTOPARENT/TEXMFROOT/ texk/tex4htk/t4ht.c
autoreconf -fiv
@@ -74,6 +78,10 @@ prepare() {
pushd texk/chktex
autoreconf -fiv
popd
pushd texk/dvipdfm-x
autoreconf -fiv
popd
}
build() {