Skip to content

Commit

Permalink
Merge pull request #19810 from raedrizqie/emacs-update
Browse files Browse the repository at this point in the history
emacs: update to 29.2
  • Loading branch information
lazka authored Jan 20, 2024
2 parents 23d401a + e03e843 commit 499db2a
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 43 deletions.
23 changes: 0 additions & 23 deletions mingw-w64-emacs/002-clang-fixes.patch
Original file line number Diff line number Diff line change
@@ -1,26 +1,3 @@
diff -aur emacs-28.2-orig/configure.ac emacs-28.2/configure.ac
--- emacs-28.2-orig/configure.ac 2022-09-07 06:24:51.000000000 +0800
+++ emacs-28.2/configure.ac 2022-10-09 20:40:07.436552500 +0800
@@ -147,7 +147,7 @@
fi
cc_target=`$cc -v 2>&1 | sed -n 's/Target: //p'`
case "$cc_target" in
- *-*) host=$cc_target
+ *-*) host=$target_alias
;;
"") AC_MSG_ERROR([Impossible to obtain $cc compiler target.
Please explicitly provide --host.])
@@ -5765,8 +5765,8 @@
mingw32)
## Is it any better under MinGW64 to relocate emacs into higher addresses?
case "$canonical" in
- x86_64-*-*) LD_SWITCH_SYSTEM_TEMACS="-Wl,-stack,0x00800000 -Wl,-heap,0x00100000 -Wl,-image-base,0x400000000 -Wl,-entry,__start -Wl,-Map,./temacs.map" ;;
- *) LD_SWITCH_SYSTEM_TEMACS="-Wl,-stack,0x00800000 -Wl,-heap,0x00100000 -Wl,-image-base,0x01000000 -Wl,-entry,__start -Wl,-Map,./temacs.map" ;;
+ x86_64-*-*) LD_SWITCH_SYSTEM_TEMACS="-Wl,-stack,0x00800000 -Wl,-image-base,0x400000000 -Wl,-entry,__start -Wl,-Map,./temacs.map" ;;
+ *) LD_SWITCH_SYSTEM_TEMACS="-Wl,-stack,0x00800000 -Wl,-image-base,0x01000000 -Wl,-entry,__start -Wl,-Map,./temacs.map" ;;
esac
## If they want unexec, disable Windows ASLR for the Emacs binary
if test "$with_dumping" = "unexec"; then
--- a/nt/mingw-cfg.site
+++ b/nt/mingw-cfg.site
@@ -29,6 +29,10 @@
Expand Down
11 changes: 0 additions & 11 deletions mingw-w64-emacs/003-Fix-touchpad-scrolling-on-MS-Windows.patch

This file was deleted.

14 changes: 5 additions & 9 deletions mingw-w64-emacs/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ _sanity_check=$([[ "${MSYSTEM}" != MINGW* ]] || echo yes)
_realname=emacs
pkgbase=mingw-w64-${_realname}
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
pkgver=29.1
pkgrel=4
pkgver=29.2
pkgrel=1
pkgdesc="The extensible, customizable, self-documenting, real-time display editor (mingw-w64)"
arch=('any')
mingw_arch=('mingw64' 'ucrt64' 'clang64')
Expand Down Expand Up @@ -41,14 +41,12 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
options=('!zipman')
source=("https://ftp.gnu.org/gnu/${_realname}/${_realname}-${pkgver}.tar.xz"{,.sig}
"001-ucrt.patch"
"002-clang-fixes.patch"
"003-Fix-touchpad-scrolling-on-MS-Windows.patch")
"002-clang-fixes.patch")
# source=("https://alpha.gnu.org/gnu/${_realname}/pretest/${_realname}-${pkgver}.tar.xz"{,.sig})
sha256sums=('d2f881a5cc231e2f5a03e86f4584b0438f83edd7598a09d24a21bd8d003e2e01'
sha256sums=('7d3d2448988720bf4bf57ad77a5a08bf22df26160f90507a841ba986be2670dc'
'SKIP'
'e1347064ec30094e21679764f784fa7557738946485359041473e6e9d7f3c3dc'
'6f3a3260d8fd6c1fbeafd0611f604c46799005dc776af076bff1fd4d8a3b6304'
'3ae782f8812224b062017dd4eb3d10c4791a38da758b364c46a442bb8c41d3a3')
'd8732584a8f3bfd0badbd16d15384b7098e25c5df48632beb02d35f6050c358b')
validpgpkeys=('28D3BED851FDF3AB57FEF93C233587A47C207910'
'17E90D521672C04631B1183EE78DAE0F3115E06B'
'E6C9029C363AD41D787A8EBB91C1262F01EB8D39'
Expand All @@ -59,8 +57,6 @@ prepare() {

patch -Np1 -i "${srcdir}/001-ucrt.patch"
patch -Np1 -i "${srcdir}/002-clang-fixes.patch"
# https://git.savannah.gnu.org/cgit/emacs.git/commit/?h=emacs-29&id=781ddd7e
patch -Np1 -i "${srcdir}/003-Fix-touchpad-scrolling-on-MS-Windows.patch"

./autogen.sh
}
Expand Down

0 comments on commit 499db2a

Please sign in to comment.