From ed232e967f30178285d4bae5219865b7ddeddebd Mon Sep 17 00:00:00 2001 From: Oscar Fuentes Date: Tue, 31 May 2022 19:18:13 +0200 Subject: [PATCH] emacs: update PKGBUILD --- mingw-w64-emacs-git/PKGBUILD | 37 +++++++++++++++++++++--------------- 1 file changed, 22 insertions(+), 15 deletions(-) diff --git a/mingw-w64-emacs-git/PKGBUILD b/mingw-w64-emacs-git/PKGBUILD index 317a973f9..e33435fb5 100644 --- a/mingw-w64-emacs-git/PKGBUILD +++ b/mingw-w64-emacs-git/PKGBUILD @@ -1,38 +1,40 @@ # Maintainer: Haroogan # Maintainer: Oscar Fuentes +_enable_jit=$([[ "${MSYSTEM}" =~ MINGW.* ]] && echo yes) _realname='emacs' pkgbase=mingw-w64-${_realname}-git pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}-git" -pkgver=r136512.b7730c259b +pkgver=r156906.8ebfcff3a6 pkgrel=1 pkgdesc="The extensible, customizable, self-documenting, real-time display editor (mingw-w64)" url="https://www.gnu.org/software/${_realname}/" license=('GPL3') arch=('any') +mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64') provides=("${MINGW_PACKAGE_PREFIX}-${_realname}") conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}") depends=("${MINGW_PACKAGE_PREFIX}-universal-ctags-git" - "${MINGW_PACKAGE_PREFIX}-xpm-nox" - "${MINGW_PACKAGE_PREFIX}-gnutls" + $([[ "$_enable_jit" == "yes" ]] && echo "${MINGW_PACKAGE_PREFIX}-libgccjit") "${MINGW_PACKAGE_PREFIX}-zlib" + "${MINGW_PACKAGE_PREFIX}-xpm-nox" + "${MINGW_PACKAGE_PREFIX}-freetype" "${MINGW_PACKAGE_PREFIX}-harfbuzz" - "${MINGW_PACKAGE_PREFIX}-winpthreads") + "${MINGW_PACKAGE_PREFIX}-jansson" + "${MINGW_PACKAGE_PREFIX}-gnutls" + "${MINGW_PACKAGE_PREFIX}-libwinpthread") optdepends=("${MINGW_PACKAGE_PREFIX}-giflib" - "${MINGW_PACKAGE_PREFIX}-imagemagick" "${MINGW_PACKAGE_PREFIX}-libjpeg-turbo" "${MINGW_PACKAGE_PREFIX}-libpng" "${MINGW_PACKAGE_PREFIX}-librsvg" "${MINGW_PACKAGE_PREFIX}-libtiff" "${MINGW_PACKAGE_PREFIX}-libxml2") -makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" - "${MINGW_PACKAGE_PREFIX}-pkg-config" - "make" - "autoconf" - "texinfo" +makedepends=("${MINGW_PACKAGE_PREFIX}-cc" + "${MINGW_PACKAGE_PREFIX}-autotools" + "texinfo" "patch" - "git" - "${optdepends[@]}") + "git" + "${optdepends[@]}") # Don't zip info files because the built-in info reader uses gzip to # decompress them. gzip is not available as a mingw binary. options=('strip' '!zipman') @@ -54,15 +56,20 @@ build() { mkdir -p "${srcdir}/build-${MINGW_CHOST}" cd "build-${MINGW_CHOST}" + _extra_cfg="" + if [[ "$_enable_jit" == "yes" ]] ; then + _extra_cfg="$_extra_cfg --with-native-compilation" + fi "${srcdir}/${_realname}/configure" \ --prefix="${MINGW_PREFIX}" \ --build="${MINGW_CHOST}" \ - --without-dbus \ --with-modules \ - --without-compress-install + --without-dbus \ + --without-compress-install \ + $_extra_cfg # --without-compress-install is needed because we don't have gzip in - # the mingw binaries. + # the mingw binaries and it is also required by native compilation. make }