--- INSTALL.orig Mon Mar 18 15:30:25 2002 +++ INSTALL Sun Oct 27 11:13:27 2002 @@ -67,7 +67,7 @@ similar to: CPPFLAGS="-I/usr/local/include" \ - GTK_CONFIG="/usr/X11R6/bin/gtk12-config" \ + PKG_CONFIG="/usr/X11R6/bin/pkg-config" \ LDFLAGS="-L/usr/local/lib" \ ./configure --includedir="/usr/local/include" \ --enable-own-labels --libdir="/usr/local/lib" && make --- TODO.orig Sat Sep 7 02:53:40 2002 +++ TODO Mon Oct 28 05:57:28 2002 @@ -1,5 +1,4 @@ * compatibility with autoconf 2.5X -* compatibility with GTK+ 2.0.X * integrate ReadWriteMixer() into LoadSettings() and SaveSettings() * translate man pages * long options --- acinclude.m4.orig Mon Jun 26 22:51:42 2000 +++ acinclude.m4 Sun Oct 27 11:23:34 2002 @@ -182,7 +182,7 @@ dnl AC_DEFUN(AM_PATH_GTK, [dnl -dnl Get the cflags and libraries from the gtk-config script +dnl Get the cflags and libraries from the pkg-config script dnl AC_ARG_WITH(gtk-prefix,[ --with-gtk-prefix=PFX Prefix where GTK is installed (optional)], gtk_config_prefix="$withval", gtk_config_prefix="") @@ -194,39 +194,39 @@ for module in . $4 do case "$module" in - gthread) - gtk_config_args="$gtk_config_args gthread" + gthread-2.0) + gtk_config_args="$gtk_config_args gthread-2.0" ;; esac done if test x$gtk_config_exec_prefix != x ; then gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix" - if test x${GTK_CONFIG+set} != xset ; then - GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config + if test x${PKG_CONFIG+set} != xset ; then + PKG_CONFIG=$gtk_config_exec_prefix/bin/pkg-config fi fi if test x$gtk_config_prefix != x ; then gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix" - if test x${GTK_CONFIG+set} != xset ; then - GTK_CONFIG=$gtk_config_prefix/bin/gtk-config + if test x${PKG_CONFIG+set} != xset ; then + PKG_CONFIG=$gtk_config_prefix/bin/pkg-config fi fi - AC_PATH_PROG(GTK_CONFIG, gtk-config, no) + AC_PATH_PROG(PKG_CONFIG, pkg-config, no) min_gtk_version=ifelse([$1], ,0.99.7,$1) AC_MSG_CHECKING(for GTK - version >= $min_gtk_version) no_gtk="" - if test "$GTK_CONFIG" = "no" ; then + if test "$PKG_CONFIG" = "no" ; then no_gtk=yes else - GTK_CFLAGS=`$GTK_CONFIG $gtk_config_args --cflags` - GTK_LIBS=`$GTK_CONFIG $gtk_config_args --libs` - gtk_config_major_version=`$GTK_CONFIG $gtk_config_args --version | \ + GTK_CFLAGS=`$PKG_CONFIG $gtk_config_args --cflags gtk+-2.0` + GTK_LIBS=`$PKG_CONFIG $gtk_config_args --libs gtk+-2.0` + gtk_config_major_version=`$PKG_CONFIG $gtk_config_args --modversion gtk+-2.0 | \ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` - gtk_config_minor_version=`$GTK_CONFIG $gtk_config_args --version | \ + gtk_config_minor_version=`$PKG_CONFIG $gtk_config_args --modversion gtk+-2.0 | \ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` - gtk_config_micro_version=`$GTK_CONFIG $gtk_config_args --version | \ + gtk_config_micro_version=`$PKG_CONFIG $gtk_config_args --modversion gtk+-2.0 | \ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` if test "x$enable_gtktest" = "xyes" ; then ac_save_CFLAGS="$CFLAGS" @@ -235,7 +235,7 @@ LIBS="$GTK_LIBS $LIBS" dnl dnl Now check if the installed GTK is sufficiently new. (Also sanity -dnl checks the results of gtk-config to some extent +dnl checks the results of pkg-config to some extent dnl rm -f conf.gtktest AC_TRY_RUN([ @@ -262,16 +262,16 @@ (gtk_minor_version != $gtk_config_minor_version) || (gtk_micro_version != $gtk_config_micro_version)) { - printf("\n*** 'gtk-config --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", + printf("\n*** 'pkg-config --modversion gtk+-2.0' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version, gtk_major_version, gtk_minor_version, gtk_micro_version); - printf ("*** was found! If gtk-config was correct, then it is best\n"); + printf ("*** was found! If pkg-config was correct, then it is best\n"); printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n"); printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); printf("*** required on your system.\n"); - printf("*** If gtk-config was wrong, set the environment variable GTK_CONFIG\n"); - printf("*** to point to the correct copy of gtk-config, and remove the file config.cache\n"); + printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG\n"); + printf("*** to point to the correct copy of pkg-config, and remove the file config.cache\n"); printf("*** before re-running configure\n"); } #if defined (GTK_MAJOR_VERSION) && defined (GTK_MINOR_VERSION) && defined (GTK_MICRO_VERSION) @@ -302,10 +302,10 @@ printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n"); printf("***\n"); printf("*** If you have already installed a sufficiently new version, this error\n"); - printf("*** probably means that the wrong copy of the gtk-config shell script is\n"); + printf("*** probably means that the wrong copy of the pkg-config shell script is\n"); printf("*** being found. The easiest way to fix this is to remove the old version\n"); - printf("*** of GTK+, but you can also set the GTK_CONFIG environment to point to the\n"); - printf("*** correct copy of gtk-config. (In this case, you will have to\n"); + printf("*** of GTK+, but you can also set the PKG_CONFIG environment to point to the\n"); + printf("*** correct copy of pkg-config. (In this case, you will have to\n"); printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); printf("*** so that the correct libraries are found at run-time))\n"); } @@ -322,11 +322,11 @@ ifelse([$2], , :, [$2]) else AC_MSG_RESULT(no) - if test "$GTK_CONFIG" = "no" ; then - echo "*** The gtk-config script installed by GTK could not be found" + if test "$PKG_CONFIG" = "no" ; then + echo "*** The pkg-config script installed by GTK could not be found" echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in" - echo "*** your path, or set the GTK_CONFIG environment variable to the" - echo "*** full path to gtk-config." + echo "*** your path, or set the PKG_CONFIG environment variable to the" + echo "*** full path to pkg-config." else if test -f conf.gtktest ; then : @@ -355,7 +355,7 @@ [ echo "*** The test program failed to compile or link. See the file config.log for the" echo "*** exact error that occured. This usually means GTK was incorrectly installed" echo "*** or that you have moved GTK since it was installed. In the latter case, you" - echo "*** may want to edit the gtk-config script: $GTK_CONFIG" ]) + echo "*** may want to edit the pkg-config script: $PKG_CONFIG" ]) CFLAGS="$ac_save_CFLAGS" LIBS="$ac_save_LIBS" fi --- configure.in.orig Sat Sep 7 06:38:34 2002 +++ configure.in Sun Oct 27 11:14:52 2002 @@ -140,17 +140,17 @@ gtk_must=off, gtk_must=on) if test $gtk_must = on; then dnl from gftp - AC_CHECK_PROG(GTK_CONFIG, gtk-config, yes, no) - if test "$GTK_CONFIG" = "no"; then - echo "gtk-config not found--compiling without GTK+." ; + AC_CHECK_PROG(PKG_CONFIG, pkg-config, yes, no) + if test "$PKG_CONFIG" = "no"; then + echo "pkg-config not found--compiling without GTK+." ; else - echo "gtk-config found--compiling with GTK+." ; + echo "pkg-config found--compiling with GTK+." ; AC_DEFINE(HAVE_GTK, 1, [Define this if you want to compile with GTK+ support.]) dnl from GIMP 1.1.6 dnl Check for GTK+ - AM_PATH_GTK(1.2.0,,AC_MSG_ERROR(Test for GTK failed. See the file 'INSTALL' for help.)) - dnl Evil stuff to extract GLIB stuff from gtk-config output + AM_PATH_GTK(2.0.0,,AC_MSG_ERROR(Test for GTK failed. See the file 'INSTALL' for help.)) + dnl Evil stuff to extract GLIB stuff from pkg-config output dnl (we want to make sure it matches with the gtk we're using) GLIB_CFLAGS=`echo $GTK_CFLAGS | sed 's/^.*\(-I[^ ]*glib[^ ]* *-I[^ ]*\).*$/\1/'` GLIB_LDFLAGS=`echo $GTK_LIBS | sed -e 's/^.*-lgdk[^ ]* *\(-L[^ ]*\).*$/\1/' -e 's/^.* -lgdk[^ ]* .*$//'` @@ -167,7 +167,7 @@ else AC_MSG_RESULT([Compiling without GTK+.]) fi -AM_CONDITIONAL(GTK, test "$gtk_must" = on && test "$GTK_CONFIG" != "no") +AM_CONDITIONAL(GTK, test "$gtk_must" = on && test "$PKG_CONFIG" != "no") AC_MSG_CHECKING([whether dummy mixer is requested]) AC_ARG_ENABLE(dummy-mixer, --- src/gpm-xterm.h.orig Thu Mar 28 01:37:26 2002 +++ src/gpm-xterm.h Sun Oct 27 12:06:57 2002 @@ -25,11 +25,7 @@ #ifndef _GPM_XTERM_H_ #define _GPM_XTERM_H_ -#ifdef HAVE_NCURSES_H -#include -#else -#include -#endif /* HAVE_CURSES */ +#include "curses.h" /* Xtermish stuff */ #define GPM_XTERM_ON \ --- src/gtk.c.orig Wed May 1 12:46:54 2002 +++ src/gtk.c Mon Oct 28 06:07:10 2002 @@ -200,7 +200,7 @@ gtk_widget_show(mainbox); gtk_container_add(GTK_CONTAINER(window), mainbox); accel = gtk_accel_group_new(); - gtk_accel_group_attach(accel, GTK_OBJECT(window)); + gtk_window_add_accel_group(GTK_WINDOW(window), accel); menubar = gtk_menu_bar_new(); gtk_widget_show(menubar); gtk_box_pack_start(GTK_BOX(mainbox), menubar, FALSE, TRUE, 0); @@ -290,6 +290,7 @@ baltracks[ii] = gtk_hscale_new(balance[ii]); gtk_scale_set_value_pos(GTK_SCALE(baltracks[ii]), GTK_POS_RIGHT); gtk_scale_set_digits(GTK_SCALE(baltracks[ii]), 0); + gtk_widget_set_size_request(GTK_WIDGET (baltracks[ii]), 84, -1); gtk_widget_show(baltracks[ii]); gtk_range_set_update_policy(GTK_RANGE(baltracks[ii]), GTK_UPDATE_CONTINUOUS); } @@ -298,6 +299,7 @@ gtk_signal_connect_object(GTK_OBJECT(viewmenuitems[ii]), "activate", GTK_SIGNAL_FUNC(HideShowChannelGTK), (gpointer) ii); gtk_scale_set_value_pos(GTK_SCALE(levels[ii]), GTK_POS_LEFT); gtk_scale_set_digits(GTK_SCALE(levels[ii]), 0); + gtk_widget_set_size_request(GTK_WIDGET (levels[ii]), 84, -1); gtk_widget_show(GTK_WIDGET(levels[ii])); gtk_range_set_update_policy(GTK_RANGE(levels[ii]), GTK_UPDATE_CONTINUOUS); }