diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2013-05-27 17:22:17 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2013-05-27 17:22:17 +0000 |
| commit | 81edb21abca0cab5d65a25275faa2b73c837bd12 (patch) | |
| tree | 38e175cc685a293a097e04c2c6977a78e2f7f3de /dev-libs/liborcus | |
| parent | Keyword amd64-linux and x86-linux (diff) | |
| download | gentoo-2-81edb21abca0cab5d65a25275faa2b73c837bd12.tar.gz gentoo-2-81edb21abca0cab5d65a25275faa2b73c837bd12.tar.bz2 gentoo-2-81edb21abca0cab5d65a25275faa2b73c837bd12.zip | |
Fix up build under latest mdds.
(Portage version: 2.2.0_alpha177/cvs/Linux x86_64, signed Manifest commit with key 8EEE3BE8)
Diffstat (limited to 'dev-libs/liborcus')
| -rw-r--r-- | dev-libs/liborcus/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-libs/liborcus/files/liborcus-0.5.1-mdds.patch | 12 | ||||
| -rw-r--r-- | dev-libs/liborcus/liborcus-0.5.1.ebuild | 7 |
3 files changed, 21 insertions, 4 deletions
diff --git a/dev-libs/liborcus/ChangeLog b/dev-libs/liborcus/ChangeLog index 28ed7eda85e1..5e52b5278e35 100644 --- a/dev-libs/liborcus/ChangeLog +++ b/dev-libs/liborcus/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-libs/liborcus # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/liborcus/ChangeLog,v 1.16 2013/04/26 19:03:20 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/liborcus/ChangeLog,v 1.17 2013/05/27 17:22:17 scarabeus Exp $ + + 27 May 2013; Tomáš Chvátal <scarabeus@gentoo.org> + +files/liborcus-0.5.1-mdds.patch, liborcus-0.5.1.ebuild: + Fix up build under latest mdds. 26 Apr 2013; Tomáš Chvátal <scarabeus@gentoo.org> liborcus-0.3.0.ebuild, liborcus-0.5.1.ebuild: diff --git a/dev-libs/liborcus/files/liborcus-0.5.1-mdds.patch b/dev-libs/liborcus/files/liborcus-0.5.1-mdds.patch new file mode 100644 index 000000000000..740376b36be1 --- /dev/null +++ b/dev-libs/liborcus/files/liborcus-0.5.1-mdds.patch @@ -0,0 +1,12 @@ +diff -urN liborcus-0.5.1.old/src/spreadsheet/sheet.cpp liborcus-0.5.1/src/spreadsheet/sheet.cpp +--- liborcus-0.5.1.old/src/spreadsheet/sheet.cpp 2013-05-27 19:07:41.712302036 +0200 ++++ liborcus-0.5.1/src/spreadsheet/sheet.cpp 2013-05-27 19:08:51.432302028 +0200 +@@ -734,7 +734,7 @@ + con.build_tree(); + + size_t index; +- if (!con.search_tree(col, index)) ++ if (!con.search_tree(col, index).second) + return 0; + + return index; diff --git a/dev-libs/liborcus/liborcus-0.5.1.ebuild b/dev-libs/liborcus/liborcus-0.5.1.ebuild index 5977048cd195..af99dd31ccad 100644 --- a/dev-libs/liborcus/liborcus-0.5.1.ebuild +++ b/dev-libs/liborcus/liborcus-0.5.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/liborcus/liborcus-0.5.1.ebuild,v 1.3 2013/04/26 19:03:20 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/liborcus/liborcus-0.5.1.ebuild,v 1.4 2013/05/27 17:22:17 scarabeus Exp $ EAPI=5 @@ -26,7 +26,7 @@ RDEPEND=" sys-libs/zlib " DEPEND="${RDEPEND} - >=dev-util/mdds-0.7.1 + >=dev-util/mdds-0.8.1:= " src_prepare() { @@ -35,7 +35,8 @@ src_prepare() { configure.ac || die epatch \ - "${FILESDIR}"/${P}-linking.patch + "${FILESDIR}"/${P}-linking.patch \ + "${FILESDIR}"/${P}-mdds.patch eautoreconf } |