[arch-commits] Commit in emacs/trunk (PKGBUILD)

[Frederik Schwan]

    Date: Wednesday, April 27, 2022 @ 00:04:13
  Author: freswa
Revision: 444072

move emacs-nox into split package

remove `--libxft` due to `--with-cairo` implicitly pulling it in [0]
remove `--with-wide-int` since the option has effects on 32 bit platforms only

[0] https://lists.gnu.org/archive/html/emacs-devel/2022-04/msg00926.html

Modified:
  emacs/trunk/PKGBUILD

----------+
 PKGBUILD |   40 +++++++++++++++++++++++++++++++++-------
 1 file changed, 33 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-04-26 23:42:41 UTC (rev 444071)
+++ PKGBUILD	2022-04-27 00:04:13 UTC (rev 444072)
@@ -1,11 +1,12 @@
 # Maintainer: Juergen Hoetzel <juergen at archlinux.org>
 # Maintainer: Frederik Schwan <freswa at archlinux dot org>
+# Contributor: Jaroslav Lichtblau <svetlemodry at archlinux.org>
 # Contributor: Renchi Raju <renchi at green.tam.uiuc.edu>
 
 pkgbase=emacs
-pkgname=(emacs emacs-nativecomp)
+pkgname=(emacs emacs-nativecomp emacs-nox)
 pkgver=28.1
-pkgrel=4
+pkgrel=5
 arch=('x86_64')
 url='https://www.gnu.org/software/emacs/emacs.html'
 license=('GPL3')
@@ -22,6 +23,7 @@
 
 prepare() {
   cp -ar ${pkgname}-${pkgver} ${pkgbase}-${pkgver}-nativecomp
+  cp -ar ${pkgname}-${pkgver} ${pkgbase}-${pkgver}-nox
 }
 
 build() {
@@ -31,22 +33,29 @@
     --localstatedir=/var \
     --with-cairo \
     --with-harfbuzz \
-    --with-modules \
-    --with-wide-int \
-    --with-x-toolkit=gtk3 \
-    --with-xft"
+    --with-libsystemd \
+    --with-modules"
 
   export ac_cv_lib_gif_EGifPutExtensionLast=yes
 
   cd ${pkgname}-${pkgver}
-  ./configure $_confflags
+  ./configure $_confflags \
+    --with-x-toolkit=gtk3
   make
 
   cd ../${pkgbase}-${pkgver}-nativecomp
   ./configure \
+    --with-x-toolkit=gtk3 \
     --with-native-compilation \
     $_confflags
   make NATIVE_FULL_AOT=1 bootstrap
+
+  cd ../${pkgbase}-${pkgver}-nox
+  ./configure \
+    --without-x \
+    --without-sound \
+    $_confflags
+  make
 }
 
 package_emacs() {
@@ -79,3 +88,20 @@
   # fix user/root permissions on usr/share files
   find "${pkgdir}"/usr/share/emacs/${pkgver} -exec chown root:root {} \;
 }
+
+package_emacs-nox() {
+  pkgdesc='The extensible, customizable, self-documenting real-time display editor without X11 support'
+  depends=(dbus glib2 gnutls jansson libxml2 ncurses perl)
+  provides=(emacs)
+  conflicts=(emacs)
+
+  cd ${pkgbase}-${pkgver}-nox
+  make DESTDIR="${pkgdir}" install
+
+  # remove conflict with ctags package
+  mv "${pkgdir}"/usr/bin/{ctags,ctags.emacs}
+  mv "${pkgdir}"/usr/share/man/man1/{ctags.1.gz,ctags.emacs.1}
+
+  # fix user/root permissions on usr/share files
+  find "${pkgdir}"/usr/share/emacs/${pkgver} -exec chown root:root {} \;
+}