Update gnome-utils to 1.4.0. Changes are bugfixes and locale updates.

4 files changed, 23 insertions, 53 deletions

diff --git a/misc/gnome-utils/patches/patch-ac b/misc/gnome-utils/patches/patch-ac
index e6dafbbea2b..6915f81b411 100644
--- a/misc/gnome-utils/patches/patch-ac
+++ b/misc/gnome-utils/patches/patch-ac
@@ -1,16 +1,25 @@
-$NetBSD: patch-ac,v 1.2 2000/11/09 21:09:43 mycroft Exp $
+$NetBSD: patch-ac,v 1.3 2001/04/07 20:52:45 rh Exp $
 
---- configure.in.orig	Fri May 19 19:33:18 2000
-+++ configure.in	Thu Nov  9 21:04:41 2000
-@@ -110,12 +110,7 @@
+--- configure.in.orig	Tue Mar 13 03:16:11 2001
++++ configure.in
+@@ -114,21 +114,7 @@
  dnl ******************** 
  dnl gfloppy
  dnl ********************
--AC_CHECK_HEADER(linux/fd.h, build_gfloppy=true,
+-build_gfloppy=true
+-AC_CHECK_HEADER(linux/fd.h, AC_DEFINE(HAVE_LINUX_FD_H),
+-		build_gfloppy=false
 -                AC_MSG_WARN([*** gfloppy will not be built.]))
--if $build_gfloppy; then
--  AC_CONFIG_SUBDIRS(gfloppy)
--fi
+-# Check for the ext2fs library
+-AC_CHECK_LIB(ext2fs, ext2fs_mkdir, x_libs="-lext2fs",
+-  build_gfloppy=false
+-  AC_MSG_WARN([
+-*** libext2fs not found. You need e2fsprogs and e2fsprogs-devel installed to build gfloppy.]))
+-# check for ext2fs header specific includes
+-AC_CHECK_HEADER(ext2fs/ext2_io.h, ,
+-  build_gfloppy=false
+-  AC_MSG_WARN([
+-*** ext2fs/ext2_io.h not found.  You need e2fsprogs-devel installed.]))
 -AM_CONDITIONAL(BUILD_GFLOPPY, test "$build_gfloppy" = true)
 +AM_CONDITIONAL(BUILD_GFLOPPY, 0)
  
diff --git a/misc/gnome-utils/patches/patch-ae b/misc/gnome-utils/patches/patch-ae
deleted file mode 100644
index 9cc4d0d44d4..00000000000
--- a/misc/gnome-utils/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2000/11/30 05:16:40 mycroft Exp $
-
---- logview/log_repaint.c.orig	Thu Apr 27 03:32:02 2000
-+++ logview/log_repaint.c	Thu Nov 30 05:09:19 2000
-@@ -480,7 +480,7 @@
- 
-   tdm = &curlog->curmark->fulldate;
-   sprintf (status_text, "%02d/%02d/%02d", 
--	   tdm->tm_mday, tdm->tm_mon, tdm->tm_year);
-+	   tdm->tm_mday, tdm->tm_mon, tdm->tm_year + 1900);
-   gtk_label_get ( date_label, (char **)&buffer);
-   if (strcmp (status_text, buffer) != 0)
-     gtk_label_set_text (date_label, status_text);
diff --git a/misc/gnome-utils/patches/patch-af b/misc/gnome-utils/patches/patch-af
index a4367b6922e..f8c9881b96d 100644
--- a/misc/gnome-utils/patches/patch-af
+++ b/misc/gnome-utils/patches/patch-af
@@ -1,7 +1,7 @@
-$NetBSD: patch-af,v 1.1 2000/11/30 05:16:16 mycroft Exp $
+$NetBSD: patch-af,v 1.2 2001/04/07 20:52:45 rh Exp $
 
---- logview/logrtns.c.orig	Thu Apr 27 03:32:02 2000
-+++ logview/logrtns.c	Thu Nov 30 05:14:16 2000
+--- logview/logrtns.c.orig	Tue Feb 27 09:33:19 2001
++++ logview/logrtns.c
 @@ -294,8 +294,8 @@
  {
     LogLine *line;
@@ -13,20 +13,7 @@ $NetBSD: patch-af,v 1.1 2000/11/30 05:16:16 mycroft Exp $
     long int old_pos;
  
     fp = lg->fp;
-@@ -308,9 +308,10 @@
-    pg->ll = LINES_P_PAGE - 1;
- 
-    /* Tell if we are reading the last page */
--   if (fgetc (fp) == EOF)
-+   ch = fgetc (fp);
-+   ungetc (ch, fp);
-+   if (ch == EOF)
-      pg->islastpage = TRUE;
--   ungetc (ch,fp);
- 
-    while (ln >= pg->fl)
-    {
-@@ -364,8 +365,8 @@
+@@ -365,8 +365,8 @@
  {
     FILE *fp;
     LogLine *line;
@@ -35,5 +22,5 @@ $NetBSD: patch-af,v 1.1 2000/11/30 05:16:16 mycroft Exp $
 +   char *c, buffer[R_BUF_SIZE + 1];
 +   int ch, ln, len;
  
-    fp = lg->fp;
-    ln = 0;
+    g_return_val_if_fail (lg != NULL, FALSE);
+ 
diff --git a/misc/gnome-utils/patches/patch-ah b/misc/gnome-utils/patches/patch-ah
deleted file mode 100644
index 41555765002..00000000000
--- a/misc/gnome-utils/patches/patch-ah
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2000/11/30 06:10:23 mycroft Exp $
-
---- gdictsrc/gdict-defbox.c.orig	Fri May 19 18:57:46 2000
-+++ gdictsrc/gdict-defbox.c	Thu Nov 30 06:07:30 2000
-@@ -284,7 +284,7 @@
-     gchar *word;
-     
-     if (context != defbox->context || 
--        strcmp (defbox->database, gdict_pref.database))
-+        (defbox->database && strcmp (defbox->database, gdict_pref.database)))
-     {
-         defbox->context = context;
-