diff options
author | ashish <ashish@FreeBSD.org> | 2017-09-13 21:15:55 +0800 |
---|---|---|
committer | ashish <ashish@FreeBSD.org> | 2017-09-13 21:15:55 +0800 |
commit | c5e57593c68e74c2154e9b1eb38f394b6af6d760 (patch) | |
tree | d1161d0d4936ff4e9f33464c5f303611b36773f6 /editors/emacs-devel | |
parent | 252e0d12b53cef2e3b50a35e026ef962e8c8e614 (diff) | |
download | freebsd-ports-gnome-c5e57593c68e74c2154e9b1eb38f394b6af6d760.tar.gz freebsd-ports-gnome-c5e57593c68e74c2154e9b1eb38f394b6af6d760.tar.zst freebsd-ports-gnome-c5e57593c68e74c2154e9b1eb38f394b6af6d760.zip |
- Update to git snapshot 49a42fb
- Remove the workaround added in previous commit
Security: https://www.vuxml.org/freebsd/47e2e52c-975c-11e7-942d-5404a68a61a2.html
Diffstat (limited to 'editors/emacs-devel')
-rw-r--r-- | editors/emacs-devel/Makefile | 4 | ||||
-rw-r--r-- | editors/emacs-devel/distinfo | 6 | ||||
-rw-r--r-- | editors/emacs-devel/files/patch-configure.ac | 9 |
3 files changed, 5 insertions, 14 deletions
diff --git a/editors/emacs-devel/Makefile b/editors/emacs-devel/Makefile index 6ff5a6d645df..c2bbf9c987e5 100644 --- a/editors/emacs-devel/Makefile +++ b/editors/emacs-devel/Makefile @@ -19,10 +19,10 @@ BROKEN_aarch64= Segfaults during build USE_GITHUB= yes GH_ACCOUNT= emacs-mirror -GH_TAGNAME= 1b492fa +GH_TAGNAME= 49a42fb EMACS_VER= 26.0.50 -EMACS_REV= 20170903 +EMACS_REV= 20170912 GNU_CONFIGURE= yes USES= autoreconf:build cpe gmake makeinfo ncurses pkgconfig INFO_PATH= ${DATADIR_REL}/info diff --git a/editors/emacs-devel/distinfo b/editors/emacs-devel/distinfo index b54c1b41dc3f..d953ca4e3753 100644 --- a/editors/emacs-devel/distinfo +++ b/editors/emacs-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1504453415 -SHA256 (emacs-mirror-emacs-26.0.50.20170903-1b492fa_GH0.tar.gz) = f409d8d0afecbf35999a4af0bb168969cb84a8f21428bbbdc9c28b498e804da7 -SIZE (emacs-mirror-emacs-26.0.50.20170903-1b492fa_GH0.tar.gz) = 39365573 +TIMESTAMP = 1505223890 +SHA256 (emacs-mirror-emacs-26.0.50.20170912-49a42fb_GH0.tar.gz) = a3ef3450a5adae16f4c0f1303492a8c57dae6ecb1f745ab881a90cb836ed1c5b +SIZE (emacs-mirror-emacs-26.0.50.20170912-49a42fb_GH0.tar.gz) = 39375071 diff --git a/editors/emacs-devel/files/patch-configure.ac b/editors/emacs-devel/files/patch-configure.ac index 7026a2043480..2dc44ce5cb0a 100644 --- a/editors/emacs-devel/files/patch-configure.ac +++ b/editors/emacs-devel/files/patch-configure.ac @@ -10,12 +10,3 @@ *' (GNU texinfo) '[[5-9]]* | \ *' (GNU texinfo) '[[1-9][0-9]]* ) ;; *) MAKEINFO=no;; -@@ -3364,7 +3365,7 @@ if test "${HAVE_X11}" = "yes"; then - AC_CACHE_CHECK([for XpmReturnAllocPixels preprocessor define], - [emacs_cv_cpp_xpm_return_alloc_pixels], - [AC_EGREP_CPP(no_return_alloc_pixels, -- [#include "noX/xpm.h" -+ [#include "X11/xpm.h" - #ifndef XpmReturnAllocPixels - no_return_alloc_pixels - #endif |