From 3b9456c0381db0b2b79efd7128a36cc9af09d2d3 Mon Sep 17 00:00:00 2001 From: markd Date: Sun, 2 Jan 2005 21:59:23 +0000 Subject: Fix build with db4.3. --- devel/kdesdk3/distinfo | 3 ++- devel/kdesdk3/patches/patch-ad | 30 ++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 devel/kdesdk3/patches/patch-ad (limited to 'devel') diff --git a/devel/kdesdk3/distinfo b/devel/kdesdk3/distinfo index cd3f9a2559e..c174ba04eaa 100644 --- a/devel/kdesdk3/distinfo +++ b/devel/kdesdk3/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.17 2004/12/10 06:29:31 markd Exp $ +$NetBSD: distinfo,v 1.18 2005/01/02 21:59:23 markd Exp $ SHA1 (kdesdk-3.3.2.tar.bz2) = a4e037661765b590ea1f64fd7182e835e52a1374 Size (kdesdk-3.3.2.tar.bz2) = 4358995 bytes SHA1 (patch-ab) = a975fd30cbee8107856774161f9216cde2548a10 SHA1 (patch-ac) = 86d3e639fe15e88dad41b590e5399b3d50207307 +SHA1 (patch-ad) = bbc3675b927a2cef5879a38eac34796a52999702 diff --git a/devel/kdesdk3/patches/patch-ad b/devel/kdesdk3/patches/patch-ad new file mode 100644 index 00000000000..678724d659c --- /dev/null +++ b/devel/kdesdk3/patches/patch-ad @@ -0,0 +1,30 @@ +$NetBSD: patch-ad,v 1.3 2005/01/02 21:59:23 markd Exp $ + +--- kbabel/kbabeldict/modules/dbsearchengine/database.cpp.orig 2005-01-03 00:39:59.000000000 +1300 ++++ kbabel/kbabeldict/modules/dbsearchengine/database.cpp +@@ -728,7 +728,11 @@ int + DataBaseManager::count () + { + DB_BTREE_STAT *dstat = 0; ++#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 3 ++ db->stat (db, NULL, &dstat, DB_FAST_STAT); ++#else + db->stat (db, &dstat, DB_FAST_STAT); ++#endif + int ret = dstat->bt_nkeys; + free (dstat); + +@@ -963,8 +967,13 @@ DataBaseManager::loadInfo () + int nrec; + DB_BTREE_STAT *stat; + // memset(&stat,0,sizeof(DB_BTREE_STAT)); ++#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 3 ++ if (infoDb->stat (infoDb, NULL, &stat, DB_FAST_STAT)) ++ fprintf (stderr, "Cannot stat\n"); ++#else + if (infoDb->stat (infoDb, &stat, DB_FAST_STAT)) + fprintf (stderr, "Cannot stat\n"); ++#endif + nrec = stat->bt_nkeys; + free (stat); + -- cgit v1.2.3