diff options
author | Yasuhiro Kimura <yasu@FreeBSD.org> | 2023-07-24 02:25:39 +0900 |
---|---|---|
committer | Yasuhiro Kimura <yasu@FreeBSD.org> | 2023-08-20 09:53:11 +0900 |
commit | ba4eb3a50e909d902a6e031e4c3477ed369799d2 (patch) | |
tree | bf8c117e44a512a31efbae42eb66e0b942339d66 /editors/sly-asdf | |
parent | devel/py-apscheduler: update to 3.10.4 (diff) |
editors/emacs: Update to 29.1
* Update Canna patch to the one for Emacs 29.
* Add new options PGTK, SQLITE3, TREESITTER and WEBP. SQLITE3 and
TREESITTER are ON by default. PGTK and WEBP options are excluded
from nox flavor.
* CARGO option doesn't imply XFT but prevents it. It is caused as a
result of adding pure GTK support (PGTK option).
* OTK options doesn't imply XTF any more. It is also caused as a
result of adding pure GTK support.
* Update NATIVECOMP option so it specifies ahead-of-time compilation
via the configure argument.
* Remove "experimental" from NATIVECOMP_DESC.
* Add print/freetype2 and x11-fonts/fontconfig to CAIRO_LIB_DEPENDS
and GTK3_LIB_DEPENDS. Necessary to link emacs binary with shared
libraries.
* When PGTK option is ON and SCROLLBARS is OFF, configure fails as
following
----------------------------------------------------------------------
checking for gnutls >= 2.12.2... yes
checking for jansson >= 2.7... yes
checking for tree-sitter >= 0.20.2... yes
checking for libkqueue... no
checking for library containing kqueue... none required
configure: error: Non-toolkit scroll bars are not implemented for your system
----------------------------------------------------------------------
So add SCROLLBARS to PGTK_IMPLIES to avoid such options setting.
* When MODULES option is OFF and TREESITTER is ON, link error happens
as following.
----------------------------------------------------------------------
cc -o temacs.tmp \
-Demacs -I. -I. -I../lib -I../lib -I/usr/local/include -I/usr/local/include/librsvg-2.0 -I/usr/local/include/glib-2.0 -I/usr/local/lib/glib-2.0/include -I/usr/local/include -I/usr/local/include/gdk-pixbuf-2.0 -pthread -I/usr/local/include/cairo -I/usr/local/include/pixman-1 -I/usr/local/include/freetype2 -I/usr/local/include/libpng16 -D_THREAD_SAFE -I/usr/local/include/libpng16 -I/usr/local/include/libxml2 -I/usr/local/include/dbus-1.0 -I/usr/local/lib/dbus-1.0/include -I/usr/local/include -D_THREAD_SAFE -I/usr/local/include -D_THREAD_SAFE -I/usr/local/include -D_THREAD_SAFE -I/usr/local/include -D_THREAD_SAFE -I/usr/local/include -I/usr/local/include/webp -I/usr/local/include -I/usr/local/include -I/usr/local/include/glib-2.0 -I/usr/local/lib/glib-2.0/include -pthread -I/usr/local/include -I/usr/local/include/glib-2.0 -I/usr/local/lib/glib-2.0/include -I/usr/local/include/freetype2 -I/usr/local/include/libpng16 -I/usr/local/include -I/usr/local/include -I/usr/local/include/freetype2 -I/usr/local/include/libpng16 -I/usr/local/include/harfbuzz -I/usr/local/include/freetype2 -I/usr/local/include/libpng16 -I/usr/local/include -I/usr/local/include/glib-2.0 -I/usr/local/lib/glib-2.0/include -MMD -MF deps/.d -MP -I/usr/local/include -I/usr/local/include -I/usr/local/include -I/usr/local/include/p11-kit-1 -I/usr/local/include/cairo -I/usr/local/include -I/usr/local/include/glib-2.0 -I/usr/local/lib/glib-2.0/include -I/usr/local/include/pixman-1 -I/usr/local/include/freetype2 -I/usr/local/include/libpng16 -D_THREAD_SAFE -Wno-switch -Wno-pointer-sign -Wno-string-plus-int -Wno-unknown-attributes -Wno-unknown-pragmas -Wno-initializer-overrides -Wno-tautological-compare -Wno-tautological-constant-out-of-range-compare -O2 -pipe -fstack-protector-strong -isystem /usr/local/include -fno-strict-aliasing -O2 -pipe -fstack-protector-strong -isystem /usr/local/include -fno-strict-aliasing -isystem /usr/local/include -fstack-protector-strong -L/usr/local/lib -L/usr/local/lib \
dispnew.o frame.o scroll.o xdisp.o menu.o xmenu.o window.o charset.o coding.o category.o ccl.o character.o chartab.o bidi.o cm.o term.o terminal.o xfaces.o xterm.o xfns.o xselect.o xrdb.o xsmfns.o xsettings.o dbusbind.o emacs.o keyboard.o macros.o keymap.o sysdep.o bignum.o buffer.o filelock.o insdel.o marker.o minibuf.o fileio.o dired.o cmds.o casetab.o casefiddle.o indent.o search.o regex-emacs.o undo.o alloc.o pdumper.o data.o doc.o editfns.o callint.o eval.o floatfns.o fns.o sort.o font.o print.o lread.o syntax.o bytecode.o comp.o process.o gnutls.o callproc.o region-cache.o sound.o timefns.o atimer.o doprnt.o intervals.o textprop.o composite.o xml.o lcms.o kqueue.o profiler.o decompress.o thread.o systhread.o sqlite.o treesit.o itree.o xfont.o ftfont.o ftcrfont.o hbfont.o fontset.o fringe.o image.o xgselect.o json.o terminfo.o lastfile.o ../lib/libgnu.a ../oldXMenu/libXMenu11.a -ltiff -ljpeg -L/usr/local/lib -lpng16 -lgif -L/usr/local/lib -lwebpdemux -lwebpdecoder -lSM -lICE -lX11 -lXrender -L/usr/local/lib -lrsvg-2 -lm -lgio-2.0 -lgdk_pixbuf-2.0 -lgobject-2.0 -lglib-2.0 -lintl -lcairo -lrt -L/usr/local/lib -ldbus-1 -lexecinfo -L/usr/local/lib -lXrandr -L/usr/local/lib -lXinerama -L/usr/local/lib -lXfixes -lXext -lXext -L/usr/local/lib -lxml2 -lutil -L/usr/local/lib -lcairo -lncurses -L/usr/local/lib -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lintl -L/usr/local/lib -lgobject-2.0 -lglib-2.0 -lintl -L/usr/local/lib -lfreetype -L/usr/local/lib -lfontconfig -lfreetype -L/usr/local/lib -lharfbuzz -L/usr/local/lib -lgnutls -lpthread -L/usr/local/lib -llcms2 -llcms2_fast_float -llcms2_threaded -lm -lz -L/usr/local/lib -ljansson -lgmp -L/usr/local/lib -lXi -L/usr/local/lib -ltree-sitter -lsqlite3 -lXcomposite -lXext
ld: error: undefined symbol: dynlib_error
>>> referenced by treesit.c
>>> treesit.o:(treesit_load_language)
>>> referenced by treesit.c
>>> treesit.o:(treesit_load_language)
>>> referenced by treesit.c
>>> treesit.o:(treesit_load_language)
>>> referenced 1 more times
ld: error: undefined symbol: dynlib_sym
>>> referenced by treesit.c
>>> treesit.o:(treesit_load_language)
ld: error: undefined symbol: dynlib_open
>>> referenced by treesit.c
>>> treesit.o:(treesit_load_language)
cc: error: linker command failed with exit code 1 (use -v to see invocation)
----------------------------------------------------------------------
So add MODULES to TREESITTER_IMPLIES to avoid such options setting.
* Bump PORTREVISION of ports that use "USES=emacs".
ChangeLog: https://git.savannah.gnu.org/cgit/emacs.git/tree/etc/NEWS?h=emacs-29.1
Reviewed by: ashish, jrm
Differential Revision: https://reviews.freebsd.org/D41444
Diffstat (limited to 'editors/sly-asdf')
-rw-r--r-- | editors/sly-asdf/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/editors/sly-asdf/Makefile b/editors/sly-asdf/Makefile index d38712e19a9b..8f8cbe868db2 100644 --- a/editors/sly-asdf/Makefile +++ b/editors/sly-asdf/Makefile @@ -1,5 +1,6 @@ PORTNAME= sly-asdf DISTVERSION= 0.2.0-20221119 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= editors elisp PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} |