| 1 |
truedfx 08/12/28 00:09:59 |
| 2 |
|
| 3 |
Added: nvi-1.81.6-db44.patch |
| 4 |
Removed: nvi-1.81.5-db4.patch nvi-1.81.5-gcc4.patch |
| 5 |
nvi-1.81.5-wide-2.patch nvi-1.81.5-tcsetattr.patch |
| 6 |
nvi-1.81.5-wide.patch nvi-1.81.5-build.patch |
| 7 |
nvi-1.81.5-header.patch |
| 8 |
Log: |
| 9 |
Fix "DB_CREATE must be specified to create databases." message with recent db, and make translations work |
| 10 |
(Portage version: 2.2_rc19/cvs/Linux 2.6.28-gentoo x86_64) |
| 11 |
|
| 12 |
Revision Changes Path |
| 13 |
1.1 app-editors/nvi/files/nvi-1.81.6-db44.patch |
| 14 |
|
| 15 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/nvi/files/nvi-1.81.6-db44.patch?rev=1.1&view=markup |
| 16 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/nvi/files/nvi-1.81.6-db44.patch?rev=1.1&content-type=text/plain |
| 17 |
|
| 18 |
Index: nvi-1.81.6-db44.patch |
| 19 |
=================================================================== |
| 20 |
|
| 21 |
First part is from http://cvsweb.se.netbsd.org/cgi-bin/bsdweb.cgi/pkgsrc/editors/nvi/patches/patch-aa?rev=1.3;content-type=text/plain |
| 22 |
|
| 23 |
--- ../common/db.h |
| 24 |
+++ ../common/db.h |
| 25 |
@@ -16,7 +16,10 @@ |
| 26 |
(env)->remove(env, path, NULL, flags) |
| 27 |
#endif |
| 28 |
|
| 29 |
-#if DB_VERSION_MAJOR >= 4 && DB_VERSION_MINOR >= 1 |
| 30 |
+#if DB_VERSION_MAJOR >= 4 && DB_VERSION_MINOR >= 4 |
| 31 |
+#define db_open(db,file,type,flags,mode) \ |
| 32 |
+ (db)->open(db, NULL, file, NULL, type, flags | DB_CREATE, mode) |
| 33 |
+#elif DB_VERSION_MAJOR >= 4 && DB_VERSION_MINOR >= 1 |
| 34 |
#define db_open(db,file,type,flags,mode) \ |
| 35 |
(db)->open(db, NULL, file, NULL, type, flags, mode) |
| 36 |
#else |
| 37 |
--- ../common/msg.c |
| 38 |
+++ ../common/msg.c |
| 39 |
@@ -724,7 +724,8 @@ |
| 40 |
p = buf; |
| 41 |
} else |
| 42 |
p = file; |
| 43 |
- if ((sp->db_error = db_create(&db, 0, 0)) != 0 || |
| 44 |
+ if (access(p, R_OK) != 0 || |
| 45 |
+ (sp->db_error = db_create(&db, 0, 0)) != 0 || |
| 46 |
(sp->db_error = db->set_re_source(db, p)) != 0 || |
| 47 |
(sp->db_error = db_open(db, NULL, DB_RECNO, 0, 0)) != 0) { |
| 48 |
if (first) { |
Archives