From: | "Ryan Hill (dirtyepic)" <dirtyepic@g.o> |
---|---|
To: | gentoo-commits@l.g.o |
Subject: | [gentoo-commits] gentoo-x86 commit in media-sound/lilypond/files: lilypond-2.12.2-glibc-2.10.patch |
Date: | Wed, 29 Jul 2009 20:49:41 |
Message-Id: | E1MWG5i-0006uf-Vs@stork.gentoo.org |
1 | dirtyepic 09/07/29 20:49:38 |
2 | |
3 | Added: lilypond-2.12.2-glibc-2.10.patch |
4 | Log: |
5 | Fix build w/ glibc-2.10. (bug #270718) |
6 | (Portage version: 2.2_rc33/cvs/Linux x86_64) |
7 | |
8 | Revision Changes Path |
9 | 1.1 media-sound/lilypond/files/lilypond-2.12.2-glibc-2.10.patch |
10 | |
11 | file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/lilypond/files/lilypond-2.12.2-glibc-2.10.patch?rev=1.1&view=markup |
12 | plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/lilypond/files/lilypond-2.12.2-glibc-2.10.patch?rev=1.1&content-type=text/plain |
13 | |
14 | Index: lilypond-2.12.2-glibc-2.10.patch |
15 | =================================================================== |
16 | diff -Naurp lilypond-2.12.2-orig/lily/relocate.cc lilypond-2.12.2/lily/relocate.cc |
17 | --- lilypond-2.12.2-orig/lily/relocate.cc 2009-01-18 18:04:57.000000000 -0600 |
18 | +++ lilypond-2.12.2/lily/relocate.cc 2009-07-29 14:31:12.908541341 -0600 |
19 | @@ -276,13 +276,13 @@ expand_environment_variables (string ori |
20 | string out; |
21 | while (ptr < start_ptr + len) |
22 | { |
23 | - char *dollar = strchr (ptr, '$'); |
24 | + const char *dollar = strchr (ptr, '$'); |
25 | |
26 | if (dollar != NULL) |
27 | { |
28 | - char *start_var = dollar + 1; |
29 | - char *end_var = start_var; |
30 | - char *start_next = end_var; |
31 | + const char *start_var = dollar + 1; |
32 | + const char *end_var = start_var; |
33 | + const char *start_next = end_var; |
34 | |
35 | out += string (ptr, dollar - ptr); |
36 | ptr = dollar; |