diff options
author | rh <rh> | 2002-09-05 23:25:27 +0000 |
---|---|---|
committer | rh <rh> | 2002-09-05 23:25:27 +0000 |
commit | 08158e35bcfb78cac5437d8c876118ff24553463 (patch) | |
tree | afd22d83c936a9e580bf3199d285be167389dc03 /mail/evolution/patches | |
parent | 5b6ef1ea059fdebb6321ac45c549ef825dddd66e (diff) | |
download | pkgsrc-08158e35bcfb78cac5437d8c876118ff24553463.tar.gz |
Fix db3 version check so that addressbook now finally works.
Bump PKGREVISION.
This closes PR pkg/18164 by Ales Krenek <ljocha@ics.muni.cz>
Diffstat (limited to 'mail/evolution/patches')
-rw-r--r-- | mail/evolution/patches/patch-ag | 17 | ||||
-rw-r--r-- | mail/evolution/patches/patch-aj | 19 |
2 files changed, 31 insertions, 5 deletions
diff --git a/mail/evolution/patches/patch-ag b/mail/evolution/patches/patch-ag index 60789be2325..a9bea5231ee 100644 --- a/mail/evolution/patches/patch-ag +++ b/mail/evolution/patches/patch-ag @@ -1,6 +1,6 @@ -$NetBSD: patch-ag,v 1.3 2001/12/03 10:08:26 tron Exp $ +$NetBSD: patch-ag,v 1.4 2002/09/05 23:25:27 rh Exp $ ---- e-util/e-dbhash.c.orig Sat Jul 28 00:14:12 2001 +--- e-util/e-dbhash.c.orig Mon Oct 22 23:54:12 2001 +++ e-util/e-dbhash.c @@ -16,9 +16,9 @@ #include "md5-utils.h" @@ -15,3 +15,16 @@ $NetBSD: patch-ag,v 1.3 2001/12/03 10:08:26 tron Exp $ #endif struct _EDbHashPrivate +@@ -37,9 +37,9 @@ + + db_version (&major, &minor, &patch); + +- if (major != 3 || +- minor != 1 || +- patch != 17) { ++ if (major != DB_VERSION_MAJOR || ++ minor != DB_VERSION_MINOR || ++ patch != DB_VERSION_PATCH) { + g_warning ("Wrong version of libdb."); + return NULL; + } diff --git a/mail/evolution/patches/patch-aj b/mail/evolution/patches/patch-aj index 80d5d7c717f..6447df571dd 100644 --- a/mail/evolution/patches/patch-aj +++ b/mail/evolution/patches/patch-aj @@ -1,7 +1,7 @@ -$NetBSD: patch-aj,v 1.5 2002/03/26 20:50:13 rh Exp $ +$NetBSD: patch-aj,v 1.6 2002/09/05 23:25:27 rh Exp $ ---- addressbook/backend/pas/pas-backend-file.c.orig Mon Mar 18 21:58:17 2002 -+++ addressbook/backend/pas/pas-backend-file.c Tue Mar 26 15:02:22 2002 +--- addressbook/backend/pas/pas-backend-file.c.orig Sun Jun 16 08:54:02 2002 ++++ addressbook/backend/pas/pas-backend-file.c @@ -21,9 +21,9 @@ #include <e-util/e-db3-utils.h> @@ -15,3 +15,16 @@ $NetBSD: patch-aj,v 1.5 2002/03/26 20:50:13 rh Exp $ #endif #include <gtk/gtksignal.h> +@@ -1244,9 +1244,9 @@ + + db_version (&major, &minor, &patch); + +- if (major != 3 || +- minor != 1 || +- patch != 17) { ++ if (major != DB_VERSION_MAJOR || ++ minor != DB_VERSION_MINOR || ++ patch != DB_VERSION_PATCH) { + g_warning ("Wrong version of libdb."); + return GNOME_Evolution_Addressbook_BookListener_OtherError; + } |