diff options
| author |   Alon Bar-Lev <alonbl@gentoo.org> | 2006-10-28 22:50:34 +0000 |
|---|---|---|
| committer | Alon Bar-Lev <alonbl@gentoo.org> | 2006-10-28 22:50:34 +0000 |
| commit | 321e292139599ab3e1cd0dc4dda1e45377e62b75 (patch) | |
| tree | c7d0b92feaa3ab4f15292a872b1c0183ce6b5ff9 /app-crypt | |
| parent | Initial import. Ebuild submitted by jano #153137. (diff) | |
| download | gentoo-2-321e292139599ab3e1cd0dc4dda1e45377e62b75.tar.gz gentoo-2-321e292139599ab3e1cd0dc4dda1e45377e62b75.tar.bz2 gentoo-2-321e292139599ab3e1cd0dc4dda1e45377e62b75.zip | |
Added db4.3 compatability, thanks to Tomas Sedlak, closes bug#153156
(Portage version: 2.1.1)
Diffstat (limited to 'app-crypt')
| -rw-r--r-- | app-crypt/xca/ChangeLog | 6 | ||||
| -rw-r--r-- | app-crypt/xca/files/xca-0.5.1-db.patch | 30 | ||||
| -rw-r--r-- | app-crypt/xca/xca-0.5.1-r1.ebuild | 3 |
3 files changed, 37 insertions, 2 deletions
diff --git a/app-crypt/xca/ChangeLog b/app-crypt/xca/ChangeLog index ee4d4028fc04..09af12c46704 100644 --- a/app-crypt/xca/ChangeLog +++ b/app-crypt/xca/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-crypt/xca # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-crypt/xca/ChangeLog,v 1.9 2006/10/27 01:34:44 alonbl Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-crypt/xca/ChangeLog,v 1.10 2006/10/28 22:50:34 alonbl Exp $ + + 28 Oct 2006; Alon Bar-Lev <alonbl@gentoo.org> +files/xca-0.5.1-db.patch, + xca-0.5.1-r1.ebuild: + Added db4.3 compatability, thanks to Tomas Sedlak, closes bug#153156 27 Oct 2006; Alon Bar-Lev <alonbl@gentoo.org> +files/xca-0.5.1-build.patch, -files/xca-0.5.1-qt.diff, diff --git a/app-crypt/xca/files/xca-0.5.1-db.patch b/app-crypt/xca/files/xca-0.5.1-db.patch new file mode 100644 index 000000000000..d4b426bd791c --- /dev/null +++ b/app-crypt/xca/files/xca-0.5.1-db.patch @@ -0,0 +1,30 @@ +diff -urNp xca-0.5.1.org/widgets/MainWindow.cpp xca-0.5.1/widgets/MainWindow.cpp +--- xca-0.5.1.org/widgets/MainWindow.cpp 2004-06-14 00:22:37.000000000 +0300 ++++ xca-0.5.1/widgets/MainWindow.cpp 2006-10-29 00:42:07.000000000 +0200 +@@ -445,7 +445,11 @@ void MainWindow::Error(errorEx &err) + } + } + ++#if DB_VERSION_MINOR < 3 + void MainWindow::dberr(const char *errpfx, char *msg) ++#else ++void MainWindow::dberr(const DbEnv *dbEnv, const char *errpfx, const char *msg) ++#endif + { + errorEx e(QString(errpfx) + "\n" + msg); + Error(e); +diff -urNp xca-0.5.1.org/widgets/MainWindow.h xca-0.5.1/widgets/MainWindow.h +--- xca-0.5.1.org/widgets/MainWindow.h 2004-04-15 02:36:56.000000000 +0300 ++++ xca-0.5.1/widgets/MainWindow.h 2006-10-29 00:43:38.000000000 +0200 +@@ -104,7 +104,11 @@ class MainWindow: public MainWindow_UI + int initPass(); + static int passRead(char *buf, int size, int rwflag, void *userdata); + static int passWrite(char *buf, int size, int rwflag, void *userdata); ++#if DB_VERSION_MINOR < 3 + static void dberr(const char *errpfx, char *msg); ++#else ++ static void dberr(const DbEnv *dbEnv, const char *errpfx, const char *msg); ++#endif + static NewX509 *newX509(); + static QString md5passwd(const char *pass); + static void Error(errorEx &err); diff --git a/app-crypt/xca/xca-0.5.1-r1.ebuild b/app-crypt/xca/xca-0.5.1-r1.ebuild index 9ed95fba9d62..a75b09ce1b05 100644 --- a/app-crypt/xca/xca-0.5.1-r1.ebuild +++ b/app-crypt/xca/xca-0.5.1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-crypt/xca/xca-0.5.1-r1.ebuild,v 1.2 2006/10/27 01:34:44 alonbl Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-crypt/xca/xca-0.5.1-r1.ebuild,v 1.3 2006/10/28 22:50:34 alonbl Exp $ inherit eutils kde toolchain-funcs @@ -24,6 +24,7 @@ src_unpack() { epatch "${FILESDIR}/${P}-gcc4.patch" epatch "${FILESDIR}/${P}-openssl.patch" epatch "${FILESDIR}/${P}-qt.patch" + epatch "${FILESDIR}/${P}-db.patch" } src_compile() { |