pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/devel/kdesdk3 Fix build with db4.3.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/4f1e1e1d3fcb
branches:  trunk
changeset: 486765:4f1e1e1d3fcb
user:      markd <markd%pkgsrc.org@localhost>
date:      Sun Jan 02 21:59:23 2005 +0000

description:
Fix build with db4.3.

diffstat:

 devel/kdesdk3/distinfo         |   3 ++-
 devel/kdesdk3/patches/patch-ad |  30 ++++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 1 deletions(-)

diffs (46 lines):

diff -r d9c602e47378 -r 4f1e1e1d3fcb devel/kdesdk3/distinfo
--- a/devel/kdesdk3/distinfo    Sun Jan 02 20:29:16 2005 +0000
+++ b/devel/kdesdk3/distinfo    Sun Jan 02 21:59:23 2005 +0000
@@ -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 -r d9c602e47378 -r 4f1e1e1d3fcb devel/kdesdk3/patches/patch-ad
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/kdesdk3/patches/patch-ad    Sun Jan 02 21:59:23 2005 +0000
@@ -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);
+ 



Home | Main Index | Thread Index | Old Index