svn commit: r436909 - in head/editors/emacs-devel: . files
Ashish SHUKLA
ashish at FreeBSD.org
Sat Mar 25 17:38:53 UTC 2017
Author: ashish
Date: Sat Mar 25 17:38:51 2017
New Revision: 436909
URL: https://svnweb.freebsd.org/changeset/ports/436909
Log:
- Update to git snapshot 211d41a, fixes building as non-root user[1]
- Resurrect LLDB option with updated patchset from upstream[2]
[1] http://lists.gnu.org/archive/html/emacs-devel/2017-03/msg00622.html
[2] https://opensource.apple.com/source/lldb/lldb-76/utils/emacs/
Submitted by: jrm
Reported by: rakuco
Added:
head/editors/emacs-devel/files/extrapatch-lldb-gud.el
- copied, changed from r436799, head/editors/emacs-devel/files/extrapatch-lldb-gud.el
Modified:
head/editors/emacs-devel/Makefile
head/editors/emacs-devel/distinfo
head/editors/emacs-devel/pkg-plist
Modified: head/editors/emacs-devel/Makefile
==============================================================================
--- head/editors/emacs-devel/Makefile Sat Mar 25 17:34:53 2017 (r436908)
+++ head/editors/emacs-devel/Makefile Sat Mar 25 17:38:51 2017 (r436909)
@@ -19,10 +19,10 @@ BROKEN_aarch64= Fails to link: missing
USE_GITHUB= yes
GH_ACCOUNT= emacs-mirror
-GH_TAGNAME= 560d6f9
+GH_TAGNAME= 211d41a
EMACS_VER= 26.0.50
-EMACS_REV= 20170323
+EMACS_REV= 20170324
GNU_CONFIGURE= yes
USES= autoreconf:build cpe gmake makeinfo ncurses pkgconfig
INFO_PATH= ${DATADIR_REL}/info
@@ -42,7 +42,7 @@ INFO= ada-mode auth autotype bovine calc
rcirc reftex remember sasl sc semantic ses sieve smtpmail speedbar \
srecode todo-mode tramp url vhdl-mode vip viper widget wisent woman
-OPTIONS_DEFINE= ACL DBUS GNUTLS MODULES SOURCES THREADS X11 XML
+OPTIONS_DEFINE= ACL DBUS GNUTLS LLDB MODULES SOURCES THREADS X11 XML
OPTIONS_RADIO= FILENOTIFY SOUND X11TOOLKIT
OPTIONS_RADIO_FILENOTIFY= GFILE KQUEUE
@@ -65,6 +65,7 @@ GFILE_DESC= File notification via gfile
GRAPHICS_DESC= Graphics support (each implies X11)
GSETTINGS_DESC= GSettings support (implies DBUS)
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)
@@ -118,6 +119,7 @@ JPEG_USES= jpeg
JPEG_CONFIGURE_WITH= jpeg
JPEG_IMPLIES= X11
KQUEUE_CONFIGURE_ON= --with-file-notification=kqueue
+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
Modified: head/editors/emacs-devel/distinfo
==============================================================================
--- head/editors/emacs-devel/distinfo Sat Mar 25 17:34:53 2017 (r436908)
+++ head/editors/emacs-devel/distinfo Sat Mar 25 17:38:51 2017 (r436909)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1490239489
-SHA256 (emacs-mirror-emacs-26.0.50.20170323-560d6f9_GH0.tar.gz) = b49615830c87379ae2daf68a3420c17272f3a066bb37185cb8d326f765a63787
-SIZE (emacs-mirror-emacs-26.0.50.20170323-560d6f9_GH0.tar.gz) = 38951203
+TIMESTAMP = 1490398378
+SHA256 (emacs-mirror-emacs-26.0.50.20170324-211d41a_GH0.tar.gz) = af10cd46e8037d8a5d3fb398d8146ecd2479abf65ab6d78c5309f03c2e8d624b
+SIZE (emacs-mirror-emacs-26.0.50.20170324-211d41a_GH0.tar.gz) = 38952007
Copied and modified: head/editors/emacs-devel/files/extrapatch-lldb-gud.el (from r436799, head/editors/emacs-devel/files/extrapatch-lldb-gud.el)
==============================================================================
--- head/editors/emacs-devel/files/extrapatch-lldb-gud.el Thu Mar 23 23:25:37 2017 (r436799, copy source)
+++ head/editors/emacs-devel/files/extrapatch-lldb-gud.el Sat Mar 25 17:38:51 2017 (r436909)
@@ -1,14 +1,13 @@
-This diff is retrieved from http://lists.gnu.org/archive/html/emacs-devel/2015-02/msg00274.html
+This diff is a slightly modified version of the one from
+http://lists.gnu.org/archive/html/emacs-devel/2015-02/msg00274.html
-And traces its origin back to https://gitorious.org/lldb/lldb/commit/40e4dbf
+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/
-diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el
-index 42c5b20..7f2e9c0 100644
---- lisp/progmodes/gud.el
+--- 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.
@@ -28,7 +27,7 @@ index 42c5b20..7f2e9c0 100644
pdb (Python), and jdb."
:group 'processes
:group 'tools)
-@@ -141,12 +141,12 @@ Used to gray out relevant toolbar icons.")
+@@ -141,12 +141,12 @@ Used to gray out relevant toolbar icons.
(display-graphic-p)
(fboundp 'x-show-tip))
:visible (memq gud-minor-mode
@@ -38,12 +37,12 @@ index 42c5b20..7f2e9c0 100644
([refresh] "Refresh" . gud-refresh)
([run] menu-item "Run" gud-run
:enable (not gud-running)
-- :visible (memq gud-minor-mode '(gdbmi gdb dbx jdb)))
-+ :visible (memq gud-minor-mode '(lldb gdbmi gdb dbx jdb)))
- ([go] menu-item (if (bound-and-true-p gdb-active-process)
- "Continue" "Run") gud-go
- :visible (and (eq gud-minor-mode 'gdbmi)
-@@ -164,18 +164,18 @@ Used to gray out relevant toolbar icons.")
+- :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
@@ -65,7 +64,7 @@ index 42c5b20..7f2e9c0 100644
([pp] menu-item "Print S-expression" gud-pp
:enable (and (not gud-running)
(bound-and-true-p gdb-active-process))
-@@ -187,7 +187,7 @@ Used to gray out relevant toolbar icons.")
+@@ -191,7 +191,7 @@ Used to gray out relevant toolbar icons.
"Dump object"
"Print Dereference") gud-pstar
:enable (not gud-running)
@@ -74,7 +73,7 @@ index 42c5b20..7f2e9c0 100644
([print] menu-item "Print Expression" gud-print
:enable (not gud-running))
([watch] menu-item "Watch Expression" gud-watch
-@@ -196,13 +196,13 @@ Used to gray out relevant toolbar icons.")
+@@ -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
@@ -91,7 +90,7 @@ index 42c5b20..7f2e9c0 100644
([step] menu-item "Step Line" gud-step
:enable (not gud-running))
([next] menu-item "Next Line" gud-next
-@@ -237,7 +237,7 @@ Used to gray out relevant toolbar icons.")
+@@ -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
@@ -100,7 +99,7 @@ index 42c5b20..7f2e9c0 100644
([menu-bar go] menu-item
,(propertize " go " 'face 'font-lock-doc-face) gud-go
:visible (and (eq gud-minor-mode 'gdbmi)
-@@ -356,6 +356,7 @@ are interpreted specially if present. These are:
+@@ -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.
@@ -108,7 +107,7 @@ index 42c5b20..7f2e9c0 100644
%p -- Prefix argument to the command (if any) as a number.
%c -- Fully qualified class name derived from the expression
surrounding point (jdb only).
-@@ -964,6 +965,131 @@ SKIP is the number of chars to skip on each line, it defaults to 0."
+@@ -974,6 +975,131 @@ SKIP is the number of chars to skip on e
;; ======================================================================
@@ -240,7 +239,7 @@ index 42c5b20..7f2e9c0 100644
;; sdb functions
;; History of argument lists passed to sdb.
-@@ -2499,9 +2625,10 @@ gud, see `gud-mode'."
+@@ -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,
@@ -254,7 +253,7 @@ index 42c5b20..7f2e9c0 100644
After startup, the following commands are available in both the GUD
interaction buffer and any source buffer GUD visits due to a breakpoint stop
-@@ -2531,7 +2658,7 @@ Under gdb, sdb and xdb, \\[gud-tbreak] behaves exactly like \\[gud-break],
+@@ -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.
@@ -263,7 +262,7 @@ index 42c5b20..7f2e9c0 100644
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 window the specified file and line."
+@@ -2858,7 +2985,7 @@ Obeying it means displaying in another w
result)
(while (and str
(let ((case-fold-search nil))
@@ -272,7 +271,7 @@ index 42c5b20..7f2e9c0 100644
(let ((key (string-to-char (match-string 2 str)))
subst)
(cond
-@@ -2886,6 +3013,8 @@ Obeying it means displaying in another window the specified file and line."
+@@ -2886,6 +3013,8 @@ Obeying it means displaying in another w
(setq subst (gud-find-expr)))
((eq key ?a)
(setq subst (gud-read-address)))
@@ -281,7 +280,7 @@ index 42c5b20..7f2e9c0 100644
((eq key ?c)
(setq subst
(gud-find-class
-@@ -3520,6 +3649,7 @@ With arg, dereference expr if ARG is positive, otherwise do not dereference."
+@@ -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
Modified: head/editors/emacs-devel/pkg-plist
==============================================================================
--- head/editors/emacs-devel/pkg-plist Sat Mar 25 17:34:53 2017 (r436908)
+++ head/editors/emacs-devel/pkg-plist Sat Mar 25 17:38:51 2017 (r436909)
@@ -2326,6 +2326,7 @@ share/applications/emacs.desktop
%%DATADIR%%/%%EMACS_VER%%/lisp/language/viet-util.elc
%%DATADIR%%/%%EMACS_VER%%/lisp/language/vietnamese.el.gz
%%DATADIR%%/%%EMACS_VER%%/lisp/language/vietnamese.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/ldefs-boot.el
%%DATADIR%%/%%EMACS_VER%%/lisp/leim/ja-dic/ja-dic.el.gz
%%DATADIR%%/%%EMACS_VER%%/lisp/leim/ja-dic/ja-dic.elc
%%DATADIR%%/%%EMACS_VER%%/lisp/leim/leim-list.el
More information about the svn-ports-head
mailing list