Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion git-extra/PKGBUILD
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.646.1654659da
pkgver=1.1.649.af5925057
pkgrel=1
pkgdesc="Git for Windows extra files"
arch=('any')
Expand Down
9 changes: 5 additions & 4 deletions git-extra/git-extra.install
Original file line number Diff line number Diff line change
Expand Up @@ -298,11 +298,12 @@ test -d "$TMPDIR" || test ! -d "$TMP" || {\
! grep -q '"[CD]:/' /etc/xml/catalog ||
sed -i -e 's|"[CD]:/[^"]*/usr/|"/usr/|g' /etc/xml/catalog

# Work around an outdated i686 gnupg/gnutls build that depends on a hence-updated libunistring
if test i686 = $arch -a ! -e /usr/bin/msys-unistring-2.dll -a -e /usr/bin/msys-unistring-5.dll &&
grep msys-unistring-2 /usr/bin/msys-gnutls-30.dll 2>&1 >/dev/null
# Remove work around for an outdated i686 gnupg/gnutls build that depended on a hence-updated libunistring
if test i686 = $arch -a -e /usr/bin/msys-unistring-2.dll &&
! pacman -Qoq /usr/bin/msys-unistring-2.dll >/dev/null 2>&1 &&
! grep -q msys-unistring-2 /usr/bin/msys-gnutls-30.dll 2>&1 >/dev/null
then
cp /usr/bin/msys-unistring-5.dll /usr/bin/msys-unistring-2.dll
rm /usr/bin/msys-unistring-2.dll
fi
}

Expand Down
9 changes: 5 additions & 4 deletions git-extra/git-extra.install.in
Original file line number Diff line number Diff line change
Expand Up @@ -264,11 +264,12 @@ test -d "$TMPDIR" || test ! -d "$TMP" || {\
! grep -q '"[CD]:/' /etc/xml/catalog ||
sed -i -e 's|"[CD]:/[^"]*/usr/|"/usr/|g' /etc/xml/catalog

# Work around an outdated i686 gnupg/gnutls build that depends on a hence-updated libunistring
if test i686 = $arch -a ! -e /usr/bin/msys-unistring-2.dll -a -e /usr/bin/msys-unistring-5.dll &&
grep msys-unistring-2 /usr/bin/msys-gnutls-30.dll 2>&1 >/dev/null
# Remove work around for an outdated i686 gnupg/gnutls build that depended on a hence-updated libunistring
if test i686 = $arch -a -e /usr/bin/msys-unistring-2.dll &&
! pacman -Qoq /usr/bin/msys-unistring-2.dll >/dev/null 2>&1 &&
! grep -q msys-unistring-2 /usr/bin/msys-gnutls-30.dll 2>&1 >/dev/null
then
cp /usr/bin/msys-unistring-5.dll /usr/bin/msys-unistring-2.dll
rm /usr/bin/msys-unistring-2.dll
fi
}

Expand Down