emacs: 25.1 released

Base PKGBUILD on emacs-git. This removes lots of unneeded stuff.

mingw-w64-emacs/0001-gnutls.patch

@@ -1,30 +0,0 @@
-diff --git a/lisp/term/w32-win.el b/lisp/term/w32-win.el
-index 6db7e20..d4fc0cd 100644
---- a/lisp/term/w32-win.el
-+++ b/lisp/term/w32-win.el
-@@ -265,7 +265,7 @@ This returns an error if any Emacs frames are X frames, or always under W32."
-        '(gdk-pixbuf "libgdk_pixbuf-2.0-0.dll")
-        '(glib "libglib-2.0-0.dll")
-        '(gobject "libgobject-2.0-0.dll")
--       '(gnutls "libgnutls-28.dll" "libgnutls-26.dll")
-+       '(gnutls "libgnutls-30.dll" "libgnutls-28.dll" "libgnutls-26.dll")
-        '(libxml2 "libxml2-2.dll" "libxml2.dll")
-        '(zlib "zlib1.dll" "libz-1.dll")))
- 
-diff --git a/src/gnutls.c b/src/gnutls.c
-index d363fea..c8a2b72 100644
---- a/src/gnutls.c
-+++ b/src/gnutls.c
-@@ -1020,8 +1020,10 @@ one trustfile (usually a CA bundle).  */)
-     return gnutls_make_error (ret);
- 
-   GNUTLS_INITSTAGE (proc) = GNUTLS_STAGE_CRED_SET;
--  ret = emacs_gnutls_handshake (XPROCESS (proc));
--  if (ret < GNUTLS_E_SUCCESS)
-+  do {
-+    ret = emacs_gnutls_handshake (XPROCESS (proc));
-+  } while (ret == GNUTLS_E_INTERRUPTED || ret == GNUTLS_E_AGAIN);
-+  if (ret < GNUTLS_E_SUCCESS && ret != GNUTLS_E_WARNING_ALERT_RECEIVED)
-     return gnutls_make_error (ret);
- 
-   /* Now verify the peer, following

mingw-w64-emacs/Makefile.in.diff

@@ -1,11 +0,0 @@
---- admin/unidata/Makefile.in.orig	2014-11-08 01:37:29.445161700 +0100
-+++ admin/unidata/Makefile.in	2014-11-08 01:33:48.642212600 +0100
-@@ -33,7 +33,7 @@
- 
- .PHONY: all compile install
- 
--all: ${top_srcdir}/src/macuvs.h ${DSTDIR}/charprop.el
-+all: ${DSTDIR}/charprop.el
- 
- ${top_srcdir}/src/macuvs.h: ${srcdir}/uvs.el ${srcdir}/IVD_Sequences.txt
- 	${EMACS} -batch -l "${srcdir}/uvs.el" \

mingw-w64-emacs/PKGBUILD

@@ -1,10 +1,11 @@
 # Maintainer: Haroogan <Haroogan@gmail.com>
+# Maintainer: Oscar Fuentes <ofv@wanadoo.es>
 
 _realname=emacs
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-pkgver=24.5
-pkgrel=6
+pkgver=25.1
+pkgrel=1
 pkgdesc="The extensible, customizable, self-documenting, real-time display editor (mingw-w64)"
 url="https://www.gnu.org/software/${_realname}/"
 license=('GPL3')
@@ -24,30 +25,22 @@ optdepends=("${MINGW_PACKAGE_PREFIX}-giflib"
             "${MINGW_PACKAGE_PREFIX}-zlib")
 makedepends=("${MINGW_PACKAGE_PREFIX}-gcc"
              "${MINGW_PACKAGE_PREFIX}-pkg-config"
-             "${MINGW_PACKAGE_PREFIX}-xpm-nox")
-options=('strip')
+             "patch")
+# Don't zip info files because the built-in info reader uses gzip to
+# decompress them. gzip is not available as a mingw binary.
+options=('strip' '!zipman')
 source=("https://ftp.gnu.org/gnu/${_realname}/${_realname}-${pkgver}.tar.xz"{,.sig}
         'image.c.diff'
-        'lread.c.diff'
-        'Makefile.in.diff'
-        'emacs-24.5-w32-ime.diff'
-        '0001-gnutls.patch')
-sha256sums=('dd47d71dd2a526cf6b47cb49af793ec2e26af69a0951cc40e43ae290eacfc34e'
-            'SKIP'
+        'lread.c.diff')
+sha256sums=('19f2798ee3bc26c95dca3303e7ab141e7ad65d6ea2b6945eeba4dbea7df48f33'
+	    'fce9c0494bec47106e6d6853e44b825e49558a8da009ec47930d7c7d6814037a'
             '4571d45ec26fd556e73a70bb0ab0a2a8fa1efc5e3b3c5b472ab68bb7dc9bf52c'
-            '24b2201aa2e965c759cfc9539aa4b610d97f1d0240d9888e335da490b87b84b5'
-            '1a49a2d4711d0204db80a88c120510168b2eb7649888de65634da252f03b7f16'
-            '08e3863250aa88bfd54915fe1b5cb14b6481d4cf300669998d54e016563af3f2'
-            '3a28e153e3934e5a96aaa762f181c606f0bb46684730fe9a0a34c67869cb6762')
+	    '24b2201aa2e965c759cfc9539aa4b610d97f1d0240d9888e335da490b87b84b5')
 
 prepare() {
   cd "${_realname}-${pkgver}"
   patch --binary --forward -p0 < "${srcdir}/image.c.diff"
   patch --binary --forward -p0 < "${srcdir}/lread.c.diff"
-  patch --binary --forward -p0 < "${srcdir}/Makefile.in.diff"
-  [[ -f "lisp/international/w32-ime.el" ]] && rm -rf "lisp/international/w32-ime.el"
-  patch --binary --forward -p0 < "${srcdir}/emacs-24.5-w32-ime.diff"
-  patch -p1 -i ${srcdir}/0001-gnutls.patch
   ./autogen.sh
 }
 
@@ -56,25 +49,14 @@ build() {
   mkdir -p "${srcdir}/build-${MINGW_CHOST}"
   cd "build-${MINGW_CHOST}"
 
-  local with_wide_int='no'
-
-  if test "${CARCH}" == 'x86_64'; then
-    with_wide_int='yes'
-  fi
-
-  CPPFLAGS="-DNDEBUG -isystem ${MINGW_PREFIX}/include"
-  CFLAGS="-pipe -O3 -fomit-frame-pointer -funroll-loops"
-  LDFLAGS="-s -Wl,-s"
   ../${_realname}-${pkgver}/configure \
     --prefix="${MINGW_PREFIX}" \
     --build="${MINGW_CHOST}" \
-    --with-wide-int="${with_wide_int}" \
-    --with-sound="yes" \
-    --with-file-notification="yes" \
-    --without-gpm \
-    --without-gconf \
-    --without-gsettings \
-    --without-selinux
+    --with-modules \
+    --without-compress-install
+
+  # --without-compress-install is needed because we don't have gzip in
+  # the mingw binaries.
 
   make
 }