Imported sources from subversion.
This commit is contained in:
Ricardo Martins
59
packages/readline/default.bash
Normal file
59
packages/readline/default.bash
Normal file
@@ -0,0 +1,59 @@
|
||||
version=\
|
||||
(
|
||||
'6.2'
|
||||
)
|
||||
|
||||
revision=\
|
||||
(
|
||||
'1'
|
||||
)
|
||||
|
||||
url=\
|
||||
(
|
||||
"ftp://ftp.gnu.org/gnu/readline/readline-$version.tar.gz"
|
||||
)
|
||||
|
||||
md5=\
|
||||
(
|
||||
'67948acb2ca081f23359d0256e9a271c'
|
||||
)
|
||||
|
||||
maintainer=\
|
||||
(
|
||||
'Ricardo Martins <rasm@fe.up.pt>'
|
||||
)
|
||||
|
||||
post_unpack()
|
||||
{
|
||||
patches=$(ls "$cfg_package_spec_dir/patches/"*.patch)
|
||||
if [ -n "$patches" ]; then
|
||||
cat $patches | patch -p0
|
||||
fi
|
||||
}
|
||||
|
||||
configure()
|
||||
{
|
||||
"../readline-$version/configure" \
|
||||
--prefix="$cfg_dir_toolchain_sysroot/usr" \
|
||||
--target="$cfg_target_canonical" \
|
||||
--host="$cfg_target_canonical" \
|
||||
--build="$cfg_host_canonical"
|
||||
}
|
||||
|
||||
build()
|
||||
{
|
||||
$cmd_make
|
||||
}
|
||||
|
||||
host_install()
|
||||
{
|
||||
$cmd_make install
|
||||
}
|
||||
|
||||
target_install()
|
||||
{
|
||||
for lib in history readline; do
|
||||
install "$cfg_dir_toolchain_sysroot/usr/lib/lib$lib.so"* "$cfg_dir_rootfs/usr/lib"
|
||||
$cmd_target_strip --strip-unneeded "$cfg_dir_rootfs/usr/lib/lib$lib.so"*
|
||||
done
|
||||
}
|
||||
46
packages/readline/patches/readline62-001.patch
Normal file
46
packages/readline/patches/readline62-001.patch
Normal file
@@ -0,0 +1,46 @@
|
||||
READLINE PATCH REPORT
|
||||
=====================
|
||||
|
||||
Readline-Release: 6.2
|
||||
Patch-ID: readline62-001
|
||||
|
||||
Bug-Reported-by: Clark J. Wang <dearvoid@gmail.com>
|
||||
Bug-Reference-ID: <AANLkTimGbW7aC4E5infXP6ku5WPci4t=xVc+L1SyHqrD@mail.gmail.com>
|
||||
Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-02/msg00157.html
|
||||
|
||||
Bug-Description:
|
||||
|
||||
The readline vi-mode `cc', `dd', and `yy' commands failed to modify the
|
||||
entire line.
|
||||
|
||||
[This patch intentionally does not modify patchlevel]
|
||||
|
||||
Patch (apply with `patch -p0'):
|
||||
|
||||
*** ../readline-6.2-patched/vi_mode.c 2010-11-20 19:51:39.000000000 -0500
|
||||
--- vi_mode.c 2011-02-17 20:24:25.000000000 -0500
|
||||
***************
|
||||
*** 1115,1119 ****
|
||||
_rl_vi_last_motion = c;
|
||||
RL_UNSETSTATE (RL_STATE_VIMOTION);
|
||||
! return (0);
|
||||
}
|
||||
#if defined (READLINE_CALLBACKS)
|
||||
--- 1115,1119 ----
|
||||
_rl_vi_last_motion = c;
|
||||
RL_UNSETSTATE (RL_STATE_VIMOTION);
|
||||
! return (vidomove_dispatch (m));
|
||||
}
|
||||
#if defined (READLINE_CALLBACKS)
|
||||
*** ../readline-6.2-patched/callback.c 2010-06-06 12:18:58.000000000 -0400
|
||||
--- callback.c 2011-02-17 20:43:28.000000000 -0500
|
||||
***************
|
||||
*** 149,152 ****
|
||||
--- 149,155 ----
|
||||
/* Should handle everything, including cleanup, numeric arguments,
|
||||
and turning off RL_STATE_VIMOTION */
|
||||
+ if (RL_ISSTATE (RL_STATE_NUMERICARG) == 0)
|
||||
+ _rl_internal_char_cleanup ();
|
||||
+
|
||||
return;
|
||||
}
|
||||
57
packages/readline/patches/readline62-002.patch
Normal file
57
packages/readline/patches/readline62-002.patch
Normal file
@@ -0,0 +1,57 @@
|
||||
READLINE PATCH REPORT
|
||||
=====================
|
||||
|
||||
Readline-Release: 6.2
|
||||
Patch-ID: readline62-002
|
||||
|
||||
Bug-Reported-by: Vincent Sheffer <vince.sheffer@apisphere.com>
|
||||
Bug-Reference-ID: <F13C1C4F-C44C-4071-BFED-4BB6D13CF92F@apisphere.com>
|
||||
Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-readline/2011-08/msg00000.html
|
||||
|
||||
Bug-Description:
|
||||
|
||||
The readline shared library helper script needs to be updated for Mac OS X
|
||||
10.7 (Lion, darwin11).
|
||||
|
||||
Patch (apply with `patch -p0'):
|
||||
|
||||
*** ../readline-6.2-patched/support/shobj-conf 2009-10-28 09:20:21.000000000 -0400
|
||||
--- support/shobj-conf 2011-08-27 13:25:23.000000000 -0400
|
||||
***************
|
||||
*** 158,162 ****
|
||||
|
||||
# Darwin/MacOS X
|
||||
! darwin[89]*|darwin10*)
|
||||
SHOBJ_STATUS=supported
|
||||
SHLIB_STATUS=supported
|
||||
--- 172,176 ----
|
||||
|
||||
# Darwin/MacOS X
|
||||
! darwin[89]*|darwin1[012]*)
|
||||
SHOBJ_STATUS=supported
|
||||
SHLIB_STATUS=supported
|
||||
***************
|
||||
*** 187,191 ****
|
||||
|
||||
case "${host_os}" in
|
||||
! darwin[789]*|darwin10*) SHOBJ_LDFLAGS=''
|
||||
SHLIB_XLDFLAGS='-dynamiclib -arch_only `/usr/bin/arch` -install_name $(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v'
|
||||
;;
|
||||
--- 201,205 ----
|
||||
|
||||
case "${host_os}" in
|
||||
! darwin[789]*|darwin1[012]*) SHOBJ_LDFLAGS=''
|
||||
SHLIB_XLDFLAGS='-dynamiclib -arch_only `/usr/bin/arch` -install_name $(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v'
|
||||
;;
|
||||
|
||||
*** ../readline-6.2-patched/patchlevel 2010-01-14 10:15:52.000000000 -0500
|
||||
--- patchlevel 2011-11-17 11:09:35.000000000 -0500
|
||||
***************
|
||||
*** 1,3 ****
|
||||
# Do not edit -- exists only for use by patch
|
||||
|
||||
! 1
|
||||
--- 1,3 ----
|
||||
# Do not edit -- exists only for use by patch
|
||||
|
||||
! 2
|
||||
76
packages/readline/patches/readline62-003.patch
Normal file
76
packages/readline/patches/readline62-003.patch
Normal file
@@ -0,0 +1,76 @@
|
||||
READLINE PATCH REPORT
|
||||
=====================
|
||||
|
||||
Readline-Release: 6.2
|
||||
Patch-ID: readline62-003
|
||||
|
||||
Bug-Reported-by: Max Horn <max@quendi.de>
|
||||
Bug-Reference-ID: <20CC5C60-07C3-4E41-9817-741E48D407C5@quendi.de>
|
||||
Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-readline/2012-06/msg00005.html
|
||||
|
||||
Bug-Description:
|
||||
|
||||
A change between readline-6.1 and readline-6.2 to prevent the readline input
|
||||
hook from being called too frequently had the side effect of causing delays
|
||||
when reading pasted input on systems such as Mac OS X. This patch fixes
|
||||
those delays while retaining the readline-6.2 behavior.
|
||||
|
||||
Patch (apply with `patch -p0'):
|
||||
|
||||
*** ../readline-6.2-patched/input.c 2010-05-30 18:33:01.000000000 -0400
|
||||
--- input.c 2012-06-25 21:08:42.000000000 -0400
|
||||
***************
|
||||
*** 410,414 ****
|
||||
rl_read_key ()
|
||||
{
|
||||
! int c;
|
||||
|
||||
rl_key_sequence_length++;
|
||||
--- 412,416 ----
|
||||
rl_read_key ()
|
||||
{
|
||||
! int c, r;
|
||||
|
||||
rl_key_sequence_length++;
|
||||
***************
|
||||
*** 430,441 ****
|
||||
while (rl_event_hook)
|
||||
{
|
||||
! if (rl_gather_tyi () < 0) /* XXX - EIO */
|
||||
{
|
||||
rl_done = 1;
|
||||
return ('\n');
|
||||
}
|
||||
RL_CHECK_SIGNALS ();
|
||||
- if (rl_get_char (&c) != 0)
|
||||
- break;
|
||||
if (rl_done) /* XXX - experimental */
|
||||
return ('\n');
|
||||
--- 432,447 ----
|
||||
while (rl_event_hook)
|
||||
{
|
||||
! if (rl_get_char (&c) != 0)
|
||||
! break;
|
||||
!
|
||||
! if ((r = rl_gather_tyi ()) < 0) /* XXX - EIO */
|
||||
{
|
||||
rl_done = 1;
|
||||
return ('\n');
|
||||
}
|
||||
+ else if (r == 1) /* read something */
|
||||
+ continue;
|
||||
+
|
||||
RL_CHECK_SIGNALS ();
|
||||
if (rl_done) /* XXX - experimental */
|
||||
return ('\n');
|
||||
*** ../readline-6.2-patched/patchlevel 2010-01-14 10:15:52.000000000 -0500
|
||||
--- patchlevel 2011-11-17 11:09:35.000000000 -0500
|
||||
***************
|
||||
*** 1,3 ****
|
||||
# Do not edit -- exists only for use by patch
|
||||
|
||||
! 2
|
||||
--- 1,3 ----
|
||||
# Do not edit -- exists only for use by patch
|
||||
|
||||
! 3
|
||||
108
packages/readline/patches/readline62-004.patch
Normal file
108
packages/readline/patches/readline62-004.patch
Normal file
@@ -0,0 +1,108 @@
|
||||
READLINE PATCH REPORT
|
||||
=====================
|
||||
|
||||
Readline-Release: 6.2
|
||||
Patch-ID: readline62-004
|
||||
|
||||
Bug-Reported-by: Jakub Filak
|
||||
Bug-Reference-ID:
|
||||
Bug-Reference-URL: https://bugzilla.redhat.com/show_bug.cgi?id=813289
|
||||
|
||||
Bug-Description:
|
||||
|
||||
Attempting to redo (using `.') the vi editing mode `cc', `dd', or `yy'
|
||||
commands leads to an infinite loop.
|
||||
|
||||
Patch (apply with `patch -p0'):
|
||||
|
||||
*** ../readline-6.2-patched/vi_mode.c 2011-02-25 11:17:02.000000000 -0500
|
||||
--- vi_mode.c 2012-06-02 12:24:47.000000000 -0400
|
||||
***************
|
||||
*** 1235,1243 ****
|
||||
r = rl_domove_motion_callback (_rl_vimvcxt);
|
||||
}
|
||||
! else if (vi_redoing)
|
||||
{
|
||||
_rl_vimvcxt->motion = _rl_vi_last_motion;
|
||||
r = rl_domove_motion_callback (_rl_vimvcxt);
|
||||
}
|
||||
#if defined (READLINE_CALLBACKS)
|
||||
else if (RL_ISSTATE (RL_STATE_CALLBACK))
|
||||
--- 1297,1313 ----
|
||||
r = rl_domove_motion_callback (_rl_vimvcxt);
|
||||
}
|
||||
! else if (vi_redoing && _rl_vi_last_motion != 'd') /* `dd' is special */
|
||||
{
|
||||
_rl_vimvcxt->motion = _rl_vi_last_motion;
|
||||
r = rl_domove_motion_callback (_rl_vimvcxt);
|
||||
}
|
||||
+ else if (vi_redoing) /* handle redoing `dd' here */
|
||||
+ {
|
||||
+ _rl_vimvcxt->motion = _rl_vi_last_motion;
|
||||
+ rl_mark = rl_end;
|
||||
+ rl_beg_of_line (1, key);
|
||||
+ RL_UNSETSTATE (RL_STATE_VIMOTION);
|
||||
+ r = vidomove_dispatch (_rl_vimvcxt);
|
||||
+ }
|
||||
#if defined (READLINE_CALLBACKS)
|
||||
else if (RL_ISSTATE (RL_STATE_CALLBACK))
|
||||
***************
|
||||
*** 1317,1325 ****
|
||||
r = rl_domove_motion_callback (_rl_vimvcxt);
|
||||
}
|
||||
! else if (vi_redoing)
|
||||
{
|
||||
_rl_vimvcxt->motion = _rl_vi_last_motion;
|
||||
r = rl_domove_motion_callback (_rl_vimvcxt);
|
||||
}
|
||||
#if defined (READLINE_CALLBACKS)
|
||||
else if (RL_ISSTATE (RL_STATE_CALLBACK))
|
||||
--- 1387,1403 ----
|
||||
r = rl_domove_motion_callback (_rl_vimvcxt);
|
||||
}
|
||||
! else if (vi_redoing && _rl_vi_last_motion != 'c') /* `cc' is special */
|
||||
{
|
||||
_rl_vimvcxt->motion = _rl_vi_last_motion;
|
||||
r = rl_domove_motion_callback (_rl_vimvcxt);
|
||||
}
|
||||
+ else if (vi_redoing) /* handle redoing `cc' here */
|
||||
+ {
|
||||
+ _rl_vimvcxt->motion = _rl_vi_last_motion;
|
||||
+ rl_mark = rl_end;
|
||||
+ rl_beg_of_line (1, key);
|
||||
+ RL_UNSETSTATE (RL_STATE_VIMOTION);
|
||||
+ r = vidomove_dispatch (_rl_vimvcxt);
|
||||
+ }
|
||||
#if defined (READLINE_CALLBACKS)
|
||||
else if (RL_ISSTATE (RL_STATE_CALLBACK))
|
||||
***************
|
||||
*** 1378,1381 ****
|
||||
--- 1456,1472 ----
|
||||
r = rl_domove_motion_callback (_rl_vimvcxt);
|
||||
}
|
||||
+ else if (vi_redoing && _rl_vi_last_motion != 'y') /* `yy' is special */
|
||||
+ {
|
||||
+ _rl_vimvcxt->motion = _rl_vi_last_motion;
|
||||
+ r = rl_domove_motion_callback (_rl_vimvcxt);
|
||||
+ }
|
||||
+ else if (vi_redoing) /* handle redoing `yy' here */
|
||||
+ {
|
||||
+ _rl_vimvcxt->motion = _rl_vi_last_motion;
|
||||
+ rl_mark = rl_end;
|
||||
+ rl_beg_of_line (1, key);
|
||||
+ RL_UNSETSTATE (RL_STATE_VIMOTION);
|
||||
+ r = vidomove_dispatch (_rl_vimvcxt);
|
||||
+ }
|
||||
#if defined (READLINE_CALLBACKS)
|
||||
else if (RL_ISSTATE (RL_STATE_CALLBACK))
|
||||
*** ../readline-6.2-patched/patchlevel 2010-01-14 10:15:52.000000000 -0500
|
||||
--- patchlevel 2011-11-17 11:09:35.000000000 -0500
|
||||
***************
|
||||
*** 1,3 ****
|
||||
# Do not edit -- exists only for use by patch
|
||||
|
||||
! 3
|
||||
--- 1,3 ----
|
||||
# Do not edit -- exists only for use by patch
|
||||
|
||||
! 4
|
||||
Reference in New Issue
Block a user