diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2009-08-08 22:43:26 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2009-08-08 22:43:26 +0000 |
| commit | f0eee7dc12269e4b72dc38c146c1c3c11e264669 (patch) | |
| tree | f1e583263593e1fa4c83845f1ef5d8769f3a3420 /app-office/ledger | |
| parent | USE flag is not called xlock, but lock (diff) | |
| download | gentoo-2-f0eee7dc12269e4b72dc38c146c1c3c11e264669.tar.gz gentoo-2-f0eee7dc12269e4b72dc38c146c1c3c11e264669.tar.bz2 gentoo-2-f0eee7dc12269e4b72dc38c146c1c3c11e264669.zip | |
Fix building with GLIBC 2.10+ wrt #275905, thanks to Arttu Valo for patch.
(Portage version: 2.2_rc36/cvs/Linux x86_64)
Diffstat (limited to 'app-office/ledger')
| -rw-r--r-- | app-office/ledger/ChangeLog | 6 | ||||
| -rw-r--r-- | app-office/ledger/files/ledger-2.6.1-glibc-2.10.patch | 38 | ||||
| -rw-r--r-- | app-office/ledger/ledger-2.6.1.ebuild | 9 |
3 files changed, 50 insertions, 3 deletions
diff --git a/app-office/ledger/ChangeLog b/app-office/ledger/ChangeLog index 9e0bce830714..f872250917fe 100644 --- a/app-office/ledger/ChangeLog +++ b/app-office/ledger/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-office/ledger # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/ledger/ChangeLog,v 1.10 2009/06/05 16:12:59 loki_val Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/ledger/ChangeLog,v 1.11 2009/08/08 22:43:26 ssuominen Exp $ + + 08 Aug 2009; Samuli Suominen <ssuominen@gentoo.org> ledger-2.6.1.ebuild, + +files/ledger-2.6.1-glibc-2.10.patch: + Fix building with GLIBC 2.10+ wrt #275905, thanks to Arttu Valo for patch. 05 Jun 2009; Peter Alfredsen <loki_val@gentoo.org> metadata.xml: Retiring, bug 220219. diff --git a/app-office/ledger/files/ledger-2.6.1-glibc-2.10.patch b/app-office/ledger/files/ledger-2.6.1-glibc-2.10.patch new file mode 100644 index 000000000000..c7729de0f84f --- /dev/null +++ b/app-office/ledger/files/ledger-2.6.1-glibc-2.10.patch @@ -0,0 +1,38 @@ +diff -ur ledger-2.6.1.old/gnucash.cc ledger-2.6.1/gnucash.cc +--- ledger-2.6.1.old/gnucash.cc 2009-07-07 09:10:35.461037758 +0300 ++++ ledger-2.6.1/gnucash.cc 2009-07-07 09:29:17.462613252 +0300 +@@ -201,7 +201,7 @@ + { + const char * num = number.c_str(); + +- if (char * p = std::strchr(num, '/')) { ++ if (const char * p = std::strchr(num, '/')) { + std::string numer_str(num, p - num); + std::string denom_str(p + 1); + +diff -ur ledger-2.6.1.old/option.cc ledger-2.6.1/option.cc +--- ledger-2.6.1.old/option.cc 2009-07-07 09:10:35.459038062 +0300 ++++ ledger-2.6.1/option.cc 2009-07-07 09:15:26.238434229 +0300 +@@ -893,7 +893,7 @@ + namespace { + void parse_price_setting(const char * optarg) + { +- char * equals = std::strchr(optarg, '='); ++ const char * equals = std::strchr(optarg, '='); + if (! equals) + return; + +diff -ur ledger-2.6.1.old/textual.cc ledger-2.6.1/textual.cc +--- ledger-2.6.1.old/textual.cc 2009-07-07 09:10:35.458037934 +0300 ++++ ledger-2.6.1/textual.cc 2009-07-07 09:26:23.627028972 +0300 +@@ -298,8 +298,8 @@ + DEBUG_PRINT("ledger.textual.parse", "line " << linenum << ": " << + "Parsed a note '" << xact->note << "'"); + +- if (char * b = std::strchr(xact->note.c_str(), '[')) +- if (char * e = std::strchr(xact->note.c_str(), ']')) { ++ if (const char * b = std::strchr(xact->note.c_str(), '[')) ++ if (const char * e = std::strchr(xact->note.c_str(), ']')) { + char buf[256]; + std::strncpy(buf, b + 1, e - b - 1); + buf[e - b - 1] = '\0'; diff --git a/app-office/ledger/ledger-2.6.1.ebuild b/app-office/ledger/ledger-2.6.1.ebuild index 44bc208c5599..08066eea9b7c 100644 --- a/app-office/ledger/ledger-2.6.1.ebuild +++ b/app-office/ledger/ledger-2.6.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/ledger/ledger-2.6.1.ebuild,v 1.2 2009/05/17 10:35:11 loki_val Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/ledger/ledger-2.6.1.ebuild,v 1.3 2009/08/08 22:43:26 ssuominen Exp $ inherit eutils elisp-common @@ -23,8 +23,13 @@ DEPEND="dev-libs/gmp SITEFILE=50${PN}-gentoo.el -src_compile() { +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}"/${P}-glibc-2.10.patch +} +src_compile() { econf \ $(use_enable xml) \ $(use_enable ofx) \ |