From 35389dd69345cd659df5524e6db8fc068669f67c Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Fri, 21 Jul 2023 12:22:21 +0200 Subject: [PATCH] emacs: update to 29.0.92. --- srcpkgs/emacs/template | 39 ++++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/srcpkgs/emacs/template b/srcpkgs/emacs/template index 328d0a36ce03..1124bd4da106 100644 --- a/srcpkgs/emacs/template +++ b/srcpkgs/emacs/template @@ -1,53 +1,54 @@ # Template file for 'emacs' pkgname=emacs -version=28.2 -revision=2 +version=29.0.92 +revision=1 create_wrksrc=required build_style=gnu-configure configure_args="--with-file-notification=inotify --with-modules $(vopt_with jpeg) $(vopt_with tiff) $(vopt_with gif) $(vopt_with png) - $(vopt_with xpm) $(vopt_with svg rsvg) $(vopt_with imagemagick) + $(vopt_with webp) $(vopt_with xpm) $(vopt_with svg rsvg) $(vopt_with imagemagick) $(vopt_with xml xml2) $(vopt_with gnutls) $(vopt_with sound) $(vopt_with m17n m17n-flt) $(vopt_with json) $(vopt_with harfbuzz) $(vopt_with cairo) $(vopt_with gmp libgmp) - $(vopt_with nativecomp native-compilation)" + $(vopt_with sqlite) $(vopt_with treesitter tree-sitter) + $(vopt_with nativecomp native-compilation=aot)" hostmakedepends="pkg-config tar" -makedepends="ncurses-devel libXaw-devel gtk+3-devel webkit2gtk-devel +makedepends="ncurses-devel libXaw-devel libXi-devel gtk+3-devel webkit2gtk-devel dbus-devel acl-devel $(vopt_if jpeg libjpeg-turbo-devel) $(vopt_if tiff tiff-devel) - $(vopt_if gif giflib-devel) $(vopt_if png libpng-devel) $(vopt_if xpm libXpm-devel) + $(vopt_if gif giflib-devel) $(vopt_if png libpng-devel) + $(vopt_if webp libwebp-devel) $(vopt_if xpm libXpm-devel) $(vopt_if svg librsvg-devel) $(vopt_if imagemagick libmagick-devel) $(vopt_if xml libxml2-devel) $(vopt_if gnutls gnutls-devel) $(vopt_if sound alsa-lib-devel) $(vopt_if m17n m17n-lib-devel) $(vopt_if json jansson-devel) $(vopt_if harfbuzz harfbuzz-devel) $(vopt_if cairo cairo-devel) $(vopt_if gmp gmp-devel) + $(vopt_if treesitter tree-sitter-devel) $(vopt_if sqlite sqlite-devel) $(vopt_if nativecomp libgccjit-devel)" depends="emacs-common-${version}_${revision}" short_desc="GNU Emacs editor" maintainer="Leah Neukirchen " license="GPL-3.0-or-later" homepage="http://www.gnu.org/software/emacs/" -distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz" -checksum=ee21182233ef3232dc97b486af2d86e14042dbb65bbc535df562c3a858232488 +distfiles="https://alpha.gnu.org/gnu/emacs/pretest/emacs-29.0.92.tar.xz" +checksum=a85b3c3d9cc52d7e3ce5ef70da23a5a830715f1b9425702dfdb5bc41d3fc2304 nocross=yes nopie=yes # Package build options -build_options="jpeg tiff gif png xpm svg xml imagemagick gnutls sound m17n dbus json harfbuzz cairo gmp nativecomp" +build_options="cairo dbus gif gmp gnutls harfbuzz imagemagick jpeg json m17n + nativecomp png sound sqlite svg tiff treesitter webp xml xpm" desc_option_cairo="Enable support for drawing with Cairo" desc_option_gmp="Enable support for big numbers using GMP" desc_option_json="Enable support for native JSON parsing" desc_option_m17n="Enable support for m17n multilingual text processing" desc_option_nativecomp="Enable support for native compilation" desc_option_sound="Enable support for sound" +desc_option_sqlite="Enable support for SQLite3" +desc_option_treesitter="Enable support for tree-sitter parsers" +desc_option_webp="Enable support for WebP format" desc_option_xpm="Enable support for XPM images" -build_options_default="cairo gif gmp gnutls harfbuzz jpeg json m17n - png sound svg tiff xml xpm" - -case "$XBPS_TARGET_MACHINE" in - ppc64*) build_options_default+=" nativecomp";; - ppc*) ;; # assembler errors - *) build_options_default+=" nativecomp";; -esac +build_options_default="cairo gif gmp gnutls harfbuzz jpeg json m17n nativecomp + png sound sqlite svg tiff treesitter webp xml xpm" post_extract() { # Just configuring in different directories results in @@ -73,8 +74,8 @@ do_configure() { do_build() { make ${makejobs} -C nox - make ${makejobs} -C x11 $(vopt_if nativecomp NATIVE_FULL_AOT=1) - make ${makejobs} -C gtk3 $(vopt_if nativecomp NATIVE_FULL_AOT=1) + make ${makejobs} -C x11 + make ${makejobs} -C gtk3 } do_install() {