From 875f421e0b9c11a819e2fccef883feefcb243f00 Mon Sep 17 00:00:00 2001
From: termux-pacman-bot <termux-pacman-bot@outlook.com>
Date: Thu, 28 Aug 2025 20:37:21 +0000
Subject: [PATCH] bump(main/emacs,x11/emacs-x): 30.2

---
 packages/emacs/build.sh                  | 12 ++++--------
 packages/emacs/lib-sig2str.h.patch       | 21 +++++++++++++++++++++
 x11-packages/emacs-x/build.sh            | 12 ++++--------
 x11-packages/emacs-x/lib-sig2str.h.patch |  1 +
 4 files changed, 30 insertions(+), 16 deletions(-)
 create mode 100644 packages/emacs/lib-sig2str.h.patch
 create mode 120000 x11-packages/emacs-x/lib-sig2str.h.patch

diff --git a/packages/emacs/build.sh b/packages/emacs/build.sh
index d185bd71e3..49978967e8 100644
--- a/packages/emacs/build.sh
+++ b/packages/emacs/build.sh
@@ -3,13 +3,9 @@ TERMUX_PKG_DESCRIPTION="Extensible, customizable text editor-and more"
 TERMUX_PKG_LICENSE="GPL-3.0"
 TERMUX_PKG_MAINTAINER="@termux"
 # Update both emacs and emacs-x to the same version in one PR.
-TERMUX_PKG_VERSION=30.1
-TERMUX_PKG_REVISION=4
+TERMUX_PKG_VERSION=30.2
 TERMUX_PKG_SRCURL=https://ftp.gnu.org/gnu/emacs/emacs-${TERMUX_PKG_VERSION}.tar.xz
-if [[ $TERMUX_PKG_VERSION == *-rc* ]]; then
-	TERMUX_PKG_SRCURL=https://alpha.gnu.org/gnu/emacs/pretest/emacs-${TERMUX_PKG_VERSION#*:}.tar.xz
-fi
-TERMUX_PKG_SHA256=6ccac1ae76e6af93c6de1df175e8eb406767c23da3dd2a16aa67e3124a6f138f
+TERMUX_PKG_SHA256=b3f36f18a6dd2715713370166257de2fae01f9d38cfe878ced9b1e6ded5befd9
 TERMUX_PKG_DEPENDS="libgmp, libgnutls, libsqlite, libxml2, ncurses, tree-sitter, zlib"
 TERMUX_PKG_BREAKS="emacs-dev"
 TERMUX_PKG_REPLACES="emacs-dev"
@@ -35,7 +31,7 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 --without-x
 "
 
-if $TERMUX_DEBUG_BUILD; then
+if [[ "$TERMUX_DEBUG_BUILD" == "true" ]]; then
 	TERMUX_PKG_EXTRA_CONFIGURE_ARGS+="
 	--enable-checking=yes,glyphs
 	--enable-check-lisp-object-type
@@ -56,7 +52,7 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" ac_cv_lib_elf_elf_begin=no"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" gl_cv_func_dup2_works=no"
 # disable setrlimit function to make termux-am work from within emacs
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" ac_cv_func_setrlimit=no"
-if [ "$TERMUX_ARCH" == "arm" ] || [ "$TERMUX_ARCH" == "i686" ]; then
+if [[ "$TERMUX_ARCH_BITS" == "32" ]]; then
 	# setjmp does not work properly on 32bit android:
 	# https://github.com/termux/termux-packages/issues/2599
 	TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" emacs_cv_func__setjmp=no"
