r3250 - trunk/patches

igor at linuxfromscratch.org igor at linuxfromscratch.org
Mon Jan 10 14:43:52 PST 2005


Author: igor
Date: 2005-01-10 15:43:51 -0700 (Mon, 10 Jan 2005)
New Revision: 3250

Added:
   trunk/patches/GConf-1.0.9-db43-1.patch
   trunk/patches/Python-2.4-db43-1.patch
   trunk/patches/kdesdk-3.3.2-db43-1.patch
   trunk/patches/php-5.0.3-db43-1.patch
Removed:
   trunk/patches/GConf-1.0.9-db43.patch
   trunk/patches/Python-2.4-db43.patch
   trunk/patches/kdesdk-3.3.2-db43.patch
   trunk/patches/php-5.0.3-db43.patch
Modified:
   trunk/patches/gcc-3.3.4-no_fixincludes-1.patch
Log:
Fixed db43 patch filenames.

Copied: trunk/patches/GConf-1.0.9-db43-1.patch (from rev 3249, trunk/patches/GConf-1.0.9-db43.patch)

Deleted: trunk/patches/GConf-1.0.9-db43.patch
===================================================================
--- trunk/patches/GConf-1.0.9-db43.patch	2005-01-10 22:41:26 UTC (rev 3249)
+++ trunk/patches/GConf-1.0.9-db43.patch	2005-01-10 22:43:51 UTC (rev 3250)
@@ -1,84 +0,0 @@
-Submitted By:            Igor Zivkovic <igor at 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.
-
-$LastChangedBy$
-$Date$
-
---- GConf-1.0.9/configure.orig	2005-01-10 16:11:34.673838384 +0000
-+++ GConf-1.0.9/configure	2005-01-10 16:11:48.740699896 +0000
-@@ -7945,7 +7945,7 @@
- BDB_LIBS=
- BDB_CFLAGS=
- 
--for dblib in db-3.3 db-3.2 db-3.1 db-3; do
-+for dblib in db db-3.3 db-3.2 db-3.1 db-3; do
-   as_ac_Lib=`echo "ac_cv_lib_$dblib''_db_env_create" | $as_tr_sh`
- echo "$as_me:7950: checking for db_env_create in -l$dblib" >&5
- echo $ECHO_N "checking for db_env_create in -l$dblib... $ECHO_C" >&6
-@@ -8010,7 +8010,7 @@
- echo "$as_me: WARNING: No db3 library found. Not building bdb backend." >&2;}
- else
- 
--for ac_header in db3/db.h
-+for ac_header in db.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
- echo "$as_me:8016: checking for $ac_header" >&5
---- GConf-1.0.9/backends/bdb.h.orig	2005-01-10 16:13:16.876301248 +0000
-+++ GConf-1.0.9/backends/bdb.h	2005-01-10 16:13:35.797424800 +0000
-@@ -116,11 +116,7 @@
- 
- #ifndef BDB_H
- 
--#ifdef HAVE_DB3_DB_H
--#include <db3/db.h>
--#else
- #include <db.h>
--#endif
- #include <glib.h>
- #include <gconf/gconf.h>
- 
---- GConf-1.0.9/backends/bdb.c.orig	2001-10-17 03:43:01.000000000 +0000
-+++ GConf-1.0.9/backends/bdb.c	2005-01-10 21:24:49.676852808 +0000
-@@ -154,7 +154,7 @@
- 	       dbname);
- #endif
-     }
--  if ((ret = dbp->open (dbp, dbname, NULL, DB_BTREE, flags, 0664)) != 0)
-+  if ((ret = dbp->open (dbp, NULL, dbname, NULL, DB_BTREE, flags | DB_AUTO_COMMIT, 0664)) != 0)
-     {
-       dbp->err (dbp, ret, "%s: open", dbname);
-       goto err1;
-@@ -433,7 +433,7 @@
- 
-   if (!inited)
-     {
--      lock_id (bdb_db_env, &id);
-+      bdb_db_env->lock_id(bdb_db_env, &id); 
-       inited = 1;
-     }
-   return id;
-@@ -455,8 +455,7 @@
-   init_dbt_int (&kdir_id, &dir_id);
- 
- #if LOCKING
--  if (lock_get
--      (bdb_db_env, get_lock_id (), 0, &dir, DB_LOCK_WRITE, &lock) != 0)
-+  if (bdb_db_env->lock_get(bdb_db_env, get_lock_id(), 0, &dir, DB_LOCK_WRITE, &lock) != 0)
-     {
-       /* TODO: error failed to lock id row of DB_DIR table */
- #ifdef GCONF_ERROR_VERBOSE
-@@ -541,7 +540,7 @@
-   ret = dir_id;
- unlock_and_return:
- #ifdef LOCKING
--  if (lock_put (bdb_db_env, &lock) != 0)
-+  if (bdb_db_env->lock_put(bdb_db_env, &lock) != 0)
-     {
- #ifdef GCONF_ERROR_VERBOSE
-       fprintf (stderr, "%s: CRITICAL failed to unlock BDB dir database\n",

Copied: trunk/patches/Python-2.4-db43-1.patch (from rev 3249, trunk/patches/Python-2.4-db43.patch)

Deleted: trunk/patches/Python-2.4-db43.patch
===================================================================
--- trunk/patches/Python-2.4-db43.patch	2005-01-10 22:41:26 UTC (rev 3249)
+++ trunk/patches/Python-2.4-db43.patch	2005-01-10 22:43:51 UTC (rev 3250)
@@ -1,91 +0,0 @@
-Submitted By:            Igor Zivkovic <igor at linuxfromscratch.org>
-Date:                    2004-12-09
-Initial Package Version: 2.3.4
-Upstream Status:         Submitted at Python patch tracker.
-Origin:                  Michal Cihar and Suzuki Hisao
-Description:             Adds support for Berkeley DB-4.3.x.
-
-$LastChangedBy$
-$Date$
-
---- Python-2.3.4/Modules/_bsddb.c.orig	2004-12-09 15:26:24.807332600 +0000
-+++ Python-2.3.4/Modules/_bsddb.c	2004-12-09 15:26:39.966028128 +0000
-@@ -422,7 +422,15 @@
- /* Callback used to save away more information about errors from the DB
-  * library. */
- static char _db_errmsg[1024];
--static void _db_errorCallback(const char* prefix, char* msg)
-+static void _db_errorCallback(
-+#if (DBVER >= 43)
-+        const DB_ENV *dbenv,
-+#endif
-+        const char* prefix, 
-+#if (DBVER >= 43)
-+        const 
-+#endif
-+        char* msg)
- {
-     strcpy(_db_errmsg, msg);
- }
-@@ -1987,7 +1995,11 @@
- 
-     MYDB_BEGIN_ALLOW_THREADS;
- #if (DBVER >= 33)
--    err = self->db->stat(self->db, &sp, flags);
-+    err = self->db->stat(self->db, 
-+#if (DBVER >= 43)
-+            NULL /*txnid*/,
-+#endif
-+            &sp, flags);
- #else
-     err = self->db->stat(self->db, &sp, NULL, flags);
- #endif
-@@ -2249,7 +2261,11 @@
- 
-     MYDB_BEGIN_ALLOW_THREADS;
- #if (DBVER >= 33)
--    err = self->db->stat(self->db, &sp, flags);
-+    err = self->db->stat(self->db, 
-+#if (DBVER >= 43)
-+            NULL /*txnid*/,
-+#endif
-+            &sp, flags);
- #else
-     err = self->db->stat(self->db, &sp, NULL, flags);
- #endif
-@@ -2375,7 +2391,11 @@
-     err = self->db->get(self->db, txn, &key, &data, 0);
-     MYDB_END_ALLOW_THREADS;
-     FREE_DBT(key);
-+#if (DBVER >= 43)
-+    return PyInt_FromLong((err == DB_BUFFER_SMALL) || (err == 0));
-+#else
-     return PyInt_FromLong((err == ENOMEM) || (err == 0));
-+#endif
- }
- 
- 
-@@ -4527,7 +4547,12 @@
- 
- #if (DBVER >= 33)
-     ADD_INT(d, DB_LSTAT_ABORTED);
-+#if (DBVER < 43)
-     ADD_INT(d, DB_LSTAT_ERR);
-+#endif
-+#if (DBVER >= 42)
-+    ADD_INT(d, DB_LSTAT_EXPIRED);
-+#endif
-     ADD_INT(d, DB_LSTAT_FREE);
-     ADD_INT(d, DB_LSTAT_HELD);
- #if (DBVER == 33)
---- Python-2.3.4/setup.py.orig	2004-12-09 15:26:30.007542048 +0000
-+++ Python-2.3.4/setup.py	2004-12-09 15:26:39.971027368 +0000
-@@ -480,7 +480,7 @@
-         # when sorted in reverse order, keys for this dict must appear in the
-         # order you wish to search - e.g., search for db4 before db3
-         db_try_this = {
--            'db4': {'libs': ('db-4.2', 'db42', 'db-4.1', 'db41', 'db-4.0', 'db4',),
-+            'db4': {'libs': ('db-4.3', 'db43', 'db-4.2', 'db42', 'db-4.1', 'db41', 'db-4.0', 'db4',),
-                     'libdirs': ('/usr/local/BerkeleyDB.4.2/lib',
-                                 '/usr/local/BerkeleyDB.4.1/lib',
-                                 '/usr/local/BerkeleyDB.4.0/lib',

Modified: trunk/patches/gcc-3.3.4-no_fixincludes-1.patch
===================================================================
--- trunk/patches/gcc-3.3.4-no_fixincludes-1.patch	2005-01-10 22:41:26 UTC (rev 3249)
+++ trunk/patches/gcc-3.3.4-no_fixincludes-1.patch	2005-01-10 22:43:51 UTC (rev 3250)
@@ -4,6 +4,9 @@
 Origin: Originally developed for GCC 3.2 by Greg Schafer <gschafer at zip dot com dot au>
 Description: Prevent fixincludes script from running.
 
+$LastChangedBy$
+$Date$
+
 --- gcc-3.3.1.orig/gcc/Makefile.in	2003-08-03 15:48:36.000000000 +0000
 +++ gcc-3.3.1/gcc/Makefile.in	2003-08-15 23:40:28.000000000 +0000
 @@ -2335,10 +2335,6 @@

Copied: trunk/patches/kdesdk-3.3.2-db43-1.patch (from rev 3249, trunk/patches/kdesdk-3.3.2-db43.patch)

Deleted: trunk/patches/kdesdk-3.3.2-db43.patch
===================================================================
--- trunk/patches/kdesdk-3.3.2-db43.patch	2005-01-10 22:41:26 UTC (rev 3249)
+++ trunk/patches/kdesdk-3.3.2-db43.patch	2005-01-10 22:43:51 UTC (rev 3250)
@@ -1,30 +0,0 @@
-Submitted By:            Igor Zivkovic <igor at linuxfromscratch.org>
-Date:                    2005-01-10
-Initial Package Version: 3.3.2
-Upstream Status:         Not submitted.
-Origin:                  http://www.sleepycat.com/docs/ref/upgrade.4.3/toc.html
-Description:             Adds support for Berkeley DB-4.3.x.
-
-$LastChangedBy$
-$Date$
-
---- kdesdk-3.3.2/kbabel/kbabeldict/modules/dbsearchengine/database.cpp.orig	2005-01-10 15:58:10.523087880 +0000
-+++ kdesdk-3.3.2/kbabel/kbabeldict/modules/dbsearchengine/database.cpp	2005-01-10 15:58:14.681455712 +0000
-@@ -728,7 +728,7 @@
- DataBaseManager::count ()
- {
-     DB_BTREE_STAT *dstat = 0;
--    db->stat (db, &dstat, DB_FAST_STAT);
-+    db->stat (db, NULL, &dstat, DB_FAST_STAT);
-     int ret = dstat->bt_nkeys;
-     free (dstat);
- 
-@@ -963,7 +963,7 @@
-     int nrec;
-     DB_BTREE_STAT *stat;
- // memset(&stat,0,sizeof(DB_BTREE_STAT));
--    if (infoDb->stat (infoDb, &stat, DB_FAST_STAT))
-+    if (infoDb->stat (infoDb, NULL, &stat, DB_FAST_STAT))
- 	fprintf (stderr, "Cannot stat\n");
-     nrec = stat->bt_nkeys;
-     free (stat);

Copied: trunk/patches/php-5.0.3-db43-1.patch (from rev 3249, trunk/patches/php-5.0.3-db43.patch)

Deleted: trunk/patches/php-5.0.3-db43.patch
===================================================================
--- trunk/patches/php-5.0.3-db43.patch	2005-01-10 22:41:26 UTC (rev 3249)
+++ trunk/patches/php-5.0.3-db43.patch	2005-01-10 22:43:51 UTC (rev 3250)
@@ -1,21 +0,0 @@
-Submitted By:            Igor Zivkovic <igor at linuxfromscratch.org>
-Date:                    2005-01-10
-Initial Package Version: 5.0.3
-Upstream Status:         Not submitted.
-Origin:                  http://www.sleepycat.com/docs/ref/upgrade.4.3/toc.html
-Description:             Adds support for Berkeley DB-4.3.x.
-
-$LastChangedBy$
-$Date$
-
---- php-5.0.3/ext/dba/dba_db4.c.orig	2005-01-10 00:10:49.798665848 +0000
-+++ php-5.0.3/ext/dba/dba_db4.c	2005-01-10 00:23:10.805015760 +0000
-@@ -36,7 +36,7 @@
- #include <db.h>
- #endif
- 
--static void php_dba_db4_errcall_fcn(const char *errpfx, char *msg)
-+static void php_dba_db4_errcall_fcn(const DB_ENV *dbenv, const char *errpfx, const char *msg)
- {
- 	TSRMLS_FETCH();
- 	




More information about the blfs-book mailing list