Merge pull request #4687 from lazka/emacs-29.3

emacs: Update to 29.3

emacs/001-no-rebase.patch

@@ -0,0 +1,12 @@
+--- emacs-29.3/src/Makefile.in.orig	2024-01-06 13:56:31.000000000 +0100
++++ emacs-29.3/src/Makefile.in	2024-06-11 07:41:07.067826400 +0200
+@@ -613,9 +613,6 @@
+ emacs$(EXEEXT): temacs$(EXEEXT) \
+                 lisp.mk $(etc)/DOC $(lisp) \
+                 $(lispsource)/international/charprop.el ${charsets}
+-ifeq ($(SYSTEM_TYPE),cygwin)
+-	find ${top_builddir} -name '*.eln' | rebase -v -O -T -
+-endif
+ ifeq ($(DUMPING),unexec)
+ 	LC_ALL=C $(RUN_TEMACS) -batch $(BUILD_DETAILS) -l loadup --temacs=dump
+   ifneq ($(PAXCTL_dumped),)

emacs/PKGBUILD

@@ -1,8 +1,8 @@
 # Maintainer: Ricky <rickleaf.wu@gmail.com>
 
 pkgname=emacs
-pkgver=27.2
+pkgver=29.3
-pkgrel=2
+pkgrel=1
 pkgdesc="The extensible, customizable, self-documenting, real-time display editor (msys2)"
 url="https://www.gnu.org/software/${pkgname}/"
 msys2_references=(
@@ -15,28 +15,31 @@ groups=('editors')
 makedepends=('gawk' 'libiconv-devel' 'libxml2-devel' 'libiconv-devel' 'ncurses-devel' 'libgnutls-devel' 'libunistring-devel' 'autotools' 'gcc')
 options=('strip')
 source=("https://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz"{,.sig}
-        'configure.ac.diff')
+        '001-no-rebase.patch')
-sha256sums=('b4a7cc4e78e63f378624e0919215b910af5bb2a0afc819fad298272e9f40c1b9'
+sha256sums=('c34c05d3ace666ed9c7f7a0faf070fea3217ff1910d004499bd5453233d742a0'
             'SKIP'
-            '0cb204f2cab4740d27a47a4adc7e4168d6034e86cd522605a85bbd03fb1db59d')
+            '4a82e7f1c51ab4084dcd2625bba2c04b4a99524532e02b641ee91d2748ffddc3')
-validpgpkeys=('E6C9029C363AD41D787A8EBB91C1262F01EB8D39' # Eli Zaretskii (eliz) <eliz@gnu.org>
+validpgpkeys=('17E90D521672C04631B1183EE78DAE0F3115E06B') # Eli Zaretskii (eliz) <eliz@gnu.org>
-              '28D3BED851FDF3AB57FEF93C233587A47C207910') # Nicolas Petton <nicolas@petton.fr>
 
 prepare() {
   cd "${pkgname}-${pkgver}"
-  patch --binary --forward -p0 < "${srcdir}/configure.ac.diff"
+
+  patch -p1 -i "${srcdir}/001-no-rebase.patch"
+
   ./autogen.sh
 }
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
+  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
+
   CPPFLAGS="-DNDEBUG"
   CFLAGS="-pipe -O3 -fomit-frame-pointer -funroll-loops"
   LDFLAGS="-s -Wl,-s"
   ./configure \
     --prefix=/usr \
-    --build="${CHOST}" \
+    --build="${CYGWIN_CHOST}" \
     --with-x-toolkit=no \
     --with-sound=yes \
     --with-modules \

emacs/configure.ac.diff

@@ -1,14 +0,0 @@
---- configure.ac	2016-07-25 15:08:36.000000000 +0800
-+++ configure_ricky.ac	2016-10-20 13:46:29.466294000 +0800
-@@ -625,6 +625,11 @@
-     opsys=cygwin
-   ;;
- 
-+  ## MSYS2 ports
-+  *-*-msys )
-+    opsys=cygwin
-+  ;;
-+
-   ## HP 9000 series 700 and 800, running HP/UX
-   hppa*-hp-hpux10.2* )
-     opsys=hpux10-20