Ticket #1044: GConf-1.0.9-db43.3.patch
File GConf-1.0.9-db43.3.patch, 2.6 KB (added by , 19 years ago) |
---|
-
GConf-1.0.9/configure
Submitted By: Igor Zivkovic <igor@linuxfromscratch.org> Date: 2005-01-10 Initial Package Version: 1.0.9 Upstream Status: Not submitted. Origin: http://www.sleepycat.com/docs/ref/upgrade.4.0/lock.html http://www.sleepycat.com/docs/ref/upgrade.4.1/fop.html Description: Adds support for Berkeley DB-4.3.x.
old new 7945 7945 BDB_LIBS= 7946 7946 BDB_CFLAGS= 7947 7947 7948 for dblib in db -3.3 db-3.2 db-3.1 db-3; do7948 for dblib in db db-3.3 db-3.2 db-3.1 db-3; do 7949 7949 as_ac_Lib=`echo "ac_cv_lib_$dblib''_db_env_create" | $as_tr_sh` 7950 7950 echo "$as_me:7950: checking for db_env_create in -l$dblib" >&5 7951 7951 echo $ECHO_N "checking for db_env_create in -l$dblib... $ECHO_C" >&6 … … 8010 8010 echo "$as_me: WARNING: No db3 library found. Not building bdb backend." >&2;} 8011 8011 else 8012 8012 8013 for ac_header in db 3/db.h8013 for ac_header in db.h 8014 8014 do 8015 8015 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` 8016 8016 echo "$as_me:8016: checking for $ac_header" >&5 -
GConf-1.0.9/backends/bdb.h
old new 116 116 117 117 #ifndef BDB_H 118 118 119 #ifdef HAVE_DB3_DB_H120 #include <db3/db.h>121 #else122 119 #include <db.h> 123 #endif124 120 #include <glib.h> 125 121 #include <gconf/gconf.h> 126 122 -
GConf-1.0.9/backends/bdb.c
old new 154 154 dbname); 155 155 #endif 156 156 } 157 if ((ret = dbp->open (dbp, dbname, NULL, DB_BTREE, flags, 0664)) != 0)157 if ((ret = dbp->open (dbp, NULL, dbname, NULL, DB_BTREE, flags | DB_AUTO_COMMIT, 0664)) != 0) 158 158 { 159 159 dbp->err (dbp, ret, "%s: open", dbname); 160 160 goto err1; … … 433 433 434 434 if (!inited) 435 435 { 436 lock_id (bdb_db_env, &id);436 bdb_db_env->lock_id(bdb_db_env, &id); 437 437 inited = 1; 438 438 } 439 439 return id; … … 455 455 init_dbt_int (&kdir_id, &dir_id); 456 456 457 457 #if LOCKING 458 if (lock_get 459 (bdb_db_env, get_lock_id (), 0, &dir, DB_LOCK_WRITE, &lock) != 0) 458 if (bdb_db_env->lock_get(bdb_db_env, get_lock_id(), 0, &dir, DB_LOCK_WRITE, &lock) != 0) 460 459 { 461 460 /* TODO: error failed to lock id row of DB_DIR table */ 462 461 #ifdef GCONF_ERROR_VERBOSE … … 541 540 ret = dir_id; 542 541 unlock_and_return: 543 542 #ifdef LOCKING 544 if ( lock_put(bdb_db_env, &lock) != 0)543 if (bdb_db_env->lock_put(bdb_db_env, &lock) != 0) 545 544 { 546 545 #ifdef GCONF_ERROR_VERBOSE 547 546 fprintf (stderr, "%s: CRITICAL failed to unlock BDB dir database\n",