emacs: update to 30.1.

JSON is builtin now, drop xwidgets as our webkit2gtk is too recent.
This commit is contained in:
Leah Neukirchen 2025-02-24 12:24:29 +01:00
parent a09ce04809
commit 3db909e9e9

View file

@ -1,18 +1,18 @@
# Template file for 'emacs' # Template file for 'emacs'
pkgname=emacs pkgname=emacs
version=29.4 version=30.1
revision=3 revision=1
create_wrksrc=required create_wrksrc=required
build_style=gnu-configure build_style=gnu-configure
configure_args="--with-file-notification=inotify --with-modules configure_args="--with-file-notification=inotify --with-modules
$(vopt_with jpeg) $(vopt_with tiff) $(vopt_with gif) $(vopt_with png) $(vopt_with jpeg) $(vopt_with tiff) $(vopt_with gif) $(vopt_with png)
$(vopt_with webp) $(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 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 harfbuzz) $(vopt_with cairo) $(vopt_with gmp libgmp)
$(vopt_with sqlite sqlite3) $(vopt_with treesitter tree-sitter) $(vopt_with sqlite sqlite3) $(vopt_with treesitter tree-sitter)
$(vopt_with nativecomp native-compilation=aot)" $(vopt_with nativecomp native-compilation=aot)"
hostmakedepends="pkg-config tar texinfo" hostmakedepends="pkg-config tar texinfo"
makedepends="ncurses-devel libXaw-devel libXi-devel gtk+3-devel libwebkit2gtk41-devel makedepends="ncurses-devel libXaw-devel libXi-devel gtk+3-devel
dbus-devel acl-devel dbus-devel acl-devel
$(vopt_if jpeg libjpeg-turbo-devel) $(vopt_if tiff tiff-devel) $(vopt_if jpeg libjpeg-turbo-devel) $(vopt_if tiff tiff-devel)
$(vopt_if gif giflib-devel) $(vopt_if png libpng-devel) $(vopt_if gif giflib-devel) $(vopt_if png libpng-devel)
@ -20,7 +20,7 @@ makedepends="ncurses-devel libXaw-devel libXi-devel gtk+3-devel libwebkit2gtk41-
$(vopt_if svg librsvg-devel) $(vopt_if imagemagick libmagick-devel) $(vopt_if svg librsvg-devel) $(vopt_if imagemagick libmagick-devel)
$(vopt_if xml libxml2-devel) $(vopt_if gnutls gnutls-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 sound alsa-lib-devel) $(vopt_if m17n m17n-lib-devel)
$(vopt_if json jansson-devel) $(vopt_if harfbuzz harfbuzz-devel) $(vopt_if harfbuzz harfbuzz-devel)
$(vopt_if cairo cairo-devel) $(vopt_if gmp gmp-devel) $(vopt_if cairo cairo-devel) $(vopt_if gmp gmp-devel)
$(vopt_if treesitter tree-sitter-devel) $(vopt_if sqlite sqlite-devel) $(vopt_if treesitter tree-sitter-devel) $(vopt_if sqlite sqlite-devel)
$(vopt_if nativecomp libgccjit-devel)" $(vopt_if nativecomp libgccjit-devel)"
@ -31,16 +31,15 @@ license="GPL-3.0-or-later"
homepage="http://www.gnu.org/software/emacs/" homepage="http://www.gnu.org/software/emacs/"
changelog="https://www.gnu.org/savannah-checkouts/gnu/emacs/emacs.html#Releases" changelog="https://www.gnu.org/savannah-checkouts/gnu/emacs/emacs.html#Releases"
distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz" distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
checksum=ba897946f94c36600a7e7bb3501d27aa4112d791bfe1445c61ed28550daca235 checksum=6ccac1ae76e6af93c6de1df175e8eb406767c23da3dd2a16aa67e3124a6f138f
nocross=yes nocross=yes
nopie=yes nopie=yes
# Package build options # Package build options
build_options="cairo dbus gif gmp gnutls harfbuzz imagemagick jpeg json m17n build_options="cairo dbus gif gmp gnutls harfbuzz imagemagick jpeg m17n
nativecomp png sound sqlite svg tiff treesitter webp xml xpm" nativecomp png sound sqlite svg tiff treesitter webp xml xpm"
desc_option_cairo="Enable support for drawing with Cairo" desc_option_cairo="Enable support for drawing with Cairo"
desc_option_gmp="Enable support for big numbers using GMP" 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_m17n="Enable support for m17n multilingual text processing"
desc_option_nativecomp="Enable support for native compilation" desc_option_nativecomp="Enable support for native compilation"
desc_option_sound="Enable support for sound" desc_option_sound="Enable support for sound"
@ -48,7 +47,7 @@ desc_option_sqlite="Enable support for SQLite3"
desc_option_treesitter="Enable support for tree-sitter parsers" desc_option_treesitter="Enable support for tree-sitter parsers"
desc_option_webp="Enable support for WebP format" desc_option_webp="Enable support for WebP format"
desc_option_xpm="Enable support for XPM images" desc_option_xpm="Enable support for XPM images"
build_options_default="cairo gif gmp gnutls harfbuzz jpeg json m17n nativecomp build_options_default="cairo gif gmp gnutls harfbuzz jpeg m17n nativecomp
png sound sqlite svg tiff treesitter webp xml xpm" png sound sqlite svg tiff treesitter webp xml xpm"
post_extract() { post_extract() {
@ -71,7 +70,7 @@ do_configure() {
${configure_args} ${configure_args}
cd $wrksrc/gtk3 cd $wrksrc/gtk3
./configure --with-x-toolkit=gtk3 --with-xwidgets ${configure_args} ./configure --with-x-toolkit=gtk3 ${configure_args}
cd $wrksrc/pgtk cd $wrksrc/pgtk
./configure --with-pgtk ${configure_args} ./configure --with-pgtk ${configure_args}