diff --git a/packages/emacs/lib-sig2str.h.patch b/packages/emacs/lib-sig2str.h.patch
new file mode 100644
index 0000000000..d154732ab5
--- /dev/null
+++ b/packages/emacs/lib-sig2str.h.patch
@@ -0,0 +1,21 @@
+--- emacs/lib/sig2str.h.org	2025-08-27 00:45:29.029553730 +0200
++++ emacs/lib/sig2str.h	2025-08-27 00:45:47.573043985 +0200
+@@ -19,9 +19,6 @@
+ 
+ #include <signal.h>
+ 
+-/* Don't override system declarations of SIG2STR_MAX, sig2str, str2sig.  */
+-#ifndef SIG2STR_MAX
+-
+ # include "intprops.h"
+ 
+ /* Size of a buffer needed to hold a signal name like "HUP".  */
+@@ -38,8 +35,6 @@
+ }
+ #endif
+ 
+-#endif
+-
+ /* An upper bound on signal numbers allowed by the system.  */
+ 
+ #if defined _sys_nsig
diff --git a/x11-packages/emacs-x/build.sh b/x11-packages/emacs-x/build.sh
index f32e2a89eb..23ba4cc6eb 100644
--- a/x11-packages/emacs-x/build.sh
+++ b/x11-packages/emacs-x/build.sh
@@ -3,13 +3,9 @@ TERMUX_PKG_DESCRIPTION="Extensible, customizable text editor-and more"
 TERMUX_PKG_LICENSE="GPL-3.0"
 TERMUX_PKG_MAINTAINER="@termux"
 # Update both emacs and emacs-x to the same version in one PR.
-TERMUX_PKG_VERSION=30.1
-TERMUX_PKG_REVISION=3
+TERMUX_PKG_VERSION=30.2
 TERMUX_PKG_SRCURL=https://ftp.gnu.org/gnu/emacs/emacs-${TERMUX_PKG_VERSION}.tar.xz
-if [[ $TERMUX_PKG_VERSION == *-rc* ]]; then
-	TERMUX_PKG_SRCURL=https://alpha.gnu.org/gnu/emacs/pretest/emacs-${TERMUX_PKG_VERSION#*:}.tar.xz
-fi
-TERMUX_PKG_SHA256=6ccac1ae76e6af93c6de1df175e8eb406767c23da3dd2a16aa67e3124a6f138f
+TERMUX_PKG_SHA256=b3f36f18a6dd2715713370166257de2fae01f9d38cfe878ced9b1e6ded5befd9
 TERMUX_PKG_DEPENDS="fontconfig, freetype, gdk-pixbuf, giflib, glib, harfbuzz, libgmp, libgnutls, libice, libjpeg-turbo, libpng, librsvg, libsm, libsqlite, libtiff, libx11, libxaw, libxcb, libxext, libxfixes, libxft, libxinerama, libxml2, libxmu, libxpm, libxrandr, libxrender, libxt, littlecms, ncurses, tree-sitter, zlib"
 TERMUX_PKG_CONFLICTS="emacs"
 TERMUX_PKG_REPLACES="emacs"
@@ -34,7 +30,7 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 --with-tree-sitter
 "
 
-if $TERMUX_DEBUG_BUILD; then
+if [[ "$TERMUX_DEBUG_BUILD" == "true" ]]; then
 	TERMUX_PKG_EXTRA_CONFIGURE_ARGS+="
 	--enable-checking=yes,glyphs
 	--enable-check-lisp-object-type
@@ -55,7 +51,7 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" ac_cv_lib_elf_elf_begin=no"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" gl_cv_func_dup2_works=no"
 # disable setrlimit function to make termux-am work from within emacs
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" ac_cv_func_setrlimit=no"
-if [ "$TERMUX_ARCH" == "arm" ] || [ "$TERMUX_ARCH" == "i686" ]; then
+if [[ "$TERMUX_ARCH_BITS" == "32" ]]; then
 	# setjmp does not work properly on 32bit android:
 	# https://github.com/termux/termux-packages/issues/2599
 	TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" emacs_cv_func__setjmp=no"
diff --git a/x11-packages/emacs-x/lib-sig2str.h.patch b/x11-packages/emacs-x/lib-sig2str.h.patch
new file mode 120000
index 0000000000..75ee2714ae
--- /dev/null
+++ b/x11-packages/emacs-x/lib-sig2str.h.patch
@@ -0,0 +1 @@
+../../packages/emacs/lib-sig2str.h.patch
\ No newline at end of file