mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-08-05 05:17:07 +02:00
community/emacs bump to 26.1
This commit is contained in:
stf
Natanael Copa
parent
adfae8d22a
commit
132b6b71fa
@ -2,7 +2,7 @@
|
||||
# Contributor: Timo Teräs <timo.teras@iki.fi>
|
||||
|
||||
pkgname=emacs
|
||||
pkgver=25.3
|
||||
pkgver=26.1
|
||||
pkgrel=0
|
||||
pkgdesc="The extensible, customizable, self-documenting real-time display editor"
|
||||
arch="all !aarch64"
|
||||
@ -16,9 +16,7 @@ makedepends="autoconf automake linux-headers paxmark gawk
|
||||
ncurses-libs gnutls-dev libxaw-dev"
|
||||
subpackages="$pkgname-doc $pkgname-nox $pkgname-x11 $pkgname-gtk2"
|
||||
source="ftp://ftp.gnu.org/gnu/emacs/emacs-$pkgver.tar.xz
|
||||
gamedir.patch
|
||||
noaslr-dump.patch
|
||||
musl.patch"
|
||||
gamedir.patch"
|
||||
|
||||
prepare() {
|
||||
cd "$builddir/$1"
|
||||
@ -139,7 +137,5 @@ gtk2() {
|
||||
_subpackage gtk2
|
||||
}
|
||||
|
||||
sha512sums="1cce656451b6ca8502ebb229e88bd3ef48b7f9444a10eeac4ea43bd5491b2efacd641dfa35227a33362c3866493d3449cf1df81606563eef44bba0ed668e457f emacs-25.3.tar.xz
|
||||
8898f309aeaf274366849bd5c56c8e2a1be94dfee2f01b20f1700bf26203f49b9600237e5090fc3d8eaad3ea246f803ffd493d0c04cb3512084a4e3bf58f8f5e gamedir.patch
|
||||
d3a30a9bf7ef7349806a75ee919d6683a8000eb70f4c3040d149bd8911dc95b931a05c7cbf9f5b93176940ad87520dbb2ddef3b4136b0d5b140de0cdbc4b7a8f noaslr-dump.patch
|
||||
4ec078f970c2d0ad9b082a613e7c7e64e40f37eaee96e67ab9b2e467595c74533f94ced74f6753e393a9c0ead88fad75adcfdd31be4295f5763292a6dd846fe8 musl.patch"
|
||||
sha512sums="537c2cfdd281151b360002419dde6280c313e07a937ed96405c67f754b3401ec5541091a3c0aa6690929bc33dd79e8e0d8844e7a6b014b7798c63cb15de210c2 emacs-26.1.tar.xz
|
||||
8898f309aeaf274366849bd5c56c8e2a1be94dfee2f01b20f1700bf26203f49b9600237e5090fc3d8eaad3ea246f803ffd493d0c04cb3512084a4e3bf58f8f5e gamedir.patch"
|
||||
|
||||
@ -1,87 +0,0 @@
|
||||
--- emacs-25.1/configure.ac 2016-07-25 07:08:36.000000000 +0000
|
||||
+++ emacs-25.1-musl/configure.ac 2016-10-24 15:38:00.518625055 +0000
|
||||
@@ -2133,7 +2133,7 @@
|
||||
|
||||
system_malloc=$emacs_cv_sanitize_address
|
||||
|
||||
-hybrid_malloc=
|
||||
+hybrid_malloc=yes
|
||||
|
||||
case "$opsys" in
|
||||
## darwin ld insists on the use of malloc routines in the System framework.
|
||||
--- emacs-25.1/src/Makefile.in 2016-06-29 09:49:20.000000000 +0000
|
||||
+++ emacs-25.1-musl/src/Makefile.in 2016-10-24 15:38:00.518625055 +0000
|
||||
@@ -398,6 +398,7 @@
|
||||
doprnt.o intervals.o textprop.o composite.o xml.o $(NOTIFY_OBJ) \
|
||||
$(XWIDGETS_OBJ) \
|
||||
profiler.o decompress.o \
|
||||
+ sheap.o \
|
||||
$(MSDOS_OBJ) $(MSDOS_X_OBJ) $(NS_OBJ) $(CYGWIN_OBJ) $(FONT_OBJ) \
|
||||
$(W32_OBJ) $(WINDOW_SYSTEM_OBJ) $(XGSELOBJ)
|
||||
obj = $(base_obj) $(NS_OBJC_OBJ)
|
||||
--- emacs-25.1/src/gmalloc.c 2016-06-29 09:49:22.000000000 +0000
|
||||
+++ emacs-25.1-musl/src/gmalloc.c 2016-10-24 15:38:00.518625055 +0000
|
||||
@@ -70,7 +70,7 @@
|
||||
#define aligned_alloc galigned_alloc
|
||||
#define free gfree
|
||||
|
||||
-#ifdef CYGWIN
|
||||
+//#ifdef CYGWIN
|
||||
extern void *bss_sbrk (ptrdiff_t size);
|
||||
extern int bss_sbrk_did_unexec;
|
||||
extern char bss_sbrk_buffer[];
|
||||
@@ -78,7 +78,7 @@
|
||||
#define DUMPED bss_sbrk_did_unexec
|
||||
#define ALLOCATED_BEFORE_DUMPING(P) \
|
||||
((P) < bss_sbrk_buffer_end && (P) >= (void *) bss_sbrk_buffer)
|
||||
-#endif
|
||||
+//#endif
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C"
|
||||
@@ -1523,16 +1523,19 @@
|
||||
__default_morecore (ptrdiff_t increment)
|
||||
{
|
||||
void *result;
|
||||
-#if defined (CYGWIN)
|
||||
+//#if defined (CYGWIN)
|
||||
if (!DUMPED)
|
||||
{
|
||||
return bss_sbrk (increment);
|
||||
}
|
||||
-#endif
|
||||
+//#endif
|
||||
+#if 0
|
||||
result = (void *) __sbrk (increment);
|
||||
if (result == (void *) -1)
|
||||
return NULL;
|
||||
return result;
|
||||
+#endif
|
||||
+ return NULL;
|
||||
}
|
||||
/* Copyright (C) 1991, 92, 93, 94, 95, 96 Free Software Foundation, Inc.
|
||||
|
||||
--- emacs-25.1/src/print.c 2016-06-29 09:49:22.000000000 +0000
|
||||
+++ emacs-25.1-musl/src/print.c 2016-10-24 15:38:00.518625055 +0000
|
||||
@@ -775,7 +775,7 @@
|
||||
print_output_debug_flag = x;
|
||||
}
|
||||
|
||||
-#if defined (GNU_LINUX)
|
||||
+#if defined (GNU_LINUX) && defined (__GLIBC__)
|
||||
|
||||
/* This functionality is not vitally important in general, so we rely on
|
||||
non-portable ability to use stderr as lvalue. */
|
||||
--- emacs-25.1/src/unexelf.c 2016-06-29 09:49:23.000000000 +0000
|
||||
+++ emacs-25.1-musl/src/unexelf.c 2016-10-24 15:38:00.518625055 +0000
|
||||
@@ -227,6 +227,9 @@
|
||||
off_t new_file_size;
|
||||
void *new_break;
|
||||
|
||||
+ extern int bss_sbrk_did_unexec;
|
||||
+ bss_sbrk_did_unexec = 1;
|
||||
+
|
||||
/* Pointers to the base of the image of the two files. */
|
||||
caddr_t old_base, new_base;
|
||||
|
||||
|
||||
@ -1,20 +0,0 @@
|
||||
diff -urw emacs-25.1/src/Makefile.in emacs-25.1-noaslr-dump/src/Makefile.in
|
||||
--- emacs-25.1/src/Makefile.in 2016-06-29 09:49:20.000000000 +0000
|
||||
+++ emacs-25.1-noaslr-dump/src/Makefile.in 2016-10-24 15:38:10.365238378 +0000
|
||||
@@ -532,6 +532,7 @@
|
||||
ifeq ($(CANNOT_DUMP),yes)
|
||||
ln -f temacs$(EXEEXT) $@
|
||||
else
|
||||
+ paxmark -r temacs$(EXEEXT)
|
||||
LC_ALL=C $(RUN_TEMACS) -batch -l loadup dump
|
||||
ifneq ($(PAXCTL_dumped),)
|
||||
$(PAXCTL_dumped) $@
|
||||
@@ -737,6 +738,7 @@
|
||||
ifeq ($(CANNOT_DUMP),yes)
|
||||
ln -f temacs$(EXEEXT) $@
|
||||
else
|
||||
+ paxmark -r temacs$(EXEEXT)
|
||||
$(RUN_TEMACS) --batch --load loadup bootstrap
|
||||
ifneq ($(PAXCTL_dumped),)
|
||||
$(PAXCTL_dumped) emacs$(EXEEXT)
|
||||
Only in emacs-25.1-noaslr-dump/src: Makefile.in.orig
|
||||
Loading…
Reference in New Issue
Block a user