summaryrefslogtreecommitdiff
path: root/x11-toolkits/py-wxPython24/files
diff options
context:
space:
mode:
Diffstat (limited to 'x11-toolkits/py-wxPython24/files')
-rw-r--r--x11-toolkits/py-wxPython24/files/patch-aa16
-rw-r--r--x11-toolkits/py-wxPython24/files/patch-ac111
-rw-r--r--x11-toolkits/py-wxPython24/files/patch-src-gtk_gdi.cpp20
-rw-r--r--x11-toolkits/py-wxPython24/files/patch-src_helpers.cpp20
4 files changed, 0 insertions, 167 deletions
diff --git a/x11-toolkits/py-wxPython24/files/patch-aa b/x11-toolkits/py-wxPython24/files/patch-aa
deleted file mode 100644
index 42bd28ded7f2..000000000000
--- a/x11-toolkits/py-wxPython24/files/patch-aa
+++ /dev/null
@@ -1,16 +0,0 @@
---- wxPython/py/introspect.py.orig Mon Jul 30 08:07:25 2007
-+++ wxPython/py/introspect.py Mon Jul 30 08:07:35 2007
-@@ -1,11 +1,11 @@
- """Provides a variety of introspective-type support functions for
- things like call tips and command auto completion."""
-
-+from __future__ import nested_scopes
-+
- __author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
- __cvsid__ = "$Id: introspect.py,v 1.1.2.2 2003/05/19 21:41:24 PKO Exp $"
- __revision__ = "$Revision: 1.1.2.2 $"[11:-2]
--
--from __future__ import nested_scopes
-
- import cStringIO
- import inspect
diff --git a/x11-toolkits/py-wxPython24/files/patch-ac b/x11-toolkits/py-wxPython24/files/patch-ac
deleted file mode 100644
index 49eeaaf5cd91..000000000000
--- a/x11-toolkits/py-wxPython24/files/patch-ac
+++ /dev/null
@@ -1,111 +0,0 @@
-
-$FreeBSD$
-
---- setup.py.orig Fri Mar 21 01:49:39 2003
-+++ setup.py Fri Apr 18 18:02:09 2003
-@@ -152,6 +152,16 @@
-
-
- #----------------------------------------------------------------------
-+# Check for some environment variables
-+#----------------------------------------------------------------------
-+
-+try: gtk_config = os.environ['GTK_CONFIG']
-+except KeyError: gtk_config = 'gtk-config'
-+
-+try: sys_libs = os.environ['LIBS'].split()
-+except KeyError: sys_libs = []
-+
-+#----------------------------------------------------------------------
- # Check for build flags on the command line
- #----------------------------------------------------------------------
-
-@@ -434,7 +444,7 @@
-
- if WXPORT == 'gtk':
- WXPLAT = '__WXGTK__'
-- portcfg = os.popen('gtk-config --cflags', 'r').read()[:-1]
-+ portcfg = os.popen(gtk_config + ' --cflags', 'r').read()[:-1]
- elif WXPORT == 'gtk2':
- WXPLAT = '__WXGTK__'
- GENDIR = 'gtk' # no code differences so use the same generated sources
-@@ -457,6 +467,7 @@
-
- libdirs = []
- libs = []
-+ libs.extend(sys_libs)
-
- Verify_WX_CONFIG()
-
-@@ -691,8 +702,8 @@
- if BUILD_OGL:
- msg('Preparing OGL...')
- location = 'contrib/ogl'
-- OGLLOC = opj(location, 'contrib/src/ogl')
-- OGLINC = opj(location, 'contrib/include')
-+ OGLLOC = opj(location, '../../../contrib/src/ogl')
-+ OGLINC = opj(location, '../../../contrib/include')
-
- swig_files = ['ogl.i', 'oglbasic.i', 'oglshapes.i', 'oglshapes2.i',
- 'oglcanvas.i']
-@@ -740,9 +751,9 @@
- if BUILD_STC:
- msg('Preparing STC...')
- location = 'contrib/stc'
-- STCLOC = opj(location, 'contrib/src/stc')
-- STCINC = opj(location, 'contrib/include')
-- STC_H = opj(location, 'contrib/include/wx/stc')
-+ STCLOC = opj(location, '../../../contrib/src/stc')
-+ STCINC = opj(location, '../../../contrib/include')
-+ STC_H = opj(location, '../../../contrib/include/wx/stc')
-
- if IN_CVS_TREE:
- # Check if gen_iface needs to be run for the wxSTC sources
-@@ -885,8 +896,8 @@
- if BUILD_XRC:
- msg('Preparing XRC...')
- location = 'contrib/xrc'
-- XMLLOC = opj(location, 'contrib/src/xrc')
-- XMLINC = opj(location, 'contrib/include')
-+ XMLLOC = opj(location, '../../../contrib/src/xrc')
-+ XMLINC = opj(location, '../../../contrib/include')
-
- swig_files = ['xrc.i']
-
-@@ -974,8 +985,8 @@
- if BUILD_GIZMOS:
- msg('Preparing GIZMOS...')
- location = 'contrib/gizmos'
-- GIZMOLOC = opj(location, 'contrib/src/gizmos')
-- GIZMOINC = opj(location, 'contrib/include')
-+ GIZMOLOC = opj(location, '../../../contrib/src/gizmos')
-+ GIZMOINC = opj(location, '../../../contrib/include')
-
- swig_files = ['gizmos.i']
-
-@@ -1052,8 +1063,8 @@
- if BUILD_CANVAS:
- msg('Preparing CANVAS...')
- location = 'contrib/canvas'
-- CANVASLOC = opj(location, 'contrib/src/canvas')
-- CANVASINC = opj(location, 'contrib/include')
-+ CANVASLOC = opj(location, '../../../contrib/src/canvas')
-+ CANVASINC = opj(location, '../../../contrib/include')
-
- swig_files = ['canvas.i']
-
-@@ -1091,10 +1102,10 @@
- if BUILD_ART2D:
- msg('Preparing ART2D...')
- location = 'contrib/art2d'
-- ART2DLOC = opj(location, 'modules/canvas/src')
-- ART2DINC = opj(location, 'modules/canvas/include')
-- EXPATLOC = opj(location, 'modules/expat')
-- EXPATINC = opj(location, 'modules/expat/include')
-+ ART2DLOC = opj(location, '../../../modules/canvas/src')
-+ ART2DINC = opj(location, '../../../modules/canvas/include')
-+ EXPATLOC = opj(location, '../../../modules/expat')
-+ EXPATINC = opj(location, '../../../modules/expat/include')
-
- swig_files = ['art2d.i',
- 'art2d_misc.i',
diff --git a/x11-toolkits/py-wxPython24/files/patch-src-gtk_gdi.cpp b/x11-toolkits/py-wxPython24/files/patch-src-gtk_gdi.cpp
deleted file mode 100644
index 8e36a0fc82a8..000000000000
--- a/x11-toolkits/py-wxPython24/files/patch-src-gtk_gdi.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/gtk/gdi.cpp.orig 2003-09-23 01:06:27.000000000 +0200
-+++ src/gtk/gdi.cpp 2009-05-13 17:59:41.000000000 +0200
-@@ -137,7 +137,7 @@
-
- wxBitmap* wxBitmapFromBits(PyObject* bits, int width, int height, int depth = 1 ) {
- char* buf;
-- int length;
-+ Py_ssize_t length;
- PyString_AsStringAndSize(bits, &buf, &length);
- return new wxBitmap(buf, width, height, depth);
- }
-@@ -193,7 +193,7 @@
- PyObject* maskBits=0) {
- char* bitsbuf;
- char* maskbuf = NULL;
-- int length;
-+ Py_ssize_t length;
- PyString_AsStringAndSize(bits, &bitsbuf, &length);
- if (maskBits)
- PyString_AsStringAndSize(maskBits, &maskbuf, &length);
diff --git a/x11-toolkits/py-wxPython24/files/patch-src_helpers.cpp b/x11-toolkits/py-wxPython24/files/patch-src_helpers.cpp
deleted file mode 100644
index c93b50ce05d4..000000000000
--- a/x11-toolkits/py-wxPython24/files/patch-src_helpers.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/helpers.cpp.orig 2009-05-13 16:55:33.000000000 +0200
-+++ src/helpers.cpp 2009-05-13 16:57:42.000000000 +0200
-@@ -1656,7 +1656,7 @@
- target = new wxString(tmpPtr, *wxConvCurrent, tmpSize);
- }
- #else
-- char* tmpPtr; int tmpSize;
-+ char* tmpPtr; Py_ssize_t tmpSize;
- if (PyString_AsStringAndSize(source, &tmpPtr, &tmpSize) == -1) {
- PyErr_SetString(PyExc_TypeError, "Unable to convert string");
- return NULL;
-@@ -1702,7 +1702,7 @@
- target = wxString(tmpPtr, *wxConvCurrent, tmpSize);
- }
- #else
-- char* tmpPtr; int tmpSize;
-+ char* tmpPtr; Py_ssize_t tmpSize;
- PyString_AsStringAndSize(source, &tmpPtr, &tmpSize);
- target = wxString(tmpPtr, tmpSize);
- #endif // wxUSE_UNICODE
generated by cgit v1.2.3 (git 2.25.1) at 2025-09-06 04:06:08 +0000