+++ /dev/null
---- Python-2.5.1/Include/pyexpat.h.rhconfig 2006-06-19 19:21:25.000000000 -0400
-+++ Python-2.5.1/Include/pyexpat.h 2007-06-27 10:12:45.000000000 -0400
-@@ -5,6 +5,19 @@
-
- #define PyExpat_CAPI_MAGIC "pyexpat.expat_CAPI 1.0"
-
-+#ifdef XML_LARGE_SIZE /* Use large integers for file/stream positions. */
-+#if defined(XML_USE_MSC_EXTENSIONS) && _MSC_VER < 1400
-+typedef __int64 XML_Index;
-+typedef unsigned __int64 XML_Size;
-+#else
-+typedef long long XML_Index;
-+typedef unsigned long long XML_Size;
-+#endif
-+#else
-+typedef long XML_Index;
-+typedef unsigned long XML_Size;
-+#endif /* XML_LARGE_SIZE */
-+
- struct PyExpat_CAPI
- {
- char* magic; /* set to PyExpat_CAPI_MAGIC */
---- Python-2.5.1/Modules/Setup.dist.rhconfig 2006-08-06 03:26:21.000000000 -0400
-+++ Python-2.5.1/Modules/Setup.dist 2007-06-27 10:12:45.000000000 -0400
-@@ -149,7 +149,7 @@ GLHACK=-Dclear=__GLclear
- # modules are to be built as shared libraries (see above for more
- # detail; also note that *static* reverses this effect):
-
--#*shared*
-+*shared*
-
- # GNU readline. Unlike previous Python incarnations, GNU readline is
- # now incorporated in an optional module, configured in the Setup file
-@@ -159,69 +159,69 @@ GLHACK=-Dclear=__GLclear
- # it, depending on your system -- see the GNU readline instructions.
- # It's okay for this to be a shared library, too.
-
--#readline readline.c -lreadline -ltermcap
-+readline readline.c -lreadline -lncursesw
-
-
- # Modules that should always be present (non UNIX dependent):
-
--#array arraymodule.c # array objects
--#cmath cmathmodule.c # -lm # complex math library functions
--#math mathmodule.c # -lm # math library functions, e.g. sin()
--#_struct _struct.c # binary structure packing/unpacking
--#time timemodule.c # -lm # time operations and variables
--#operator operator.c # operator.add() and similar goodies
--#_weakref _weakref.c # basic weak reference support
--#_testcapi _testcapimodule.c # Python C API test module
--#_random _randommodule.c # Random number generator
--#collections collectionsmodule.c # Container types
--#itertools itertoolsmodule.c # Functions creating iterators for efficient looping
--#strop stropmodule.c # String manipulations
-+array arraymodule.c # array objects
-+cmath cmathmodule.c # -lm # complex math library functions
-+math mathmodule.c # -lm # math library functions, e.g. sin()
-+_struct _struct.c # binary structure packing/unpacking
-+time timemodule.c # -lm # time operations and variables
-+operator operator.c # operator.add() and similar goodies
-+_weakref _weakref.c # basic weak reference support
-+_testcapi _testcapimodule.c # Python C API test module
-+_random _randommodule.c # Random number generator
-+collections collectionsmodule.c # Container types
-+itertools itertoolsmodule.c # Functions creating iterators for efficient looping
-+strop stropmodule.c # String manipulations
-
--#unicodedata unicodedata.c # static Unicode character database
-+unicodedata unicodedata.c # static Unicode character database
-
- # access to ISO C locale support
--#_locale _localemodule.c # -lintl
-+_locale _localemodule.c # -lintl
-
-
- # Modules with some UNIX dependencies -- on by default:
- # (If you have a really backward UNIX, select and socket may not be
- # supported...)
-
--#fcntl fcntlmodule.c # fcntl(2) and ioctl(2)
--#spwd spwdmodule.c # spwd(3)
--#grp grpmodule.c # grp(3)
--#select selectmodule.c # select(2); not on ancient System V
-+fcntl fcntlmodule.c # fcntl(2) and ioctl(2)
-+spwd spwdmodule.c # spwd(3)
-+grp grpmodule.c # grp(3)
-+select selectmodule.c # select(2); not on ancient System V
-
- # Memory-mapped files (also works on Win32).
--#mmap mmapmodule.c
-+mmap mmapmodule.c
-
- # CSV file helper
--#_csv _csv.c
-+_csv _csv.c
-
- # Socket module helper for socket(2)
--#_socket socketmodule.c
-+_socket socketmodule.c
-
- # Socket module helper for SSL support; you must comment out the other
- # socket line above, and possibly edit the SSL variable:
- #SSL=/usr/local/ssl
--#_ssl _ssl.c \
--# -DUSE_SSL -I$(SSL)/include -I$(SSL)/include/openssl \
--# -L$(SSL)/lib -lssl -lcrypto
-+_ssl _ssl.c \
-+ -DUSE_SSL -I$(SSL)/include -I$(SSL)/include/openssl \
-+ -L$(SSL)/lib -lssl -lcrypto
-
- # The crypt module is now disabled by default because it breaks builds
- # on many systems (where -lcrypt is needed), e.g. Linux (I believe).
- #
- # First, look at Setup.config; configure may have set this for you.
-
--#crypt cryptmodule.c # -lcrypt # crypt(3); needs -lcrypt on some systems
-+crypt cryptmodule.c -lcrypt # crypt(3); needs -lcrypt on some systems
-
-
- # Some more UNIX dependent modules -- off by default, since these
- # are not supported by all UNIX systems:
-
--#nis nismodule.c -lnsl # Sun yellow pages -- not everywhere
--#termios termios.c # Steen Lumholt's termios module
--#resource resource.c # Jeremy Hylton's rlimit interface
-+nis nismodule.c -lnsl # Sun yellow pages -- not everywhere
-+termios termios.c # Steen Lumholt's termios module
-+resource resource.c # Jeremy Hylton's rlimit interface
-
-
- # Multimedia modules -- off by default.
-@@ -229,9 +229,9 @@ GLHACK=-Dclear=__GLclear
- # #993173 says audioop works on 64-bit platforms, though.
- # These represent audio samples or images as strings:
-
--#audioop audioop.c # Operations on audio samples
--#imageop imageop.c # Operations on images
--#rgbimg rgbimgmodule.c # Read SGI RGB image files (but coded portably)
-+audioop audioop.c # Operations on audio samples
-+imageop imageop.c # Operations on images
-+rgbimg rgbimgmodule.c # Read SGI RGB image files (but coded portably)
-
-
- # Note that the _md5 and _sha modules are normally only built if the
-@@ -241,12 +241,12 @@ GLHACK=-Dclear=__GLclear
- # Message-Digest Algorithm, described in RFC 1321. The necessary files
- # md5.c and md5.h are included here.
-
--#_md5 md5module.c md5.c
-+_md5 md5module.c md5.c
-
-
- # The _sha module implements the SHA checksum algorithm.
- # (NIST's Secure Hash Algorithm.)
--#_sha shamodule.c
-+_sha shamodule.c
-
-
- # SGI IRIX specific modules -- off by default.
-@@ -293,12 +293,12 @@ GLHACK=-Dclear=__GLclear
- # A Linux specific module -- off by default; this may also work on
- # some *BSDs.
-
--#linuxaudiodev linuxaudiodev.c
-+linuxaudiodev linuxaudiodev.c
-
-
- # George Neville-Neil's timing module:
-
--#timing timingmodule.c
-+timing timingmodule.c
-
-
- # The _tkinter module.
-@@ -313,7 +313,7 @@ GLHACK=-Dclear=__GLclear
- # every system.
-
- # *** Always uncomment this (leave the leading underscore in!):
--# _tkinter _tkinter.c tkappinit.c -DWITH_APPINIT \
-+_tkinter _tkinter.c tkappinit.c -DWITH_APPINIT \
- # *** Uncomment and edit to reflect where your Tcl/Tk libraries are:
- # -L/usr/local/lib \
- # *** Uncomment and edit to reflect where your Tcl/Tk headers are:
-@@ -323,7 +323,7 @@ GLHACK=-Dclear=__GLclear
- # *** Or uncomment this for Solaris:
- # -I/usr/openwin/include \
- # *** Uncomment and edit for Tix extension only:
--# -DWITH_TIX -ltix8.1.8.2 \
-+ -DWITH_TIX -ltix \
- # *** Uncomment and edit for BLT extension only:
- # -DWITH_BLT -I/usr/local/blt/blt8.0-unoff/include -lBLT8.0 \
- # *** Uncomment and edit for PIL (TkImaging) extension only:
-@@ -332,7 +332,7 @@ GLHACK=-Dclear=__GLclear
- # *** Uncomment and edit for TOGL extension only:
- # -DWITH_TOGL togl.c \
- # *** Uncomment and edit to reflect your Tcl/Tk versions:
--# -ltk8.2 -ltcl8.2 \
-+ -ltk -ltcl \
- # *** Uncomment and edit to reflect where your X11 libraries are:
- # -L/usr/X11R6/lib \
- # *** Or uncomment this for Solaris:
-@@ -342,7 +342,7 @@ GLHACK=-Dclear=__GLclear
- # *** Uncomment for AIX:
- # -lld \
- # *** Always uncomment this; X11 libraries to link with:
--# -lX11
-+ -lX11
-
- # Lance Ellinghaus's syslog module
- #syslog syslogmodule.c # syslog daemon interface
-@@ -354,9 +354,9 @@ GLHACK=-Dclear=__GLclear
- #
- # First, look at Setup.config; configure may have set this for you.
-
--#_curses _cursesmodule.c -lcurses -ltermcap
-+_curses _cursesmodule.c -lncursesw
- # Wrapper for the panel library that's part of ncurses and SYSV curses.
--#_curses_panel _curses_panel.c -lpanel -lncurses
-+_curses_panel _curses_panel.c -lpanel -lncursesw
-
-
- # Generic (SunOS / SVR4) dynamic loading module.
-@@ -364,7 +364,7 @@ GLHACK=-Dclear=__GLclear
- # it is a highly experimental and dangerous device for calling
- # *arbitrary* C functions in *arbitrary* shared libraries:
-
--#dl dlmodule.c
-+dl dlmodule.c
-
-
- # Modules that provide persistent dictionary-like semantics. You will
-@@ -387,7 +387,7 @@ GLHACK=-Dclear=__GLclear
- #
- # First, look at Setup.config; configure may have set this for you.
-
--#gdbm gdbmmodule.c -I/usr/local/include -L/usr/local/lib -lgdbm
-+gdbm gdbmmodule.c -I/usr/local/include -L/usr/local/lib -lgdbm
-
-
- # Sleepycat Berkeley DB interface.
-@@ -402,11 +402,10 @@ GLHACK=-Dclear=__GLclear
- #
- # Edit the variables DB and DBLIBVERto point to the db top directory
- # and the subdirectory of PORT where you built it.
--#DB=/usr/local/BerkeleyDB.4.0
--#DBLIBVER=4.0
--#DBINC=$(DB)/include
--#DBLIB=$(DB)/lib
--#_bsddb _bsddb.c -I$(DBINC) -L$(DBLIB) -ldb-$(DBLIBVER)
-+DBLIBVER=4.7
-+DBINC=/usr/include/db4
-+DBLIB=/usr/lib
-+_bsddb _bsddb.c -I$(DBINC) -L$(DBLIB) -ldb-$(DBLIBVER)
-
- # Historical Berkeley DB 1.85
- #
-@@ -421,14 +420,14 @@ GLHACK=-Dclear=__GLclear
-
-
- # Helper module for various ascii-encoders
--#binascii binascii.c
-+binascii binascii.c
-
- # Fred Drake's interface to the Python parser
--#parser parsermodule.c
-+parser parsermodule.c
-
- # cStringIO and cPickle
--#cStringIO cStringIO.c
--#cPickle cPickle.c
-+cStringIO cStringIO.c
-+cPickle cPickle.c
-
-
- # Lee Busby's SIGFPE modules.
-@@ -451,7 +450,7 @@ GLHACK=-Dclear=__GLclear
- # Andrew Kuchling's zlib module.
- # This require zlib 1.1.3 (or later).
- # See http://www.gzip.org/zlib/
--#zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib -lz
-+zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib -lz
-
- # Interface to the Expat XML parser
- #
-@@ -465,20 +464,20 @@ GLHACK=-Dclear=__GLclear
- # More information on Expat can be found at www.libexpat.org.
- #
- #EXPAT_DIR=/usr/local/src/expat-1.95.2
--#pyexpat pyexpat.c -DHAVE_EXPAT_H -I$(EXPAT_DIR)/lib -L$(EXPAT_DIR) -lexpat
-+pyexpat pyexpat.c -DHAVE_EXPAT_H -lexpat
-
-
- # Hye-Shik Chang's CJKCodecs
-
- # multibytecodec is required for all the other CJK codec modules
--#_multibytecodec cjkcodecs/multibytecodec.c
-+_multibytecodec cjkcodecs/multibytecodec.c
-
--#_codecs_cn cjkcodecs/_codecs_cn.c
--#_codecs_hk cjkcodecs/_codecs_hk.c
--#_codecs_iso2022 cjkcodecs/_codecs_iso2022.c
--#_codecs_jp cjkcodecs/_codecs_jp.c
--#_codecs_kr cjkcodecs/_codecs_kr.c
--#_codecs_tw cjkcodecs/_codecs_tw.c
-+_codecs_cn cjkcodecs/_codecs_cn.c
-+_codecs_hk cjkcodecs/_codecs_hk.c
-+_codecs_iso2022 cjkcodecs/_codecs_iso2022.c
-+_codecs_jp cjkcodecs/_codecs_jp.c
-+_codecs_kr cjkcodecs/_codecs_kr.c
-+_codecs_tw cjkcodecs/_codecs_tw.c
-
- # Example -- included for reference only:
- # xx xxmodule.c
---- Python-2.5.1/setup.py.rhconfig 2007-06-27 10:26:41.000000000 -0400
-+++ Python-2.5.1/setup.py 2007-06-27 10:26:51.000000000 -0400
-@@ -998,7 +998,6 @@ class PyBuildExt(build_ext):
-
- exts.append(Extension('pyexpat',
- define_macros = define_macros,
-- include_dirs = [expatinc],
- sources = ['pyexpat.c',
- 'expat/xmlparse.c',
- 'expat/xmlrole.c',
-@@ -1013,7 +1012,6 @@ class PyBuildExt(build_ext):
- define_macros.append(('USE_PYEXPAT_CAPI', None))
- exts.append(Extension('_elementtree',
- define_macros = define_macros,
-- include_dirs = [expatinc],
- sources = ['_elementtree.c'],
- ))
-
git.annexia.org / fedora-mingw.git / blobdiff