diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-04-14 13:11:29 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-04-14 13:11:29 +0200 |
| commit | 1d953269cf1d33902f0a61e4cb50ed8ed2895874 (patch) | |
| tree | 5738504fa3ad42138b46f2906cf8a40b5f78afb9 /extra/emacs | |
| parent | 8e5c27c1b5d01d353df2542166d50f9f456b2597 (diff) | |
| parent | caa3e47071c8516ac31afaa0b654f5aaa4911939 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
extra/php-apc/PKGBUILD
testing/glibmm/PKGBUILD
testing/gtkmm3/PKGBUILD
testing/udisks2/PKGBUILD
Diffstat (limited to 'extra/emacs')
| -rw-r--r-- | extra/emacs/PKGBUILD | 12 | ||||
| -rw-r--r-- | extra/emacs/emacs-23.3-xgselect_init.patch | 13 |
2 files changed, 21 insertions, 4 deletions
diff --git a/extra/emacs/PKGBUILD b/extra/emacs/PKGBUILD index 0b844a996..0bc839ac8 100644 --- a/extra/emacs/PKGBUILD +++ b/extra/emacs/PKGBUILD @@ -1,24 +1,28 @@ -# $Id: PKGBUILD 148704 2012-02-05 11:47:36Z ibiru $ +# $Id: PKGBUILD 156054 2012-04-12 12:20:45Z juergen $ # Maintainer: Juergen Hoetzel <juergen@archlinux.org> # Contributor: Renchi Raju <renchi@green.tam.uiuc.edu> pkgname=emacs pkgver=23.4 -pkgrel=1 +pkgrel=2 pkgdesc="The extensible, customizable, self-documenting real-time display editor" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/emacs/emacs.html" license=('GPL3') depends=('librsvg' 'gpm' 'giflib' 'libxpm' 'gtk2' 'hicolor-icon-theme' 'gconf' 'desktop-file-utils' 'alsa-lib') install=emacs.install -source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver.tar.bz2{,.sig} emacs-subversion17.patch) +source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver.tar.bz2{,.sig} + emacs-subversion17.patch + emacs-23.3-xgselect_init.patch) md5sums=('070c68ad8e3c31fb3cb2414feaf5e6f0' '55eb16eb48b44987693c0e3ea5ab8075' - '12e2e7a66df5cc5ded54e1d30083a1fb') + '12e2e7a66df5cc5ded54e1d30083a1fb' + '0d3b3d701ba1295613ace30e8d67ca88') build() { cd "$srcdir"/$pkgname-$pkgver patch -p1 -i ../emacs-subversion17.patch + patch -p1 -i ../emacs-23.3-xgselect_init.patch ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \ --localstatedir=/var --with-x-toolkit=gtk --with-xft make diff --git a/extra/emacs/emacs-23.3-xgselect_init.patch b/extra/emacs/emacs-23.3-xgselect_init.patch new file mode 100644 index 000000000..f3168e0e2 --- /dev/null +++ b/extra/emacs/emacs-23.3-xgselect_init.patch @@ -0,0 +1,13 @@ +diff -up emacs-23.3/src/xgselect.c.xgselect_init emacs-23.3/src/xgselect.c +--- emacs-23.3/src/xgselect.c.xgselect_init 2011-01-08 18:45:14.000000000 +0100 ++++ emacs-23.3/src/xgselect.c 2011-11-11 13:00:53.211765255 +0100 +@@ -55,6 +55,9 @@ xg_select (max_fds, rfds, wfds, efds, ti + do { + if (n_gfds > gfds_size) + { ++ if (gfds_size == 0) ++ xgselect_initialize (); ++ + while (n_gfds > gfds_size) + gfds_size *= 2; + xfree (gfds); |