X-Recipient: archive-cygwin AT delorie DOT com
X-SWARE-Spam-Status: No, hits=3.3 required=5.0 	tests=AWL,BAYES_00,BOTNET
X-Spam-Check-By: sourceware.org
Date: Fri, 12 Feb 2010 14:11:13 -0500
From: Jason Tishler <jason AT tishler DOT net>
To: cygwin AT cygwin DOT com
Subject: Re: Python 2.6 ?
Message-id: <20100212191113.GF5740@tishler.net>
Mail-followup-to: cygwin AT cygwin DOT com
References: <4B5EADFB DOT 4010200 AT users DOT sourceforge DOT net>  <20100126135611 DOT GA2212 AT tishler DOT net> <4B5F54D1 DOT 3080400 AT users DOT sourceforge DOT net>  <20100127193431 DOT GA1332 AT tishler DOT net> <4B60CB02 DOT 7010106 AT users DOT sourceforge DOT net>
MIME-version: 1.0
Content-type: multipart/mixed; boundary=9zSXsLTf0vkW971A
Content-disposition: inline
In-reply-to: <4B60CB02.7010106@users.sourceforge.net>
User-Agent: Mutt/1.4.2.1i
X-IsSubscribed: yes
Mailing-List: contact cygwin-help AT cygwin DOT com; run by ezmlm
Precedence: bulk
List-Id: <cygwin.cygwin.com>
List-Unsubscribe: <mailto:cygwin-unsubscribe-archive-cygwin=delorie DOT com AT cygwin DOT com>
List-Subscribe: <mailto:cygwin-subscribe AT cygwin DOT com>
List-Archive: <http://sourceware.org/ml/cygwin/>
List-Post: <mailto:cygwin AT cygwin DOT com>
List-Help: <mailto:cygwin-help AT cygwin DOT com>, <http://sourceware.org/ml/#faqs>
Sender: cygwin-owner AT cygwin DOT com
Mail-Followup-To: cygwin AT cygwin DOT com
Delivered-To: mailing list cygwin AT cygwin DOT com

--9zSXsLTf0vkW971A
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

Yaakov,

On Wed, Jan 27, 2010 at 05:23:46PM -0600, Yaakov (Cygwin/X) wrote:
> On 27/01/2010 13:34, Jason Tishler wrote:
> >I prefer the above approach.  However, what happens if 2.7 is
> >released during the 2.5 to 2.6 transition period?
> 
> 2.7 is currently holding at alpha2.  The 2.7 release schedule[1] shows
> that 2.7 final is due in June, and even if it's on time, it could be
> months before most software is ready for 2.7 and even longer before
> anything actually *needs* it.  I doubt most distros will make it the
> default 2.x version until 2011, so I still think 2.6 is the way to go
> right now.
> [snip]

I've started to make some progress in releasing Python 2.5 and 2.6 for
Cygwin 1.7.  I've decided to switch to cygport, so I was hoping you
could review my work and answer another question.  Note I used your
python-2.5.4-10.cygport from cygwin-ports SVN as my starting point.

The attached patches are my changes:

1. I removed your 2.5.2-tkinter-x11.patch and added a 2.5.5-tkinter.patch,
so _tkinter builds and runs against the Win32 tcltk instead of the X11
version.  FWIW, this is consistent with the _tkinter module that has
been in the standard Cygwin distribution for years.

2. I added 2.5.5-curses.patch and CPPFLAGS=-I/usr/include/ncurses, so
the _curses and _curses_panel modules will build cleanly against the
latest ncurses.

3. I changed "requires" in tkinter.hint as per #1 above.

Are you OK with these changes?

I would like to release 2.5.5 first and then 2.6.4.  Unfortunately,
there is no HTML documentation specifically for 2.5.5, so I guess I
should use the documentation from 2.5.4.  Do you know of any clever ways
to mix 2.5.5 source and 2.5.4 documentation without having to hardcode
versions in the cygport file?

Thanks,
Jason

-- 
PGP/GPG Key: http://www.tishler.net/jason/pubkey.asc or key servers
Fingerprint: 7A73 1405 7F2B E669 C19D  8784 1AFD E4CC ECF4 8EF6

--9zSXsLTf0vkW971A
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="cygport.patch"

--- python-2.5.4-10.cygport.orig	2010-02-11 16:47:25.454038100 -0500
+++ python-2.5.4-10.cygport	2010-02-12 08:58:01.641802800 -0500
@@ -11,9 +11,10 @@
 	2.5.2-destdir.patch
 	2.5.2-no-libm.patch
 	2.5.2-ossaudio.patch
-	2.5.2-tkinter-x11.patch
 	2.5.2-ctypes-util-find_library.patch
 	2.5.4-gcc4.patch
+	2.5.5-curses.patch
+	2.5.5-tkinter.patch
 "
 
 SRC_DIR="Python-${PV}"
@@ -43,6 +44,7 @@
 	--with-libc=
 	--with-libm=
 	--with-system-ffi
+	CPPFLAGS=-I/usr/include/ncurses
 "
 
 src_install() {
--- CYGWIN-PATCHES/tkinter.hint.orig	2010-02-12 11:51:28.597161100 -0500
+++ CYGWIN-PATCHES/tkinter.hint	2010-02-12 11:52:22.397236500 -0500
@@ -1,5 +1,5 @@
 category: Python X11
-requires: python tcl tk tk-tix
+requires: python tcltk
 external-source: python
 sdesc: "Python Tkinter GUI module"
 ldesc: "Python is an interpreted, interactive object-oriented 

--9zSXsLTf0vkW971A
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="2.5.5-curses.patch"

--- Include/py_curses.h.orig	2003-06-29 11:46:21.000000000 -0400
+++ Include/py_curses.h	2010-02-05 08:11:51.857091600 -0500
@@ -39,6 +39,10 @@
 #endif
 #endif
 
+#ifdef __CYGWIN__
+#define NCURSES_INTERNALS
+#endif
+
 #ifdef HAVE_NCURSES_H
 #include <ncurses.h>
 #else

--9zSXsLTf0vkW971A
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="2.5.5-tkinter.patch"

--- setup.py.orig	2010-02-11 20:33:58.674306600 -0500
+++ setup.py	2010-02-11 20:43:03.625069500 -0500
@@ -1266,6 +1266,8 @@
         if platform == 'sunos5':
             include_dirs.append('/usr/openwin/include')
             added_lib_dirs.append('/usr/openwin/lib')
+        elif platform == 'cygwin':
+            include_dirs.append('/usr/include')
         elif os.path.exists('/usr/X11R6/include'):
             include_dirs.append('/usr/X11R6/include')
             added_lib_dirs.append('/usr/X11R6/lib64')


--9zSXsLTf0vkW971A
Content-Type: text/plain; charset=us-ascii

--
Problem reports:       http://cygwin.com/problems.html
FAQ:                   http://cygwin.com/faq/
Documentation:         http://cygwin.com/docs.html
Unsubscribe info:      http://cygwin.com/ml/#unsubscribe-simple
--9zSXsLTf0vkW971A--