Update to 25.1

3 files changed, 29 insertions, 27 deletions

diff --git a/.SRCINFO b/.SRCINFO
index cd804d20db6d..546c1374c597 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = emacs-24bit
 	pkgdesc = The extensible, customizable, self-documenting real-time display editor
-	pkgver = 24.5
-	pkgrel = 3
+	pkgver = 25.1
+	pkgrel = 1
 	url = http://www.gnu.org/software/emacs/emacs.html
 	install = emacs.install
 	arch = i686
@@ -10,29 +10,27 @@ pkgbase = emacs-24bit
 	depends = librsvg
 	depends = gpm
 	depends = giflib
-	depends = gmime
 	depends = libxpm
 	depends = libotf
 	depends = m17n-lib
 	depends = gtk3
 	depends = hicolor-icon-theme
 	depends = gconf
-	depends = desktop-file-utils
 	depends = alsa-lib
 	depends = imagemagick
 	depends = gnutls
+	provides = emacs=25.1
 	conflicts = emacs
-	source = ftp://ftp.gnu.org/gnu/emacs/emacs-24.5.tar.xz
-	source = ftp://ftp.gnu.org/gnu/emacs/emacs-24.5.tar.xz.sig
-	source = https://gist.githubusercontent.com/choppsv1/e8198df70cb1778b04d6/raw/99b9c436c5b7dc96f2d4645b7b2cdeec614f7698/emacs-24.5-24bit.diff
-	source = gmalloc.c.diff::https://bugs.debian.org/cgi-bin/bugreport.cgi?att=1;bug=833727;filename=0020-Always-define-gmalloc-etc.-in-src-gmalloc.c.patch;msg=5
+	conflicts = emacs-nox
+	source = ftp://ftp.gnu.org/gnu/emacs/emacs-25.1.tar.xz
+	source = ftp://ftp.gnu.org/gnu/emacs/emacs-25.1.tar.xz.sig
+	source = https://gist.githubusercontent.com/choppsv1/3364fd6658ef498b5e06151217187017/raw/82f872d78a101effabd0cbfe7959c464b7471b3c/emacs-25.1-24bit.diff
 	validpgpkeys = BE216115
 	validpgpkeys = B29426DEFB07724C3C35E5D36592E9A3A0B0F199
 	validpgpkeys = 28D3BED851FDF3AB57FEF93C233587A47C207910
-	sha256sums = dd47d71dd2a526cf6b47cb49af793ec2e26af69a0951cc40e43ae290eacfc34e
+	sha256sums = 19f2798ee3bc26c95dca3303e7ab141e7ad65d6ea2b6945eeba4dbea7df48f33
 	sha256sums = SKIP
-	sha256sums = fbe9ce2014535f79d878d65062906f8a869bf49fe51421672f10a406e1d44b12
-	sha256sums = d210aa4fa776c0b0b8f0eb3daee19b80b30754e9c155800ea59f6b9501bb7271
+	sha256sums = f51541cae7c5f2aec6fe760f78e55d34794454fb58dc25e1e8be911fd956bfe0
 
 pkgname = emacs-24bit
 
diff --git a/PKGBUILD b/PKGBUILD
index 53d989eec701..6c04b3635f2f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,4 +1,5 @@
 # $Id$
+# Maintainer: Christian Hopps <chopps@gmail.com>
 # Contributor: Christian Hopps <chopps@gmail.com>
 #
 # To enable 24 bit color in the terminal one must define the environment
@@ -7,28 +8,28 @@
 # Derived from standard emacs PKGBUILD
 
 pkgname=emacs-24bit
-pkgver=24.5
-pkgrel=3
+pkgver=25.1
+pkgrel=1
 pkgdesc="The extensible, customizable, self-documenting real-time display editor"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/emacs/emacs.html"
 license=('GPL3')
