Skip to content

Commit

Permalink
Update emacs to 29.1
Browse files Browse the repository at this point in the history
  • Loading branch information
alexpdp7 committed Nov 4, 2023
1 parent f63c84f commit 90ecaa8
Show file tree
Hide file tree
Showing 5 changed files with 72 additions and 38 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ less-643.built.$(ARCH): ncurses-6.4.built.$(ARCH) readline-8.2.built.$(ARCH)
grep-3.11.built.$(ARCH): ncurses-6.4.built.$(ARCH) readline-8.2.built.$(ARCH)
berry-lang.built.$(ARCH): readline-8.2.built.$(ARCH)

emacs-28.2.built.$(ARCH): ncurses-6.4.built.$(ARCH)
emacs-29.1.built.$(ARCH): ncurses-6.4.built.$(ARCH)
vim-9.0.1670.built.$(ARCH): ncurses-6.4.built.$(ARCH) readline-8.2.built.$(ARCH)
nano-7.2.built.$(ARCH): ncurses-6.4.built.$(ARCH) readline-8.2.built.$(ARCH)

Expand Down Expand Up @@ -71,7 +71,7 @@ compress: cosmo-repo-thirdparty.built.$(ARCH)\
gzip-1.13.built.$(ARCH) tar-1.35.built.$(ARCH)

web: wget-1.21.built.$(ARCH) rsync-3.2.7.built.$(ARCH) curl-8.4.0.built.$(ARCH) git-2.42.0.built.$(ARCH)
editor: nano-7.2.built.$(ARCH) emacs-28.2.built.$(ARCH) vim-9.0.1670.built.$(ARCH)
editor: nano-7.2.built.$(ARCH) emacs-29.1.built.$(ARCH) vim-9.0.1670.built.$(ARCH)
pypack1: cpy311-pypack1.built.$(ARCH)
datasette: cpy311-datasette.built.$(ARCH)
gcc: gcc-11.2-patched.built.$(ARCH)
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ APE binaries](https://github.com/jart/cosmopolitan#amd64--arm64-fat-ape-binaries
Currently available:

* GNU `bash-5.2`, `findutils-4.9.0`, `coreutils-9.4`
* `vim-9.0.1670`, `emacs-28.2`, `nano-7.2`
* `vim-9.0.1670`, `emacs-29.1`, `nano-7.2`
* CPython3.11.4
* `wget-1.21`, `curl-8.4.0`, `git-2.42.0`
* [`gcc-11.2.0`][portcosmo] and `binutils-2.35.2` targeting `x86_64-linux-cosmo`
Expand Down
33 changes: 0 additions & 33 deletions emacs-28.2/minimal.diff

This file was deleted.

66 changes: 66 additions & 0 deletions emacs-29.1/minimal.diff
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
--- ./emacs-29.1/src/config.in 2023-07-23 09:58:50.000000000 +0200
+++ ./emacs-29.1/src/config.in.new 2023-11-04 23:52:46.616547788 +0100
@@ -998,7 +998,7 @@
#undef HAVE_MMSYSTEM_H

/* Define to 1 if dynamic modules are enabled */
-#undef HAVE_MODULES
+#undef HAVE_MODULES0

/* Define to 1 if native compiler is available. */
#undef HAVE_NATIVE_COMP
@@ -1790,7 +1790,7 @@
#undef INTERNAL_TERMINAL

/* Define to read input using SIGIO. */
-#undef INTERRUPT_INPUT
+#undef INTERRUPT_INPUT0

/* Returns true if character is any form of separator. */
#undef IS_ANY_SEP
@@ -2094,7 +2094,7 @@
#undef UNIX98_PTYS

/* Define to 1 if FIONREAD is usable. */
-#undef USABLE_FIONREAD
+#undef USABLE_FIONREAD0

/* Define to 1 if SIGIO is usable. */
#undef USABLE_SIGIO

--- ./emacs-29.1/src/filelock.c 2023-01-01 14:46:43.000000000 +0100
+++ ./emacs-29.1/src/filelock.c.new 2023-11-04 17:53:19.163803983 +0100
@@ -298,7 +298,7 @@
There is no way to tell whether a symlink call fails due to
permissions issues or because links are not supported, but luckily
the lock file code should work either way. */
-enum { LINKS_MIGHT_NOT_WORK = EPERM };
+#define LINKS_MIGHT_NOT_WORK EPERM

/* Rename OLD to NEW. If FORCE, replace any existing NEW.
It is OK if there are temporarily two hard links to OLD.
@@ -498,17 +498,14 @@

/* True if errno values are negative. Although the C standard
requires them to be positive, they are negative in Haiku. */
-enum { NEGATIVE_ERRNO = EDOM < 0 };
+#define NEGATIVE_ERRNO (EDOM < 0)

/* Nonzero values that are not errno values. */
-enum
- {
- /* Another process on this machine owns it. */
- ANOTHER_OWNS_IT = NEGATIVE_ERRNO ? 1 : -1,
-
- /* This Emacs process owns it. */
- I_OWN_IT = 2 * ANOTHER_OWNS_IT
- };
+/* Another process on this machine owns it. */
+#define ANOTHER_OWNS_IT (NEGATIVE_ERRNO ? 1 : -1)
+
+/* This Emacs process owns it. */
+#define I_OWN_IT (2 * ANOTHER_OWNS_IT)

/* Return 0 if nobody owns the lock file LFNAME or the lock is obsolete,
ANOTHER_OWNS_IT if another process owns it

5 changes: 3 additions & 2 deletions emacs-28.2/superconfigure → emacs-29.1/superconfigure
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ fi

alias strip=$STRIP
alias ar=$AR
FOLDER="emacs-28.2"
FOLDER="emacs-29.1"

if [[ -f sources.tar.gz ]]; then
# we already downloaded it
Expand All @@ -25,7 +25,7 @@ if [[ -f sources.tar.gz ]]; then
cd ..
else
# download the source code
wget -q https://ftp.gnu.org/gnu/emacs/emacs-28.2.tar.gz -O sources.tar.gz
wget -q https://ftp.gnu.org/gnu/emacs/emacs-29.1.tar.gz -O sources.tar.gz
tar -xzf sources.tar.gz

# apply patches if any
Expand All @@ -49,6 +49,7 @@ export PKG_CONFIG=""
--without-gsettings --without-gconf\
--without-cairo --without-xml2\
--without-tiff --without-dbus --without-selinux\
--without-modules\
--sysconfdir=/zip --datarootdir=/zip/share\
--libexecdir=/zip/$ARCH --prefix=$COSMOS\
CFLAGS="-Os -I$COSMOS/include/ncurses"
Expand Down

0 comments on commit 90ecaa8

Please sign in to comment.