From: Felix Janda Date: Thu, 10 Nov 2016 00:15:57 +0000 (-0500) Subject: app-editors/nvi: fix compilation with sys-libs/db-6.0.35 X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=8aa81deeb141121bb524c90e203630d82f579be1;p=gentoo.git app-editors/nvi: fix compilation with sys-libs/db-6.0.35 Gentoo-Bug: https://bugs.gentoo.org/599318 Closes: https://github.com/gentoo/gentoo/pull/2794 Signed-off-by: David Seifert --- 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 3a75bf0d12a0..4d4c75d2cb35 100644 --- a/app-editors/nvi/files/nvi-1.81.6-db44.patch +++ b/app-editors/nvi/files/nvi-1.81.6-db44.patch @@ -1,8 +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 + First part is adapted from http://cvsweb.se.netbsd.org/cgi-bin/bsdweb.cgi/pkgsrc/editors/nvi/patches/patch-aa?rev=1.3;content-type=text/plain ---- a/common/db.h 2012-08-27 06:55:01.000000000 -0400 -+++ b/common/db.h 2012-08-27 07:17:48.000000000 -0400 +--- a/common/db.h ++++ b/common/db.h +@@ -4,7 +4,7 @@ + #define DB_BUFFER_SMALL ENOMEM + #endif + +-#if DB_VERSION_MAJOR >= 3 && DB_VERSION_MINOR >= 1 ++#if (DB_VERSION_MAJOR >= 3 && DB_VERSION_MINOR >= 1) || DB_VERSION_MAJOR > 3 + #define db_env_open(env,path,flags,mode) \ + (env)->open(env, path, flags, mode) + #define db_env_remove(env,path,flags) \ @@ -16,7 +16,10 @@ (env)->remove(env, path, NULL, flags) #endif