-depends=('librsvg' 'gpm' 'giflib' 'gmime' 'libxpm' 'libotf' 'm17n-lib' 'gtk3' 'hicolor-icon-theme' 'gconf' 'desktop-file-utils' 'alsa-lib' 'imagemagick' 'gnutls')
+depends=('librsvg' 'gpm' 'giflib' 'libxpm' 'libotf' 'm17n-lib' 'gtk3' 'hicolor-icon-theme' 'gconf' 'alsa-lib' 'imagemagick' 'gnutls')
 install=emacs.install
 validpgpkeys=('BE216115' 'B29426DEFB07724C3C35E5D36592E9A3A0B0F199' '28D3BED851FDF3AB57FEF93C233587A47C207910')
 source=(ftp://ftp.gnu.org/gnu/emacs/emacs-$pkgver.tar.xz{,.sig}
-        https://gist.githubusercontent.com/choppsv1/e8198df70cb1778b04d6/raw/99b9c436c5b7dc96f2d4645b7b2cdeec614f7698/emacs-24.5-24bit.diff
-        'gmalloc.c.diff::https://bugs.debian.org/cgi-bin/bugreport.cgi?att=1;bug=833727;filename=0020-Always-define-gmalloc-etc.-in-src-gmalloc.c.patch;msg=5')
-sha256sums=('dd47d71dd2a526cf6b47cb49af793ec2e26af69a0951cc40e43ae290eacfc34e'
-         'SKIP'
-         'fbe9ce2014535f79d878d65062906f8a869bf49fe51421672f10a406e1d44b12'
-         'd210aa4fa776c0b0b8f0eb3daee19b80b30754e9c155800ea59f6b9501bb7271')
-conflicts=(emacs)
+        https://gist.githubusercontent.com/choppsv1/3364fd6658ef498b5e06151217187017/raw/82f872d78a101effabd0cbfe7959c464b7471b3c/emacs-25.1-24bit.diff)
+
+sha256sums=('19f2798ee3bc26c95dca3303e7ab141e7ad65d6ea2b6945eeba4dbea7df48f33'
+            'SKIP'
+            'f51541cae7c5f2aec6fe760f78e55d34794454fb58dc25e1e8be911fd956bfe0')
+
+provides=('emacs=25.1')
+conflicts=(emacs emacs-nox)
 
 prepare() {
         cd "$srcdir/emacs-${pkgver/_/}"
-        patch -Np1 -i ../emacs-24.5-24bit.diff
-        patch -Np1 -i ../gmalloc.c.diff
+        patch -Np1 -i ../emacs-25.1-24bit.diff
 }
 
 build() {
@@ -45,8 +46,7 @@ package() {
   # remove conflict with ctags package
   mv "$pkgdir"/usr/bin/{ctags,ctags.emacs}
   mv "$pkgdir"/usr/share/man/man1/{ctags.1.gz,ctags.emacs.1}
-  # remove conflict with texinfo
-  rm "$pkgdir"/usr/share/info/info.info.gz
+
   # fix user/root permissions on usr/share files
   find "$pkgdir"/usr/share/emacs/$pkgver -exec chown root:root {} \;
   # fix perms on /var/games
diff --git a/emacs.install b/emacs.install
index 6712f44bab84..64a719df5c81 100644
--- a/emacs.install
+++ b/emacs.install
@@ -9,7 +9,9 @@ speedbar srecode tramp url vip viper widget wisent woman)
 
 post_install() {
   gtk-update-icon-cache -q -t -f ${ICON_PATH}
-  update-desktop-database -q
+  if which update-desktop-database > /dev/null 2> /dev/null; then
+    update-desktop-database -q
+  fi
 
   [[ -x usr/bin/install-info ]] || return 0
   for f in ${INFO_FILES[@]}; do
@@ -23,7 +25,9 @@ post_upgrade() {
 
 pre_remove() {
   gtk-update-icon-cache -q -t -f ${ICON_PATH}
-  update-desktop-database -q
+  if which update-desktop-database > /dev/null 2> /dev/null; then
+    update-desktop-database -q
+  fi
 
   [[ -x usr/bin/install-info ]] || return 0
   for f in ${INFO_FILES[@]}; do