diff --git a/Mk/Uses/emacs.mk b/Mk/Uses/emacs.mk index 335f5a1c5dc7..747d78cdda77 100644 --- a/Mk/Uses/emacs.mk +++ b/Mk/Uses/emacs.mk @@ -1,154 +1,154 @@ # Provide support for ports requiring Emacs. This includes flavors with proper # dependencies and useful variables. # # Feature: emacs # Usage: USES=emacs or USES=emacs:args # Valid ARGS: build, run, noflavors # # build Indicates that Emacs is required at build time. # run Indicates that Emacs is required at run time. # noflavors Prevents flavors. This is implied when there is no run # dependency on Emacs. # # If build and run are omitted from the argument list, Emacs will be added to # BUILD_DEPENDS and RUN_DEPENDS. EMACS_NO_DEPENDS can be set to prevent both # dependencies. # # Variables, which can be set in make.conf: # DEFAULT_VERSIONS+= The default flavor for Emacs ports (ports with # USES=emacs, but not the Emacs ports themselves) # can be added to DEFAULT_VERSIONS. For example, # DEFAULT_VERSIONS+= emacs=nox # Valid flavors: full canna nox devel_full devel_nox # Flavors specified on the command line take # precedence. # # Variables, which can be set by ports: # EMACS_FLAVORS_EXCLUDE: Do NOT build these Emacs flavors. # If EMACS_FLAVORS_EXCLUDE is not defined and # - there is a run dependency on Emacs # - the noflavors argument is not specified # then all valid Emacs flavors are assumed. # # EMACS_NO_DEPENDS: Do NOT add build or run dependencies on Emacs. # This will prevent flavors. # # Variables, which can be read by ports: # EMACS_CMD: Emacs command with full path (e.g. /usr/local/bin/emacs-28.2) # EMACS_FLAVOR: Used for dependencies (e.g. BUILD_DEPENDS= dash.el${EMACS_PKGNAMESUFFIX}>0:devel/dash@${EMACS_FLAVOR}) # EMACS_LIBDIR: Emacs Library directory without ${PREFIX} (e.g. share/emacs) # EMACS_LIBDIR_WITH_VER: Library directory without ${PREFIX} including version (e.g. share/emacs/28.2) # EMACS_MAJOR_VER: Emacs major version (e.g. 28) # EMACS_PKGNAMESUFFIX: PKGNAMESUFFIX to distinguish Emacs flavors # EMACS_SITE_LISPDIR: Emacs site-lisp directory without ${PREFIX} (e.g. share/emacs/site-lisp) # EMACS_VER: Emacs version (e.g. 28.2) # EMACS_VERSION_SITE_LISPDIR: Include version (e.g. share/emacs/28.2/site-lisp) #------------------------------------------------------------------------------- # # MAINTAINER: emacs@FreeBSD.org .if !defined(_INCLUDE_USES_EMACS_MK) _INCLUDE_USES_EMACS_MK= yes # Make sure that no dependency or some other environment variable # pollutes the build/run dependency detection .undef _EMACS_BUILD_DEP .undef _EMACS_RUN_DEP .undef _EMACS_NOFLAVORS _EMACS_ARGS= ${emacs_ARGS:S/,/ /g} . if ${_EMACS_ARGS:Mbuild} _EMACS_BUILD_DEP= yes _EMACS_ARGS:= ${_EMACS_ARGS:Nbuild} . endif . if ${_EMACS_ARGS:Mrun} _EMACS_RUN_DEP= yes _EMACS_ARGS:= ${_EMACS_ARGS:Nrun} . endif . if ${_EMACS_ARGS:Mnoflavors} _EMACS_NOFLAVORS= yes _EMACS_ARGS:= ${_EMACS_ARGS:Nnoflavors} . endif # If the port does not specify a build or run dependency, and does not define # EMACS_NO_DEPENDS, assume both dependencies are required. . if !defined(_EMACS_BUILD_DEP) && !defined(_EMACS_RUN_DEP) && \ !defined(EMACS_NO_DEPENDS) _EMACS_BUILD_DEP= yes _EMACS_RUN_DEP= yes . endif # Only set FLAVORS when... . if defined(_EMACS_RUN_DEP) && !defined(_EMACS_NOFLAVORS) FLAVORS= full canna nox wayland devel_full devel_nox # Sort the default to be first . if defined(EMACS_DEFAULT) FLAVORS:= ${EMACS_DEFAULT} ${FLAVORS:N${EMACS_DEFAULT}} . endif . for flavor in ${EMACS_FLAVORS_EXCLUDE} FLAVORS:= ${FLAVORS:N${flavor}} . endfor . endif # Only set FLAVOR when... . if defined(_EMACS_RUN_DEP) && !defined(_EMACS_NOFLAVORS) && empty(FLAVOR) . if defined(EMACS_DEFAULT) FLAVOR= ${EMACS_DEFAULT} . else FLAVOR= ${FLAVORS:[1]} . endif # defined(EMACS_DEFAULT) . endif # !defined(_EMACS_NOFLAVORS) && defined(_EMACS_RUN_DEP) && empty(FLAVOR) . if !empty(FLAVOR) EMACS_FLAVOR= ${FLAVOR} . else EMACS_FLAVOR= full . endif . if ${FLAVOR:Mdevel*} EMACS_VER= 31.0.50 EMACS_PORTDIR= editors/emacs-devel . else -EMACS_VER= 29.4 +EMACS_VER= 30.1 EMACS_PORTDIR= editors/emacs . endif EMACS_MAJOR_VER= ${EMACS_VER:C/\..*//} EMACS_LIBDIR= share/emacs EMACS_LIBDIR_WITH_VER= share/emacs/${EMACS_VER} EMACS_PORT_NAME= emacs${EMACS_MAJOR_VER} . if ${EMACS_FLAVOR} == "devel_full" EMACS_PKGNAMESUFFIX= -emacs_devel . elif ${EMACS_FLAVOR} == "devel_nox" EMACS_PKGNAMESUFFIX= -emacs_devel_nox . elif ${EMACS_FLAVOR} == "full" EMACS_PKGNAMESUFFIX= . else EMACS_PKGNAMESUFFIX= -emacs_${EMACS_FLAVOR} . endif EMACS_CMD= ${PREFIX}/bin/emacs-${EMACS_VER} EMACS_SITE_LISPDIR= ${EMACS_LIBDIR}/site-lisp EMACS_VERSION_SITE_LISPDIR= ${EMACS_LIBDIR_WITH_VER}/site-lisp . if defined(_EMACS_BUILD_DEP) BUILD_DEPENDS+= ${EMACS_CMD}:${EMACS_PORTDIR}@${EMACS_FLAVOR:C/devel_//} . endif . if defined(_EMACS_RUN_DEP) RUN_DEPENDS+= ${EMACS_CMD}:${EMACS_PORTDIR}@${EMACS_FLAVOR:C/devel_//} . endif MAKE_ARGS+= EMACS=${EMACS_CMD} SCRIPTS_ENV+= EMACS_LIBDIR=${EMACS_LIBDIR} \ EMACS_VER=${EMACS_VER} \ EMACS_LIBDIR_WITH_VER=${EMACS_LIBDIR_WITH_VER} \ EMACS_SITE_LISPDIR=${EMACS_SITE_LISPDIR} \ EMACS_VERSION_SITE_LISPDIR=${EMACS_VERSION_SITE_LISPDIR} PLIST_SUB+= EMACS_LIBDIR=${EMACS_LIBDIR} \ EMACS_VER=${EMACS_VER} \ EMACS_LIBDIR_WITH_VER=${EMACS_LIBDIR_WITH_VER} \ EMACS_SITE_LISPDIR=${EMACS_SITE_LISPDIR} \ EMACS_VERSION_SITE_LISPDIR=${EMACS_VERSION_SITE_LISPDIR} .endif # _INCLUDE_USES_EMACS_MK diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile index 794ecf2fc907..f58ac956d85e 100644 --- a/editors/emacs/Makefile +++ b/editors/emacs/Makefile @@ -1,307 +1,309 @@ PORTNAME= emacs -DISTVERSION= 29.4 -PORTREVISION= 1 +DISTVERSION= 30.1 PORTEPOCH= 3 CATEGORIES= editors MASTER_SITES= GNU .if ${FLAVOR:U} == canna -PATCH_SITES+= https://www.gentei.org/~yuuji/software/emacs29canna/:canna -PATCHFILES+= emacs29.1-canna-20230730.diff.xz:-p1:canna +PATCH_SITES+= https://www.gentei.org/~yuuji/software/emacs30canna/:canna +PATCHFILES+= emacs30.1-canna-20250224.diff.gz:-p1:canna .endif MAINTAINER= emacs@FreeBSD.org COMMENT= GNU editing macros ${COMMENT_${FLAVOR}} WWW= https://www.gnu.org/software/emacs/ COMMENT_nox= (No X flavor) COMMENT_canna= (Canna Japanese input flavor) COMMENT_wayland= (Wayland flavor) LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libgmp.so:math/gmp FLAVORS= full canna nox wayland canna_PKGNAMESUFFIX= -canna canna_LIB_DEPENDS= libcanna.so:japanese/canna-lib canna_CONFLICTS_INSTALL= emacs emacs-nox emacs-wayland canna_DESCR= ${.CURDIR}/pkg-descr-canna full_CONFLICTS_INSTALL= emacs-canna emacs-nox emacs-wayland nox_PKGNAMESUFFIX= -nox nox_CONFLICTS_INSTALL= emacs emacs-canna emacs-wayland wayland_PKGNAMESUFFIX= -wayland wayland_CONFLICTS_INSTALL= emacs emacs-canna emacs-nox USES= cpe gmake localbase:ldflags ncurses pkgconfig tar:xz CPE_VENDOR= gnu GNU_CONFIGURE= yes -GNU_CONFIGURE_MANPREFIX=${PREFIX}/share CONFIGURE_ARGS= --disable-build-details \ --localstatedir=/var \ --without-gconf \ --without-libsystemd \ --without-selinux .if ${FLAVOR:U} == canna CONFIGURE_ARGS+= --with-canna .elif ${FLAVOR:U} == nox CONFIGURE_ARGS+= --with-sound=no \ --with-x-toolkit=no \ --without-cairo \ --without-dbus \ --without-gconf \ --without-gif \ --without-gsettings \ --without-imagemagick \ --without-jpeg \ --without-lcms2 \ --without-libotf \ --without-m17n-flt \ --without-pgtk \ --without-png \ --without-rsvg \ --without-tiff \ --without-toolkit-scroll-bars \ --without-webp \ --without-x \ --without-xim \ --without-xpm \ --without-xwidgets .elif ${FLAVOR:U} == wayland CONFIGURE_ARGS+= --without-x .else CONFIGURE_ARGS+= --with-x .endif # See r468320 to determine if/when the next line can be removed CONFIGURE_ENV= ac_cv_header_sys_sysinfo_h=no CONFLICTS_INSTALL= emacs-devel emacs-devel-nox BINARY_ALIAS= makeinfo=true SUB_FILES= sources.el -SUB_LIST= EMACS_VER=${DISTVERSION} +SUB_LIST= EMACS_VER=${DISTVERSION} \ + NATIVECOMP_COMMENT_END=${NATIVECOMP_COMMENT_END} \ + NATIVECOMP_COMMENT_START=${NATIVECOMP_COMMENT_START} INFO= auth autotype bovine calc ccmode cl dbus dired-x ebrowse ede \ ediff edt efaq eglot eieio eintr elisp emacs emacs-gnutls \ emacs-mime epa erc ert eshell eudc eww flymake forms gnus \ htmlfontify idlwave ido info mairix-el message mh-e \ modus-themes newsticker nxml-mode octave-mode org pcl-cvs pgg \ rcirc reftex remember sasl sc semantic ses sieve smtpmail \ speedbar srecode todo-mode tramp transient url use-package \ vhdl-mode vip viper vtable widget wisent woman INFO_PATH= ${DATADIR_REL}/info .if ${FLAVOR:U} == canna PLIST_FILES+= ${DATADIR}/${DISTVERSION}/lisp/canna.el.gz \ ${DATADIR}/${DISTVERSION}/lisp/canna.elc \ ${DATADIR}/${DISTVERSION}/lisp/isearch-ext.el.gz \ ${DATADIR}/${DISTVERSION}/lisp/isearch-ext.elc .endif PLIST_SUB= EMACS_VER=${DISTVERSION} \ GNU_HOST=${CONFIGURE_TARGET} -OPTIONS_DEFINE= ACL DBUS GNUTLS GSETTINGS HARFBUZZ JSON LCMS2 \ - M17N MAILUTILS MODULES NATIVECOMP OTF PGTK \ +OPTIONS_DEFINE= ACL DBUS GNUTLS GSETTINGS HARFBUZZ LCMS2 M17N \ + MAILUTILS MODULES NATIVECOMP OTF PGTK \ SCROLLBARS SOURCES SQLITE3 THREADS TREESITTER \ XFT XIM XML XWIDGETS OPTIONS_DEFAULT= ACL CAIRO DBUS GIF GNUTLS GSETTINGS GTK3 \ - HARFBUZZ JPEG JSON KQUEUE LCMS2 MAILUTILS \ - MODULES OSS PNG SCROLLBARS SOURCES SQLITE3 SVG \ - THREADS TIFF TREESITTER WEBP XIM XML XPM + HARFBUZZ JPEG KQUEUE LCMS2 MAILUTILS MODULES \ + NATIVECOMP OSS PNG SCROLLBARS SOURCES SQLITE3 \ + SVG THREADS TIFF TREESITTER WEBP XIM XML XPM OPTIONS_GROUP= GRAPHICS OPTIONS_GROUP_GRAPHICS= CAIRO GIF JPEG MAGICK PNG SVG TIFF WEBP XPM OPTIONS_RADIO= FILENOTIFY SOUND X11TOOLKIT OPTIONS_RADIO_FILENOTIFY= GFILE KQUEUE OPTIONS_RADIO_SOUND= ALSA OSS OPTIONS_RADIO_X11TOOLKIT= GTK2 GTK3 MOTIF XAW XAW3D .if ${FLAVOR:U} == wayland OPTIONS_EXCLUDE+= GTK2 MOTIF XAW XAW3D XIM ${PGTK_PREVENTS} \ ${PGTK_IMPLIES:@i@${${i}_PREVENTS}@} OPTIONS_SLAVE+= PGTK ${PGTK_IMPLIES} \ ${PGTK_IMPLIES:@i@${${i}_IMPLIES}@} .elif ${FLAVOR:U} == nox OPTIONS_EXCLUDE+= ALSA CAIRO DBUS GFILE GIF GSETTINGS GTK2 GTK3 \ HARFBUZZ JPEG LCMS2 M17N MAGICK MOTIF OSS OTF \ PGTK PNG SCROLLBARS SVG TIFF WEBP XAW XAW3D XFT \ XIM XPM XWIDGETS .endif OPTIONS_SUB= YES ACL_DESC= Access control list support CAIRO_DESC= Cairo graphics library support [implies PNG, prevents XFT] FILENOTIFY_DESC= File notification support GFILE_DESC= File notification via gfile GRAPHICS_DESC= Graphics support GSETTINGS_DESC= GSettings API for application settings HARFBUZZ_DESC= HarfBuzz for text shaping KQUEUE_DESC= File notification via kqueue M17N_DESC= M17N support for text-shaping [implies XFT] MAGICK_DESC= ImageMagick image processing support (deprecated) MAILUTILS_DESC= Mail framework via GNU Mailutils MODULES_DESC= Dynamic modules support NATIVECOMP_DESC= Emacs Lisp native compiler support OTF_DESC= Opentype fonts PGTK_DESC= Pure GTK GUI [implies CAIRO, GTK3] SCROLLBARS_DESC= Toolkit scroll-bars SOURCES_DESC= Install sources SVG_DESC= Scalable vector graphics support [implies PNG] TREESITTER_DESC= tree-sitter support X11TOOLKIT_DESC= X11 toolkit XAW3D_DESC= Athena3D widgets XAW_DESC= Athena widgets XIM_DESC= X Input Method XWIDGETS_DESC= Experimental GTK widgets [implies GTK3] ACL_CONFIGURE_ENABLE= acl ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib ALSA_CONFIGURE_ON= --with-sound=alsa CAIRO_IMPLIES= PNG CAIRO_PREVENTS= XFT CAIRO_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 CAIRO_USE= GNOME=cairo CAIRO_CONFIGURE_WITH= cairo DBUS_LIB_DEPENDS= libdbus-1.so:devel/dbus DBUS_CONFIGURE_WITH= dbus GFILE_USE= GNOME=glib20 GFILE_CONFIGURE_ON= --with-file-notification=gfile GIF_LIB_DEPENDS= libgif.so:graphics/giflib GIF_CONFIGURE_WITH= gif GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls GNUTLS_CONFIGURE_WITH= gnutls GSETTINGS_USE= GNOME=glib20 GSETTINGS_CONFIGURE_WITH= gsettings GTK2_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 GTK2_USE= GNOME=cairo,gtk20 GTK2_CONFIGURE_ON= --with-x-toolkit=gtk2 GTK3_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 GTK3_USE= GNOME=cairo,gtk30 GTK3_CONFIGURE_ON= --with-x-toolkit=gtk3 HARFBUZZ_LIB_DEPENDS= libharfbuzz.so:print/harfbuzz HARFBUZZ_CONFIGURE_WITH= harfbuzz JPEG_USES= jpeg JPEG_CONFIGURE_WITH= jpeg -JSON_LIB_DEPENDS= libjansson.so:devel/jansson -JSON_CONFIGURE_WITH= json KQUEUE_CONFIGURE_ON= --with-file-notification=kqueue LCMS2_LIB_DEPENDS= liblcms2.so:graphics/lcms2 LCMS2_CONFIGURE_WITH= lcms2 #LTO_CONFIGURE_ON= --enable-link-time-optimization M17N_IMPLIES= XFT M17N_LIB_DEPENDS= libm17n.so:devel/m17n-lib M17N_CONFIGURE_WITH= m17n-flt MAGICK_USES= magick:7 MAGICK_CONFIGURE_WITH= imagemagick -MAILUTILS_LIB_DEPENDS= libmailutils.so:mail/mailutils +MAILUTILS_RUN_DEPENDS= mailutils:mail/mailutils MAILUTILS_CONFIGURE_WITH= mailutils MAILUTILS_CONFIGURE_ENV_OFF= ac_cv_lib_lockfile_maillock=no \ ac_cv_prog_liblockfile=no MODULES_CONFIGURE_WITH= modules MOTIF_USES= motif MOTIF_CONFIGURE_ON= --with-x-toolkit=motif NATIVECOMP_USE= GCC=yes NATIVECOMP_CONFIGURE_WITH= native-compilation=aot OSS_CONFIGURE_ON= --with-sound=oss OTF_LIB_DEPENDS= libotf.so:print/libotf OTF_CONFIGURE_WITH= libotf PGTK_IMPLIES= CAIRO GTK3 SCROLLBARS PGTK_PREVENTS= M17N XFT XPM PGTK_CATEGORIES= wayland PGTK_CONFIGURE_WITH= pgtk -PNG_LIB_DEPENDS= libpng.so:graphics/png +PNG_LIB_DEPENDS= libpng16.so:graphics/png PNG_CONFIGURE_WITH= png SCROLLBARS_CONFIGURE_WITH= toolkit-scroll-bars .if ${FLAVOR:U} == canna SOURCES_PLIST_FILES= ${DATADIR}/${DISTVERSION}/src/canna.c .endif SQLITE3_USES= sqlite:3 SQLITE3_CONFIGURE_WITH= sqlite3 SVG_IMPLIES= PNG SVG_USE= GNOME=cairo,librsvg2 SVG_CONFIGURE_WITH= rsvg THREADS_CONFIGURE_WITH= threads TIFF_LIB_DEPENDS= libtiff.so:graphics/tiff TIFF_CONFIGURE_WITH= tiff TREESITTER_IMPLIES= MODULES TREESITTER_LIB_DEPENDS= libtree-sitter.so:devel/tree-sitter TREESITTER_CONFIGURE_WITH= tree-sitter -WEBP_LIB_DEPENDS= libwebp.so:graphics/webp +WEBP_LIB_DEPENDS= libwebpdemux.so:graphics/webp WEBP_CONFIGURE_WITH= webp XAW3D_LIB_DEPENDS= libXaw3d.so:x11-toolkits/Xaw3d XAW3D_CONFIGURE_ON= --with-x-toolkit=athena XAW_USE= XORG=xaw XAW_CONFIGURE_ON= --with-x-toolkit=athena \ --without-xaw3d XFT_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 XFT_USE= XORG=xft,xrender XFT_CONFIGURE_WITH= xft XIM_CONFIGURE_WITH= xim # keep XML_USES=gnome, because nox flavor does not have USES=gnome XML_USES= gnome XML_USE= GNOME=libxml2 XML_CONFIGURE_WITH= xml2 XPM_USE= XORG=xpm XPM_CONFIGURE_WITH= xpm XWIDGETS_IMPLIES= GTK3 XWIDGETS_LIB_DEPENDS= libsoup-2.4.so:devel/libsoup \ libwebkit2gtk-4.0.so:www/webkit2-gtk3 XWIDGETS_USE= XORG=xcomposite XWIDGETS_CONFIGURE_WITH= xwidgets .include -.if ${ARCH:Mpowerpc64*} -USE_GCC= yes +.if ${PORT_OPTIONS:MNATIVECOMP} +NATIVECOMP_COMMENT_END= +NATIVECOMP_COMMENT_START= +.else +NATIVECOMP_COMMENT_END= '*/' +NATIVECOMP_COMMENT_START= '/*' .endif .if ${FLAVOR:U} != nox USES+= desktop-file-utils gnome .if !${PORT_OPTIONS:MPGTK} USES+= xorg USE_XORG+= ice sm x11 xcb xcomposite xext xfixes xi xinerama xmu xrandr \ xrender xt .endif .endif .if !${PORT_OPTIONS:MGTK2} && !${PORT_OPTIONS:MGTK3} && !${PORT_OPTIONS:MMOTIF} && \ !${PORT_OPTIONS:MXAW} && !${PORT_OPTIONS:MXAW3D} CONFIGURE_ARGS+= --with-x-toolkit=no .endif # Schema generation is dependent on both PGTK, and GSETTINGS options # as per https://git.savannah.gnu.org/cgit/emacs.git/commit/?id=183936ee8e5 .if ${PORT_OPTIONS:MGSETTINGS} && ${PORT_OPTIONS:MPGTK} GLIB_SCHEMAS+= org.gnu.emacs.defaults.gschema.xml .endif .if ${FLAVOR} == nox # With a desktop entry stage-qa will give a warning about requiring # desktop-file-utils and portlint -C will give a warning about INSTALLS_ICONS, # but don't pull in those dependencies with the nox flavor. post-patch: @${REINPLACE_CMD} -e 's/^Terminal=.*$$/Terminal=true/' ${WRKSRC}/etc/emacs.desktop .endif post-install: @${RM} -r ${STAGEDIR}${PREFIX}/lib/systemd @(cd ${STAGEDIR}${PREFIX} && ${FIND} libexec/emacs/${DISTVERSION}/${CONFIGURE_TARGET}/ -name emacs-*.pdmp >> ${TMPPLIST}) post-install-MAILUTILS-on: ${LN} -sf ${PREFIX}/bin/movemail \ ${STAGEDIR}${PREFIX}/libexec/emacs/${DISTVERSION}/${CONFIGURE_TARGET} # Natively compiled elisp files names include build checksum information, so add # these files to the plist after the build. post-install-NATIVECOMP-on: @(cd ${WRKSRC} && ${FIND} native-lisp -type f | ${SED} -e 's,^,lib/emacs/${DISTVERSION}/,') >> ${TMPPLIST} @${FIND} ${STAGEDIR}${PREFIX}/lib/emacs/${DISTVERSION}/native-lisp/ -name '*.eln*' -exec ${STRIP_CMD} {} + post-install-SOURCES-on: @${MKDIR} ${STAGEDIR}${DATADIR}/${DISTVERSION}/src ${INSTALL_DATA} ${WRKSRC}/src/*.[ch] ${STAGEDIR}${DATADIR}/${DISTVERSION}/src ${INSTALL_DATA} ${WRKDIR}/sources.el ${STAGEDIR}${DATADIR}/${DISTVERSION}/site-lisp/site-start.el .include diff --git a/editors/emacs/distinfo b/editors/emacs/distinfo index 5830c821414f..6928533ab5ca 100644 --- a/editors/emacs/distinfo +++ b/editors/emacs/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1719179787 -SHA256 (emacs-29.4.tar.xz) = ba897946f94c36600a7e7bb3501d27aa4112d791bfe1445c61ed28550daca235 -SIZE (emacs-29.4.tar.xz) = 52210344 -SHA256 (emacs29.1-canna-20230730.diff.xz) = 03741d173d86823409e42906f47cbd3c924cf88ec25cc3e228c4827a96243125 -SIZE (emacs29.1-canna-20230730.diff.xz) = 26852 +TIMESTAMP = 1740416719 +SHA256 (emacs-30.1.tar.xz) = 6ccac1ae76e6af93c6de1df175e8eb406767c23da3dd2a16aa67e3124a6f138f +SIZE (emacs-30.1.tar.xz) = 54978160 +SHA256 (emacs30.1-canna-20250224.diff.gz) = b93296ae41037e6457317fd1113f8c3f659f32d4310c28a6a5bf633f6fcd31e5 +SIZE (emacs30.1-canna-20250224.diff.gz) = 30488 diff --git a/editors/emacs/files/patch-tty-rgb b/editors/emacs/files/patch-tty-rgb deleted file mode 100644 index 812edf247b57..000000000000 --- a/editors/emacs/files/patch-tty-rgb +++ /dev/null @@ -1,34 +0,0 @@ -Add RGB fallback if environment has COLORTERM=truecolor -https://github.com/emacs-mirror/emacs/commit/50f489b5dc59 - ---- doc/misc/efaq.texi.orig 2019-01-07 14:26:06 UTC -+++ doc/misc/efaq.texi -@@ -1603,6 +1603,10 @@ Currently there's no standard way to determine whether - supports direct color mode. If such standard arises later on, support - for @samp{setb24} and @samp{setf24} may be removed. - -+If Terminfo database is not available, but 24-bit direct color mode is -+supported, it can still be enabled by defining the environment -+variable @env{COLORTERM} to @samp{truecolor}. -+ - @node Debugging a customization file - @section How do I debug a @file{.emacs} file? - @cindex Debugging @file{.emacs} file ---- src/term.c.orig 2019-01-07 14:26:07 UTC -+++ src/term.c -@@ -4157,6 +4157,15 @@ use the Bourne shell command 'TERM=...; export TERM' ( - tty->TS_set_background = bg; - tty->TN_max_colors = 16777216; - } -+ /* Fall back to xterm+direct (semicolon version) if requested -+ by the COLORTERM environment variable. */ -+ else if ((bg = getenv("COLORTERM")) != NULL -+ && strcasecmp(bg, "truecolor") == 0) -+ { -+ tty->TS_set_foreground = "\033[%?%p1%{8}%<%t3%p1%d%e38;2;%p1%{65536}%/%d;%p1%{256}%/%{255}%&%d;%p1%{255}%&%d%;m"; -+ tty->TS_set_background = "\033[%?%p1%{8}%<%t4%p1%d%e48;2;%p1%{65536}%/%d;%p1%{256}%/%{255}%&%d;%p1%{255}%&%d%;m"; -+ tty->TN_max_colors = 16777216; -+ } - } - #endif - diff --git a/editors/emacs/files/pkg-message.in b/editors/emacs/files/pkg-message.in new file mode 100644 index 000000000000..7d67c2378a22 --- /dev/null +++ b/editors/emacs/files/pkg-message.in @@ -0,0 +1,75 @@ +[ +%%NATIVECOMP_COMMENT_START%% +{ type: install + message: <