summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorPedro A. López-Valencia2017-07-30 18:18:24 -0500
committerPedro A. López-Valencia2017-07-30 18:18:24 -0500
commit81f3088eec20f4a1ea8b5a7b84a148b6dcdd5ab4 (patch)
treed412c8a3f097a8ae7bd898ece385122360783a79
parent6059ca84f0d4952a94784da3af7b6acb7ee00682 (diff)
downloadaur-81f3088eec20f4a1ea8b5a7b84a148b6dcdd5ab4.tar.gz
emacs-git-26.0.50.130000-1
* Disable linking with gconf or dconf as it breaks setting fonts from ~/.emacs as per https://debbugs.gnu.org/cgi/bugreport.cgi?bug=25228
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD12
2 files changed, 10 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index ad037910c91a..ab86c8eaf438 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = emacs-git
pkgdesc = GNU Emacs. Master development branch.
- pkgver = 26.0.50.129666
+ pkgver = 26.0.50.130000
pkgrel = 1
url = http://www.gnu.org/software/emacs/
arch = i686
diff --git a/PKGBUILD b/PKGBUILD
index 075e0efab390..0c99c12dda1e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -38,7 +38,7 @@ NOGZ="YES" # Don't compress el files. Info and man pages are
#######################################################################
pkgname=emacs-git
-pkgver=26.0.50.129666
+pkgver=26.0.50.130000
pkgrel=1
pkgdesc="GNU Emacs. Master development branch."
arch=('i686' 'x86_64')
@@ -177,10 +177,16 @@ if [[ $ATHENA = "YES" ]]; then
);
fi
+# Beware https://debbugs.gnu.org/cgi/bugreport.cgi?bug=25228
+# dconf and gconf break font settings set in ~/.emacs
+# If you insist you'll need to play gymnastics with
+# set-frame-font and set-menu-font. Good luck!
if [[ $GTK2 = "YES" ]]; then
- _conf+=( '--with-x-toolkit=gtk2' '--with-gconf' '--without-gsettings' );
+ #_conf+=( '--with-x-toolkit=gtk2' '--with-gconf' '--without-gsettings' );
+ _conf+=( '--with-x-toolkit=gtk2' '--without-gconf' '--without-gsettings' );
else
- _conf+=( '--with-x-toolkit=gtk3' '--without-gconf' '--with-gsettings' );
+ #_conf+=( '--with-x-toolkit=gtk3' '--without-gconf' '--with-gsettings' );
+ _conf+=( '--with-x-toolkit=gtk3' '--without-gconf' '--without-gsettings' );
fi
if [[ ! $GPM = "YES" ]]; then