emacs: actually apply hunspell_1.7.patch and remove unused musl patch

resolves #5809
This commit is contained in:
John 2018-12-13 18:06:52 +01:00 committed by maxice8
parent 86af146219
commit 8ad0e3ae15
3 changed files with 11 additions and 98 deletions

View File

@ -1,87 +0,0 @@
--- configure
+++ configure
@@ -2092,7 +2092,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.
--- src/Makefile.in
+++ src/Makefile.in
@@ -373,6 +373,7 @@
region-cache.o sound.o atimer.o \
doprnt.o intervals.o textprop.o composite.o xml.o $(NOTIFY_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)
--- src/gmalloc.c
+++ src/gmalloc.c
@@ -72,7 +72,7 @@
#define free gfree
#endif /* HYBRID_MALLOC */
-#ifdef CYGWIN
+//#ifdef CYGWIN
extern void *bss_sbrk (ptrdiff_t size);
extern int bss_sbrk_did_unexec;
extern char bss_sbrk_buffer[];
@@ -80,7 +80,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"
@@ -1525,16 +1525,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.
--- src/print.c
+++ src/print.c
@@ -755,7 +755,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. */
--- src/unexelf.c
+++ src/unexelf.c
@@ -632,6 +632,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;

View File

@ -1,5 +1,5 @@
--- a/lisp/textmodes/ispell.el --- lisp/textmodes/ispell.el
+++ b/lisp/textmodes/ispell.el +++ lisp/textmodes/ispell.el
@@ -1113,7 +1113,12 @@ dictionary from that list was found." @@ -1113,7 +1113,12 @@ dictionary from that list was found."
null-device null-device
t t

View File

@ -1,9 +1,12 @@
# Template file for 'emacs' # Template file for 'emacs'
pkgname=emacs pkgname=emacs
version=26.1 version=26.1
revision=3 revision=4
nocross=yes build_style="gnu-configure"
nopie=yes configure_args="--with-file-notification=inotify --with-modules
$(vopt_with jpeg) $(vopt_with tiff) $(vopt_with gif) $(vopt_with png)
$(vopt_with xpm) $(vopt_with svg rsvg) $(vopt_with imagemagick)
$(vopt_with xml xml2) $(vopt_with gnutls) $(vopt_with sound) $(vopt_with m17n m17n-flt)"
hostmakedepends="pkg-config" hostmakedepends="pkg-config"
makedepends="ncurses-devel libXaw-devel gtk+-devel gtk+3-devel webkit2gtk-devel makedepends="ncurses-devel libXaw-devel gtk+-devel gtk+3-devel webkit2gtk-devel
dbus-devel acl-devel dbus-devel acl-devel
@ -13,18 +16,15 @@ makedepends="ncurses-devel libXaw-devel gtk+-devel gtk+3-devel webkit2gtk-devel
$(vopt_if xml libxml2-devel) $(vopt_if gnutls gnutls-devel) $(vopt_if xml libxml2-devel) $(vopt_if gnutls gnutls-devel)
$(vopt_if sound alsa-lib-devel) $(vopt_if m17n m17n-lib-devel)" $(vopt_if sound alsa-lib-devel) $(vopt_if m17n m17n-lib-devel)"
depends="emacs-common-${version}_${revision}" depends="emacs-common-${version}_${revision}"
replaces="emacs>=0"
build_style="gnu-configure"
configure_args="--with-file-notification=inotify --with-modules
$(vopt_with jpeg) $(vopt_with tiff) $(vopt_with gif) $(vopt_with png)
$(vopt_with xpm) $(vopt_with svg rsvg) $(vopt_with imagemagick)
$(vopt_with xml xml2) $(vopt_with gnutls) $(vopt_with sound) $(vopt_with m17n m17n-flt)"
short_desc="GNU Emacs editor" short_desc="GNU Emacs editor"
maintainer="Leah Neukirchen <leah@vuxu.org>" maintainer="Leah Neukirchen <leah@vuxu.org>"
license="GPL-3.0-or-later" license="GPL-3.0-or-later"
homepage="http://www.gnu.org/software/emacs/" homepage="http://www.gnu.org/software/emacs/"
distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz" distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
checksum=1cf4fc240cd77c25309d15e18593789c8dbfba5c2b44d8f77c886542300fd32c checksum=1cf4fc240cd77c25309d15e18593789c8dbfba5c2b44d8f77c886542300fd32c
replaces="emacs>=0"
nocross=yes
nopie=yes
# Package build options # Package build options
build_options="jpeg tiff gif png xpm svg xml imagemagick gnutls sound m17n" build_options="jpeg tiff gif png xpm svg xml imagemagick gnutls sound m17n"