summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2002-10-30 18:29:35 +0000
committerMike Frysinger <vapier@gentoo.org>2002-10-30 18:29:35 +0000
commitdd4ded22757577a9a3a3b041f8496f7742abc193 (patch)
treeb58302bb22957928aa6b51c9126b98ffb9513dac /dev-python/wxPython/files
parentAdding ~x86 masked selinux-sources (diff)
downloadgentoo-2-dd4ded22757577a9a3a3b041f8496f7742abc193.tar.gz
gentoo-2-dd4ded22757577a9a3a3b041f8496f7742abc193.tar.bz2
gentoo-2-dd4ded22757577a9a3a3b041f8496f7742abc193.zip
wxPython done properly (without wxGTK)
Diffstat (limited to 'dev-python/wxPython/files')
-rw-r--r--dev-python/wxPython/files/digest-wxPython-2.3.3.1-r21
-rw-r--r--dev-python/wxPython/files/wxPython-2.3.3.1-noglcanvas.diff93
2 files changed, 94 insertions, 0 deletions
diff --git a/dev-python/wxPython/files/digest-wxPython-2.3.3.1-r2 b/dev-python/wxPython/files/digest-wxPython-2.3.3.1-r2
new file mode 100644
index 000000000000..d8ba57c02af6
--- /dev/null
+++ b/dev-python/wxPython/files/digest-wxPython-2.3.3.1-r2
@@ -0,0 +1 @@
+MD5 ba09626f1ff92304677a473b870bcb24 wxPythonSrc-2.3.3.1.tar.gz 11143374
diff --git a/dev-python/wxPython/files/wxPython-2.3.3.1-noglcanvas.diff b/dev-python/wxPython/files/wxPython-2.3.3.1-noglcanvas.diff
new file mode 100644
index 000000000000..0c9462e1914f
--- /dev/null
+++ b/dev-python/wxPython/files/wxPython-2.3.3.1-noglcanvas.diff
@@ -0,0 +1,93 @@
+diff -urN wxPython-2.3.2.1/setup.py wxPython-2.3.2.1-modified/setup.py
+--- wxPython-2.3.2.1/setup.py Thu Dec 20 11:33:42 2001
++++ wxPython-2.3.2.1-modified/setup.py Thu Aug 22 14:04:04 2002
+@@ -28,7 +28,7 @@
+ """
+
+
+-BUILD_GLCANVAS = 1 # If true, build the contrib/glcanvas extension module
++BUILD_GLCANVAS = 0 # If true, build the contrib/glcanvas extension module
+ BUILD_OGL = 1 # If true, build the contrib/ogl extension module
+ BUILD_STC = 1 # If true, build the contrib/stc extension module
+ BUILD_XRC = 1 # XML based resource system
+@@ -500,43 +500,43 @@
+ #----------------------------------------------------------------------
+ # Define the GLCanvas extension module
+ #----------------------------------------------------------------------
+-
+-CTRB_SRC = opj(WXDIR, 'contrib/src')
+-CTRB_INC = opj(WXDIR, 'contrib/include/wx')
+-
+-if BUILD_GLCANVAS or GL_ONLY:
+- msg('Preparing GLCANVAS...')
+- location = 'contrib/glcanvas'
+- swig_files = ['glcanvas.i']
+- other_sources = []
+-
+- swig_sources = run_swig(swig_files, location, GENDIR, PKGDIR,
+- USE_SWIG, swig_force, swig_args, swig_deps)
+-
+- gl_libs = []
+- if os.name == 'posix':
+- gl_config = os.popen(WX_CONFIG + ' --gl-libs', 'r').read()[:-1]
+- gl_lflags = string.split(gl_config) + lflags
+- gl_libs = libs
+- else:
+- other_sources = [opj(location, 'msw/myglcanvas.cpp')]
+- gl_libs = libs + ['opengl32', 'glu32']
+- gl_lflags = lflags
+-
+- ext = Extension('glcanvasc',
+- swig_sources + other_sources,
+-
+- include_dirs = includes,
+- define_macros = defines,
+-
+- library_dirs = libdirs,
+- libraries = gl_libs,
+-
+- extra_compile_args = cflags,
+- extra_link_args = gl_lflags,
+- )
+-
+- wxpExtensions.append(ext)
++#
++#CTRB_SRC = opj(WXDIR, 'contrib/src')
++#CTRB_INC = opj(WXDIR, 'contrib/include/wx')
++#
++#if BUILD_GLCANVAS or GL_ONLY:
++# msg('Preparing GLCANVAS...')
++# location = 'contrib/glcanvas'
++# swig_files = ['glcanvas.i']
++# other_sources = []
++#
++# swig_sources = run_swig(swig_files, location, GENDIR, PKGDIR,
++# USE_SWIG, swig_force, swig_args, swig_deps)
++#
++# gl_libs = []
++# if os.name == 'posix':
++# gl_config = os.popen(WX_CONFIG + ' --gl-libs', 'r').read()[:-1]
++# gl_lflags = string.split(gl_config) + lflags
++# gl_libs = libs
++# else:
++# other_sources = [opj(location, 'msw/myglcanvas.cpp')]
++# gl_libs = libs + ['opengl32', 'glu32']
++# gl_lflags = lflags
++#
++# ext = Extension('glcanvasc',
++# swig_sources + other_sources,
++#
++# include_dirs = includes,
++# define_macros = defines,
++#
++# library_dirs = libdirs,
++# libraries = gl_libs,
++#
++# extra_compile_args = cflags,
++# extra_link_args = gl_lflags,
++# )
++#
++# wxpExtensions.append(ext)
+
+
+ #----------------------------------------------------------------------