[arch-commits] Commit in python/repos (4 files)

[Allan McRae]

    Date: Sunday, July 19, 2009 @ 22:28:20
  Author: allan
Revision: 46742

Merged revisions 46740 via svnmerge from 
svn+ssh://archlinux.org/srv/svn-packages/python/trunk

........
  r46740 | allan | 2009-07-20 12:27:23 +1000 (Mon, 20 Jul 2009) | 2 lines
  
  upgpkg: python 2.6.2-5
      fix for readline6.0 (FS#15548)
........

Added:
  python/repos/extra-i686/python-2.6-readline.patch
    (from rev 46740, python/trunk/python-2.6-readline.patch)
Modified:
  python/repos/extra-i686/	(properties)
  python/repos/extra-i686/ChangeLog
  python/repos/extra-i686/PKGBUILD

---------------------------+
 ChangeLog                 |    5 +++++
 PKGBUILD                  |    5 ++++-
 python-2.6-readline.patch |   23 +++++++++++++++++++++++
 3 files changed, 32 insertions(+), 1 deletion(-)


Property changes on: python/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /python/trunk:1-45599
   + /python/trunk:1-46740

Modified: extra-i686/ChangeLog
===================================================================
--- extra-i686/ChangeLog	2009-07-20 02:27:58 UTC (rev 46741)
+++ extra-i686/ChangeLog	2009-07-20 02:28:20 UTC (rev 46742)
@@ -1,3 +1,8 @@
+2009-07-20  Allan McRae <allan at archlinux.org>
+	* python 2.6.2-5
+	* add patch to fix readline completion support
+	  with readline 6.0
+
 2009-07-13  Allan McRae <allan at archlinux.org>
 	* python 2.6.2-4
 	* use our CFLAGS (FS#15336)

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-07-20 02:27:58 UTC (rev 46741)
+++ extra-i686/PKGBUILD	2009-07-20 02:28:20 UTC (rev 46742)
@@ -4,7 +4,7 @@
 
 pkgname=python
 pkgver=2.6.2
-pkgrel=4
+pkgrel=5
 _pybasever=2.6
 pkgdesc="A high-level scripting language"
 arch=('i686' 'x86_64')
@@ -19,12 +19,14 @@
 	python-2.6-internal-expat.patch
 	python-2.6-gdbm.patch
 	python-2.6-smtplib.patch
+	python-2.6-readline.patch
 	modulator-launcher
 	pynche-launcher)
 md5sums=('245db9f1e0f09ab7e0faaa0cf7301011'
          '993800dbcc0c4f199c1ceee998a06e71'
          '13fab4bb2cacbc433e62d7191a17f71e'
          'c38d58521acfb6eec0c3d3c5ad38410a'
+         '1f0aed8b96d4531f40fd3e24a80157a5'
          'b4a531570415280dc406c8d5c1fa8d83'
          '9f731b9033db285132a3524fb36409e7')
 
@@ -34,6 +36,7 @@
   patch -Np0 -i ${srcdir}/python-2.6-internal-expat.patch
   patch -Np1 -i ${srcdir}/python-2.6-gdbm.patch
   patch -Np0 -i ${srcdir}/python-2.6-smtplib.patch
+  patch -Np0 -i ${srcdir}/python-2.6-readline.patch
 
   export OPT="${CFLAGS}"
   ./configure --prefix=/usr --enable-shared --with-threads --enable-unicode

Copied: python/repos/extra-i686/python-2.6-readline.patch (from rev 46740, python/trunk/python-2.6-readline.patch)
===================================================================
--- extra-i686/python-2.6-readline.patch	                        (rev 0)
+++ extra-i686/python-2.6-readline.patch	2009-07-20 02:28:20 UTC (rev 46742)
@@ -0,0 +1,23 @@
+--- Modules/readline.c	2008-11-04 12:43:31.000000000 -0800
++++ Modules/readline.c	2009-04-22 15:50:49.000000000 -0700
+@@ -759,6 +759,10 @@
+ static char **
+ flex_complete(char *text, int start, int end)
+ {
++#ifdef HAVE_RL_COMPLETION_APPEND_CHARACTER
++	rl_completion_append_character ='\0';
++	rl_completion_suppress_append = 0;
++#endif
+ 	Py_XDECREF(begidx);
+ 	Py_XDECREF(endidx);
+ 	begidx = PyInt_FromLong((long) start);
+@@ -799,11 +803,8 @@
+ 	rl_completer_word_break_characters =
+		strdup(" \t\n`~!@#$%^&*()-=+[{]}\\|;:'\",<>/?");
+ 		/* All nonalphanums except '.' */
+-#ifdef HAVE_RL_COMPLETION_APPEND_CHARACTER
+-	rl_completion_append_character ='\0';
+-#endif
+ 
+ 	begidx = PyInt_FromLong(0L);
+ 	endidx = PyInt_FromLong(0L);