summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorP.A. López-Valencia2016-10-28 20:39:30 -0500
committerP.A. López-Valencia2016-10-28 20:39:30 -0500
commitfbc07433aa7a884bafbcfd412f25ab734a39016e (patch)
treeb40700a0f5cde3a473b27ebcd73d344a1ebe546e
parentaecb1469e4545674ec675e401c481569b47300d9 (diff)
downloadaur-fbc07433aa7a884bafbcfd412f25ab734a39016e.tar.gz
emacs-git 26.0.50.127315-1
-rw-r--r--.SRCINFO5
-rw-r--r--PKGBUILD20
2 files changed, 17 insertions, 8 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 47de8d411f36..65d2cec4b9dc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = emacs-git
pkgdesc = GNU Emacs. Master development branch.
- pkgver = 26.0.50.127211
+ pkgver = 26.0.50.127315
pkgrel = 1
url = http://www.gnu.org/software/emacs/
arch = i686
@@ -8,12 +8,11 @@ pkgbase = emacs-git
license = GPL
makedepends = git
depends = gpm
- depends = giflib
depends = m17n-lib
- depends = desktop-file-utils
depends = alsa-lib
depends = imagemagick
depends = gtk3
+ depends = webkit2gtk
provides = emacs
conflicts = emacs
source = emacs-git::git://git.savannah.gnu.org/emacs.git
diff --git a/PKGBUILD b/PKGBUILD
index e78c9e1e5a4d..16d341c1a9c2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -31,27 +31,37 @@
#######################################################################
GTK3="YES" # Leave empty to compile with gtk+ 2 support.
LTO= # Enable link-time optimization. Broken.
-CAIRO= # Very broken for me. Use at own risk.
+CAIRO= # Very broken for everyone. Use at own risk.
XWIDGETS= # Use GTK+ native widgets pulled from webkitgtk.
+ # Experimental as in: It will break and eat your homework.
DOCS_HTML= # Generate and install html documentation.
DOCS_PDF= # Generate and install pdf documentation.
#######################################################################
pkgname=emacs-git
-pkgver=26.0.50.127211
+pkgver=26.0.50.127315
pkgrel=1
pkgdesc="GNU Emacs. Master development branch."
arch=('i686' 'x86_64')
url="http://www.gnu.org/software/emacs/"
license=('GPL')
-depends=('gpm' 'giflib' 'm17n-lib' 'desktop-file-utils' 'alsa-lib' 'imagemagick')
+depends=('gpm' 'm17n-lib' 'alsa-lib' 'imagemagick')
makedepends=('git')
#######################################################################
#######################################################################
-if [[ $GTK3 = "YES" ]]; then depends+=('gtk3'); else depends+=('gtk2'); fi
+if [[ $GTK3 = "YES" ]]; then
+ depends+=('gtk3');
+else
+ depends+=('gtk2');
+fi
if [[ $CAIRO = "YES" ]]; then depends+=('cairo'); fi
+if [[ $XWIDGETS = "" ]]; then depends+=('giflib'); fi
if [[ $XWIDGETS = "YES" ]]; then
- if [[ $GTK3 = "YES" ]]; then depends+=('webkitgtk'); else depends+=('webkitgtk2'); fi
+ if [[ $GTK3 = "YES" ]]; then
+ depends+=('webkit2gtk');
+ else
+ depends+=('webkitgtk2');
+ fi
fi
if [[ $DOCS_PDF = "YES" ]]; then makedepends+=('texlive-core'); fi
#######################################################################