diff options
| author |   Benedikt Boehm <hollow@gentoo.org> | 2008-04-30 20:55:03 +0000 |
|---|---|---|
| committer | Benedikt Boehm <hollow@gentoo.org> | 2008-04-30 20:55:03 +0000 |
| commit | 72a7f69eced67d9e8399acc79fc6cbcfd072ec3c (patch) | |
| tree | d8c32cd8a144f9b4e4a4dce959ac118271c20526 /dev-util/kdesvn | |
| parent | update subversion checks wrt #219475 (diff) | |
| download | gentoo-2-72a7f69eced67d9e8399acc79fc6cbcfd072ec3c.tar.gz gentoo-2-72a7f69eced67d9e8399acc79fc6cbcfd072ec3c.tar.bz2 gentoo-2-72a7f69eced67d9e8399acc79fc6cbcfd072ec3c.zip | |
add patch for subversion 1.5 compatibility wrt #219505
(Portage version: 2.1.5_rc6)
Diffstat (limited to 'dev-util/kdesvn')
| -rw-r--r-- | dev-util/kdesvn/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-util/kdesvn/files/kdesvn-0.14.1-subversion-1.5.patch | 13 | ||||
| -rw-r--r-- | dev-util/kdesvn/kdesvn-0.14.1.ebuild | 10 |
3 files changed, 26 insertions, 3 deletions
diff --git a/dev-util/kdesvn/ChangeLog b/dev-util/kdesvn/ChangeLog index 43961593daa9..db3c854b2ad6 100644 --- a/dev-util/kdesvn/ChangeLog +++ b/dev-util/kdesvn/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-util/kdesvn # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/kdesvn/ChangeLog,v 1.36 2008/04/19 11:59:24 ingmar Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/kdesvn/ChangeLog,v 1.37 2008/04/30 20:55:03 hollow Exp $ + + 30 Apr 2008; Benedikt Böhm <hollow@gentoo.org> + +files/kdesvn-0.14.1-subversion-1.5.patch, kdesvn-0.14.1.ebuild: + add patch for subversion 1.5 compatibility wrt #219505 19 Apr 2008; Ingmar Vanhassel <ingmar@gentoo.org> kdesvn-0.14.1.ebuild: Inherit qt3.eclass to keep sandbox happy, bug 218393. diff --git a/dev-util/kdesvn/files/kdesvn-0.14.1-subversion-1.5.patch b/dev-util/kdesvn/files/kdesvn-0.14.1-subversion-1.5.patch new file mode 100644 index 000000000000..ce35c07e3c7e --- /dev/null +++ b/dev-util/kdesvn/files/kdesvn-0.14.1-subversion-1.5.patch @@ -0,0 +1,13 @@ +--- src/svnqt/client_modify.cpp ++++ src/svnqt/client_modify.cpp +@@ -188,9 +188,7 @@ + #endif + + svn_error_t * error = +-#if (SVN_VER_MAJOR >= 1) && (SVN_VER_MINOR >= 5) +- svn_client_commit4 +-#elif (SVN_VER_MAJOR >= 1) && (SVN_VER_MINOR >= 3) ++#if (SVN_VER_MAJOR >= 1) && (SVN_VER_MINOR >= 3) + svn_client_commit3 + #else + svn_client_commit2 diff --git a/dev-util/kdesvn/kdesvn-0.14.1.ebuild b/dev-util/kdesvn/kdesvn-0.14.1.ebuild index 38746ae50fa4..7699a18512d9 100644 --- a/dev-util/kdesvn/kdesvn-0.14.1.ebuild +++ b/dev-util/kdesvn/kdesvn-0.14.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/kdesvn/kdesvn-0.14.1.ebuild,v 1.3 2008/04/19 11:59:24 ingmar Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/kdesvn/kdesvn-0.14.1.ebuild,v 1.4 2008/04/30 20:55:03 hollow Exp $ inherit qt3 base eutils versionator toolchain-funcs kde-functions @@ -21,7 +21,13 @@ DEPEND=">=dev-util/subversion-1.3 need-kde 3.3 -PATCHES="${FILESDIR}/${P}-as-needed.patch" +src_unpack() { + unpack ${A} + cd "${S}" + + epatch "${FILESDIR}"/${P}-as-needed.patch + epatch "${FILESDIR}"/${P}-subversion-1.5.patch +} src_compile() { local myconf |