emacs: Update to 30.1

* 001-ucrt.patch: refresh
* 004-libtree-sitter.patch: fixed upstream

Remove compiler error workarounds, both fixed in this release.
This commit is contained in:
Christoph Reiter
2025-02-23 19:23:33 +01:00
parent 31c7313b70
commit 3cc390c6c7
3 changed files with 10 additions and 31 deletions

View File

@@ -11,9 +11,10 @@
/* We don't want to include stdio.h because we are already duplicating
lots of it here */
extern int _snprintf (char *buffer, size_t count, const char *format, ...);
--- emacs-28.1/src/sysdep.c.orig 2022-06-23 20:59:02.252891700 +0200
+++ emacs-28.1/src/sysdep.c 2022-06-23 21:05:31.998322600 +0200
@@ -2693,7 +2693,9 @@
--- emacs-30.1/src/sysdep.c.orig 2025-02-18 19:31:36.000000000 +0100
+++ emacs-30.1/src/sysdep.c 2025-02-23 19:26:04.314287100 +0100
@@ -2984,8 +2984,10 @@
#else /* !__ANDROID__ */
if (close_stream (stdout) != 0)
{
+#ifndef _UCRT // XXX: close_stream(stdout) fails for some reason
@@ -23,7 +24,7 @@
}
/* Do not close stderr if addresses are being sanitized, as the
@@ -2702,7 +2704,11 @@
@@ -2994,7 +2996,11 @@
if (err | (ADDRESS_SANITIZER
? fflush (stderr) != 0 || ferror (stderr)
: close_stream (stderr) != 0))
@@ -32,6 +33,6 @@
+#else
+ ;
+#endif
#endif /* __ANDROID__ */
}
#ifndef DOS_NT

View File

@@ -1,11 +0,0 @@
--- a/lisp/term/w32-win.el
+++ b/lisp/term/w32-win.el
@@ -314,7 +314,7 @@
'(gccjit "libgccjit-0.dll")
;; MSYS2 distributes libtree-sitter.dll, without API version
;; number...
- '(tree-sitter "libtree-sitter.dll" "libtree-sitter-0.dll")))
+ '(tree-sitter "libtree-sitter.dll" "libtree-sitter-0.dll" "libtree-sitter-0.25.dll")))
;;; multi-tty support
(defvar w32-initialized nil

View File

@@ -7,8 +7,8 @@ _sanity_check=$([[ "${MSYSTEM}" != MINGW* ]] || echo yes)
_realname=emacs
pkgbase=mingw-w64-${_realname}
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
pkgver=29.4
pkgrel=4
pkgver=30.1
pkgrel=1
pkgdesc="The extensible, customizable, self-documenting, real-time display editor (mingw-w64)"
arch=('any')
mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
@@ -45,16 +45,13 @@ source=("https://ftp.gnu.org/gnu/${_realname}/${_realname}-${pkgver}.tar.xz"{,.s
"001-ucrt.patch"
"002-clang-fixes.patch"
"003-aarch64-fixes.patch"
# current patch implementation requires change after each libtree-sitter soversion bump
"004-libtree-sitter.patch"
"emacs-ARM64.manifest")
# source=("https://alpha.gnu.org/gnu/${_realname}/pretest/${_realname}-${pkgver}.tar.xz"{,.sig})
sha256sums=('ba897946f94c36600a7e7bb3501d27aa4112d791bfe1445c61ed28550daca235'
sha256sums=('6ccac1ae76e6af93c6de1df175e8eb406767c23da3dd2a16aa67e3124a6f138f'
'SKIP'
'e1347064ec30094e21679764f784fa7557738946485359041473e6e9d7f3c3dc'
'8093c4c6dc8006c11fd33a78c5aefcb2b5b1f05e5afb9bd3da7d5b146dfc112c'
'd8732584a8f3bfd0badbd16d15384b7098e25c5df48632beb02d35f6050c358b'
'd128982d87af1e524ae809147613168153f0e5c1efb0ef633793df47b762c9e1'
'4a3f2f6a26c75a1b31f74d67a4208fa83b946690922d862469e73eaee40d70e0'
'bfe64602dbeeec85799c1156ca4f3837fdac42a076e83a4221768db3417220e1')
validpgpkeys=('28D3BED851FDF3AB57FEF93C233587A47C207910'
'17E90D521672C04631B1183EE78DAE0F3115E06B'
@@ -69,7 +66,6 @@ prepare() {
patch -Np1 -i "${srcdir}/001-ucrt.patch"
patch -Np1 -i "${srcdir}/002-clang-fixes.patch"
patch -Np1 -i "${srcdir}/003-aarch64-fixes.patch"
patch -Np1 -i "${srcdir}/004-libtree-sitter.patch"
./autogen.sh
}
@@ -86,13 +82,6 @@ build() {
export LDFLAGS="${LDFLAGS} -lpthread"
# -D_FORTIFY_SOURCE breaks build
CFLAGS=${CFLAGS//"-Wp,-D_FORTIFY_SOURCE=2"}
# -foptimize-sibling-calls breaks native compilation (GCC 13.1)
# TODO, fixed upstream now: https://git.savannah.gnu.org/cgit/emacs.git/commit/?id=19c983ddedf083f82008472c13dfd08ec94b615f
CFLAGS+=" -fno-optimize-sibling-calls"
# configure script can not deal with the warnings that were turned
# into errors in GCC 14
# TODO, fixed upstream now: https://git.savannah.gnu.org/cgit/emacs.git/commit/?id=5216903ae6c3f91ebefb1152af40753f723cbc39
CFLAGS+=" -Wno-error=implicit-function-declaration"
../${_realname}-${pkgver}/configure \
--prefix="${MINGW_PREFIX}" \