[cp-patches] GTK and Cairo requirements

[Thomas Fitzsimmons]

Hi,

This patch drops the GTK 2.6 requirement back down to GTK 2.4.  So now
GTK >= 2.4 and Cairo >= 0.5.0 are required to build the peers and Cairo
Graphics2D backend.

Tom

2005-06-29  Thomas Fitzsimmons  <address@hidden>

        * INSTALL: Drop GTK requirement to 2.4.
        * NEWS: Likewise.
        * configure.ac: Likewise.

Index: INSTALL
===================================================================
RCS file: /cvsroot/classpath/classpath/INSTALL,v
retrieving revision 1.28
diff -u -r1.28 INSTALL
--- INSTALL     8 Jun 2005 21:19:25 -0000       1.28
+++ INSTALL     29 Jun 2005 20:25:52 -0000
@@ -40,7 +40,7 @@
        are required unless --disable-gtk-peer is used as an argument to
        configure.
 
-        - GTK+ 2.6.x (or higher)
+        - GTK+ 2.4.x (or higher)
         - libart_lgpl 2.1.0
         - gdk-pixbuf
 
Index: NEWS
===================================================================
RCS file: /cvsroot/classpath/classpath/NEWS,v
retrieving revision 1.83
diff -u -r1.83 NEWS
--- NEWS        29 Jun 2005 14:51:38 -0000      1.83
+++ NEWS        29 Jun 2005 20:25:52 -0000
@@ -25,7 +25,7 @@
     try Classpath implementation, reporting the possible bugs.
 
 * GdkGraphics2D has been updated to use Cairo 0.5.0 APIs.
-* Better GTK scrollbar peer implementation requiring GTK 2.6 or higher.
+* Better GTK scrollbar peer implementation when using GTK >= 2.6.
 * New --with-vm-classes configure option, and new 'build' setting
   for --with-glibj
 
Index: configure.ac
===================================================================
RCS file: /cvsroot/classpath/classpath/configure.ac,v
retrieving revision 1.88
diff -u -r1.88 configure.ac
--- configure.ac        8 Jun 2005 21:19:25 -0000       1.88
+++ configure.ac        29 Jun 2005 20:25:52 -0000
@@ -264,7 +264,7 @@
      AC_CHECK_LIB([Xtst], [XTestQueryExtension], [true],
                  [AC_MSG_ERROR([libXtst NOT found, required for GdkRobot])],
                  [${X_LIBS}])
-     PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.6 gthread-2.0 >= 2.2 libart-2.0 
gdk-pixbuf-2.0)
+     PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.4 gthread-2.0 >= 2.2 libart-2.0 
gdk-pixbuf-2.0)
      AC_SUBST(GTK_CFLAGS)
      AC_SUBST(GTK_LIBS)
   fi