Tunining in and up.

3 files changed, 29 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6c05bf298ef9..37faeb748070 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = emacs25-git
-	pkgdesc = GNU Emacs. Version 25 development and maintenance branch. Fix 2.
+	pkgdesc = GNU Emacs. Version 25 development and maintenance branch.
 	pkgver = 25.1.50.125246
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.gnu.org/software/emacs/
 	arch = i686
 	arch = x86_64
@@ -11,8 +11,8 @@ pkgbase = emacs25-git
 	depends = m17n-lib
 	depends = alsa-lib
 	depends = imagemagick
-	depends = 
-	depends = webkitgtk
+	depends = gtk3
+	depends = gnutls
 	provides = emacs
 	conflicts = emacs
 	source = emacs25-git::git://git.savannah.gnu.org/emacs.git#branch=emacs-25
diff --git a/.gitignore b/.gitignore
index 81a906f6f6d1..ad00fc143605 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+emacs25-git
 *~
 *.log
 pkg/
@@ -13,4 +14,3 @@ src/
 *.tar
 *.jar
 *.zip
-emacs25-git
diff --git a/PKGBUILD b/PKGBUILD
index dcf648df0aae..df668aa54187 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -28,19 +28,23 @@
 
 #######################################################################
 # Assign "YES" to the variable you want enabled, empty otherwise
+#
+#      Where you read experimental, replace with foobar.
+# =============================================================
+#
 #######################################################################
-GTK3="YES"       # Leave empty to compile with gtk+ 2 support.
-LTO=             # Enable link-time optimization. Broken.
-CAIRO=           # Very broken for everyone. Use at own risk.
+GTK2=            # Leave empty to compile with gtk+ 3 support.
+LTO=             # Enable link-time optimization. Experimental.
+CAIRO=           # Experimental.
 XWIDGETS=        # Use GTK+ native widgets pulled from webkitgtk.
-                 # Experimental as in: It will break and eat your homework.
+                 # Highly experimental.
 DOCS_HTML=       # Generate and install html documentation.
 DOCS_PDF=        # Generate and install pdf documentation.
 #######################################################################
 
 pkgname=emacs25-git
 pkgver=25.1.50.125246
-pkgrel=1
+pkgrel=2
 pkgdesc="GNU Emacs. Version 25 development and maintenance branch."
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/emacs/"
@@ -49,18 +53,23 @@ depends=('gpm' 'm17n-lib' 'alsa-lib' 'imagemagick')
 makedepends=('git')
 #######################################################################
 #######################################################################
-if [[ $GTK3 = "YES" ]]; then
-  depends+=('gtk3');
+if [[ $GTK2 = "YES" ]]; then
+  depends+=('gtk2');
 else
-  depends+=('gtk2'); 
+  depends+=('gtk3'); 
 fi
 if [[ $CAIRO = "YES" ]]; then depends+=('cairo'); fi
 if [[ $XWIDGETS = "" ]]; then depends+=('gnutls'); fi
 if [[ $XWIDGETS = "YES" ]]; then
-  if [[ $GTK3 = "YES" ]]; then 
-    depends+=('webkitgtk'); 
+  if [[ $GTK2 = "YES" ]]; then 
+    echo "";
+    echo "";
+    echo "Xwidgets support *requires* gtk+3!!!";
+    echo "";
+    echo "";
+    exit 1;
    else 
-    depends+=('webkitgtk2'); 
+    depends+=('webkit2gtk'); 
   fi
 fi
 if [[ $DOCS_PDF = "YES" ]]; then makedepends+=('texlive-core'); fi
@@ -109,10 +118,10 @@ build() {
 
 #######################################################################
 #######################################################################
-  if [[ $GTK3 = "YES" ]]; then 
-    _conf+=('--with-x-toolkit=gtk3' '--without-gconf' '--with-gsettings'); 
-  else
+  if [[ $GTK2 = "YES" ]]; then 
     _conf+=('--with-x-toolkit=gtk2' '--with-gconf' '--without-gsettings');
+  else
+    _conf+=('--with-x-toolkit=gtk3' '--without-gconf' '--with-gsettings'); 
   fi
   if [[ $LTO = "YES" ]]; then _conf+=('--enable-link-time-optimization'); fi
   if [[ $CAIRO = "YES" ]]; then _conf+=('--with-cairo'); fi
@@ -130,8 +139,7 @@ build() {
   # are reusing your src directory!
   make
 
-  # You may need to run this if loaddefs.el files become
-  # corrupt.
+  # You may need to run this if loaddefs.el files become corrupt.
   #cd "$srcdir/$pkgname/lisp"
   #make autoloads
   #cd ../