Skip to content

Commit b9d2af4

Browse files
committed
git-extra: commit updates made by sdk build
The way the `git-extra` package is designed, it updates the version as well as the `git-extra.install` file as part of running `makepkg-mingw`. These are the updates after the parent commit changed `git-extra.install.in` to introduce a hack to allow gnupg/gnutls to find `libunistring`'s DLL again. Signed-off-by: Johannes Schindelin <[email protected]>
1 parent 38774dc commit b9d2af4

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

git-extra/PKGBUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ pkgbase="mingw-w64-${_realname}"
55
pkgname=($_realname
66
"${MINGW_PACKAGE_PREFIX}-${_realname}")
77
_ver_base=1.1
8-
pkgver=1.1.641.031e03baf
8+
pkgver=1.1.643.38774dcc1
99
pkgrel=1
1010
pkgdesc="Git for Windows extra files"
1111
arch=('any')

git-extra/git-extra.install

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -297,6 +297,13 @@ test -d "$TMPDIR" || test ! -d "$TMP" || {\
297297
# Work around /etc/xml/catalog being updated using the MINGW version of xmlcatalog
298298
! grep -q '"[CD]:/' /etc/xml/catalog ||
299299
sed -i -e 's|"[CD]:/[^"]*/usr/|"/usr/|g' /etc/xml/catalog
300+
301+
# Work around an outdated i686 gnupg/gnutls build that depends on a hence-updated libunistring
302+
if test i686 = $arch -a ! -e /usr/bin/msys-unistring-2.dll -a -e /usr/bin/msys-unistring-5.dll &&
303+
grep msys-unistring-2 /usr/bin/msys-gnutls-30.dll 2>&1 >/dev/null
304+
then
305+
cp /usr/bin/msys-unistring-5.dll /usr/bin/msys-unistring-2.dll
306+
fi
300307
}
301308

302309
post_upgrade () {

0 commit comments

Comments
 (0)