summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorPedro A. López-Valencia2022-06-03 13:29:28 -0500
committerPedro A. López-Valencia2022-06-03 13:29:28 -0500
commita6c8d10c5085712d6fd3489f4049d328109cfc8f (patch)
tree5a2de2df3fc0d46363cc835aba66a427a5589eab
parent43d6e95a36395093df9573dbe01d1bd2096ef744 (diff)
downloadaur-a6c8d10c5085712d6fd3489f4049d328109cfc8f.tar.gz
* 29.0.50.156996-1
-rw-r--r--.SRCINFO21
-rw-r--r--PKGBUILD15
2 files changed, 9 insertions, 27 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 624127633749..05cd63b01b41 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = emacs-git
pkgdesc = GNU Emacs. Development master branch.
- pkgver = 29.0.50.156833
+ pkgver = 29.0.50.156996
pkgrel = 1
url = http://www.gnu.org/software/emacs/
install = emacs-git.install
@@ -24,27 +24,10 @@ pkgbase = emacs-git
depends = giflib
depends = libwebp
depends = libtiff
+ depends = cairo
provides = emacs
- provides = emacs-pretest
- provides = emacs26-git
- provides = emacs-27-git
- provides = emacs28-git
- provides = emacs-seq
- provides = emacs-nox
conflicts = emacs
- conflicts = emacs-pretest
- conflicts = emacs26-git
- conflicts = emacs-27-git
- conflicts = emacs28-git
- conflicts = emacs-seq
- conflicts = emacs-nox
replaces = emacs
- replaces = emacs-pretest
- replaces = emacs26-git
- replaces = emacs-27-git
- replaces = emacs28-git
- replaces = emacs-seq
- replaces = emacs-nox
options = !strip
source = emacs-git::git+https://git.savannah.gnu.org/git/emacs.git
b2sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index be3d29f4f532..47192259b151 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -24,7 +24,7 @@ CHECK= # Run tests. May fail, this is developement after all.
CLANG= # Use clang.
-GOLD="YES" # Use the gold linker.
+GOLD= # Use the gold linker.
LTO= # Enable link-time optimization. Still experimental.
@@ -42,9 +42,9 @@ GPM= # Mouse support in Linux console using gpmd.
NOTKIT= # Use no toolkit widgets. Like B&W Twm (001d sk00l).
# Bitmap fonts only, 1337!
-PGTK="YES" # Use native GTK3 build. Supports Wayland, yay!
+PGTK= # Use native GTK3 build. Supports Wayland, yay!
-GTK3= # GTK3 old windowing interface.
+GTK3="YES" # GTK3 old windowing interface.
LUCID= # Use the lucid, a.k.a athena, toolkit. Like XEmacs, sorta.
#
@@ -76,7 +76,7 @@ if [[ $CLI == "YES" ]] ; then
else
pkgname="emacs-git"
fi
-pkgver=29.0.50.156833
+pkgver=29.0.50.156996
pkgrel=1
pkgdesc="GNU Emacs. Development master branch."
arch=('x86_64')
@@ -235,7 +235,6 @@ build() {
# If you insist you'll need to read that bug report in *full*.
# Good luck!
--without-gconf
- --without-gsettings
)
################################################################################
@@ -270,9 +269,9 @@ elif [[ $PGTK == "YES" ]]; then
_conf+=( '--with-pgtk' '--without-xaw3d' );
fi
-#if [[ ! $PGTK == "YES" ]]; then
-# _conf+=( '--without-gsettings' ) :
-#fi
+if [[ ! $PGTK == "YES" ]]; then
+ _conf+=( '--without-gsettings' ) :
+fi
if [[ $NOCAIRO == "YES" || $CLI == "YES" || $NOTKIT == "YES" || $LUCID == "YES" ]]; then
_conf+=( '--without-cairo' );