Gentoo Archives: gentoo-commits

From: "Jesus Rivero (neurogeek)" <neurogeek@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-editors/nvi/files: nvi-1.81.6-db44.patch
Date: Mon, 27 Aug 2012 15:47:59
Message-Id: 20120827154749.B39FE20920@flycatcher.gentoo.org
1 neurogeek 12/08/27 15:47:49
2
3 Modified: nvi-1.81.6-db44.patch
4 Log:
5 Fixed logic in db44 patch. Closes bug #421671. Thanks Diego
6
7 (Portage version: 2.2.0_alpha100/cvs/Linux i686)
8
9 Revision Changes Path
10 1.3 app-editors/nvi/files/nvi-1.81.6-db44.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/nvi/files/nvi-1.81.6-db44.patch?rev=1.3&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/nvi/files/nvi-1.81.6-db44.patch?rev=1.3&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/nvi/files/nvi-1.81.6-db44.patch?r1=1.2&r2=1.3
15
16 Index: nvi-1.81.6-db44.patch
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/app-editors/nvi/files/nvi-1.81.6-db44.patch,v
19 retrieving revision 1.2
20 retrieving revision 1.3
21 diff -u -r1.2 -r1.3
22 --- nvi-1.81.6-db44.patch 17 Jun 2012 22:37:22 -0000 1.2
23 +++ nvi-1.81.6-db44.patch 27 Aug 2012 15:47:49 -0000 1.3
24 @@ -1,17 +1,17 @@
25
26 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
27
28 ---- common/db.h
29 -+++ common/db.h
30 +--- common/db.h 2012-08-27 06:55:01.000000000 -0400
31 ++++ common/db.h 2012-08-27 07:17:48.000000000 -0400
32 @@ -16,7 +16,10 @@
33 (env)->remove(env, path, NULL, flags)
34 #endif
35
36 -#if DB_VERSION_MAJOR >= 4 && DB_VERSION_MINOR >= 1
37 -+#if DB_VERSION_MAJOR >= 4 && DB_VERSION_MINOR >= 4
38 ++# if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 4) || DB_VERSION_MAJOR > 4
39 +#define db_open(db,file,type,flags,mode) \
40 + (db)->open(db, NULL, file, NULL, type, flags | DB_CREATE, mode)
41 -+#elif DB_VERSION_MAJOR >= 4 && DB_VERSION_MINOR >= 1
42 ++#elif DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1
43 #define db_open(db,file,type,flags,mode) \
44 (db)->open(db, NULL, file, NULL, type, flags, mode)
45 #else