emacs-git 25.1.50.r126117-1

    Problems with gtk+ 3.20 were fixed in commit afc9e65.

2 files changed, 7 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 750d5b810d69..c045b19ddd5e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = emacs-git
 	pkgdesc = GNU Emacs. Master development branch.
-	pkgver = 25.1.50.r125786
-	pkgrel = 2
+	pkgver = 25.1.50.r126117
+	pkgrel = 1
 	url = http://www.gnu.org/software/emacs/
 	arch = i686
 	arch = x86_64
@@ -13,7 +13,7 @@ pkgbase = emacs-git
 	depends = desktop-file-utils
 	depends = alsa-lib
 	depends = imagemagick
-	depends = gtk2
+	depends = gtk3
 	provides = emacs
 	conflicts = emacs
 	source = emacs-git::git://git.savannah.gnu.org/emacs.git
diff --git a/PKGBUILD b/PKGBUILD
index 3ee147f155f1..38cac976a3f9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -18,12 +18,6 @@
 #
 #  "makepkg -i" is your friend.
 #
-#  There is a bug with gtk+ 3.20 where the geometry is not 
-#  calculated at all. Emacs opens in a very small frame.
-#  From within emacs, search for the options initial-frame-alist
-#  and default-frame-alist to set up emacs frame geometry to
-#  your personal preference. Switching to GTK+2 fixes it for now.
-#
 #######################################################################
 
 #######################################################################
@@ -35,7 +29,7 @@
 #######################################################################
 # Assign "YES" to the variable you want enabled, empty otherwise
 #######################################################################
-GTK3=            # Leave empty to compile with gtk+ 2 support. BTW, gtk3 is broken.
+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.
 XWIDGETS=        # Use GTK+ native widgets pulled from webkitgtk.
@@ -44,8 +38,8 @@ DOCS_PDF=        # Generate and install pdf documentation.
 #######################################################################
 
 pkgname=emacs-git
-pkgver=25.1.50.r125786
-pkgrel=2
+pkgver=25.1.50.r126117
+pkgrel=1
 pkgdesc="GNU Emacs. Master development branch."
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/emacs/"
@@ -65,8 +59,8 @@ if [[ $DOCS_PDF = "YES" ]]; then makedepends+=('texlive-core'); fi
 conflicts=('emacs')
 provides=('emacs')
 source=("$pkgname::git://git.savannah.gnu.org/emacs.git")
-md5sums=('SKIP')
 #source=("$pkgname::git+http://git.savannah.gnu.org/r/emacs.git")
+md5sums=('SKIP')
 
 pkgver() {
   cd "$srcdir/$pkgname"