[PKGBUILD] Update Emacs PKGBUILD

This commit is contained in:
Lucien Cartier-Tilet 2022-08-07 12:58:19 +02:00
parent d23d0deafb
commit b96be382a6
Signed by: phundrak
GPG Key ID: BD7789E705CB8DCA

View File

@ -27,12 +27,11 @@ LTO="YES" # Enable link-time optimization. Still experimental.
JIT="YES" # Enable native just-in-time compilation. libgccjit is in AUR. JIT="YES" # Enable native just-in-time compilation. libgccjit is in AUR.
# This compiles only performance critical elisp files. # This compiles only performance critical elisp files.
# #
# To compile all elisp on demand, add # To compile all site-lisp on demand (repos/AUR packages,
# ELPA, MELPA, whatever), add
# (setq comp-deferred-compilation t) # (setq comp-deferred-compilation t)
# to your .emacs file. # to your .emacs file.
AOT="YES" # Precompile all included elisp. It takes a long time. AOT="YES" # Compile all elisp files.
# You still need to enable on-demand compilation
# for your own packages.
CLI= # CLI only binary. CLI= # CLI only binary.
GPM= # Mouse support in Linux console using gpmd. GPM= # Mouse support in Linux console using gpmd.
NOTKIT= # Use no toolkit widgets. Like B&W Twm (001d sk00l). NOTKIT= # Use no toolkit widgets. Like B&W Twm (001d sk00l).
@ -48,7 +47,7 @@ LUCID= # Use the lucid, a.k.a athena, toolkit. Like XEmacs, sorta.
# Xft, if you choose no toolkit or Lucid. # Xft, if you choose no toolkit or Lucid.
XI2="YES" # Use Xinput2 support. XI2="YES" # Use Xinput2 support.
# https://www.x.org/releases/X11R7.7/doc/inputproto/XI2proto.txt # https://www.x.org/releases/X11R7.7/doc/inputproto/XI2proto.txt
ALSA="YES" # Linux sound support. ALSA= # Linux sound support.
NOCAIRO= # Disable here. NOCAIRO= # Disable here.
XWIDGETS="YES" # Use GTK+ widgets pulled from webkit2gtk. Usable. XWIDGETS="YES" # Use GTK+ widgets pulled from webkit2gtk. Usable.
DOCS_HTML="YES" # Generate and install html documentation. DOCS_HTML="YES" # Generate and install html documentation.
@ -62,7 +61,7 @@ if [[ $CLI == "YES" ]] ; then
else else
pkgname="emacs-phundrak-git" pkgname="emacs-phundrak-git"
fi fi
pkgver=29.0.50.157086 pkgver=29.0.50.158884
pkgrel=1 pkgrel=1
pkgdesc="GNU Emacs. Development master branch with Phundraks tweaks." pkgdesc="GNU Emacs. Development master branch with Phundraks tweaks."
arch=('x86_64') arch=('x86_64')
@ -71,10 +70,13 @@ license=('GPL3')
depends_nox=('gnutls' 'libxml2' 'jansson') depends_nox=('gnutls' 'libxml2' 'jansson')
depends=("${depends_nox[@]}" 'harfbuzz') depends=("${depends_nox[@]}" 'harfbuzz')
makedepends=('git') makedepends=('git')
provides=('emacs' 'emacs-pretest' 'emacs26-git' 'emacs-27-git' 'emacs28-git' 'emacs-seq' 'emacs-nox' 'emacs-git') b2sums=('SKIP')
conflicts=('emacs' 'emacs-pretest' 'emacs26-git' 'emacs-27-git' 'emacs28-git' 'emacs-seq' 'emacs-nox' 'emacs-git') provides=('emacs')
replaces=('emacs' 'emacs-pretest' 'emacs26-git' 'emacs-27-git' 'emacs28-git' 'emacs-seq' 'emacs-nox' 'emacs-git') replaces=('emacs')
source=("emacs-git::git://git.savannah.gnu.org/emacs.git") # source=("emacs-git::git://git.savannah.gnu.org/emacs.git")
source=("emacs-git::git+https://git.savannah.gnu.org/git/emacs.git")
b2sums=('SKIP')
b2sums=('SKIP')
b2sums=('SKIP') b2sums=('SKIP')
OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge !debug) OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge !debug)
install=emacs-git.install install=emacs-git.install
@ -138,7 +140,7 @@ elif [[ $PGTK == "YES" ]]; then
fi fi
if [[ ! $NOX == "YES" ]] && [[ ! $CLI == "YES" ]]; then if [[ ! $NOX == "YES" ]] && [[ ! $CLI == "YES" ]]; then
depends+=( 'libjpeg-turbo' 'giflib' ); depends+=( 'libjpeg-turbo' 'libpng' 'giflib' 'libwebp' 'libtiff' 'libxpm');
elif [[ $CLI == "YES" ]]; then elif [[ $CLI == "YES" ]]; then
depends+=(); depends+=();
fi fi
@ -176,7 +178,7 @@ if [[ $GPM == "YES" ]]; then
fi fi
fi fi
if [[ $DOCS_PDF == "YES" ]]; then if [[ $DOCS_PDF == "YES" ]] && [[ ! -d '/usr/local/texlive' ]]; then
makedepends+=( 'texlive-core' ); makedepends+=( 'texlive-core' );
fi fi
################################################################################ ################################################################################
@ -186,9 +188,9 @@ pkgver() {
cd "$srcdir/emacs-git" cd "$srcdir/emacs-git"
printf "%s.%s" \ printf "%s.%s" \
"$(grep AC_INIT configure.ac | \ $(grep AC_INIT configure.ac | \
sed -e 's/^.\+\ \([0-9]\+\.[0-9]\+\.[0-9]\+\?\).\+$/\1/')" \ awk -F',' '{ gsub("[ \\[\\]]","",$2); print $2 }') \
"$(git rev-list --count HEAD)" $(git rev-list --count HEAD)
} }
# There is no need to run autogen.sh after first checkout. # There is no need to run autogen.sh after first checkout.
@ -196,17 +198,18 @@ pkgver() {
prepare() { prepare() {
cd "$srcdir/emacs-git" cd "$srcdir/emacs-git"
[[ -x configure ]] || ( ./autogen.sh git && ./autogen.sh autoconf ) [[ -x configure ]] || ( ./autogen.sh git && ./autogen.sh autoconf )
mkdir -p "$srcdir/emacs-git/build"
} }
if [[ $CHECK == "YES" ]]; then if [[ $CHECK == "YES" ]]; then
check() { check() {
cd "$srcdir/emacs-git" cd "$srcdir/emacs-git/build"
make check make check
} }
fi fi
build() { build() {
cd "$srcdir/emacs-git" cd "$srcdir/emacs-git/build"
local _conf=( local _conf=(
--prefix=/usr --prefix=/usr
@ -215,7 +218,6 @@ build() {
--localstatedir=/var --localstatedir=/var
--mandir=/usr/share/man --mandir=/usr/share/man
--with-gameuser=:games --with-gameuser=:games
--with-sound=alsa
--with-modules --with-modules
--without-libotf --without-libotf
--without-m17n-flt --without-m17n-flt
@ -224,7 +226,6 @@ build() {
# If you insist you'll need to read that bug report in *full*. # If you insist you'll need to read that bug report in *full*.
# Good luck! # Good luck!
--without-gconf --without-gconf
--without-gsettings
) )
################################################################################ ################################################################################
@ -259,6 +260,10 @@ elif [[ $PGTK == "YES" ]]; then
_conf+=( '--with-pgtk' '--without-xaw3d' ); _conf+=( '--with-pgtk' '--without-xaw3d' );
fi fi
if [[ ! $PGTK == "YES" ]]; then
_conf+=( '--without-gsettings' ) :
fi
if [[ $NOCAIRO == "YES" || $CLI == "YES" || $NOTKIT == "YES" || $LUCID == "YES" ]]; then if [[ $NOCAIRO == "YES" || $CLI == "YES" || $NOTKIT == "YES" || $LUCID == "YES" ]]; then
_conf+=( '--without-cairo' ); _conf+=( '--without-cairo' );
fi fi
@ -290,7 +295,7 @@ _conf+=('--program-transform-name=s/\([ec]tags\)/\1.emacs/')
################################################################################ ################################################################################
./configure "${_conf[@]}" ../configure "${_conf[@]}"
# Using "make" instead of "make bootstrap" enables incremental # Using "make" instead of "make bootstrap" enables incremental
# compiling. Less time recompiling. Yay! But you may # compiling. Less time recompiling. Yay! But you may
@ -309,7 +314,7 @@ _conf+=('--program-transform-name=s/\([ec]tags\)/\1.emacs/')
# You may need to run this if 'loaddefs.el' files become corrupt. # You may need to run this if 'loaddefs.el' files become corrupt.
#cd "$srcdir/emacs-git/lisp" #cd "$srcdir/emacs-git/lisp"
#make autoloads #make autoloads
#cd ../ #cd ../build
# Optional documentation formats. # Optional documentation formats.
if [[ $DOCS_HTML == "YES" ]]; then if [[ $DOCS_HTML == "YES" ]]; then
@ -322,7 +327,7 @@ _conf+=('--program-transform-name=s/\([ec]tags\)/\1.emacs/')
} }
package() { package() {
cd "$srcdir/emacs-git" cd "$srcdir/emacs-git/build"
make DESTDIR="$pkgdir/" install make DESTDIR="$pkgdir/" install