diff options
| author |   Jesus Rivero <neurogeek@gentoo.org> | 2012-08-27 15:47:49 +0000 |
|---|---|---|
| committer | Jesus Rivero <neurogeek@gentoo.org> | 2012-08-27 15:47:49 +0000 |
| commit | 7f3fb06ac97ab1b73371ebaebf7c22c59f8c2e7c (patch) | |
| tree | 6e9c35206e02bf3b4953345aa09b0e7903d66d3d /app-editors/nvi | |
| parent | Actually remove old. (diff) | |
| download | gentoo-2-7f3fb06ac97ab1b73371ebaebf7c22c59f8c2e7c.tar.gz gentoo-2-7f3fb06ac97ab1b73371ebaebf7c22c59f8c2e7c.tar.bz2 gentoo-2-7f3fb06ac97ab1b73371ebaebf7c22c59f8c2e7c.zip | |
Fixed logic in db44 patch. Closes bug #421671. Thanks Diego
(Portage version: 2.2.0_alpha100/cvs/Linux i686)
Diffstat (limited to 'app-editors/nvi')
| -rw-r--r-- | app-editors/nvi/ChangeLog | 5 | ||||
| -rw-r--r-- | app-editors/nvi/files/nvi-1.81.6-db44.patch | 8 |
2 files changed, 8 insertions, 5 deletions
diff --git a/app-editors/nvi/ChangeLog b/app-editors/nvi/ChangeLog index 8417f232115c..2fa62058bd65 100644 --- a/app-editors/nvi/ChangeLog +++ b/app-editors/nvi/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for app-editors/nvi # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/nvi/ChangeLog,v 1.87 2012/06/17 22:37:23 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/nvi/ChangeLog,v 1.88 2012/08/27 15:47:49 neurogeek Exp $ + + 27 Aug 2012; Jesus Rivero <neurogeek@gentoo.org> files/nvi-1.81.6-db44.patch: + Fixed logic in db44 patch. Closes bug #421671. Thanks Diego 17 Jun 2012; Diego E. Pettenò <flameeyes@gentoo.org> files/nvi-1.81.6-db.patch, files/nvi-1.81.6-db44.patch, diff --git a/app-editors/nvi/files/nvi-1.81.6-db44.patch b/app-editors/nvi/files/nvi-1.81.6-db44.patch index 7385137a68c8..f081a2d28bea 100644 --- a/app-editors/nvi/files/nvi-1.81.6-db44.patch +++ b/app-editors/nvi/files/nvi-1.81.6-db44.patch @@ -1,17 +1,17 @@ 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 ---- common/db.h -+++ common/db.h +--- common/db.h 2012-08-27 06:55:01.000000000 -0400 ++++ common/db.h 2012-08-27 07:17:48.000000000 -0400 @@ -16,7 +16,10 @@ (env)->remove(env, path, NULL, flags) #endif -#if DB_VERSION_MAJOR >= 4 && DB_VERSION_MINOR >= 1 -+#if DB_VERSION_MAJOR >= 4 && DB_VERSION_MINOR >= 4 ++# if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 4) || DB_VERSION_MAJOR > 4 +#define db_open(db,file,type,flags,mode) \ + (db)->open(db, NULL, file, NULL, type, flags | DB_CREATE, mode) -+#elif DB_VERSION_MAJOR >= 4 && DB_VERSION_MINOR >= 1 ++#elif DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1 #define db_open(db,file,type,flags,mode) \ (db)->open(db, NULL, file, NULL, type, flags, mode) #else |