summaryrefslogtreecommitdiff
path: root/admin/nt/dist-build
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2020-03-23 09:48:15 -0700
committerGlenn Morris <rgm@gnu.org>2020-03-23 09:48:15 -0700
commit5d5d5d492c0f1cc500713b133b1ad3e205031714 (patch)
tree958a27c2c2408caf042d83d3652f24631dd44e9b /admin/nt/dist-build
parent7832e6192de1256e37f04ec172ba3633e5e49b91 (diff)
parentd66331aea4d86db17da2a4965e020274e623fda0 (diff)
downloademacs-5d5d5d492c0f1cc500713b133b1ad3e205031714.tar.gz
Merge from origin/emacs-27
d66331aea4 (origin/emacs-27) Don't build the Gnulib 'utimens' module ... f2351a689b Add Harfbuzz dependency 8944310d7c Don't signal during backtrace unrewind (Bug#40088) 8709aaddd8 Fix a couple of problems in changelog generating functions 9ab85f087f Fix cl-concatenate (Bug#40180) 561e9fb91b Improve documentation of project.el commands b28a9a6cc3 Make svg images with links valid 7515252cce * lisp/tab-line.el (tab-line-new-button-show): New defcustom. # Conflicts: # etc/NEWS # nt/gnulib-cfg.mk
Diffstat (limited to 'admin/nt/dist-build')
-rwxr-xr-xadmin/nt/dist-build/build-dep-zips.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/admin/nt/dist-build/build-dep-zips.py b/admin/nt/dist-build/build-dep-zips.py
index 9d19fe079a5..b0345a42cf3 100755
--- a/admin/nt/dist-build/build-dep-zips.py
+++ b/admin/nt/dist-build/build-dep-zips.py
@@ -31,6 +31,7 @@ EMACS_MAJOR_VERSION="28"
# This list derives from the features we want Emacs to compile with.
PKG_REQ='''mingw-w64-x86_64-giflib
mingw-w64-x86_64-gnutls
+mingw-w64-x86_64-harfbuzz
mingw-w64-x86_64-lcms2
mingw-w64-x86_64-libjpeg-turbo
mingw-w64-x86_64-libpng