[patch] pygtk-2.10.6-numpy.patch

pygtk-2.10.6-numpy.patch (text/plain), 5.89 KB, created by Ali Polatel (RETIRED) on 2007-07-19 00:07:52 UTC

diff -urN pygtk-2.10.6/configure.in pygtk-2.10.6_numpy/configure.in
--- pygtk-2.10.6/configure.in	2007-07-10 13:12:49.000000000 +0300
+++ pygtk-2.10.6_numpy/configure.in	2007-07-19 00:06:20.000000000 +0300
@@ -262,18 +262,19 @@
 esac
 
 
-dnl checks to see if Numeric Python is installed.
+dnl checks to see if numpy is installed.
 AC_ARG_ENABLE(numpy,
   AC_HELP_STRING([--disable-numpy], [Disable numeric python features]),,
   enable_numpy=yes)
 
 if test "x$enable_numpy" != xno; then
   save_CPPFLAGS="$CPPFLAGS"
-  CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES"
-  AC_CHECK_HEADER([Numeric/arrayobject.h],
+  numpy_INCLUDES=`$PYTHON -c "import numpy; print numpy.get_include()"`
+  CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES -I$numpy_INCLUDES"
+  AC_CHECK_HEADER([numpy/arrayobject.h],
     [AC_DEFINE(HAVE_NUMPY,,[whether to include numeric python support])],,
     [#include <Python.h>])
-  CPPFLAGS="$save_CPPFLAGS"
+  CPPFLAGS="$save_CPPFLAGS -I$numpy_INCLUDES"
 fi
 
 dnl add required cflags ...
diff -urN pygtk-2.10.6/gtk/gdk.override pygtk-2.10.6_numpy/gtk/gdk.override
--- pygtk-2.10.6/gtk/gdk.override	2007-07-10 13:12:32.000000000 +0300
+++ pygtk-2.10.6_numpy/gtk/gdk.override	2007-07-19 00:05:38.000000000 +0300
@@ -43,7 +43,7 @@
 #define GDK_DISPLAY(object) (GDK_DISPLAY_OBJECT(object))
 
 #ifdef HAVE_NUMPY
-#  include <Numeric/arrayobject.h>
+#  include <numpy/arrayobject.h>
 static int have_numpy(void);
 #endif
 
diff -urN pygtk-2.10.6/m4/jhflags.m4 pygtk-2.10.6_numpy/m4/jhflags.m4
--- pygtk-2.10.6/m4/jhflags.m4	1970-01-01 02:00:00.000000000 +0200
+++ pygtk-2.10.6_numpy/m4/jhflags.m4	2007-07-19 00:05:38.000000000 +0300
@@ -0,0 +1,21 @@
+dnl
+dnl JH_ADD_CFLAG(FLAG)
+dnl checks whether the C compiler supports the given flag, and if so, adds
+dnl it to $CFLAGS.  If the flag is already present in the list, then the
+dnl check is not performed.
+AC_DEFUN([JH_ADD_CFLAG],
+[
+case " $CFLAGS " in
+*@<:@\	\ @:>@$1@<:@\	\ @:>@*)
+  ;;
+*)
+  save_CFLAGS="$CFLAGS"
+  CFLAGS="$CFLAGS $1"
+  AC_MSG_CHECKING([whether [$]CC understands $1])
+  AC_TRY_COMPILE([], [], [jh_has_option=yes], [jh_has_option=no])
+  AC_MSG_RESULT($jh_has_option)
+  if test $jh_has_option = no; then
+    CFLAGS="$save_CFLAGS"
+  fi
+  ;;
+esac])
diff -urN pygtk-2.10.6/m4/python.m4 pygtk-2.10.6_numpy/m4/python.m4
--- pygtk-2.10.6/m4/python.m4	1970-01-01 02:00:00.000000000 +0200
+++ pygtk-2.10.6_numpy/m4/python.m4	2007-07-19 00:05:38.000000000 +0300
@@ -0,0 +1,66 @@
+## this one is commonly used with AM_PATH_PYTHONDIR ...
+dnl AM_CHECK_PYMOD(MODNAME [,SYMBOL [,ACTION-IF-FOUND [,ACTION-IF-NOT-FOUND]]])
+dnl Check if a module containing a given symbol is visible to python.
+AC_DEFUN([AM_CHECK_PYMOD],
+[AC_REQUIRE([AM_PATH_PYTHON])
+py_mod_var=`echo $1['_']$2 | sed 'y%./+-%__p_%'`
+AC_MSG_CHECKING(for ifelse([$2],[],,[$2 in ])python module $1)
+AC_CACHE_VAL(py_cv_mod_$py_mod_var, [
+ifelse([$2],[], [prog="
+import sys
+try:
+        import $1
+except ImportError:
+        sys.exit(1)
+except:
+        sys.exit(0)
+sys.exit(0)"], [prog="
+import $1
+$1.$2"])
+if $PYTHON -c "$prog" 1>&AC_FD_CC 2>&AC_FD_CC
+  then
+    eval "py_cv_mod_$py_mod_var=yes"
+  else
+    eval "py_cv_mod_$py_mod_var=no"
+  fi
+])
+py_val=`eval "echo \`echo '$py_cv_mod_'$py_mod_var\`"`
+if test "x$py_val" != xno; then
+  AC_MSG_RESULT(yes)
+  ifelse([$3], [],, [$3
+])dnl
+else
+  AC_MSG_RESULT(no)
+  ifelse([$4], [],, [$4
+])dnl
+fi
+])
+
+dnl a macro to check for ability to create python extensions
+dnl  AM_CHECK_PYTHON_HEADERS([ACTION-IF-POSSIBLE], [ACTION-IF-NOT-POSSIBLE])
+dnl function also defines PYTHON_INCLUDES
+AC_DEFUN([AM_CHECK_PYTHON_HEADERS],
+[AC_REQUIRE([AM_PATH_PYTHON])
+AC_MSG_CHECKING(for headers required to compile python extensions)
+dnl deduce PYTHON_INCLUDES
+py_prefix=`$PYTHON -c "import sys; print sys.prefix"`
+py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"`
+if test -x "$PYTHON-config"; then
+PYTHON_INCLUDES=`$PYTHON-config --includes 2>/dev/null`
+else
+PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}"
+if test "$py_prefix" != "$py_exec_prefix"; then
+  PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}"
+fi
+fi
+AC_SUBST(PYTHON_INCLUDES)
+dnl check if the headers exist:
+save_CPPFLAGS="$CPPFLAGS"
+CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES"
+AC_TRY_CPP([#include <Python.h>],dnl
+[AC_MSG_RESULT(found)
+$1],dnl
+[AC_MSG_RESULT(not found)
+$2])
+CPPFLAGS="$save_CPPFLAGS"
+])
diff -urN pygtk-2.10.6/README pygtk-2.10.6_numpy/README
--- pygtk-2.10.6/README	2007-07-10 13:12:49.000000000 +0300
+++ pygtk-2.10.6_numpy/README	2007-07-19 00:05:38.000000000 +0300
@@ -52,7 +52,7 @@
     GTK+ 2.10.0 or higher for 2.10 API
   * libglade 2.5.0 or higher (optional)
   * pycairo 0.5.0 or higher (optional)
-  * Numeric (optional)
+  * numpy (optional)
 
 This release is supporting the following GTK+ releases:
 
diff -urN pygtk-2.10.6/setup.py pygtk-2.10.6_numpy/setup.py
--- pygtk-2.10.6/setup.py	2007-07-10 13:12:49.000000000 +0300
+++ pygtk-2.10.6_numpy/setup.py	2007-07-19 00:05:38.000000000 +0300
@@ -233,16 +233,16 @@
         data_files.append((DEFS_DIR, ('pangocairo.defs',)))
         GLOBAL_MACROS.append(('HAVE_PYCAIRO',1))
 if gtk.can_build():
-    if '--disable-numeric' in sys.argv:
-        sys.argv.remove('--disable-numeric')
+    if '--disable-numpy' in sys.argv:
+        sys.argv.remove('--disable-numpy')
     else:
         try:
-            import Numeric
-            Numeric # pyflakes
+            import numpy
+            numpy # pyflakes
             GLOBAL_MACROS.append(('HAVE_NUMPY', 1))
         except ImportError:
-            print ('* Numeric module could not be found, '
-                   'will build without Numeric support.')
+            print ('* numpy module could not be found, '
+                   'will build without numpy support.')
     ext_modules.append(gtk)
     data_files.append((os.path.join(INCLUDE_DIR, 'pygtk'), ('gtk/pygtk.h',)))
     data_files.append((DEFS_DIR, ('gtk/gdk.defs', 'gtk/gdk-types.defs',