[arch-commits] Commit in readline/repos (10 files)
Allan McRae
allan at nymeria.archlinux.org
Sat Mar 8 02:20:50 UTC 2014
Date: Saturday, March 8, 2014 @ 03:20:50
Author: allan
Revision: 207156
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
readline/repos/testing-i686/
readline/repos/testing-i686/PKGBUILD
(from rev 207155, readline/trunk/PKGBUILD)
readline/repos/testing-i686/inputrc
(from rev 207155, readline/trunk/inputrc)
readline/repos/testing-i686/readline-6.3-vi-last.patch
(from rev 207155, readline/trunk/readline-6.3-vi-last.patch)
readline/repos/testing-i686/readline.install
(from rev 207155, readline/trunk/readline.install)
readline/repos/testing-x86_64/
readline/repos/testing-x86_64/PKGBUILD
(from rev 207155, readline/trunk/PKGBUILD)
readline/repos/testing-x86_64/inputrc
(from rev 207155, readline/trunk/inputrc)
readline/repos/testing-x86_64/readline-6.3-vi-last.patch
(from rev 207155, readline/trunk/readline-6.3-vi-last.patch)
readline/repos/testing-x86_64/readline.install
(from rev 207155, readline/trunk/readline.install)
-------------------------------------------+
testing-i686/PKGBUILD | 60 ++++++++++++++++++++++++++++
testing-i686/inputrc | 36 ++++++++++++++++
testing-i686/readline-6.3-vi-last.patch | 15 +++++++
testing-i686/readline.install | 17 +++++++
testing-x86_64/PKGBUILD | 60 ++++++++++++++++++++++++++++
testing-x86_64/inputrc | 36 ++++++++++++++++
testing-x86_64/readline-6.3-vi-last.patch | 15 +++++++
testing-x86_64/readline.install | 17 +++++++
8 files changed, 256 insertions(+)
Copied: readline/repos/testing-i686/PKGBUILD (from rev 207155, readline/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2014-03-08 02:20:50 UTC (rev 207156)
@@ -0,0 +1,60 @@
+# $Id$
+# Maintainer: Allan McRae <allan at archlinux.org>
+# Contributor: judd <jvinet at zeroflux.org>
+
+pkgname=readline
+_basever=6.3
+_patchlevel=000 #prepare for some patches
+pkgver=$_basever #.$_patchlevel
+pkgrel=2
+pkgdesc="GNU readline library"
+arch=('i686' 'x86_64')
+url="http://tiswww.case.edu/php/chet/readline/rltop.html"
+license=('GPL')
+depends=('glibc' 'ncurses')
+backup=('etc/inputrc')
+options=('!emptydirs')
+install=readline.install
+source=(http://ftp.gnu.org/gnu/readline/readline-$_basever.tar.gz{,.sig}
+ inputrc
+ readline-6.3-vi-last.patch)
+if [ $_patchlevel -gt 00 ]; then
+ for (( p=1; p<=$((10#${_patchlevel})); p++ )); do
+ source=(${source[@]} http://ftp.gnu.org/gnu/readline/readline-$_basever-patches/readline${_basever//./}-$(printf "%03d" $p){,.sig})
+ done
+fi
+md5sums=('33c8fb279e981274f485fd91da77e94a'
+ 'SKIP'
+ '58d54966c1191db45973cb3191ac621a'
+ 'fcfe0a50c69f56f66ad04127a927862e')
+
+preapre() {
+ cd ${srcdir}/${pkgname}-$_basever
+ for (( p=1; p<=$((10#${_patchlevel})); p++ )); do
+ msg "applying patch readline${_basever//./}-$(printf "%03d" $p)"
+ patch -p0 -i $srcdir/readline${_basever//./}-$(printf "%03d" $p)
+ done
+
+ # patch from upstream mailing list to fix vi mode
+ patch -p2 -i $srcdir/readline-6.3-vi-last.patch
+
+ # Remove RPATH from shared objects (FS#14366)
+ sed -i 's|-Wl,-rpath,$(libdir) ||g' support/shobj-conf
+}
+
+build() {
+ cd ${srcdir}/${pkgname}-$_basever
+
+ # build with -fPIC for x86_64 (FS#15634)
+ [[ $CARCH == "x86_64" ]] && CFLAGS="$CFLAGS -fPIC"
+
+ ./configure --prefix=/usr
+ make SHLIB_LIBS=-lncurses
+}
+
+package() {
+ cd ${srcdir}/${pkgname}-$_basever
+ make DESTDIR=${pkgdir} install
+
+ install -Dm644 ${srcdir}/inputrc ${pkgdir}/etc/inputrc
+}
Copied: readline/repos/testing-i686/inputrc (from rev 207155, readline/trunk/inputrc)
===================================================================
--- testing-i686/inputrc (rev 0)
+++ testing-i686/inputrc 2014-03-08 02:20:50 UTC (rev 207156)
@@ -0,0 +1,36 @@
+# do not bell on tab-completion
+#set bell-style none
+
+set meta-flag on
+set input-meta on
+set convert-meta off
+set output-meta on
+
+$if mode=emacs
+
+# for linux console and RH/Debian xterm
+"\e[1~": beginning-of-line
+"\e[4~": end-of-line
+"\e[5~": beginning-of-history
+"\e[6~": end-of-history
+"\e[7~": beginning-of-line
+"\e[3~": delete-char
+"\e[2~": quoted-insert
+"\e[5C": forward-word
+"\e[5D": backward-word
+"\e\e[C": forward-word
+"\e\e[D": backward-word
+"\e[1;5C": forward-word
+"\e[1;5D": backward-word
+
+# for rxvt
+"\e[8~": end-of-line
+
+# for non RH/Debian xterm, can't hurt for RH/DEbian xterm
+"\eOH": beginning-of-line
+"\eOF": end-of-line
+
+# for freebsd console
+"\e[H": beginning-of-line
+"\e[F": end-of-line
+$endif
Copied: readline/repos/testing-i686/readline-6.3-vi-last.patch (from rev 207155, readline/trunk/readline-6.3-vi-last.patch)
===================================================================
--- testing-i686/readline-6.3-vi-last.patch (rev 0)
+++ testing-i686/readline-6.3-vi-last.patch 2014-03-08 02:20:50 UTC (rev 207156)
@@ -0,0 +1,15 @@
+*** ../bash-4.3/lib/readline/readline.c 2013-10-28 14:58:06.000000000 -0400
+--- lib/readline/readline.c 2014-03-07 15:20:33.000000000 -0500
+***************
+*** 965,969 ****
+ if (rl_editing_mode == vi_mode && _rl_keymap == vi_movement_keymap &&
+ key != ANYOTHERKEY &&
+! rl_key_sequence_length == 1 && /* XXX */
+ _rl_vi_textmod_command (key))
+ _rl_vi_set_last (key, rl_numeric_arg, rl_arg_sign);
+--- 965,969 ----
+ if (rl_editing_mode == vi_mode && _rl_keymap == vi_movement_keymap &&
+ key != ANYOTHERKEY &&
+! _rl_dispatching_keymap == vi_movement_keymap &&
+ _rl_vi_textmod_command (key))
+ _rl_vi_set_last (key, rl_numeric_arg, rl_arg_sign);
Copied: readline/repos/testing-i686/readline.install (from rev 207155, readline/trunk/readline.install)
===================================================================
--- testing-i686/readline.install (rev 0)
+++ testing-i686/readline.install 2014-03-08 02:20:50 UTC (rev 207156)
@@ -0,0 +1,17 @@
+infodir=usr/share/info
+filelist=(history.info readline.info rluserman.info)
+
+post_upgrade() {
+ [ -x usr/bin/install-info ] || return 0
+ for file in ${filelist[@]}; do
+ install-info $infodir/$file.gz $infodir/dir 2> /dev/null
+ done
+}
+
+pre_remove() {
+ [ -x usr/bin/install-info ] || return 0
+ for file in ${filelist[@]}; do
+ install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
+ done
+}
+
Copied: readline/repos/testing-x86_64/PKGBUILD (from rev 207155, readline/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2014-03-08 02:20:50 UTC (rev 207156)
@@ -0,0 +1,60 @@
+# $Id$
+# Maintainer: Allan McRae <allan at archlinux.org>
+# Contributor: judd <jvinet at zeroflux.org>
+
+pkgname=readline
+_basever=6.3
+_patchlevel=000 #prepare for some patches
+pkgver=$_basever #.$_patchlevel
+pkgrel=2
+pkgdesc="GNU readline library"
+arch=('i686' 'x86_64')
+url="http://tiswww.case.edu/php/chet/readline/rltop.html"
+license=('GPL')
+depends=('glibc' 'ncurses')
+backup=('etc/inputrc')
+options=('!emptydirs')
+install=readline.install
+source=(http://ftp.gnu.org/gnu/readline/readline-$_basever.tar.gz{,.sig}
+ inputrc
+ readline-6.3-vi-last.patch)
+if [ $_patchlevel -gt 00 ]; then
+ for (( p=1; p<=$((10#${_patchlevel})); p++ )); do
+ source=(${source[@]} http://ftp.gnu.org/gnu/readline/readline-$_basever-patches/readline${_basever//./}-$(printf "%03d" $p){,.sig})
+ done
+fi
+md5sums=('33c8fb279e981274f485fd91da77e94a'
+ 'SKIP'
+ '58d54966c1191db45973cb3191ac621a'
+ 'fcfe0a50c69f56f66ad04127a927862e')
+
+preapre() {
+ cd ${srcdir}/${pkgname}-$_basever
+ for (( p=1; p<=$((10#${_patchlevel})); p++ )); do
+ msg "applying patch readline${_basever//./}-$(printf "%03d" $p)"
+ patch -p0 -i $srcdir/readline${_basever//./}-$(printf "%03d" $p)
+ done
+
+ # patch from upstream mailing list to fix vi mode
+ patch -p2 -i $srcdir/readline-6.3-vi-last.patch
+
+ # Remove RPATH from shared objects (FS#14366)
+ sed -i 's|-Wl,-rpath,$(libdir) ||g' support/shobj-conf
+}
+
+build() {
+ cd ${srcdir}/${pkgname}-$_basever
+
+ # build with -fPIC for x86_64 (FS#15634)
+ [[ $CARCH == "x86_64" ]] && CFLAGS="$CFLAGS -fPIC"
+
+ ./configure --prefix=/usr
+ make SHLIB_LIBS=-lncurses
+}
+
+package() {
+ cd ${srcdir}/${pkgname}-$_basever
+ make DESTDIR=${pkgdir} install
+
+ install -Dm644 ${srcdir}/inputrc ${pkgdir}/etc/inputrc
+}
Copied: readline/repos/testing-x86_64/inputrc (from rev 207155, readline/trunk/inputrc)
===================================================================
--- testing-x86_64/inputrc (rev 0)
+++ testing-x86_64/inputrc 2014-03-08 02:20:50 UTC (rev 207156)
@@ -0,0 +1,36 @@
+# do not bell on tab-completion
+#set bell-style none
+
+set meta-flag on
+set input-meta on
+set convert-meta off
+set output-meta on
+
+$if mode=emacs
+
+# for linux console and RH/Debian xterm
+"\e[1~": beginning-of-line
+"\e[4~": end-of-line
+"\e[5~": beginning-of-history
+"\e[6~": end-of-history
+"\e[7~": beginning-of-line
+"\e[3~": delete-char
+"\e[2~": quoted-insert
+"\e[5C": forward-word
+"\e[5D": backward-word
+"\e\e[C": forward-word
+"\e\e[D": backward-word
+"\e[1;5C": forward-word
+"\e[1;5D": backward-word
+
+# for rxvt
+"\e[8~": end-of-line
+
+# for non RH/Debian xterm, can't hurt for RH/DEbian xterm
+"\eOH": beginning-of-line
+"\eOF": end-of-line
+
+# for freebsd console
+"\e[H": beginning-of-line
+"\e[F": end-of-line
+$endif
Copied: readline/repos/testing-x86_64/readline-6.3-vi-last.patch (from rev 207155, readline/trunk/readline-6.3-vi-last.patch)
===================================================================
--- testing-x86_64/readline-6.3-vi-last.patch (rev 0)
+++ testing-x86_64/readline-6.3-vi-last.patch 2014-03-08 02:20:50 UTC (rev 207156)
@@ -0,0 +1,15 @@
+*** ../bash-4.3/lib/readline/readline.c 2013-10-28 14:58:06.000000000 -0400
+--- lib/readline/readline.c 2014-03-07 15:20:33.000000000 -0500
+***************
+*** 965,969 ****
+ if (rl_editing_mode == vi_mode && _rl_keymap == vi_movement_keymap &&
+ key != ANYOTHERKEY &&
+! rl_key_sequence_length == 1 && /* XXX */
+ _rl_vi_textmod_command (key))
+ _rl_vi_set_last (key, rl_numeric_arg, rl_arg_sign);
+--- 965,969 ----
+ if (rl_editing_mode == vi_mode && _rl_keymap == vi_movement_keymap &&
+ key != ANYOTHERKEY &&
+! _rl_dispatching_keymap == vi_movement_keymap &&
+ _rl_vi_textmod_command (key))
+ _rl_vi_set_last (key, rl_numeric_arg, rl_arg_sign);
Copied: readline/repos/testing-x86_64/readline.install (from rev 207155, readline/trunk/readline.install)
===================================================================
--- testing-x86_64/readline.install (rev 0)
+++ testing-x86_64/readline.install 2014-03-08 02:20:50 UTC (rev 207156)
@@ -0,0 +1,17 @@
+infodir=usr/share/info
+filelist=(history.info readline.info rluserman.info)
+
+post_upgrade() {
+ [ -x usr/bin/install-info ] || return 0
+ for file in ${filelist[@]}; do
+ install-info $infodir/$file.gz $infodir/dir 2> /dev/null
+ done
+}
+
+pre_remove() {
+ [ -x usr/bin/install-info ] || return 0
+ for file in ${filelist[@]}; do
+ install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
+ done
+}
+
More information about the arch-commits
mailing list