From b96be382a6fd730ffe9886ba7733207aee9d5009 Mon Sep 17 00:00:00 2001 From: Lucien Cartier-Tilet Date: Sun, 7 Aug 2022 12:58:19 +0200 Subject: [PATCH] [PKGBUILD] Update Emacs PKGBUILD --- Documents/code/PKGBUILDs/emacs/PKGBUILD | 49 ++++++++++++++----------- 1 file changed, 27 insertions(+), 22 deletions(-) diff --git a/Documents/code/PKGBUILDs/emacs/PKGBUILD b/Documents/code/PKGBUILDs/emacs/PKGBUILD index bda55d9..a67dedd 100644 --- a/Documents/code/PKGBUILDs/emacs/PKGBUILD +++ b/Documents/code/PKGBUILDs/emacs/PKGBUILD @@ -27,12 +27,11 @@ LTO="YES" # Enable link-time optimization. Still experimental. JIT="YES" # Enable native just-in-time compilation. libgccjit is in AUR. # 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) # to your .emacs file. -AOT="YES" # Precompile all included elisp. It takes a long time. - # You still need to enable on-demand compilation - # for your own packages. +AOT="YES" # Compile all elisp files. CLI= # CLI only binary. GPM= # Mouse support in Linux console using gpmd. 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. XI2="YES" # Use Xinput2 support. # https://www.x.org/releases/X11R7.7/doc/inputproto/XI2proto.txt -ALSA="YES" # Linux sound support. +ALSA= # Linux sound support. NOCAIRO= # Disable here. XWIDGETS="YES" # Use GTK+ widgets pulled from webkit2gtk. Usable. DOCS_HTML="YES" # Generate and install html documentation. @@ -62,7 +61,7 @@ if [[ $CLI == "YES" ]] ; then else pkgname="emacs-phundrak-git" fi -pkgver=29.0.50.157086 +pkgver=29.0.50.158884 pkgrel=1 pkgdesc="GNU Emacs. Development master branch with Phundrak’s tweaks." arch=('x86_64') @@ -71,10 +70,13 @@ license=('GPL3') depends_nox=('gnutls' 'libxml2' 'jansson') depends=("${depends_nox[@]}" 'harfbuzz') makedepends=('git') -provides=('emacs' 'emacs-pretest' 'emacs26-git' 'emacs-27-git' 'emacs28-git' 'emacs-seq' 'emacs-nox' 'emacs-git') -conflicts=('emacs' 'emacs-pretest' 'emacs26-git' 'emacs-27-git' 'emacs28-git' 'emacs-seq' 'emacs-nox' 'emacs-git') -replaces=('emacs' 'emacs-pretest' 'emacs26-git' 'emacs-27-git' 'emacs28-git' 'emacs-seq' 'emacs-nox' 'emacs-git') -source=("emacs-git::git://git.savannah.gnu.org/emacs.git") +b2sums=('SKIP') +provides=('emacs') +replaces=('emacs') +# 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') OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge !debug) install=emacs-git.install @@ -138,7 +140,7 @@ elif [[ $PGTK == "YES" ]]; then fi if [[ ! $NOX == "YES" ]] && [[ ! $CLI == "YES" ]]; then - depends+=( 'libjpeg-turbo' 'giflib' ); + depends+=( 'libjpeg-turbo' 'libpng' 'giflib' 'libwebp' 'libtiff' 'libxpm'); elif [[ $CLI == "YES" ]]; then depends+=(); fi @@ -176,7 +178,7 @@ if [[ $GPM == "YES" ]]; then fi fi -if [[ $DOCS_PDF == "YES" ]]; then +if [[ $DOCS_PDF == "YES" ]] && [[ ! -d '/usr/local/texlive' ]]; then makedepends+=( 'texlive-core' ); fi ################################################################################ @@ -186,9 +188,9 @@ pkgver() { cd "$srcdir/emacs-git" printf "%s.%s" \ - "$(grep AC_INIT configure.ac | \ - sed -e 's/^.\+\ \([0-9]\+\.[0-9]\+\.[0-9]\+\?\).\+$/\1/')" \ - "$(git rev-list --count HEAD)" + $(grep AC_INIT configure.ac | \ + awk -F',' '{ gsub("[ \\[\\]]","",$2); print $2 }') \ + $(git rev-list --count HEAD) } # There is no need to run autogen.sh after first checkout. @@ -196,17 +198,18 @@ pkgver() { prepare() { cd "$srcdir/emacs-git" [[ -x configure ]] || ( ./autogen.sh git && ./autogen.sh autoconf ) + mkdir -p "$srcdir/emacs-git/build" } if [[ $CHECK == "YES" ]]; then check() { - cd "$srcdir/emacs-git" + cd "$srcdir/emacs-git/build" make check } fi build() { - cd "$srcdir/emacs-git" + cd "$srcdir/emacs-git/build" local _conf=( --prefix=/usr @@ -215,7 +218,6 @@ build() { --localstatedir=/var --mandir=/usr/share/man --with-gameuser=:games - --with-sound=alsa --with-modules --without-libotf --without-m17n-flt @@ -224,7 +226,6 @@ build() { # If you insist you'll need to read that bug report in *full*. # Good luck! --without-gconf - --without-gsettings ) ################################################################################ @@ -259,6 +260,10 @@ elif [[ $PGTK == "YES" ]]; then _conf+=( '--with-pgtk' '--without-xaw3d' ); fi +if [[ ! $PGTK == "YES" ]]; then + _conf+=( '--without-gsettings' ) : +fi + if [[ $NOCAIRO == "YES" || $CLI == "YES" || $NOTKIT == "YES" || $LUCID == "YES" ]]; then _conf+=( '--without-cairo' ); 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 # 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. #cd "$srcdir/emacs-git/lisp" #make autoloads - #cd ../ + #cd ../build # Optional documentation formats. if [[ $DOCS_HTML == "YES" ]]; then @@ -322,7 +327,7 @@ _conf+=('--program-transform-name=s/\([ec]tags\)/\1.emacs/') } package() { - cd "$srcdir/emacs-git" + cd "$srcdir/emacs-git/build" make DESTDIR="$pkgdir/" install