Skip to content

Replace docx2txt with the Rust docx2txt-rs for 64-bit installers #708

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dscho wants to merge 4 commits into
base: main
Choose a base branch
from
+7 −5
Open

Replace docx2txt with the Rust docx2txt-rs for 64-bit installers #708

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6219b8c
git-extra: depend on docx2txt-rs in 64-bit variants
dscho Jun 5, 2026
8dd445c
git-extra/astextplain: prefer docx2txt-rs over the Perl shim
dscho Jun 5, 2026
44b1470
make-file-list: drop the explicit docx2txt reference
dscho Jun 5, 2026
3a3a113
git-extra: bump pkgver
dscho Jun 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions git-extra/PKGBUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ pkgbase="mingw-w64-${_realname}"
pkgname=($_realname
"${MINGW_PACKAGE_PREFIX}-${_realname}")
_ver_base=1.1
pkgver=1.1.693.6dc76c4f4
pkgver=1.1.696.8dd445c32
pkgrel=1
pkgdesc="Git for Windows extra files"
arch=('any')
Expand Down Expand Up @@ -81,7 +81,7 @@ sha256sums=('8ed76d1cb069ac8568f21c431f5e23caebea502d932ab4cdff71396f4f0d5b72'
'dcbd1b981d5b899afe30151a5f5a27ea52025ff1335f131af1b5891f62ddd55b'
'683ab066be19cb4defec470ebd53f165ca5dbf761fd40c13aee8abe31ba42803'
'1cf2c13fb97c51375a76ed479362c3cbcdb51ab4d3a745e8d2c3a780badd8d46'
'c6a92fc3bc23f19d396e9544353495d4591be481e9890f7bbb5968f7693091da'
'4e9d036e63632491ccd825d0a5d3791ad6614a7a9263934b83a572524dbc1634'
'd9be882f292f23219332770902404d899420c8e069c7cd56cd89eff98e654631'
'22f41610dea842890955032af30efdb60e80f310e95a04e57ab36b10e0376923'
'8120b41b869693e07acc4707a0ab45505e7c5e4156a3a44b19152f1f425df85f'
Expand Down Expand Up @@ -180,6 +180,7 @@ package_git-extra() {
package_mingw-w64-x86_64-git-extra() {
conflicts=('git-extra' 'mingw-w64-clang-aarch64-git-extra' 'mingw-w64-i686-git-extra')
provides=('git-extra')
depends+=("${MINGW_PACKAGE_PREFIX}-docx2txt-rs")
package
}

Expand All @@ -192,5 +193,6 @@ package_mingw-w64-i686-git-extra() {
package_mingw-w64-clang-aarch64-git-extra() {
conflicts=('git-extra' 'mingw-w64-x86_64-git-extra' 'mingw-w64-i686-git-extra')
provides=('git-extra')
depends+=("${MINGW_PACKAGE_PREFIX}-docx2txt-rs")
package
}
2 changes: 1 addition & 1 deletion git-extra/astextplain
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ case "$(file --brief --mime-type "$1")" in
out=$(antiword -m UTF-8 "$1") && sed "s/\^M$//" <<<$out || cat "$1"
;;
application/vnd.openxmlformats-officedocument.wordprocessingml.* | application/vnd.ms-word.*.macroenabled.12)
docx2txt.pl "$1" - || cat "$1"
docx2txt.exe <"$1" || docx2txt.pl "$1" - || cat "$1"
;;
application/pdf)
out=$(pdftotext -q -layout -enc UTF-8 "$1" -) && sed "s/(\^M$)|(^\^L)//" <<<$out || cat "$1"
Expand Down
4 changes: 2 additions & 2 deletions make-file-list.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ LIBCURL_EXTRA=
required=
for req in mingw-w64-$PACMAN_ARCH-git-credential-manager $SH_FOR_REBASE $LIBCURL_EXTRA \
$(test -n "$MINIMAL_GIT" || echo \
mingw-w64-$PACMAN_ARCH-connect unzip docx2txt \
mingw-w64-$PACMAN_ARCH-connect unzip \
mingw-w64-$PACMAN_ARCH-antiword mingw-w64-$PACMAN_ARCH-odt2txt \
mingw-w64-$PACMAN_ARCH-xpdf-tools ssh-pageant mingw-w64-$PACMAN_ARCH-git-lfs \
tig nano perl-JSON libpcre2_8 libpcre2posix $GIT_UPDATE_EXTRA_PACKAGES)
Expand All @@ -196,7 +196,7 @@ if test -z "$MINIMAL_GIT"
then
packages="$packages mingw-w64-$PACMAN_ARCH-git-doc-html ncurses mintty vim nano
winpty less gnupg tar diffutils patch dos2unix which subversion perl-JSON
mingw-w64-$PACMAN_ARCH-tk mingw-w64-$PACMAN_ARCH-connect docx2txt
mingw-w64-$PACMAN_ARCH-tk mingw-w64-$PACMAN_ARCH-connect
mingw-w64-$PACMAN_ARCH-antiword mingw-w64-$PACMAN_ARCH-odt2txt ssh-pageant
mingw-w64-$PACMAN_ARCH-git-lfs mingw-w64-$PACMAN_ARCH-xz tig $GIT_UPDATE_EXTRA_PACKAGES"
test i686 = "$ARCH" || packages="$packages iconv"
Expand Down
Loading