Page MenuHomeFreeBSD
Files F168004612

D15728.id43533.diff
No OneTemporary
Actions

D15728.id43533.diff
View Options

Index: UPDATING
===================================================================
--- UPDATING
+++ UPDATING
@@ -451,7 +451,7 @@
# pkg install emacs-canna
# pkg install emacs-nox
# pkg install emacs-devel
- # pkg install emacs-devel_nox
+ # pkg install emacs-devel-nox
For those building their own packages, a flavor other than the default must be
specified. For example, to build the nox flavor of editors/emacs, or to build
Index: editors/emacs-devel/Makefile
===================================================================
--- editors/emacs-devel/Makefile
+++ editors/emacs-devel/Makefile
@@ -9,29 +9,48 @@
MAINTAINER= emacs@FreeBSD.org
COMMENT= GNU editing macros
+.if ${FLAVOR:U} == nox
+COMMENT+= (No X flavor)
+.endif
LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/COPYING
-CONFLICTS_INSTALL= emacs emacs-canna emacs-nox
-
FLAVORS= full nox
-full_CONFLICTS_INSTALL= emacs-devel_nox
-full_PKGNAMESUFFIX= -devel
+full_CONFLICTS_INSTALL= emacs-devel-nox
nox_CONFLICTS_INSTALL= emacs-devel
-nox_PKGNAMESUFFIX= -devel_nox
+nox_PKGNAMESUFFIX= -devel-nox
USES= autoreconf:build cpe gmake localbase:ldflags makeinfo ncurses \
pkgconfig
+.if ${FLAVOR:U} != nox
+USES+= desktop-file-utils
+USE_XORG= ice sm x11 xcb xext xfixes xinerama xmu xrandr xt
+.endif
CPE_VENDOR= gnu
USE_GITHUB= yes
GH_ACCOUNT= emacs-mirror
-GH_TAGNAME= 0f48d18
+GH_TAGNAME= 66ad986
+CONFIGURE_ARGS= --disable-build-details \
+ --localstatedir=/var \
+ --with-gameuser=games:games
+.if ${FLAVOR:U} == nox
+CONFIGURE_ARGS+= --with-sound=no --without-cairo --without-dbus \
+ --without-gconf --without-gif --without-gsettings \
+ --with-x-toolkit=no --without-jpeg --without-lcms2 \
+ --without-m17n-flt --without-imagemagick \
+ --without-libotf --without-png \
+ --without-toolkit-scroll-bars --without-rsvg \
+ --without-tiff --without-x --without-xim --without-xpm \
+ --without-xwidgets
+.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 emacs-canna emacs-nox
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --with-gameuser=games:games
-CONFIGURE_ENV= ac_cv_header_sys_sysinfo_h=no \
- ac_cv_prog_liblockfile=no
INFO= ada-mode auth autotype bovine calc ccmode cl dbus dired-x \
ebrowse ede ediff edt efaq eieio eintr elisp emacs emacs-gnutls \
emacs-mime epa erc ert eshell eudc eww flymake forms gnus \
@@ -40,16 +59,18 @@
sasl sc semantic ses sieve smtpmail speedbar srecode todo-mode \
tramp url vhdl-mode vip viper widget wisent woman
INFO_PATH= ${DATADIR_REL}/info
+.if ${FLAVOR:U} != nox
+INSTALLS_ICONS= yes
+.endif
PLIST_SUB= EMACS_VER=${EMACS_VER} GNU_HOST=${CONFIGURE_TARGET}
SUB_FILES= sources.el
-SUB_LIST= EMACS_VER=${EMACS_VER}
+SUB_LIST= EMACS_VER=${EMACS_VER} # sources.el
-OPTIONS_DEFINE= ACL DBUS GCONF GNUTLS GSETTINGS JSON LCMS2 LLDB M17N MAILUTILS \
+OPTIONS_DEFINE= ACL DBUS GCONF GNUTLS GSETTINGS JSON LCMS2 M17N MAILUTILS \
MODULES OTF SCROLLBARS SOURCES THREADS XFT XIM XML XWIDGETS
-OPTIONS_DEFAULT= ACL DBUS FREEDESKTOP GCONF GIF GNUTLS GSETTINGS GTK3 \
- JPEG JSON KQUEUE LCMS2 M17N MAGICK MODULES OSS OTF PNG \
+OPTIONS_DEFAULT= ACL DBUS GCONF GIF GNUTLS GSETTINGS GTK3 JPEG JSON \
+ KQUEUE LCMS2 M17N MAGICK MAILUTILS MODULES OSS OTF PNG \
SCROLLBARS SOURCES SVG THREADS TIFF XFT XIM XML XPM
-OPTIONS_SUB= YES
OPTIONS_GROUP= GRAPHICS
OPTIONS_GROUP_GRAPHICS= CAIRO GIF JPEG MAGICK PNG SVG TIFF XPM
OPTIONS_RADIO= FILENOTIFY SOUND X11TOOLKIT
@@ -57,30 +78,34 @@
OPTIONS_RADIO_SOUND= ALSA OSS
OPTIONS_RADIO_X11TOOLKIT= GTK2 GTK3 MOTIF XAW XAW3D
+.if ${FLAVOR:U} == nox
+OPTIONS_EXCLUDE= ALSA CAIRO DBUS GCONF GFILE GIF GSETTINGS GTK2 GTK3 \
+ JPEG LCMS2 M17N MAGICK MOTIF OSS OTF PNG SCROLLBARS SVG \
+ TIFF XAW XAW3D XFT XIM XPM XWIDGETS
+.endif
+OPTIONS_SUB= YES
+
ACL_DESC= Access control list support
-CAIRO_DESC= Experimental Cairo support (implies PNG, XFT)
+CAIRO_DESC= Experimental Cairo library support (implies PNG, XFT)
FILENOTIFY_DESC= File notification support
-GCONF_DESC= GConf configuration support
GFILE_DESC= File notification via gfile
GRAPHICS_DESC= Graphics support
-GSETTINGS_DESC= GSettings support (implies DBUS)
+GSETTINGS_DESC= GSettings API for application settings
KQUEUE_DESC= File notification via kqueue
-LLDB_DESC= Enable LLDB support for GUD
#LTO_DESC= Enable link-time optimization
-MAGICK_DESC= ImageMagick support
M17N_DESC= M17N support for text-shaping (implies XFT)
+MAGICK_DESC= ImageMagick image processing support
MAILUTILS_DESC= Mail framework via GNU Mailutils
MODULES_DESC= Dynamic modules support
-OTF_DESC= Opentype fonts support (implies XFT)
-SCROLLBARS_DESC=Toolkit scroll-bars
+OTF_DESC= Opentype fonts (implies XFT)
+SCROLLBARS_DESC= Toolkit scroll-bars
SOURCES_DESC= Install sources
-SVG_DESC= SVG support (implies PNG)
-THREADS_DESC= Emacs Lisp threading support
-X11TOOLKIT_DESC=X11 toolkit
+SVG_DESC= Scalable vector graphics support (implies PNG)
+X11TOOLKIT_DESC= X11 toolkit
XAW3D_DESC= Athena3D widgets
XAW_DESC= Athena widgets
-XIM_DESC= X Input Method Support
-XWIDGETS_DESC= GTK widgets in Emacs buffers (requires GTK3)
+XIM_DESC= X Input Method
+XWIDGETS_DESC= Experimental GTK widgets (requires GTK3)
ACL_CONFIGURE_ENABLE= acl
ALSA_CONFIGURE_ON= --with-sound=alsa
@@ -93,6 +118,7 @@
GCONF_USE= GNOME=gconf2
GCONF_CONFIGURE_WITH= gconf
GFILE_CONFIGURE_ON= --with-file-notification=gfile
+GFILE_USE= GNOME=glib20
GIF_LIB_DEPENDS= libgif.so:graphics/giflib
GIF_CONFIGURE_WITH= gif
GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls
@@ -101,12 +127,10 @@
GSETTINGS_CONFIGURE_WITH= gsettings
GSETTINGS_IMPLIES= DBUS
GTK2_USE= GNOME=cairo,gtk20
-GTK2_USES= gettext
GTK2_CONFIGURE_ON= --with-x-toolkit=gtk2
GTK2_LIB_DEPENDS= libfreetype.so:print/freetype2 \
libfontconfig.so:x11-fonts/fontconfig
GTK3_USE= GNOME=cairo,gtk30
-GTK3_USES= gettext
GTK3_CONFIGURE_ON= --with-x-toolkit=gtk3
JPEG_USES= jpeg
JPEG_CONFIGURE_WITH= jpeg
@@ -115,7 +139,6 @@
KQUEUE_CONFIGURE_ON= --with-file-notification=kqueue
LCMS2_CONFIGURE_WITH= lcms2
LCMS2_LIB_DEPENDS= liblcms2.so:graphics/lcms2
-LLDB_EXTRA_PATCHES= ${PATCHDIR}/extrapatch-lldb-gud.el
#LTO_CONFIGURE_ON= --enable-link-time-optimization
M17N_LIB_DEPENDS= libm17n.so:devel/m17n-lib
M17N_CONFIGURE_WITH= m17n-flt
@@ -123,6 +146,7 @@
MAGICK_LIB_DEPENDS= libMagickCore-6.so:graphics/ImageMagick
MAGICK_CONFIGURE_WITH= imagemagick
MAILUTILS_CONFIGURE_WITH= mailutils
+MAILUTILS_CONFIGURE_ENV_OFF= ac_cv_prog_liblockfile=no ac_cv_lib_lockfile_maillock=no
MAILUTILS_LIB_DEPENDS= libmailutils.so:mail/mailutils
MODULES_CONFIGURE_WITH= modules
MOTIF_USES= motif
@@ -138,7 +162,6 @@
SVG_USE= GNOME=cairo,librsvg2
SVG_CONFIGURE_WITH= rsvg
SVG_IMPLIES= PNG
-SVG_USES= gettext
THREADS_CONFIGURE_WITH= threads
TIFF_LIB_DEPENDS= libtiff.so:graphics/tiff
TIFF_CONFIGURE_WITH= tiff
@@ -157,30 +180,12 @@
XPM_CONFIGURE_WITH= xpm
XWIDGETS_USE= XORG=xcomposite
XWIDGETS_CONFIGURE_WITH= xwidgets
-XWIDGETS_LIB_DEPENDS= libwebkit2gtk-4.0.so:www/webkit2-gtk3
+XWIDGETS_LIB_DEPENDS= libwebkit2gtk-4.0.so:www/webkit2-gtk3 \
+ libsoup-2.4.so:devel/libsoup
XWIDGETS_IMPLIES= GTK3
-.if ${FLAVOR:U} == nox
-CONFIGURE_ARGS+= --with-sound=no --without-cairo --without-dbus \
- --without-gconf --without-gif --without-gsettings \
- --with-x-toolkit=no --without-jpeg --without-lcms2 \
- --without-m17n-flt --without-imagemagick \
- --without-libotf --without-png \
- --without-toolkit-scroll-bars --without-rsvg \
- --without-tiff --without-xim --without-xpm \
- --without-xwidgets
-OPTIONS_EXCLUDE= ALSA CAIRO DBUS GCONF GIF GSETTINGS GTK2 GTK3 JPEG \
- LCMS2 M17N MAGICK MOTIF OSS OTF PNG SCROLLBARS SVG TIFF \
- XAW XAW3D XFT XIM XPM XWIDGETS
-.else
-CONFIGURE_ARGS+= --with-x
-INSTALLS_ICONS= yes
-USE_XORG= ice sm x11 xcb xext xfixes xinerama xmu xrandr xt
-USES+= desktop-file-utils
-.endif
-
EMACS_VER= 27.0.50
-EMACS_REV= 20180529
+EMACS_REV= 20180607
.include <bsd.port.options.mk>
@@ -189,20 +194,32 @@
USES+= compiler:openmp
.endif
+.if !${PORT_OPTIONS:MGTK2} && !${PORT_OPTIONS:MGTK3} && !${PORT_OPTIONS:MMOTIF} \
+ && !${PORT_OPTIONS:MXAW} && !${PORT_OPTIONS:MXAW3D}
+CONFIGURE_ARGS+= --with-x-toolkit=no
+.endif
+
pre-configure:
@(cd ${WRKSRC} && ./autogen.sh all)
+.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 INSTALL_ICONS,
+# desktop-file-utils and portlint -C will give a warning about INSTALLS_ICONS,
# but don't pull in those dependencies with the nox flavor.
-.if ${FLAVOR} == nox
post-patch:
@${REINPLACE_CMD} -e 's/^Terminal=.*$$/Terminal=true/' ${WRKSRC}/etc/emacs.desktop
.endif
+post-install-MAILUTILS-on:
+ ${LN} -sf ${PREFIX}/bin/movemail \
+ ${STAGEDIR}${PREFIX}/libexec/emacs/${EMACS_VER}/${CONFIGURE_TARGET}
+
post-install-SOURCES-on:
@${MKDIR} ${STAGEDIR}${DATADIR}/${EMACS_VER}/src
${INSTALL_DATA} ${WRKSRC}/src/*.[ch] ${STAGEDIR}${DATADIR}/${EMACS_VER}/src
${INSTALL_DATA} ${WRKDIR}/sources.el ${STAGEDIR}${DATADIR}/${EMACS_VER}/site-lisp/site-start.el
+post-install:
+ @${RM} -r ${STAGEDIR}${PREFIX}/lib/systemd
+
.include <bsd.port.mk>
Index: editors/emacs-devel/distinfo
===================================================================
--- editors/emacs-devel/distinfo
+++ editors/emacs-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1527567403
-SHA256 (emacs-mirror-emacs-27.0.50.20180529-0f48d18_GH0.tar.gz) = 10c62f3adb7a6ca4f141eb5e0ea120b72c3b39d4e504437c4491b5fda62494e1
-SIZE (emacs-mirror-emacs-27.0.50.20180529-0f48d18_GH0.tar.gz) = 40076407
+TIMESTAMP = 1528574666
+SHA256 (emacs-mirror-emacs-27.0.50.20180607-66ad986_GH0.tar.gz) = d3428532d521e6fecf2dd895bd804d60a668722232d09b6fe3b9d8c963432a61
+SIZE (emacs-mirror-emacs-27.0.50.20180607-66ad986_GH0.tar.gz) = 40097057
Index: editors/emacs-devel/files/extrapatch-lldb-gud.el
===================================================================
--- editors/emacs-devel/files/extrapatch-lldb-gud.el
+++ /dev/null
@@ -1,290 +0,0 @@
-This diff is a slightly modified version of the one from
-http://lists.gnu.org/archive/html/emacs-devel/2015-02/msg00274.html
-
-It traces its origin back to https://gitorious.org/lldb/lldb/commit/40e4dbf
-
-It's also present on Apple's OS site:
-
-http://www.opensource.apple.com/source/lldb/lldb-76/utils/emacs/
-
---- lisp/progmodes/gud.el.orig 2017-03-23 15:07:51 UTC
-+++ lisp/progmodes/gud.el
-@@ -35,7 +35,7 @@
- ;; kluge with the gud-xdb-directories hack producing gud-dbx-directories.
- ;; Derek L. Davies <ddavies@world.std.com> added support for jdb (Java
- ;; debugger.) Jan Nieuwenhuizen added support for the Guile REPL (Guile
--;; debugger).
-+;; debugger). llvm.org added support for lldb.
-
- ;;; Code:
-
-@@ -56,7 +56,7 @@
-
- (defgroup gud nil
- "The \"Grand Unified Debugger\" interface.
--Supported debuggers include gdb, sdb, dbx, xdb, perldb,
-+Supported debuggers include lldb, gdb, sdb, dbx, xdb, perldb,
- pdb (Python), and jdb."
- :group 'processes
- :group 'tools)
-@@ -141,12 +141,12 @@ Used to gray out relevant toolbar icons.
- (display-graphic-p)
- (fboundp 'x-show-tip))
- :visible (memq gud-minor-mode
-- '(gdbmi guiler dbx sdb xdb pdb))
-+ '(lldb gdbmi guiler dbx sdb xdb pdb))
- :button (:toggle . gud-tooltip-mode))
- ([refresh] "Refresh" . gud-refresh)
- ([run] menu-item "Run" gud-run
- :enable (not gud-running)
-- :visible (or (memq gud-minor-mode '(gdb dbx jdb))
-+ :visible (or (memq gud-minor-mode '(lldb gdb dbx jdb))
- (and (eq gud-minor-mode 'gdbmi)
- (or (not (gdb-show-run-p))
- (bound-and-true-p
-@@ -168,18 +168,18 @@ Used to gray out relevant toolbar icons.
- ([tbreak] menu-item "Temporary Breakpoint" gud-tbreak
- :enable (not gud-running)
- :visible (memq gud-minor-mode
-- '(gdbmi gdb sdb xdb)))
-+ '(lldb gdbmi gdb sdb xdb)))
- ([break] menu-item "Set Breakpoint" gud-break
- :enable (not gud-running)
- :visible (gud-tool-bar-item-visible-no-fringe))
- ([up] menu-item "Up Stack" gud-up
- :enable (not gud-running)
- :visible (memq gud-minor-mode
-- '(gdbmi gdb guiler dbx xdb jdb pdb)))
-+ '(lldb gdbmi gdb guiler dbx xdb jdb pdb)))
- ([down] menu-item "Down Stack" gud-down
- :enable (not gud-running)
- :visible (memq gud-minor-mode
-- '(gdbmi gdb guiler dbx xdb jdb pdb)))
-+ '(lldb gdbmi gdb guiler dbx xdb jdb pdb)))
- ([pp] menu-item "Print S-expression" gud-pp
- :enable (and (not gud-running)
- (bound-and-true-p gdb-active-process))
-@@ -191,7 +191,7 @@ Used to gray out relevant toolbar icons.
- "Dump object"
- "Print Dereference") gud-pstar
- :enable (not gud-running)
-- :visible (memq gud-minor-mode '(gdbmi gdb jdb)))
-+ :visible (memq gud-minor-mode '(lldb gdbmi gdb jdb)))
- ([print] menu-item "Print Expression" gud-print
- :enable (not gud-running))
- ([watch] menu-item "Watch Expression" gud-watch
-@@ -200,13 +200,13 @@ Used to gray out relevant toolbar icons.
- ([finish] menu-item "Finish Function" gud-finish
- :enable (not gud-running)
- :visible (memq gud-minor-mode
-- '(gdbmi gdb guiler xdb jdb pdb)))
-+ '(lldb gdbmi gdb guiler xdb jdb pdb)))
- ([stepi] menu-item "Step Instruction" gud-stepi
- :enable (not gud-running)
-- :visible (memq gud-minor-mode '(gdbmi gdb dbx)))
-+ :visible (memq gud-minor-mode '(lldb gdbmi gdb dbx)))
- ([nexti] menu-item "Next Instruction" gud-nexti
- :enable (not gud-running)
-- :visible (memq gud-minor-mode '(gdbmi gdb dbx)))
-+ :visible (memq gud-minor-mode '(lldb gdbmi gdb dbx)))
- ([step] menu-item "Step Line" gud-step
- :enable (not gud-running))
- ([next] menu-item "Next Line" gud-next
-@@ -241,7 +241,7 @@ Used to gray out relevant toolbar icons.
- :visible (not (eq gud-minor-mode 'gdbmi)))
- ([menu-bar run] menu-item
- ,(propertize "run" 'face 'font-lock-doc-face) gud-run
-- :visible (memq gud-minor-mode '(gdbmi gdb dbx jdb)))
-+ :visible (memq gud-minor-mode '(lldb gdbmi gdb dbx jdb)))
- ([menu-bar go] menu-item
- ,(propertize " go " 'face 'font-lock-doc-face) gud-go
- :visible (and (eq gud-minor-mode 'gdbmi)
-@@ -360,6 +360,7 @@ are interpreted specially if present. T
- %l -- Number of current source line.
- %e -- Text of the C lvalue or function-call expression surrounding point.
- %a -- Text of the hexadecimal address surrounding point.
-+ %b -- Text of the most recently created breakpoint id.
- %p -- Prefix argument to the command (if any) as a number.
- %c -- Fully qualified class name derived from the expression
- surrounding point (jdb only).
-@@ -974,6 +975,131 @@ SKIP is the number of chars to skip on e
-
-
- ;; ======================================================================
-+;; lldb functions
-+
-+;; History of argument lists passed to lldb.
-+(defvar gud-lldb-history nil)
-+
-+;; Keeps track of breakpoint created. In the following case, the id is "1".
-+;; It is used to implement temporary breakpoint.
-+;; (lldb) b main.c:39
-+;; breakpoint set --file 'main.c' --line 39
-+;; Breakpoint created: 1: file ='main.c', line = 39, locations = 1
-+(defvar gud-breakpoint-id nil)
-+
-+(defun lldb-extract-breakpoint-id (string)
-+ ;; Search for "Breakpoint created: \\([^:\n]*\\):" pattern.
-+ (if (string-match "Breakpoint created: \\([^:\n]*\\):" string)
-+ (progn
-+ (setq gud-breakpoint-id (match-string 1 string))
-+ (message "breakpoint id: %s" gud-breakpoint-id)))
-+)
-+
-+(defun gud-lldb-marker-filter (string)
-+ (setq gud-marker-acc
-+ (if gud-marker-acc (concat gud-marker-acc string) string))
-+ (lldb-extract-breakpoint-id gud-marker-acc)
-+ (let (start)
-+ ;; Process all complete markers in this chunk
-+ (while (or
-+ ;; (lldb) r
-+ ;; Process 15408 launched: '/Volumes/data/lldb/svn/trunk/test/conditional_break/a.out' (x86_64)
-+ ;; (lldb) Process 15408 stopped
-+ ;; * thread #1: tid = 0x2e03, 0x0000000100000de8 a.out`c + 7 at main.c:39, stop reason = breakpoint 1.1, queue = com.apple.main-thread
-+ (string-match " at \\([^:\n]*\\):\\([0-9]*\\), stop reason = .*\n"
-+ gud-marker-acc start)
-+ ;; (lldb) frame select -r 1
-+ ;; frame #1: 0x0000000100000e09 a.out`main + 25 at main.c:44
-+ (string-match "\nframe.* at \\([^:\n]*\\):\\([0-9]*\\)\n"
-+ gud-marker-acc start))
-+ (setq gud-last-frame
-+ (cons (match-string 1 gud-marker-acc)
-+ (string-to-number (match-string 2 gud-marker-acc)))
-+ start (match-end 0)))
-+
-+ ;; Search for the last incomplete line in this chunk
-+ (while (string-match "\n" gud-marker-acc start)
-+ (setq start (match-end 0)))
-+
-+ ;; If we have an incomplete line, store it in gud-marker-acc.
-+ (setq gud-marker-acc (substring gud-marker-acc (or start 0))))
-+ string)
-+
-+;; Keeps track of whether the Python lldb_oneshot_break function definition has
-+;; been exec'ed.
-+(defvar lldb-oneshot-break-defined nil)
-+
-+;;;###autoload
-+(defun lldb (command-line)
-+ "Run lldb on program FILE in buffer *gud-FILE*.
-+The directory containing FILE becomes the initial working directory
-+and source-file directory for your debugger."
-+ (interactive (list (gud-query-cmdline 'lldb)))
-+
-+ (gud-common-init command-line nil 'gud-lldb-marker-filter)
-+ (set (make-local-variable 'gud-minor-mode) 'lldb)
-+ (setq lldb-oneshot-break-defined nil)
-+
-+ (gud-def gud-listb "breakpoint list"
-+ "l" "List all breakpoints.")
-+ (gud-def gud-bt "thread backtrace"
-+ "b" "Show stack for the current thread.")
-+ (gud-def gud-bt-all "thread backtrace all"
-+ "B" "Show stacks for all the threads.")
-+
-+ (gud-def gud-break "breakpoint set -f %f -l %l"
-+ "\C-b" "Set breakpoint at current line.")
-+ (gud-def gud-tbreak
-+ (progn (gud-call "breakpoint set -f %f -l %l")
-+ (sit-for 1)
-+ (if (not lldb-oneshot-break-defined)
-+ (progn
-+ ;; The "\\n"'s are required to escape the newline chars
-+ ;; passed to the lldb process.
-+ (gud-call (concat "script exec \"def lldb_oneshot_break(frame, bp_loc):\\n"
-+ " target=frame.GetThread().GetProcess().GetTarget()\\n"
-+ " bp=bp_loc.GetBreakpoint()\\n"
-+ " print 'Deleting oneshot breakpoint:', bp\\n"
-+ " target.BreakpointDelete(bp.GetID())\""))
-+ (sit-for 1)
-+ ;; Set the flag since Python knows about the function def now.
-+ (setq lldb-oneshot-break-defined t)))
-+ (gud-call "breakpoint command add -p %b -o 'lldb_oneshot_break(frame, bp_loc)'"))
-+ "\C-t" "Set temporary breakpoint at current line.")
-+ (gud-def gud-remove "breakpoint clear -f %f -l %l"
-+ "\C-d" "Remove breakpoint at current line")
-+ (gud-def gud-step "thread step-in"
-+ "\C-s" "Step one source line with display.")
-+ (gud-def gud-stepi "thread step-inst"
-+ "\C-i" "Step one instruction with display.")
-+ (gud-def gud-next "thread step-over"
-+ "\C-n" "Step one line (skip functions).")
-+ (gud-def gud-nexti "thread step-inst-over"
-+ nil "Step one instruction (skip functions).")
-+ (gud-def gud-cont "process continue"
-+ "\C-r" "Continue with display.")
-+ (gud-def gud-finish "thread step-out"
-+ "\C-f" "Finish executing current function.")
-+ (gud-def gud-up "frame select -r %p"
-+ "<" "Up 1 stack frame.")
-+ (gud-def gud-down "frame select -r -%p"
-+ ">" "Down 1 stack frame.")
-+ (gud-def gud-print "expression -- %e"
-+ "\C-p" "Evaluate C expression at point.")
-+ (gud-def gud-pstar "expression -- *%e"
-+ nil "Evaluate C dereferenced pointer expression at point.")
-+ (gud-def gud-run "run"
-+ nil "Run the program.")
-+ (gud-def gud-stop-subjob "process kill"
-+ nil "Stop the program.")
-+
-+ (setq comint-prompt-regexp "\\(^\\|\n\\)\\*")
-+ (setq paragraph-start comint-prompt-regexp)
-+ (run-hooks 'lldb-mode-hook)
-+ )
-+
-+
-+;; ======================================================================
- ;; sdb functions
-
- ;; History of argument lists passed to sdb.
-@@ -2504,9 +2630,10 @@ gud, see `gud-mode'."
- "Major mode for interacting with an inferior debugger process.
-
- You start it up with one of the commands M-x gdb, M-x sdb, M-x dbx,
--M-x perldb, M-x xdb, or M-x jdb. Each entry point finishes by executing a
--hook; `gdb-mode-hook', `sdb-mode-hook', `dbx-mode-hook',
--`perldb-mode-hook', `xdb-mode-hook', or `jdb-mode-hook' respectively.
-+M-x perldb, M-x xdb, M-x jdb, or M-x lldb. Each entry point finishes by
-+executing a hook; `gdb-mode-hook', `sdb-mode-hook', `dbx-mode-hook',
-+`perldb-mode-hook', `xdb-mode-hook', `jdb-mode-hook', or `lldb-mode-hook'
-+respectively.
-
- After startup, the following commands are available in both the GUD
- interaction buffer and any source buffer GUD visits due to a breakpoint stop
-@@ -2536,7 +2663,7 @@ Under gdb, sdb and xdb, \\[gud-tbreak] b
- except that the breakpoint is temporary; that is, it is removed when
- execution stops on it.
-
--Under gdb, dbx, and xdb, \\[gud-up] pops up through an enclosing stack
-+Under gdb, dbx, xdb, and lldb, \\[gud-up] pops up through an enclosing stack
- frame. \\[gud-down] drops back down through one.
-
- If you are using gdb or xdb, \\[gud-finish] runs execution to the return from
-@@ -2858,7 +2985,7 @@ Obeying it means displaying in another w
- result)
- (while (and str
- (let ((case-fold-search nil))
-- (string-match "\\([^%]*\\)%\\([adefFlpc]\\)" str)))
-+ (string-match "\\([^%]*\\)%\\([abdefFlpc]\\)" str)))
- (let ((key (string-to-char (match-string 2 str)))
- subst)
- (cond
-@@ -2886,6 +3013,8 @@ Obeying it means displaying in another w
- (setq subst (gud-find-expr)))
- ((eq key ?a)
- (setq subst (gud-read-address)))
-+ ((eq key ?b)
-+ (setq subst gud-breakpoint-id))
- ((eq key ?c)
- (setq subst
- (gud-find-class
-@@ -3521,6 +3650,7 @@ With arg, dereference expr if ARG is pos
- (defun gud-tooltip-print-command (expr)
- "Return a suitable command to print the expression EXPR."
- (pcase gud-minor-mode
-+ (`lldb (concat "expression -o -- \"" expr "\""))
- (`gdbmi (concat "-data-evaluate-expression \"" expr "\""))
- (`guiler expr)
- (`dbx (concat "print " expr))
Index: editors/emacs-devel/files/patch-configure.ac
===================================================================
--- editors/emacs-devel/files/patch-configure.ac
+++ /dev/null
@@ -1,12 +0,0 @@
---- configure.ac.orig 2017-09-03 12:54:18 UTC
-+++ configure.ac
-@@ -1251,7 +1251,8 @@ AC_SUBST([PAXCTL_notdumped])
- ## Require makeinfo >= 4.13 (last of the 4.x series) to build the manuals.
- if test "${MAKEINFO:=makeinfo}" != "no"; then
- case `($MAKEINFO --version) 2>/dev/null` in
-- *' (GNU texinfo) '4.1[[3-9]]* | \
-+ *' (GNU texinfo) '4.[[8-9]]* | \
-+ *' (GNU texinfo) '4.1[[0-9]]* | \
- *' (GNU texinfo) '[[5-9]]* | \
- *' (GNU texinfo) '[[1-9][0-9]]* ) ;;
- *) MAKEINFO=no;;
Index: editors/emacs-devel/pkg-plist
===================================================================
--- editors/emacs-devel/pkg-plist
+++ editors/emacs-devel/pkg-plist
@@ -4,9 +4,8 @@
bin/emacs-%%EMACS_VER%%
bin/emacsclient
bin/etags
-%%DBUS%%lib/systemd/user/emacs.service
libexec/emacs/%%EMACS_VER%%/%%GNU_HOST%%/hexl
-%%NO_MAILUTILS%%libexec/emacs/%%EMACS_VER%%/%%GNU_HOST%%/movemail
+libexec/emacs/%%EMACS_VER%%/%%GNU_HOST%%/movemail
libexec/emacs/%%EMACS_VER%%/%%GNU_HOST%%/profile
libexec/emacs/%%EMACS_VER%%/%%GNU_HOST%%/rcs2log
@(games,games,4555) libexec/emacs/%%EMACS_VER%%/%%GNU_HOST%%/update-game-score
@@ -3352,6 +3351,8 @@
%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/executable.elc
%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/f90.el.gz
%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/f90.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/flymake-cc.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/flymake-cc.elc
%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/flymake-proc.el.gz
%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/flymake-proc.elc
%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/flymake.el.gz
@@ -3893,9 +3894,7 @@
%%DATADIR%%/%%EMACS_VER%%/lisp/xwidget.el.gz
%%DATADIR%%/%%EMACS_VER%%/lisp/xwidget.elc
%%DATADIR%%/%%EMACS_VER%%/site-lisp/subdirs.el
-%%DATADIR%%/%%EMACS_VER%%/src/json.c
-%%DATADIR%%/%%EMACS_VER%%/src/ptr-bounds.h
-%%DATADIR%%/%%EMACS_VER%%/src/w32cygwinx.c
+%%DATADIR%%/site-lisp/subdirs.el
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/site-lisp/site-start.el
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/alloc.c
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/atimer.c
@@ -3984,6 +3983,7 @@
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/insdel.c
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/intervals.c
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/intervals.h
+%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/json.c
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/keyboard.c
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/keyboard.h
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/keymap.c
@@ -4011,6 +4011,7 @@
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/process.c
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/process.h
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/profiler.c
+%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/ptr-bounds.h
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/puresize.h
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/ralloc.c
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/regex.c
@@ -4061,6 +4062,7 @@
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/w32.h
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/w32common.h
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/w32console.c
+%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/w32cygwinx.c
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/w32fns.c
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/w32font.c
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/w32font.h
@@ -4102,7 +4104,6 @@
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/xterm.h
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/xwidget.c
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/xwidget.h
-%%DATADIR%%/site-lisp/subdirs.el
share/icons/hicolor/128x128/apps/emacs.png
share/icons/hicolor/16x16/apps/emacs.png
share/icons/hicolor/24x24/apps/emacs.png
Index: editors/emacs/Makefile
===================================================================
--- editors/emacs/Makefile
+++ editors/emacs/Makefile
@@ -3,6 +3,7 @@
PORTNAME= emacs
DISTVERSION= ${EMACS_VER}
+PORTREVISION= 1
PORTEPOCH= 3
CATEGORIES= editors ipv6
MASTER_SITES= GNU
@@ -60,7 +61,7 @@
.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
+CONFLICTS_INSTALL= emacs-devel emacs-devel-nox
GNU_CONFIGURE= yes
INFO= ada-mode auth autotype bovine calc ccmode cl dbus dired-x \
ebrowse ede ediff edt efaq eieio eintr elisp emacs emacs-gnutls \
@@ -81,15 +82,13 @@
.endif
PLIST_SUB= EMACS_VER=${EMACS_VER} GNU_HOST=${CONFIGURE_TARGET}
SUB_FILES= sources.el
-SUB_LIST= ARCHLIBDIR=${PREFIX}/libexec/emacs/${EMACS_VER}/${CONFIGURE_TARGET} \
- EMACS_VER=${EMACS_VER} # sources.el
-
-OPTIONS_DEFINE= ACL DBUS GCONF GNUTLS GSETTINGS LCMS2 M17N MAILUTILS MODULES OTF\
- SCROLLBARS SOURCES XFT XIM XML XWIDGETS
-OPTIONS_DEFAULT= ACL DBUS GCONF GIF GNUTLS GSETTINGS GTK3 JPEG KQUEUE \
- LCMS2 M17N MAGICK MAILUTILS MODULES OSS OTF PNG SCROLLBARS \
- SOURCES SVG TIFF XFT XIM XML XPM
+SUB_LIST= EMACS_VER=${EMACS_VER} # sources.el
+OPTIONS_DEFINE= ACL DBUS GCONF GNUTLS GSETTINGS JSON LCMS2 M17N MAILUTILS \
+ MODULES OTF SCROLLBARS SOURCES THREADS XFT XIM XML XWIDGETS
+OPTIONS_DEFAULT= ACL DBUS GCONF GIF GNUTLS GSETTINGS GTK3 JPEG JSON \
+ KQUEUE LCMS2 M17N MAGICK MAILUTILS MODULES OSS OTF PNG \
+ SCROLLBARS SOURCES SVG THREADS TIFF XFT XIM XML XPM
OPTIONS_GROUP= GRAPHICS
OPTIONS_GROUP_GRAPHICS= CAIRO GIF JPEG MAGICK PNG SVG TIFF XPM
OPTIONS_RADIO= FILENOTIFY SOUND X11TOOLKIT
@@ -112,9 +111,9 @@
GSETTINGS_DESC= GSettings API for application settings
KQUEUE_DESC= File notification via kqueue
#LTO_DESC= Enable link-time optimization
+M17N_DESC= M17N support for text-shaping (implies XFT)
MAGICK_DESC= ImageMagick image processing support
MAILUTILS_DESC= Mail framework via GNU Mailutils
-M17N_DESC= M17N for text-shaping (implies XFT)
MODULES_DESC= Dynamic modules support
OTF_DESC= Opentype fonts (implies XFT)
SCROLLBARS_DESC= Toolkit scroll-bars
@@ -124,7 +123,7 @@
XAW3D_DESC= Athena3D widgets
XAW_DESC= Athena widgets
XIM_DESC= X Input Method
-XWIDGETS_DESC= GTK widgets in Emacs buffers (requires GTK3)
+XWIDGETS_DESC= Experimental GTK widgets (requires GTK3)
ACL_CONFIGURE_ENABLE= acl
ALSA_CONFIGURE_ON= --with-sound=alsa
@@ -146,33 +145,35 @@
GSETTINGS_CONFIGURE_WITH= gsettings
GSETTINGS_IMPLIES= DBUS
GTK2_USE= GNOME=cairo,gtk20
-GTK2_USES= gettext-runtime
GTK2_CONFIGURE_ON= --with-x-toolkit=gtk2
GTK2_LIB_DEPENDS= libfreetype.so:print/freetype2 \
libfontconfig.so:x11-fonts/fontconfig
GTK3_USE= GNOME=cairo,gtk30
-GTK3_USES= gettext-runtime
GTK3_CONFIGURE_ON= --with-x-toolkit=gtk3
JPEG_USES= jpeg
JPEG_CONFIGURE_WITH= jpeg
+JSON_CONFIGURE_WITH= json
+JSON_LIB_DEPENDS= libjansson.so:devel/jansson
KQUEUE_CONFIGURE_ON= --with-file-notification=kqueue
LCMS2_CONFIGURE_WITH= lcms2
LCMS2_LIB_DEPENDS= liblcms2.so:graphics/lcms2
#LTO_CONFIGURE_ON= --enable-link-time-optimization
M17N_LIB_DEPENDS= libm17n.so:devel/m17n-lib
M17N_CONFIGURE_WITH= m17n-flt
+M17N_IMPLIES= XFT
MAGICK_LIB_DEPENDS= libMagickCore-6.so:graphics/ImageMagick
MAGICK_CONFIGURE_WITH= imagemagick
MAILUTILS_CONFIGURE_WITH= mailutils
+MAILUTILS_CONFIGURE_ENV_OFF= ac_cv_prog_liblockfile=no ac_cv_lib_lockfile_maillock=no
MAILUTILS_LIB_DEPENDS= libmailutils.so:mail/mailutils
MODULES_CONFIGURE_WITH= modules
-MAILUTILS_PLIST_FILES_OFF= libexec/emacs/${EMACS_VER}/${CONFIGURE_TARGET}/movemail
MOTIF_USES= motif
MOTIF_CONFIGURE_ON= --with-x-toolkit=motif
MOTIF_LIB_DEPENDS= libXp.so:x11/libXp
OSS_CONFIGURE_ON= --with-sound=oss
OTF_LIB_DEPENDS= libotf.so:print/libotf
OTF_CONFIGURE_WITH= libotf
+OTF_IMPLIES= XFT
PNG_LIB_DEPENDS= libpng.so:graphics/png
PNG_CONFIGURE_WITH= png
SCROLLBARS_CONFIGURE_WITH= toolkit-scroll-bars
@@ -182,7 +183,7 @@
SVG_USE= GNOME=cairo,librsvg2
SVG_CONFIGURE_WITH= rsvg
SVG_IMPLIES= PNG
-SVG_USES= gettext-runtime
+THREADS_CONFIGURE_WITH= threads
TIFF_LIB_DEPENDS= libtiff.so:graphics/tiff
TIFF_CONFIGURE_WITH= tiff
XAW_USE= XORG=xaw
@@ -200,7 +201,8 @@
XPM_CONFIGURE_WITH= xpm
XWIDGETS_USE= XORG=xcomposite
XWIDGETS_CONFIGURE_WITH= xwidgets
-XWIDGETS_LIB_DEPENDS= libwebkit2gtk-4.0.so:www/webkit2-gtk3
+XWIDGETS_LIB_DEPENDS= libwebkit2gtk-4.0.so:www/webkit2-gtk3 \
+ libsoup-2.4.so:devel/libsoup
XWIDGETS_IMPLIES= GTK3
EMACS_VER= 26.1
@@ -225,6 +227,10 @@
@${REINPLACE_CMD} -e 's/^Terminal=.*$$/Terminal=true/' ${WRKSRC}/etc/emacs.desktop
.endif
+post-install-MAILUTILS-on:
+ ${LN} -sf ${PREFIX}/bin/movemail \
+ ${STAGEDIR}${PREFIX}/libexec/emacs/${EMACS_VER}/${CONFIGURE_TARGET}
+
post-install-SOURCES-on:
@${MKDIR} ${STAGEDIR}${DATADIR}/${EMACS_VER}/src
${INSTALL_DATA} ${WRKSRC}/src/*.[ch] ${STAGEDIR}${DATADIR}/${EMACS_VER}/src
Index: editors/emacs/pkg-plist
===================================================================
--- editors/emacs/pkg-plist
+++ editors/emacs/pkg-plist
@@ -5,6 +5,7 @@
bin/emacsclient
bin/etags
libexec/emacs/%%EMACS_VER%%/%%GNU_HOST%%/hexl
+libexec/emacs/%%EMACS_VER%%/%%GNU_HOST%%/movemail
libexec/emacs/%%EMACS_VER%%/%%GNU_HOST%%/profile
libexec/emacs/%%EMACS_VER%%/%%GNU_HOST%%/rcs2log
@(games,games,4555) libexec/emacs/%%EMACS_VER%%/%%GNU_HOST%%/update-game-score
@@ -3906,14 +3907,7 @@
%%DATADIR%%/%%EMACS_VER%%/lisp/xwidget.el.gz
%%DATADIR%%/%%EMACS_VER%%/lisp/xwidget.elc
%%DATADIR%%/%%EMACS_VER%%/site-lisp/subdirs.el
-%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/lcms.c
-%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/module-env-25.h
-%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/module-env-26.h
-%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/sheap.h
-%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/systhread.c
-%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/systhread.h
-%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/thread.c
-%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/thread.h
+%%DATADIR%%/site-lisp/subdirs.el
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/site-lisp/site-start.el
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/alloc.c
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/atimer.c
@@ -4008,6 +4002,7 @@
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/keymap.h
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/kqueue.c
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/lastfile.c
+%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/lcms.c
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/lisp.h
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/lread.c
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/macfont.h
@@ -4018,6 +4013,8 @@
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/menu.c
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/menu.h
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/minibuf.c
+%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/module-env-25.h
+%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/module-env-26.h
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/msdos.c
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/msdos.h
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/nsgui.h
@@ -4035,6 +4032,7 @@
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/scroll.c
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/search.c
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/sheap.c
+%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/sheap.h
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/sound.c
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/syntax.c
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/syntax.h
@@ -4042,6 +4040,8 @@
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/sysselect.h
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/syssignal.h
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/sysstdio.h
+%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/systhread.c
+%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/systhread.h
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/systime.h
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/systty.h
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/syswait.h
@@ -4053,6 +4053,8 @@
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/terminfo.c
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/termopts.h
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/textprop.c
+%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/thread.c
+%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/thread.h
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/tparam.c
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/tparam.h
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/undo.c
@@ -4066,8 +4068,6 @@
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/unexsol.c
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/unexw32.c
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/vm-limit.c
-%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/xwidget.c
-%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/xwidget.h
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/w16select.c
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/w32.c
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/w32.h
@@ -4112,7 +4112,8 @@
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/xsmfns.c
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/xterm.c
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/xterm.h
-%%DATADIR%%/site-lisp/subdirs.el
+%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/xwidget.c
+%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/xwidget.h
share/icons/hicolor/128x128/apps/emacs.png
share/icons/hicolor/16x16/apps/emacs.png
share/icons/hicolor/24x24/apps/emacs.png

File Metadata

Mime Type
text/plain
Expires
Wed, Aug 26, 9:10 PM (5 h, 2 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
37120134
Default Alt Text
D15728.id43533.diff (35 KB)

Event Timeline