Michal Nowak
2019-04-15 22d1d4e7b7db29a726c44d2e5b56aec19cc778d7
Update GNU Emacs to 26.2

3 files modified
25 ■■■■■ changed files
components/editor/emacs/Makefile 13 ●●●●● patch | view | raw | blame | history
components/editor/emacs/gnu-emacs.p5m 5 ●●●●● patch | view | raw | blame | history
components/editor/emacs/manifests/sample-manifest.p5m 7 ●●●●● patch | view | raw | blame | history
components/editor/emacs/Makefile
@@ -19,17 +19,18 @@
# CDDL HEADER END
#
# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2018, Michal Nowak
# Copyright (c) 2019, Michal Nowak
#
include ../../../make-rules/shared-macros.mk
COMPONENT_NAME=        emacs
COMPONENT_VERSION=    26.1
COMPONENT_VERSION=    26.2
COMPONENT_PROJECT_URL=    https://www.gnu.org/software/emacs/
COMPONENT_SRC=        $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE=    $(COMPONENT_SRC).tar.xz
COMPONENT_ARCHIVE_HASH=    \
    sha256:1cf4fc240cd77c25309d15e18593789c8dbfba5c2b44d8f77c886542300fd32c
    sha256:151ce69dbe5b809d4492ffae4a4b153b2778459de6deb26f35691e1281a9c58e
COMPONENT_ARCHIVE_URL=    http://ftp.gnu.org/gnu/emacs/$(COMPONENT_ARCHIVE)
COMPONENT_BUGDB=    utility/emacs
COMPONENT_SIG_URL=    $(COMPONENT_ARCHIVE_URL).sig
@@ -107,7 +108,7 @@
# variant specific configure options
$(BUILD_DIR)/%-nox/.configured: CONFIGURE_OPTIONS +=    --without-all --without-x
$(BUILD_DIR)/%-x/.configured:    CONFIGURE_OPTIONS +=    --with-x-toolkit=lucid
$(BUILD_DIR)/%-gtk/.configured:  CONFIGURE_OPTIONS +=    --with-x-toolkit=gtk2
$(BUILD_DIR)/%-gtk/.configured:  CONFIGURE_OPTIONS +=    --with-x-toolkit=gtk3
# we need to build all variants, but only have to install one in order
# to get the common files shared by all. We use COMPONENT_POST_INSTALL_ACTION
@@ -211,8 +212,10 @@
REQUIRED_PACKAGES += image/library/libpng16
REQUIRED_PACKAGES += image/library/librsvg
REQUIRED_PACKAGES += image/library/libtiff
REQUIRED_PACKAGES += library/desktop/cairo
REQUIRED_PACKAGES += library/desktop/gdk-pixbuf
REQUIRED_PACKAGES += library/desktop/gtk2
REQUIRED_PACKAGES += library/desktop/gtk3
REQUIRED_PACKAGES += library/desktop/pango
REQUIRED_PACKAGES += library/glib2
REQUIRED_PACKAGES += library/gnutls-3
REQUIRED_PACKAGES += library/lcms2
components/editor/emacs/gnu-emacs.p5m
@@ -19,10 +19,8 @@
# CDDL HEADER END
#
# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2018, Michal Nowak
# Copyright (c) 2019, Michal Nowak
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
set name=pkg.fmri \
    value=pkg:/editor/gnu-emacs@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
@@ -44,6 +42,7 @@
file path=usr/gnu/bin/etags
file path=usr/gnu/share/man/man1/ctags.1
file path=usr/gnu/share/man/man1/etags.1
file path=usr/include/emacs-module.h
file path=usr/lib/emacs/$(COMPONENT_VERSION)/$(EMACS_ULEVDIR)/hexl mode=0555
file path=usr/lib/emacs/$(COMPONENT_VERSION)/$(EMACS_ULEVDIR)/movemail mode=0555
file path=usr/lib/emacs/$(COMPONENT_VERSION)/$(EMACS_ULEVDIR)/profile mode=0555
components/editor/emacs/manifests/sample-manifest.p5m
@@ -28,19 +28,19 @@
hardlink path=usr/bin/emacs-gtk-$(COMPONENT_VERSION) target=emacs-gtk
hardlink path=usr/bin/emacs-nox target=emacs-nox-$(COMPONENT_VERSION)
file path=usr/bin/emacs-nox-$(COMPONENT_VERSION)
hardlink path=usr/bin/emacs-x target=emacs-x-$(COMPONENT_VERSION)
file path=usr/bin/emacs-x-$(COMPONENT_VERSION)
file path=usr/bin/emacs-x
hardlink path=usr/bin/emacs-x-$(COMPONENT_VERSION) target=emacs-x
file path=usr/bin/emacsclient
file path=usr/gnu/bin/ctags
file path=usr/gnu/bin/etags
file path=usr/gnu/share/man/man1/ctags.1
file path=usr/gnu/share/man/man1/etags.1
file path=usr/include/emacs-module.h
file path=usr/lib/emacs/$(COMPONENT_VERSION)/$(MACH)-$(PLAT)-solaris$(SOLARIS_RELEASE)/hexl
file path=usr/lib/emacs/$(COMPONENT_VERSION)/$(MACH)-$(PLAT)-solaris$(SOLARIS_RELEASE)/movemail
file path=usr/lib/emacs/$(COMPONENT_VERSION)/$(MACH)-$(PLAT)-solaris$(SOLARIS_RELEASE)/profile
file path=usr/lib/emacs/$(COMPONENT_VERSION)/$(MACH)-$(PLAT)-solaris$(SOLARIS_RELEASE)/rcs2log
file path=usr/lib/systemd/user/emacs.service
file path=usr/share/appdata/emacs.appdata.xml
file path=usr/share/applications/emacs.desktop
file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/AUTHORS
file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/CALC-NEWS
@@ -4012,3 +4012,4 @@
file path=usr/share/man/man1/emacs.1
file path=usr/share/man/man1/emacsclient.1
file path=usr/share/man/man1/etags.1
file path=usr/share/metainfo/emacs.appdata.xml