[cairo-commit] pycairo configure.ac, 1.59, 1.60 INSTALL, 1.7,
1.8 NOTES, 1.23, 1.24 README, 1.29, 1.30
Steve Chaplin
commit at pdx.freedesktop.org
Thu Dec 21 03:35:39 PST 2006
Committed by: stevech1097
Update of /cvs/cairo/pycairo
In directory kemper:/tmp/cvs-serv4843
Modified Files:
configure.ac INSTALL NOTES README
Log Message:
'SC'
Index: configure.ac
===================================================================
RCS file: /cvs/cairo/pycairo/configure.ac,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- configure.ac 27 Nov 2006 02:00:05 -0000 1.59
+++ configure.ac 21 Dec 2006 11:35:35 -0000 1.60
@@ -9,8 +9,6 @@
# versions of packages we require
m4_define(cairo_required_version, 1.2.6)
-m4_define(gtk_required_version, 2.2.0)
-m4_define(pygtk_required_version, 2.2.0)
AC_INIT([pycairo],
[pycairo_version],
@@ -28,11 +26,6 @@
AM_INIT_AUTOMAKE([1.9 -Wall])
# Options ---
-AC_ARG_WITH([pygtk],
- AS_HELP_STRING([--with-pygtk], [support pygtk [default=yes]]),
- [],
- [with_pygtk="yes"])
-
# put the ACLOCAL flags in the makefile
ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
@@ -54,27 +47,6 @@
CAIRO_LIBS=`echo $CAIRO_LIBS | sed -e "s/$export_dynamic//"`
fi
-# cairo + cairo-xlib + gtk + pygtk
-if test x"$with_pygtk" = xyes; then
- # was cairo compiled with cairo-xlib enabled?
- save_LIBS="$LIBS"
- LIBS="$CAIRO_LIBS"
- AC_CHECK_LIB([cairo], [cairo_xlib_surface_create], [], [with_pygtk=no])
- LIBS="$save_LIBS"
-fi
-
-if test x"$with_pygtk" = xyes; then
- PKG_CHECK_MODULES(GTK,
- [gtk+-2.0 >= gtk_required_version
- pygtk-2.0 >= pygtk_required_version
- pygtk-2.0 < 2.7.0],
- [], [with_pygtk=no])
- if test -n "$export_dynamic"; then
- GTK_LIBS=`echo $GTK_LIBS | sed -e "s/$export_dynamic//"`
- fi
-fi
-AM_CONDITIONAL(WITH_PYGTK, test x$with_pygtk = xyes)
-
# Checks for header files ---
AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)])
@@ -147,6 +119,5 @@
Installation prefix ${prefix}
Additional modules:
- build cairo.gtk? ${with_pygtk}
build Numeric support? ${have_numpy}
"
Index: INSTALL
===================================================================
RCS file: /cvs/cairo/pycairo/INSTALL,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- INSTALL 19 Aug 2006 13:14:44 -0000 1.7
+++ INSTALL 21 Dec 2006 11:35:35 -0000 1.8
@@ -15,12 +15,8 @@
Python will not be able to find the cairo module until you add
$prefix/lib/pythonX.Y/site-packages to the PYTHONPATH variable.
-If PyGTK or Numeric Python are detected optional modules will be compiled.
-However, if PyGTK >= 2.7.0 is detected then cairo.gtk is not built since
-pycairo is now supported directly by PyGTK.
-
-To disable PyGTK support use:
- $ ./configure --without-pygtk
+If Numeric Python is detected the additional method
+ImageSurface.create_for_array() will be compiled.
Install method2 - alternative install method
Index: NOTES
===================================================================
RCS file: /cvs/cairo/pycairo/NOTES,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- NOTES 14 Aug 2006 08:21:34 -0000 1.23
+++ NOTES 21 Dec 2006 11:35:35 -0000 1.24
@@ -14,11 +14,6 @@
* Pycairo_Check_Status() is called to check the status of cairo operations,
and raise exceptions as appropriate.
-* Includes the cairo.gtk module - a extension module with a single function
-for creating a cairo context from a GdkDrawable. This makes it possible to
-use the Pycairo with PyGTK. However, this module is not needed when using PyGTK
-2.8 and above.
-
* Provides a C API that can be used by other Python extensions.
Index: README
===================================================================
RCS file: /cvs/cairo/pycairo/README,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- README 27 Nov 2006 01:44:09 -0000 1.29
+++ README 21 Dec 2006 11:35:35 -0000 1.30
@@ -8,12 +8,6 @@
Not required, but supported if they are detected:
Numeric Python any version (?)
- PyGTK 2.2.0 <= version < 2.7.0
-
-PyGTK and the cairo.gtk module:
-PyGTK 2.8 and above has built in support for cairo and does not need to use the
-cairo.gtk module. The cairo.gtk module is deprecated and will be removed from
-a future version of pycairo.
Compiling
---------
More information about the cairo-commit
mailing list