From 3a87d263526cff65114b6a9b99687668ee1a7c43 Mon Sep 17 00:00:00 2001
From: juergen <juergen@eb2447ed-0c53-47e4-bac8-5bc4a241df78>
Date: Fri, 31 Jul 2009 17:27:47 +0000
Subject: [PATCH] Merged revisions 48120-48122 via svnmerge from
svn+ssh://svn.archlinux.org/srv/svn-packages/emacs/trunk
........
r48120 | juergen | 2009-07-31 18:22:29 +0200 (Fr, 31 Jul 2009) | 1 line
fix new depends
........
r48121 | juergen | 2009-07-31 18:31:14 +0200 (Fr, 31 Jul 2009) | 1 line
update icon cache on install/uninstall
........
r48122 | juergen | 2009-07-31 19:03:58 +0200 (Fr, 31 Jul 2009) | 1 line
add missing info pages
........
git-svn-id: file:///srv/repos/svn-packages/svn@48124 eb2447ed-0c53-47e4-bac8-5bc4a241df78
---
repos/extra-i686/PKGBUILD | 4 ++--
repos/extra-i686/emacs.install | 25 ++++++++++++++++---------
2 files changed, 18 insertions(+), 11 deletions(-)
diff --git a/repos/extra-i686/PKGBUILD b/repos/extra-i686/PKGBUILD
index 079ce19..06e5950 100644
--- a/repos/extra-i686/PKGBUILD
+++ b/repos/extra-i686/PKGBUILD
@@ -3,13 +3,13 @@
# Contributor: Renchi Raju <renchi@green.tam.uiuc.edu>
pkgname=emacs
pkgver=23.1
-pkgrel=2
+pkgrel=3
pkgdesc="The Emacs Editor"
arch=(i686 x86_64)
url="http://www.gnu.org/software/emacs/emacs.html"
license=('GPL')
options=(docs)
-depends=('ncurses' 'libpng' 'libtiff' 'giflib' 'libxpm' 'libjpeg>=7' 'gtk2' 'texinfo')
+depends=('dbus-core' 'librsvg' 'gpm' 'giflib' 'libtiff' 'libxpm' 'libjpeg>=7' 'gtk2' 'texinfo' 'hicolor-icon-theme')
source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver.tar.gz emacs.desktop)
md5sums=('a620d4452769d04ad8864d662f34f8dd' '8af038d2ba4561271e935bb444ceb4e3')
install=emacs.install
diff --git a/repos/extra-i686/emacs.install b/repos/extra-i686/emacs.install
index ba63b29..d1b4f47 100644
--- a/repos/extra-i686/emacs.install
+++ b/repos/extra-i686/emacs.install
@@ -1,12 +1,17 @@
-info_dir=/usr/share/info
-info_files=(infoada-mode autotype calc ccmode cl dir dired-x ebrowse
-ediff efaq eintr elisp emacs emacs-mime erc eshell eudc flymake forms
-gnus idlwave info message mh-e newsticker org pcl-cvs pgg rcirc reftex
-sc ses sieve smtpmail speedbar tramp url vip viper widget woman)
+ICON_PATH=/usr/share/icons/hicolor
+INFO_DIR=/usr/share/info
+
+INFO_FILES=(ada-mode auth autotype calc ccmode cl dbus dired-x ebrowse
+ediff efaq eintr elisp emacs emacs-mime epa erc eshell eudc flymake
+forms gnus idlwave info mairix-el message mh-e newsticker nxml-mode
+org pcl-cvs pgg rcirc reftex remember sasl sc ses sieve smtpmail
+speedbar tramp url vip viper widget woman)
post_install() {
- for f in ${info_files[@]}; do
- install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
+ gtk-update-icon-cache -q -t -f ${ICON_PATH}
+
+ for f in ${INFO_FILES[@]}; do
+ install-info ${INFO_DIR}/$f.gz ${INFO_DIR}/dir 2> /dev/null
done
}
@@ -15,8 +20,10 @@ post_upgrade() {
}
pre_remove() {
- for f in ${info_files[@]}; do
- install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
+ gtk-update-icon-cache -q -t -f ${ICON_PATH}
+
+ for f in ${INFO_FILES[@]}; do
+ install-info --delete ${INFO_DIR}/$f.gz ${INFO_DIR}/dir 2> /dev/null
done
}
--
GitLab