[arch-commits] Commit in emacs/repos/extra-x86_64 (6 files)
Eric Bélanger
eric at archlinux.org
Sun Aug 21 02:30:33 UTC 2011
Date: Saturday, August 20, 2011 @ 22:30:32
Author: eric
Revision: 135954
archrelease: copy trunk to extra-x86_64
Added:
emacs/repos/extra-x86_64/PKGBUILD
(from rev 135953, emacs/trunk/PKGBUILD)
emacs/repos/extra-x86_64/emacs.desktop
(from rev 135953, emacs/trunk/emacs.desktop)
emacs/repos/extra-x86_64/emacs.install
(from rev 135953, emacs/trunk/emacs.install)
Deleted:
emacs/repos/extra-x86_64/PKGBUILD
emacs/repos/extra-x86_64/emacs.desktop
emacs/repos/extra-x86_64/emacs.install
---------------+
PKGBUILD | 100 ++++++++++++++++++++++++++++----------------------------
emacs.desktop | 24 ++++++-------
emacs.install | 60 +++++++++++++++++----------------
3 files changed, 94 insertions(+), 90 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2011-08-21 02:30:07 UTC (rev 135953)
+++ PKGBUILD 2011-08-21 02:30:32 UTC (rev 135954)
@@ -1,50 +0,0 @@
-# $Id$
-# Maintainer: Juergen Hoetzel <juergen at archlinux.org>
-# Contributor: Renchi Raju <renchi at green.tam.uiuc.edu>
-pkgname=emacs
-pkgver=23.3a
-pkgrel=1
-pkgdesc="The Emacs Editor"
-arch=(i686 x86_64)
-url="http://www.gnu.org/software/emacs/emacs.html"
-license=('GPL')
-options=(docs)
-replaces=(cedet)
-depends=('dbus-core' 'librsvg' 'gpm' 'giflib' 'libtiff' 'libxpm' 'libjpeg' 'gtk2' 'texinfo' 'hicolor-icon-theme' 'gconf')
-source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver.tar.gz emacs.desktop)
-md5sums=('20aef9ea5b5bf8050d39f8b1e96a1c04'
- '8af038d2ba4561271e935bb444ceb4e3')
-install=emacs.install
-
-build() {
- cd $startdir/src/$pkgname-${pkgver%[a-z]}
- mandir=/usr/share/man
-
- # gcc 4.5 Workaround: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43904
- CFLAGS="${CFLAGS} -fno-optimize-sibling-calls"\
- ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \
- --localstatedir=/var --mandir=${mandir} --without-sound --with-x-toolkit=gtk
- make
- make DESTDIR=$startdir/pkg install
-
- # remove conflict with ctags package
- mv $startdir/pkg/usr/bin/{ctags,ctags.emacs}
- mv $startdir/pkg/usr/bin/{etags,etags.emacs}
- mv $startdir/pkg${mandir}/man1/{etags.1,etags.emacs.1}
- mv $startdir/pkg${mandir}/man1/{ctags.1,ctags.emacs.1}
- # fix all the 777 perms on directories
- find $startdir/pkg/usr/share/emacs/${pkgver%[a-z]} -type d -exec chmod 755 {} \;
- # fix user/root permissions on usr/share files
- find $startdir/pkg/usr/share/emacs/${pkgver%[a-z]} -exec chown root.root {} \;
- # fix perms on /var/games
- chmod 775 ${startdir}/pkg/var/games
- chmod 775 ${startdir}/pkg/var/games/emacs
- chmod 664 ${startdir}/pkg/var/games/emacs/*
- chown -R root:50 ${startdir}/pkg/var/games
-
-
- # fix FS#9253
- mkdir -p $startdir/pkg/usr/share/pixmaps ${startdir}/pkg/usr/share/applications
- install -D -m644 ${startdir}/src/${pkgname}.desktop ${startdir}/pkg/usr/share/applications
- ln -s ../emacs/${pkgver%[a-z]}/etc/images/icons/hicolor/48x48/apps/emacs.png $startdir/pkg/usr/share/pixmaps/emacs-icon.png
-}
Copied: emacs/repos/extra-x86_64/PKGBUILD (from rev 135953, emacs/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2011-08-21 02:30:32 UTC (rev 135954)
@@ -0,0 +1,50 @@
+# $Id$
+# Maintainer: Juergen Hoetzel <juergen at archlinux.org>
+# Contributor: Renchi Raju <renchi at green.tam.uiuc.edu>
+pkgname=emacs
+_majorver=23.3
+_minorver=a
+# We want something like "23.3.a" so pacman version comparison works, but
+# upstream uses "23.3a", which is a bit silly and interpreted as alpha.
+pkgver=$_majorver.$_minorver
+_realver=$_majorver$_minorver
+pkgrel=2
+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' 'libxpm' 'gtk2' 'hicolor-icon-theme' 'gconf' 'desktop-file-utils')
+install=emacs.install
+source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$_realver.tar.gz emacs.desktop)
+md5sums=('20aef9ea5b5bf8050d39f8b1e96a1c04'
+ '8af038d2ba4561271e935bb444ceb4e3')
+
+build() {
+ cd "$srcdir"/$pkgname-$_majorver
+ ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \
+ --localstatedir=/var --without-sound --with-x-toolkit=gtk --with-xft
+ make
+}
+
+package() {
+ cd "$srcdir"/$pkgname-$_majorver
+ make DESTDIR="$pkgdir" install
+
+ # remove conflict with ctags package
+ mv "$pkgdir"/usr/bin/{ctags,ctags.emacs}
+ mv "$pkgdir"/usr/share/man/man1/{ctags.1,ctags.emacs.1}
+ # fix all the 777 perms on directories
+ find "$pkgdir"/usr/share/emacs/$_majorver -type d -exec chmod 755 {} \;
+ # fix user/root permissions on usr/share files
+ find "$pkgdir"/usr/share/emacs/$_majorver -exec chown root:root {} \;
+ # fix perms on /var/games
+ chmod 775 "$pkgdir"/var/games
+ chmod 775 "$pkgdir"/var/games/emacs
+ chmod 664 "$pkgdir"/var/games/emacs/*
+ chown -R root:games "$pkgdir"/var/games
+
+ # fix FS#9253
+ mkdir -p "$pkgdir"/usr/share/pixmaps "$pkgdir"/usr/share/applications
+ install -D -m644 "$srcdir"/$pkgname.desktop "$pkgdir"/usr/share/applications
+ ln -s ../emacs/$_majorver/etc/images/icons/hicolor/48x48/apps/emacs.png "$pkgdir"/usr/share/pixmaps/emacs-icon.png
+}
Deleted: emacs.desktop
===================================================================
--- emacs.desktop 2011-08-21 02:30:07 UTC (rev 135953)
+++ emacs.desktop 2011-08-21 02:30:32 UTC (rev 135954)
@@ -1,12 +0,0 @@
-[Desktop Entry]
-Name=Emacs Text Editor
-Name[de]=Emacs Texteditor
-GenericName=Text Editor
-Comment=Edit text
-MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
-Exec=emacs %f
-Icon=emacs-icon
-Type=Application
-Terminal=false
-Categories=Development;TextEditor;
-StartupWMClass=Emacs
Copied: emacs/repos/extra-x86_64/emacs.desktop (from rev 135953, emacs/trunk/emacs.desktop)
===================================================================
--- emacs.desktop (rev 0)
+++ emacs.desktop 2011-08-21 02:30:32 UTC (rev 135954)
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Name=Emacs Text Editor
+Name[de]=Emacs Texteditor
+GenericName=Text Editor
+Comment=Edit text
+MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
+Exec=emacs %f
+Icon=emacs-icon
+Type=Application
+Terminal=false
+Categories=Development;TextEditor;
+StartupWMClass=Emacs
Deleted: emacs.install
===================================================================
--- emacs.install 2011-08-21 02:30:07 UTC (rev 135953)
+++ emacs.install 2011-08-21 02:30:32 UTC (rev 135954)
@@ -1,28 +0,0 @@
-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() {
- 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
-}
-
-post_upgrade() {
- post_install $1
-}
-
-pre_remove() {
- 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
-}
Copied: emacs/repos/extra-x86_64/emacs.install (from rev 135953, emacs/trunk/emacs.install)
===================================================================
--- emacs.install (rev 0)
+++ emacs.install 2011-08-21 02:30:32 UTC (rev 135954)
@@ -0,0 +1,32 @@
+ICON_PATH=usr/share/icons/hicolor
+INFO_DIR=usr/share/info
+
+INFO_FILES=(ada-mode auth autotype calc ccmode cl dbus dired-x ebrowse
+ede ediff edt efaq eieio 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 semantic ses sieve smtpmail
+speedbar tramp url vip viper widget woman)
+
+post_install() {
+ gtk-update-icon-cache -q -t -f ${ICON_PATH}
+ update-desktop-database -q
+
+ [[ -x usr/bin/install-info ]] || return 0
+ for f in ${INFO_FILES[@]}; do
+ install-info ${INFO_DIR}/$f.gz ${INFO_DIR}/dir 2> /dev/null
+ done
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+pre_remove() {
+ gtk-update-icon-cache -q -t -f ${ICON_PATH}
+ update-desktop-database -q
+
+ [[ -x usr/bin/install-info ]] || return 0
+ for f in ${INFO_FILES[@]}; do
+ install-info --delete ${INFO_DIR}/$f.gz ${INFO_DIR}/dir 2> /dev/null
+ done
+}
More information about the arch-commits
mailing list