Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 185692 | Differences between
and this patch

Collapse All | Expand All

(-)gtk/gdk.override (-1 / +1 lines)
Lines 43-49 Link Here
43
#define GDK_DISPLAY(object) (GDK_DISPLAY_OBJECT(object))
43
#define GDK_DISPLAY(object) (GDK_DISPLAY_OBJECT(object))
44
44
45
#ifdef HAVE_NUMPY
45
#ifdef HAVE_NUMPY
46
#  include <Numeric/arrayobject.h>
46
#  include <numpy/arrayobject.h>
47
static int have_numpy(void);
47
static int have_numpy(void);
48
#endif
48
#endif
49
49
(-)configure.in (-2 / +4 lines)
Lines 270-277 Link Here
270
270
271
if test "x$enable_numpy" != xno; then
271
if test "x$enable_numpy" != xno; then
272
  save_CPPFLAGS="$CPPFLAGS"
272
  save_CPPFLAGS="$CPPFLAGS"
273
  CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES"
273
  numpy_INCLUDES=`$PYTHON -c "import numpy; print numpy.get_include()"`
274
  AC_CHECK_HEADER([Numeric/arrayobject.h],
274
  PYTHON_INCLUDES="$PYTHON_INCLUDES -I$numpy_INCLUDES"
275
  CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES"
276
  AC_CHECK_HEADER([numpy/arrayobject.h],
275
    [AC_DEFINE(HAVE_NUMPY,,[whether to include numeric python support])],,
277
    [AC_DEFINE(HAVE_NUMPY,,[whether to include numeric python support])],,
276
    [#include <Python.h>])
278
    [#include <Python.h>])
277
  CPPFLAGS="$save_CPPFLAGS"
279
  CPPFLAGS="$save_CPPFLAGS"
(-)setup.py (-6 / +6 lines)
Lines 231-246 Link Here
231
        data_files.append((DEFS_DIR, ('pangocairo.defs',)))
231
        data_files.append((DEFS_DIR, ('pangocairo.defs',)))
232
        GLOBAL_MACROS.append(('HAVE_PYCAIRO',1))
232
        GLOBAL_MACROS.append(('HAVE_PYCAIRO',1))
233
if gtk.can_build():
233
if gtk.can_build():
234
    if '--disable-numeric' in sys.argv:
234
    if '--disable-numpy' in sys.argv:
235
        sys.argv.remove('--disable-numeric')
235
        sys.argv.remove('--disable-numpy')
236
    else:
236
    else:
237
        try:
237
        try:
238
            import Numeric
238
            import numpy
239
            Numeric # pyflakes
239
            numpy # pyflakes
240
            GLOBAL_MACROS.append(('HAVE_NUMPY', 1))
240
            GLOBAL_MACROS.append(('HAVE_NUMPY', 1))
241
        except ImportError:
241
        except ImportError:
242
            print ('* Numeric module could not be found, '
242
            print ('* numpy module could not be found, '
243
                   'will build without Numeric support.')
243
                   'will build without NumPy support.')
244
    ext_modules.append(gtk)
244
    ext_modules.append(gtk)
245
    data_files.append((os.path.join(INCLUDE_DIR, 'pygtk'), ('gtk/pygtk.h',)))
245
    data_files.append((os.path.join(INCLUDE_DIR, 'pygtk'), ('gtk/pygtk.h',)))
246
    data_files.append((DEFS_DIR, ('gtk/gdk.defs', 'gtk/gdk-types.defs',
246
    data_files.append((DEFS_DIR, ('gtk/gdk.defs', 'gtk/gdk-types.defs',
(-)README (-1 / +1 lines)
Lines 52-58 Link Here
52
    GTK+ 2.10.0 or higher for 2.10 API
52
    GTK+ 2.10.0 or higher for 2.10 API
53
  * libglade 2.5.0 or higher (optional)
53
  * libglade 2.5.0 or higher (optional)
54
  * pycairo 0.5.0 or higher (optional)
54
  * pycairo 0.5.0 or higher (optional)
55
  * Numeric (optional)
55
  * NumPy (optional)
56
56
57
This release is supporting the following GTK+ releases:
57
This release is supporting the following GTK+ releases:
58
58

Return to bug 185692