diff options
| author | joerg <joerg@pkgsrc.org> | 2013-06-16 20:46:52 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2013-06-16 20:46:52 +0000 |
| commit | 45d85a23787d2b592fd9484c8a0a58395c71db85 (patch) | |
| tree | e0b1aff1a9ac99bdb6bf5bf8c527838e41e2105d | |
| parent | 57cd87534eb213372e8c07b632d3ea181e07228d (diff) | |
| download | pkgsrc-45d85a23787d2b592fd9484c8a0a58395c71db85.tar.gz | |
std_vector.hh depends on config.hh, so include the latter whenever the
former is used. to_string is part of C++11 STL, so pick the version from
the global namespace whenever it is unclear which one is desired.
113 files changed, 1561 insertions, 5 deletions
diff --git a/print/lilypond/distinfo b/print/lilypond/distinfo index 0fd47472084..c6aa2ffcf6d 100644 --- a/print/lilypond/distinfo +++ b/print/lilypond/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.17 2013/04/01 12:20:46 joerg Exp $ +$NetBSD: distinfo,v 1.18 2013/06/16 20:46:52 joerg Exp $ SHA1 (lilypond-2.16.2.tar.gz) = 1eb3b0e5c117a8669dba19ab28f933351e51e39a RMD160 (lilypond-2.16.2.tar.gz) = bbb68ef05e81d8d9f5cf7ac26cffb5ab3935c61a @@ -7,9 +7,120 @@ SHA1 (patch-aa) = 99dc3ecc7df664fba71d850e6c0b253fc451ec61 SHA1 (patch-ab) = 08bf158aed8f6cbaf11d054716069486cf393d6b SHA1 (patch-ac) = ca7a8671885a40201f201431d2eb8a3377993c67 SHA1 (patch-configure) = b0c73d828f26fb8db895ace55a678a6d7b09db0e +SHA1 (patch-flower_file-name.cc) = 1f321bdf3bf3097bd6cc641231c42bfe2adddf82 +SHA1 (patch-flower_file-path.cc) = ac2d9dda58cddf39e604cbd37af0e052ed3b4d97 +SHA1 (patch-flower_interval-set.cc) = 1365d075abde2bc597a7fc76ad66f0efff20f353 +SHA1 (patch-flower_polynomial.cc) = 835aa9cc3e0344f1cf36008fd754af0a0bbf2156 +SHA1 (patch-flower_std-string.cc) = 7351f3a9a87848259e3423b214179baa62f9cdf8 +SHA1 (patch-flower_string-convert.cc) = 15a7c1237a7883ee3cc364e01f490763d07b7c8c +SHA1 (patch-flower_warn.cc) = e7e83d5c64103a587536aa12479050565be8268d SHA1 (patch-lily_GNUmakefile) = b5ee1b8a307b8d1118e603a995d7645536c71dc4 +SHA1 (patch-lily_accidental.cc) = 70bfb4d5459d3a718eb5715094d95ea78b44e145 +SHA1 (patch-lily_align-interface.cc) = e82a03ec8a1f927e69448310957c913c415c1c38 +SHA1 (patch-lily_all-font-metrics-scheme.cc) = 9ce4f0e0b1fb81fe41c862cae57c17474652e93f +SHA1 (patch-lily_all-font-metrics.cc) = 907ceb6caf7edab5cb709af5b20c4f89f61200ed +SHA1 (patch-lily_arpeggio.cc) = b6f8574d51ddef26f6591af3430c705726525dee +SHA1 (patch-lily_audio-element-info.cc) = 27393aa6deb6020b49a777614030372a79fc49d1 +SHA1 (patch-lily_audio-staff.cc) = aa3b864bbfc02a1f756a91a6869ad89bbdbe84f5 +SHA1 (patch-lily_auto-beam-engraver.cc) = 7dd069220a3a2c39f22d3f2cf98bf4659642c8fa +SHA1 (patch-lily_axis-group-interface-scheme.cc) = 763400b12ed96ff55e52bbd1e2b469dbb7f12746 +SHA1 (patch-lily_axis-group-interface.cc) = ada3b7aa16cd26fd398456845980403566b36c58 +SHA1 (patch-lily_beam-performer.cc) = cb1a93b6e914b8bc6125473fa7805d9e1e8d4d72 +SHA1 (patch-lily_bezier-bow.cc) = 20de8ef921238fe81487f148c5cd7f414ca8cc66 +SHA1 (patch-lily_bezier.cc) = aa525fc9cbef9c1d54bc1ec8c08fa21a3b401434 +SHA1 (patch-lily_book-scheme.cc) = 7f7a6f9761c55c071f30190c46f23eca5b57b364 +SHA1 (patch-lily_book.cc) = 9236100adcba689cf3b0654b29fe729ba1f3ce39 +SHA1 (patch-lily_change-iterator.cc) = cfee55dbca8269453ad7bd35f75f684ee6bc8f3c +SHA1 (patch-lily_chord-tremolo-iterator.cc) = 2efd68ad97353e3ac28c1fb4a5e2824d8e794332 +SHA1 (patch-lily_column-x-positions.cc) = 31547faa94487d4150d0c89fd3b49f5cbdc69260 +SHA1 (patch-lily_context-def.cc) = 76cbf8980efb8c5fba2527dbe92ef8b0a2994927 +SHA1 (patch-lily_context-specced-music-iterator.cc) = eb4943616459862a08a7c23bd87bb0520f2f6cc4 +SHA1 (patch-lily_drum-note-performer.cc) = da590791d34b6942f0da6ee54fcb83b4c48638a9 +SHA1 (patch-lily_dynamic-engraver.cc) = 737b88584139a172be94c890b6e0076821c8af72 +SHA1 (patch-lily_dynamic-performer.cc) = d1bbb9df39593eabcf49d726f9ec17e8b15513c0 +SHA1 (patch-lily_event-chord-iterator.cc) = 94e3d39b4c591e33676bd6eace519d296f566d03 +SHA1 (patch-lily_event-iterator.cc) = c09b915989def11e88ff0cd91cbaacf98a6eb3ee +SHA1 (patch-lily_flag.cc) = 711b1306badd4fc27bbe981b67482867bc8fe5cf +SHA1 (patch-lily_font-select.cc) = c76ad25a1ba14d214e5800fc9f6a80f1b71f1fe1 +SHA1 (patch-lily_global-ctor.cc) = 94e0337e096b1674e19bfe580c70f558bb113c61 +SHA1 (patch-lily_grace-iterator.cc) = 4efd84a1b8af7fb143efacf70596b4c2e046410f +SHA1 (patch-lily_grob-property.cc) = a392b3e8157b037c7b902fd78a560ce6a19f2648 SHA1 (patch-lily_grob.cc) = d6f12a99f3a517fb635e64d564821873f7f6b78f +SHA1 (patch-lily_horizontal-bracket.cc) = 10d4c58579632dda738732a179ac53b04367e103 +SHA1 (patch-lily_includable-lexer.cc) = 39c414fe9f914f42a4fd2ff6499eda1ce8f67dd0 SHA1 (patch-lily_include_lily-proto.hh) = a472898ad4c3adb8b31aec8009f1d04845b9ddb3 SHA1 (patch-lily_include_translator-group.hh) = c2fb449562288ecf097fefae7527c5f89f1f527c -SHA1 (patch-lily_translator-dispatch-list.cc) = 90bc3d7fa45a10d2f5b92557328e82aa3e9763d8 +SHA1 (patch-lily_input.cc) = 0c291ecc88d4f16a1f0c2b62f308d4b80665b2b3 +SHA1 (patch-lily_instrument-name-engraver.cc) = 59033b0df4b8ffca356ae11f216165ee2a766a09 +SHA1 (patch-lily_interval-minefield.cc) = c8310882e83f6d9c5bc9f318ab77402d0c0363fe +SHA1 (patch-lily_key-signature-interface.cc) = 949bae8fd69ca89f11448549d24a76af7b98f621 +SHA1 (patch-lily_keyword.cc) = 5f73a35502756fdbd1bd5c297356177439f424ad +SHA1 (patch-lily_least-squares.cc) = b5605b0b0da712bc2177b3ee83b58fabea55d4ea +SHA1 (patch-lily_ledger-line-engraver.cc) = 0bab263cfa0e6b38fc8e0a4eebca8f07a10075a8 +SHA1 (patch-lily_lexer.ll) = c806a4dcbbfd3349901ac62b6cc1bc917c9fe4a2 +SHA1 (patch-lily_lily-lexer-scheme.cc) = 0cce067ed78561f364da4932aeadcc8714912f78 +SHA1 (patch-lily_lily-lexer.cc) = 11b3df667301b5acdd56513975c0750c6f6c83f5 +SHA1 (patch-lily_lilypond-version.cc) = 0a5159d40e1840e19f68ad01fa65425442864ff9 +SHA1 (patch-lily_line-spanner.cc) = 8a725f44d9d93bfa1827ab9200c087c357afaf47 +SHA1 (patch-lily_main.cc) = f76e5065fa5658ac123e99ebb866088b2d8be5d8 +SHA1 (patch-lily_mensural-ligature.cc) = 91519515a65f12e990bf701c6248ea353e98a351 +SHA1 (patch-lily_midi-chunk.cc) = d8e607020a5661d1eb07c1f7081b61903af823ef +SHA1 (patch-lily_midi-stream.cc) = 4df239c12396f1e76093922b89577135e1d023c5 +SHA1 (patch-lily_midi-walker.cc) = 8edbe0bbbc41aaa0aa725662ea4b1c2a9224c8fc +SHA1 (patch-lily_misc.cc) = 689a5c251c36a27d1569347a643917962a029bb3 +SHA1 (patch-lily_music-wrapper-iterator.cc) = b4f0f142165d0765ca54a387ef5ea6a8d056a293 +SHA1 (patch-lily_note-collision.cc) = fd59654bf35688ab8de9fdc8535e263d34915d0d +SHA1 (patch-lily_note-head.cc) = 9814a05c4e730ffb07aa6e46b2352b29cae7b2b9 +SHA1 (patch-lily_note-performer.cc) = 608e630d70141a2f65c6fb69929732182303b8a5 +SHA1 (patch-lily_ottava-bracket.cc) = e3f4581d13eaa14c88523cbf0e550fe0586e376b +SHA1 (patch-lily_page-breaking-scheme.cc) = 49957521bb8bda897aa59ed54befacd49652569e +SHA1 (patch-lily_page-layout-problem.cc) = 5debc03851c0390dda861c0d326a8c6c483ba37f +SHA1 (patch-lily_page-spacing-result.cc) = 0d8e3be8d85ef27230c92f8c6bf05acbff1486b8 +SHA1 (patch-lily_page-turn-page-breaking.cc) = 62256aecc481ac7ec1fab87be81b04d709819145 +SHA1 (patch-lily_pango-font-scheme.cc) = 54e47095a9375595d7d6889bf8f5a3fcae310611 +SHA1 (patch-lily_pango-select.cc) = da9603983d4478d7d93e3c5928b15a8db1dff452 +SHA1 (patch-lily_paper-book-scheme.cc) = 7c8bb1142304728c21a1728d21b180f80ad150f5 +SHA1 (patch-lily_paper-book.cc) = ecff2ac56bc2a760d3446432d2378ece72ba7f4d +SHA1 (patch-lily_paper-column-engraver.cc) = 4e7dafaf44a149d5787b7c2225b56378dcffc321 +SHA1 (patch-lily_paper-column.cc) = df760725de834901c8709ff8846b8e90dd41a8b3 +SHA1 (patch-lily_paper-outputter-scheme.cc) = f367bf8b92d71e77a8684feee7c36a2cc50e47d1 +SHA1 (patch-lily_paper-outputter.cc) = ab31467616005c48f91d99d18ccc17e319f57684 +SHA1 (patch-lily_paper-score-scheme.cc) = d594b707174c52d7cf53f6d66ad4674630442733 +SHA1 (patch-lily_paper-score.cc) = 3de40fdc4a7f2b47b5a1e18d77085031a28da192 +SHA1 (patch-lily_performance-scheme.cc) = 51e20914d8dd4e79d165d9d2d7fd7688a972d328 +SHA1 (patch-lily_performance.cc) = c0e798ce519b991809a508fdb80bf9ca03f4a94f +SHA1 (patch-lily_performer-group.cc) = b7d3cd889a781907aebcbecf9e84eeefbc30bf64 +SHA1 (patch-lily_piano-pedal-performer.cc) = 26c565b27adca19e79c447315de1f6d4e24e9fca +SHA1 (patch-lily_pointer-group-interface-scheme.cc) = 27ec279e056684f01d6a9709137cf61c06cf38f0 +SHA1 (patch-lily_pointer-group-interface.cc) = 34914258ca9d777d36dbe3cf56870a339dfc5391 +SHA1 (patch-lily_property-iterator.cc) = 8366a9cfe89faf6b32926780dc83e14e010db0ec +SHA1 (patch-lily_pure-from-neighbor-interface.cc) = 8e22322a4476be195975506b57cc66d4595be376 +SHA1 (patch-lily_quote-iterator.cc) = 1cff848362c7b709524d47c8f91527096e314a69 +SHA1 (patch-lily_rest.cc) = 4e9151f7d53852a2a7cda7d5f60a424a58148180 +SHA1 (patch-lily_rhythmic-music-iterator.cc) = 890b392844b5f7dd852c926fe0170a1638a800c0 +SHA1 (patch-lily_sequential-iterator.cc) = 9d908b1e2dcab4d8bb90af479c9ae00c8b0bea28 +SHA1 (patch-lily_simple-music-iterator.cc) = 571d7d3586e4ab2e3600878e4ac9c699ee4c3de3 +SHA1 (patch-lily_simple-spacer.cc) = 352550bf4cefa4d03d076fc4329122146efc9d54 +SHA1 (patch-lily_simultaneous-music-iterator.cc) = e63de78f441f0811fba162aafc87c14a97ff7388 +SHA1 (patch-lily_slur-configuration.cc) = de748134493d14d322bd77583e8155c010ccfab6 +SHA1 (patch-lily_slur-performer.cc) = daad8d244defdb547b5e95a790d7206d8345e015 +SHA1 (patch-lily_slur.cc) = 8ad560e902bfc8b7de52bc331f12765e6270e9dd +SHA1 (patch-lily_source-file.cc) = a80cbd2e6590dad5eeca440726d9e2ce0dd97d3e +SHA1 (patch-lily_sources.cc) = 754f8ec713ab0fea21f9655b3b0d688636420215 +SHA1 (patch-lily_spacing-basic.cc) = 107c723842abb213e3d601bfa43c243e67ae465a +SHA1 (patch-lily_spacing-loose-columns.cc) = ac83e706b7d088d39328ed62124b831a432cb617 +SHA1 (patch-lily_spacing-options.cc) = 5c7e3b2ff381f02b6c346527cc9aa62623f1a60f +SHA1 (patch-lily_spacing-spanner.cc) = 80d80750ef4e4726008c7db237a4a0c2aec7d829 +SHA1 (patch-lily_span-bar-stub-engraver.cc) = 02a66397cd4b8500cb2c26a8cf37c6b5ac1b0dfc +SHA1 (patch-lily_stem.cc) = ab413430c05031b92f638c9b22c7364d3b824206 +SHA1 (patch-lily_system-start-delimiter.cc) = c58a0271bbca80222e8ba68263b424b5fe189dfa +SHA1 (patch-lily_system.cc) = 788e6c1607ffc8392b492ee93f0fefd7fb112494 +SHA1 (patch-lily_tempo-performer.cc) = 1f8c9b1877416bb147cbbad79e63a670dd1d0aa9 +SHA1 (patch-lily_tie-configuration.cc) = 422f35f2fa954d73986c38ece08d196368787b9c +SHA1 (patch-lily_tie-performer.cc) = 1ccc52b8e3caacc5c947a800cb189f66d33f5663 +SHA1 (patch-lily_time-signature.cc) = bbf6524fc4a5b2c07741abc01ece0e9d22b23969 +SHA1 (patch-lily_translator-dispatch-list.cc) = 3f66d794c0f441587a9739bfdcd2d04f0224643c +SHA1 (patch-lily_tuplet-bracket.cc) = 10e72655b79ebd82d18a3d1a4712f3265aed06e0 +SHA1 (patch-lily_tuplet-number.cc) = 0658c115e193d47dffeb33cdef0390ccf6f2104c +SHA1 (patch-lily_volta-repeat-iterator.cc) = f4a5f34736e11611070c54b9ed7d3935d1f3d2c2 SHA1 (patch-scripts_auxiliar_cg-section.sh) = c6838a358ae1ea2f8ddd0791e72eb3c25ac2019b diff --git a/print/lilypond/patches/patch-flower_file-name.cc b/print/lilypond/patches/patch-flower_file-name.cc new file mode 100644 index 00000000000..c0ff67fffb8 --- /dev/null +++ b/print/lilypond/patches/patch-flower_file-name.cc @@ -0,0 +1,12 @@ +$NetBSD: patch-flower_file-name.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ + +--- flower/file-name.cc.orig 2013-06-16 18:41:41.000000000 +0000 ++++ flower/file-name.cc +@@ -18,6 +18,7 @@ + along with LilyPond. If not, see <http://www.gnu.org/licenses/>. + */ + ++#include "config.hh" + #include "file-name.hh" + + #include <cstdio> diff --git a/print/lilypond/patches/patch-flower_file-path.cc b/print/lilypond/patches/patch-flower_file-path.cc new file mode 100644 index 00000000000..e4b3497891b --- /dev/null +++ b/print/lilypond/patches/patch-flower_file-path.cc @@ -0,0 +1,18 @@ +$NetBSD: patch-flower_file-path.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ + +--- flower/file-path.cc.orig 2013-06-16 18:36:33.000000000 +0000 ++++ flower/file-path.cc +@@ -18,12 +18,12 @@ + along with LilyPond. If not, see <http://www.gnu.org/licenses/>. + */ + ++#include "config.hh" + #include "file-path.hh" + + #include <cstdio> + #include <cerrno> + +-#include "config.hh" + #if HAVE_SYS_STAT_H + #include <sys/stat.h> + #endif diff --git a/print/lilypond/patches/patch-flower_interval-set.cc b/print/lilypond/patches/patch-flower_interval-set.cc new file mode 100644 index 00000000000..09ff0251d3e --- /dev/null +++ b/print/lilypond/patches/patch-flower_interval-set.cc @@ -0,0 +1,12 @@ +$NetBSD: patch-flower_interval-set.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ + +--- flower/interval-set.cc.orig 2013-06-16 18:41:26.000000000 +0000 ++++ flower/interval-set.cc +@@ -17,6 +17,7 @@ + along with LilyPond. If not, see <http://www.gnu.org/licenses/>. + */ + ++#include "config.hh" + #include "interval-set.hh" + + /* diff --git a/print/lilypond/patches/patch-flower_polynomial.cc b/print/lilypond/patches/patch-flower_polynomial.cc new file mode 100644 index 00000000000..835f4503833 --- /dev/null +++ b/print/lilypond/patches/patch-flower_polynomial.cc @@ -0,0 +1,12 @@ +$NetBSD: patch-flower_polynomial.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ + +--- flower/polynomial.cc.orig 2013-06-16 18:38:24.000000000 +0000 ++++ flower/polynomial.cc +@@ -17,6 +17,7 @@ + along with LilyPond. If not, see <http://www.gnu.org/licenses/>. + */ + ++#include "config.hh" + #include "polynomial.hh" + + #include "warn.hh" diff --git a/print/lilypond/patches/patch-flower_std-string.cc b/print/lilypond/patches/patch-flower_std-string.cc new file mode 100644 index 00000000000..b90683df28c --- /dev/null +++ b/print/lilypond/patches/patch-flower_std-string.cc @@ -0,0 +1,12 @@ +$NetBSD: patch-flower_std-string.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ + +--- flower/std-string.cc.orig 2013-06-16 18:38:42.000000000 +0000 ++++ flower/std-string.cc +@@ -17,6 +17,7 @@ + along with LilyPond. If not, see <http://www.gnu.org/licenses/>. + */ + ++#include "config.hh" + #include "std-string.hh" + #include "string-convert.hh" + diff --git a/print/lilypond/patches/patch-flower_string-convert.cc b/print/lilypond/patches/patch-flower_string-convert.cc new file mode 100644 index 00000000000..2f2bbcc4fa1 --- /dev/null +++ b/print/lilypond/patches/patch-flower_string-convert.cc @@ -0,0 +1,22 @@ +$NetBSD: patch-flower_string-convert.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ + +--- flower/string-convert.cc.orig 2013-06-16 18:39:57.000000000 +0000 ++++ flower/string-convert.cc +@@ -165,7 +165,7 @@ String_convert::int2dec (int i, size_t l + fill_char = '0'; + + // ugh +- string dec_string = to_string (i); ++ string dec_string = ::to_string (i); + + // ugh + return to_string (fill_char, ssize_t (length_i - dec_string.length ())) + dec_string; +@@ -299,7 +299,7 @@ String_convert::pointer_string (void con + string + String_convert::precision_string (double x, int n) + { +- string format = "%." + to_string (max (0, n - 1)) + "e"; ++ string format = "%." + ::to_string (max (0, n - 1)) + "e"; + string str = double_string (abs (x), format.c_str ()); + + int exp = dec2int (str.substr (str.length () - 3)); diff --git a/print/lilypond/patches/patch-flower_warn.cc b/print/lilypond/patches/patch-flower_warn.cc new file mode 100644 index 00000000000..afdd133bc7d --- /dev/null +++ b/print/lilypond/patches/patch-flower_warn.cc @@ -0,0 +1,12 @@ +$NetBSD: patch-flower_warn.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ + +--- flower/warn.cc.orig 2013-06-16 18:37:26.000000000 +0000 ++++ flower/warn.cc +@@ -17,6 +17,7 @@ + along with LilyPond. If not, see <http://www.gnu.org/licenses/>. + */ + ++#include "config.hh" + #include "warn.hh" + + #include <cstdlib> diff --git a/print/lilypond/patches/patch-lily_accidental.cc b/print/lilypond/patches/patch-lily_accidental.cc new file mode 100644 index 00000000000..794f9b80f73 --- /dev/null +++ b/print/lilypond/patches/patch-lily_accidental.cc @@ -0,0 +1,12 @@ +$NetBSD: patch-lily_accidental.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ + +--- lily/accidental.cc.orig 2013-06-16 19:28:17.000000000 +0000 ++++ lily/accidental.cc +@@ -17,6 +17,7 @@ + along with LilyPond. If not, see <http://www.gnu.org/licenses/>. + */ + ++#include "config.hh" + #include "accidental-interface.hh" + #include "font-interface.hh" + #include "international.hh" diff --git a/print/lilypond/patches/patch-lily_align-interface.cc b/print/lilypond/patches/patch-lily_align-interface.cc new file mode 100644 index 00000000000..abb8f24d234 --- /dev/null +++ b/print/lilypond/patches/patch-lily_align-interface.cc @@ -0,0 +1,12 @@ +$NetBSD: patch-lily_align-interface.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ + +--- lily/align-interface.cc.orig 2013-06-16 19:28:17.000000000 +0000 ++++ lily/align-interface.cc +@@ -17,6 +17,7 @@ + along with LilyPond. If not, see <http://www.gnu.org/licenses/>. + */ + ++#include "config.hh" + #include "align-interface.hh" + #include "axis-group-interface.hh" + #include "grob-array.hh" diff --git a/print/lilypond/patches/patch-lily_all-font-metrics-scheme.cc b/print/lilypond/patches/patch-lily_all-font-metrics-scheme.cc new file mode 100644 index 00000000000..55e8a5c0ac8 --- /dev/null +++ b/print/lilypond/patches/patch-lily_all-font-metrics-scheme.cc @@ -0,0 +1,12 @@ +$NetBSD: patch-lily_all-font-metrics-scheme.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ + +--- lily/all-font-metrics-scheme.cc.orig 2013-06-16 19:19:52.000000000 +0000 ++++ lily/all-font-metrics-scheme.cc +@@ -18,6 +18,7 @@ + along with LilyPond. If not, see <http://www.gnu.org/licenses/>. + */ + ++#include "config.hh" + #include "all-font-metrics.hh" + #include "main.hh" + diff --git a/print/lilypond/patches/patch-lily_all-font-metrics.cc b/print/lilypond/patches/patch-lily_all-font-metrics.cc new file mode 100644 index 00000000000..982b4cad0f0 --- /dev/null +++ b/print/lilypond/patches/patch-lily_all-font-metrics.cc @@ -0,0 +1,12 @@ +$NetBSD: patch-lily_all-font-metrics.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ + +--- lily/all-font-metrics.cc.orig 2013-06-16 19:12:28.000000000 +0000 ++++ lily/all-font-metrics.cc +@@ -17,6 +17,7 @@ + along with LilyPond. If not, see <http://www.gnu.org/licenses/>. + */ + ++#include "config.hh" + #include "all-font-metrics.hh" + + #include "string-convert.hh" diff --git a/print/lilypond/patches/patch-lily_arpeggio.cc b/print/lilypond/patches/patch-lily_arpeggio.cc new file mode 100644 index 00000000000..4b7f1966a67 --- /dev/null +++ b/print/lilypond/patches/patch-lily_arpeggio.cc @@ -0,0 +1,13 @@ +$NetBSD: patch-lily_arpeggio.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ + +--- lily/arpeggio.cc.orig 2013-06-16 19:09:07.000000000 +0000 ++++ lily/arpeggio.cc +@@ -140,7 +140,7 @@ Arpeggio::print (SCM smob) + if (dir) + { + Font_metric *fm = Font_interface::get_default_font (me); +- arrow = fm->find_by_name ("scripts.arpeggio.arrow." + to_string (dir)); ++ arrow = fm->find_by_name ("scripts.arpeggio.arrow." + ::to_string (dir)); + heads[dir] -= dir * arrow.extent (Y_AXIS).length (); + } + diff --git a/print/lilypond/patches/patch-lily_audio-element-info.cc b/print/lilypond/patches/patch-lily_audio-element-info.cc new file mode 100644 index 00000000000..56929a87621 --- /dev/null +++ b/print/lilypond/patches/patch-lily_audio-element-info.cc @@ -0,0 +1,12 @@ +$NetBSD: patch-lily_audio-element-info.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ + +--- lily/audio-element-info.cc.orig 2013-06-16 19:28:17.000000000 +0000 ++++ lily/audio-element-info.cc +@@ -17,6 +17,7 @@ + along with LilyPond. If not, see <http://www.gnu.org/licenses/>. + */ + ++#include "config.hh" + #include "audio-element-info.hh" + + #include "translator-group.hh" diff --git a/print/lilypond/patches/patch-lily_audio-staff.cc b/print/lilypond/patches/patch-lily_audio-staff.cc new file mode 100644 index 00000000000..cf4bea4dcaa --- /dev/null +++ b/print/lilypond/patches/patch-lily_audio-staff.cc @@ -0,0 +1,12 @@ +$NetBSD: patch-lily_audio-staff.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ + +--- lily/audio-staff.cc.orig 2013-06-16 19:28:17.000000000 +0000 ++++ lily/audio-staff.cc +@@ -17,6 +17,7 @@ + along with LilyPond. If not, see <http://www.gnu.org/licenses/>. + */ + ++#include "config.hh" + #include "audio-staff.hh" + + #include "midi-chunk.hh" diff --git a/print/lilypond/patches/patch-lily_auto-beam-engraver.cc b/print/lilypond/patches/patch-lily_auto-beam-engraver.cc new file mode 100644 index 00000000000..ed7d923e800 --- /dev/null +++ b/print/lilypond/patches/patch-lily_auto-beam-engraver.cc @@ -0,0 +1,12 @@ +$NetBSD: patch-lily_auto-beam-engraver.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ + +--- lily/auto-beam-engraver.cc.orig 2013-06-16 19:20:34.000000000 +0000 ++++ lily/auto-beam-engraver.cc +@@ -17,6 +17,7 @@ + along with LilyPond. If not, see <http://www.gnu.org/licenses/>. + */ + ++#include "config.hh" + #include "beaming-pattern.hh" + #include "beam.hh" + #include "context.hh" diff --git a/print/lilypond/patches/patch-lily_axis-group-interface-scheme.cc b/print/lilypond/patches/patch-lily_axis-group-interface-scheme.cc new file mode 100644 index 00000000000..51f9e9eb4a9 --- /dev/null +++ b/print/lilypond/patches/patch-lily_axis-group-interface-scheme.cc @@ -0,0 +1,12 @@ +$NetBSD: patch-lily_axis-group-interface-scheme.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ + +--- lily/axis-group-interface-scheme.cc.orig 2013-06-16 19:28:17.000000000 +0000 ++++ lily/axis-group-interface-scheme.cc +@@ -17,6 +17,7 @@ + along with LilyPond. If not, see <http://www.gnu.org/licenses/>. + */ + ++#include "config.hh" + #include "axis-group-interface.hh" + #include "lily-guile.hh" + #include "grob.hh" diff --git a/print/lilypond/patches/patch-lily_axis-group-interface.cc b/print/lilypond/patches/patch-lily_axis-group-interface.cc new file mode 100644 index 00000000000..6466504f0b1 --- /dev/null +++ b/print/lilypond/patches/patch-lily_axis-group-interface.cc @@ -0,0 +1,12 @@ +$NetBSD: patch-lily_axis-group-interface.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ + +--- lily/axis-group-interface.cc.orig 2013-06-16 19:13:48.000000000 +0000 ++++ lily/axis-group-interface.cc +@@ -17,6 +17,7 @@ + along with LilyPond. If not, see <http://www.gnu.org/licenses/>. + */ + ++#include "config.hh" + #include "axis-group-interface.hh" + + #include "align-interface.hh" diff --git a/print/lilypond/patches/patch-lily_beam-performer.cc b/print/lilypond/patches/patch-lily_beam-performer.cc new file mode 100644 index 00000000000..dce994cd33e --- /dev/null +++ b/print/lilypond/patches/patch-lily_beam-performer.cc @@ -0,0 +1,12 @@ +$NetBSD: patch-lily_beam-performer.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ + +--- lily/beam-performer.cc.orig 2013-06-16 19:28:17.000000000 +0000 ++++ lily/beam-performer.cc +@@ -17,6 +17,7 @@ + along with LilyPond. If not, see <http://www.gnu.org/licenses/>. + */ + ++#include "config.hh" + #include "performer.hh" + #include "audio-item.hh" + #include "audio-column.hh" diff --git a/print/lilypond/patches/patch-lily_bezier-bow.cc b/print/lilypond/patches/patch-lily_bezier-bow.cc new file mode 100644 index 00000000000..1ee9089c5e6 --- /dev/null +++ b/print/lilypond/patches/patch-lily_bezier-bow.cc @@ -0,0 +1,12 @@ +$NetBSD: patch-lily_bezier-bow.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ + +--- lily/bezier-bow.cc.orig 2013-06-16 18:45:49.000000000 +0000 ++++ lily/bezier-bow.cc +@@ -17,6 +17,7 @@ + along with LilyPond. If not, see <http://www.gnu.org/licenses/>. + */ + ++#include "config.hh" + #include "misc.hh" + #include "bezier.hh" + diff --git a/print/lilypond/patches/patch-lily_bezier.cc b/print/lilypond/patches/patch-lily_bezier.cc new file mode 100644 index 00000000000..906cd6e811e --- /dev/null +++ b/print/lilypond/patches/patch-lily_bezier.cc @@ -0,0 +1,12 @@ +$NetBSD: patch-lily_bezier.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ + +--- lily/bezier.cc.orig 2013-06-16 19:02:18.000000000 +0000 ++++ lily/bezier.cc +@@ -17,6 +17,7 @@ + along with LilyPond. If not, see <http://www.gnu.org/licenses/>. + */ + ++#include "config.hh" + #include "bezier.hh" + #include "warn.hh" + #include "libc-extension.hh" diff --git a/print/lilypond/patches/patch-lily_book-scheme.cc b/print/lilypond/patches/patch-lily_book-scheme.cc new file mode 100644 index 00000000000..482b3cc233f --- /dev/null +++ b/print/lilypond/patches/patch-lily_book-scheme.cc @@ -0,0 +1,12 @@ +$NetBSD: patch-lily_book-scheme.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ + +--- lily/book-scheme.cc.orig 2013-06-16 19:28:17.000000000 +0000 ++++ lily/book-scheme.cc +@@ -17,6 +17,7 @@ + along with LilyPond. If not, see <http://www.gnu.org/licenses/>. + */ + ++#include "config.hh" + #include "book.hh" + + #include "output-def.hh" diff --git a/print/lilypond/patches/patch-lily_book.cc b/print/lilypond/patches/patch-lily_book.cc new file mode 100644 index 00000000000..02bfad4cf5e --- /dev/null +++ b/print/lilypond/patches/patch-lily_book.cc @@ -0,0 +1,12 @@ +$NetBSD: patch-lily_book.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ + +--- lily/book.cc.orig 2013-06-16 19:01:16.000000000 +0000 ++++ lily/book.cc +@@ -17,6 +17,7 @@ + along with LilyPond. If not, see <http://www.gnu.org/licenses/>. + */ + ++#include "config.hh" + #include "book.hh" + + #include <cstdio> diff --git a/print/lilypond/patches/patch-lily_change-iterator.cc b/print/lilypond/patches/patch-lily_change-iterator.cc new file mode 100644 index 00000000000..3981707d925 --- /dev/null +++ b/print/lilypond/patches/patch-lily_change-iterator.cc @@ -0,0 +1,12 @@ +$NetBSD: patch-lily_change-iterator.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ + +--- lily/change-iterator.cc.orig 2013-06-16 19:11:14.000000000 +0000 ++++ lily/change-iterator.cc +@@ -17,6 +17,7 @@ + along with LilyPond. If not, see <http://www.gnu.org/licenses/>. + */ + ++#include "config.hh" + #include "change-iterator.hh" + + #include "context.hh" diff --git a/print/lilypond/patches/patch-lily_chord-tremolo-iterator.cc b/print/lilypond/patches/patch-lily_chord-tremolo-iterator.cc new file mode 100644 index 00000000000..2013d498131 --- /dev/null +++ b/print/lilypond/patches/patch-lily_chord-tremolo-iterator.cc @@ -0,0 +1,12 @@ +$NetBSD: patch-lily_chord-tremolo-iterator.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ + +--- lily/chord-tremolo-iterator.cc.orig 2013-06-16 19:27:35.000000000 +0000 ++++ lily/chord-tremolo-iterator.cc +@@ -18,6 +18,7 @@ + along with LilyPond. If not, see <http://www.gnu.org/licenses/>. + */ + ++#include "config.hh" + #include "chord-tremolo-iterator.hh" + + #include "input.hh" diff --git a/print/lilypond/patches/patch-lily_column-x-positions.cc b/print/lilypond/patches/patch-lily_column-x-positions.cc new file mode 100644 index 00000000000..1fdb604b975 --- /dev/null +++ b/print/lilypond/patches/patch-lily_column-x-positions.cc @@ -0,0 +1,12 @@ +$NetBSD: patch-lily_column-x-positions.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ + +--- lily/column-x-positions.cc.orig 2013-06-16 19:28:17.000000000 +0000 ++++ lily/column-x-positions.cc +@@ -17,6 +17,7 @@ + along with LilyPond. If not, see <http://www.gnu.org/licenses/>. + */ + ++#include "config.hh" + #include "column-x-positions.hh" + + Column_x_positions::Column_x_positions () diff --git a/print/lilypond/patches/patch-lily_context-def.cc b/print/lilypond/patches/patch-lily_context-def.cc new file mode 100644 index 00000000000..4cecaf70c0e --- /dev/null +++ b/print/lilypond/patches/patch-lily_context-def.cc @@ -0,0 +1,12 @@ +$NetBSD: patch-lily_context-def.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ + +--- lily/context-def.cc.orig 2013-06-16 19:28:17.000000000 +0000 ++++ lily/context-def.cc +@@ -20,6 +20,7 @@ + /* TODO: should junk this class an replace by + a single list of context modifications? */ + ++#include "config.hh" + #include "context-def.hh" + + #include "context.hh" diff --git a/print/lilypond/patches/patch-lily_context-specced-music-iterator.cc b/print/lilypond/patches/patch-lily_context-specced-music-iterator.cc new file mode 100644 index 00000000000..ff8051b3175 --- /dev/null +++ b/print/lilypond/patches/patch-lily_context-specced-music-iterator.cc @@ -0,0 +1,12 @@ +$NetBSD: patch-lily_context-specced-music-iterator.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ + +--- lily/context-specced-music-iterator.cc.orig 2013-06-16 19:28:17.000000000 +0000 ++++ lily/context-specced-music-iterator.cc +@@ -17,6 +17,7 @@ + along with LilyPond. If not, see <http://www.gnu.org/licenses/>. + */ + ++#include "config.hh" + #include "music-wrapper-iterator.hh" + #include "context.hh" + #include "music.hh" diff --git a/print/lilypond/patches/patch-lily_drum-note-performer.cc b/print/lilypond/patches/patch-lily_drum-note-performer.cc new file mode 100644 index 00000000000..be4df18c7ea --- /dev/null +++ b/print/lilypond/patches/patch-lily_drum-note-performer.cc @@ -0,0 +1,12 @@ +$NetBSD: patch-lily_drum-note-performer.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ + +--- lily/drum-note-performer.cc.orig 2013-06-16 19:28:17.000000000 +0000 ++++ lily/drum-note-performer.cc +@@ -17,6 +17,7 @@ + along with LilyPond. If not, see <http://www.gnu.org/licenses/>. + */ + ++#include "config.hh" + #include "performer.hh" + #include "audio-item.hh" + #include "audio-column.hh" diff --git a/print/lilypond/patches/patch-lily_dynamic-engraver.cc b/print/lilypond/patches/patch-lily_dynamic-engraver.cc new file mode 100644 index 00000000000..bfdf5c9a0c5 --- /dev/null +++ b/print/lilypond/patches/patch-lily_dynamic-engraver.cc @@ -0,0 +1,12 @@ +$NetBSD: patch-lily_dynamic-engraver.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ + +--- lily/dynamic-engraver.cc.orig 2013-06-16 19:18:47.000000000 +0000 ++++ lily/dynamic-engraver.cc +@@ -17,6 +17,7 @@ + along with LilyPond. If not, see <http://www.gnu.org/licenses/>. + */ + ++#include "config.hh" + #include "axis-group-interface.hh" + #include "context.hh" + #include "engraver.hh" diff --git a/print/lilypond/patches/patch-lily_dynamic-performer.cc b/print/lilypond/patches/patch-lily_dynamic-performer.cc new file mode 100644 index 00000000000..b6754750d99 --- /dev/null +++ b/print/lilypond/patches/patch-lily_dynamic-performer.cc @@ -0,0 +1,12 @@ +$NetBSD: patch-lily_dynamic-performer.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ + +--- lily/dynamic-performer.cc.orig 2013-06-16 18:48:59.000000000 +0000 ++++ lily/dynamic-performer.cc +@@ -17,6 +17,7 @@ + along with LilyPond. If not, see <http://www.gnu.org/licenses/>. + */ + ++#include "config.hh" + #include "performer.hh" + #include "audio-item.hh" + #include "stream-event.hh" diff --git a/print/lilypond/patches/patch-lily_event-chord-iterator.cc b/print/lilypond/patches/patch-lily_event-chord-iterator.cc new file mode 100644 index 00000000000..8bc14937b9b --- /dev/null +++ b/print/lilypond/patches/patch-lily_event-chord-iterator.cc @@ -0,0 +1,12 @@ +$NetBSD: patch-lily_event-chord-iterator.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ + +--- lily/event-chord-iterator.cc.orig 2013-06-16 19:25:55.000000000 +0000 ++++ lily/event-chord-iterator.cc +@@ -17,6 +17,7 @@ + along with LilyPond. If not, see <http://www.gnu.org/licenses/>. + */ + ++#include "config.hh" + #include "event-chord-iterator.hh" + + #include "context.hh" diff --git a/print/lilypond/patches/patch-lily_event-iterator.cc b/print/lilypond/patches/patch-lily_event-iterator.cc new file mode 100644 index 00000000000..a1278cd6d18 --- /dev/null +++ b/print/lilypond/patches/patch-lily_event-iterator.cc @@ -0,0 +1,12 @@ +$NetBSD: patch-lily_event-iterator.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ + +--- lily/event-iterator.cc.orig 2013-06-16 19:11:41.000000000 +0000 ++++ lily/event-iterator.cc +@@ -17,6 +17,7 @@ + along with LilyPond. If not, see <http://www.gnu.org/licenses/>. + */ + ++#include "config.hh" + #include "event-iterator.hh" + + #include "context.hh" diff --git a/print/lilypond/patches/patch-lily_flag.cc b/print/lilypond/patches/patch-lily_flag.cc new file mode 100644 index 00000000000..352c7bc3639 --- /dev/null +++ b/print/lilypond/patches/patch-lily_flag.cc @@ -0,0 +1,21 @@ +$NetBSD: patch-lily_flag.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ + +--- lily/flag.cc.orig 2013-06-16 19:24:59.000000000 +0000 ++++ lily/flag.cc +@@ -18,6 +18,7 @@ + along with LilyPond. If not, see <http://www.gnu.org/licenses/>. + */ + ++#include "config.hh" + #include "stem.hh" + + #include "directional-element-interface.hh" +@@ -106,7 +107,7 @@ Flag::print (SCM smob) + + char dir = (d == UP) ? 'u' : 'd'; + string font_char = flag_style +- + to_string (dir) + staffline_offs + to_string (log); ++ + ::to_string (dir) + staffline_offs + ::to_string (log); + Font_metric *fm = Font_interface::get_default_font (me); + Stencil flag = fm->find_by_name ("flags." + font_char); + if (flag.is_empty ()) diff --git a/print/lilypond/patches/patch-lily_font-select.cc b/print/lilypond/patches/patch-lily_font-select.cc new file mode 100644 index 00000000000..97b73a2f868 --- /dev/null +++ b/print/lilypond/patches/patch-lily_font-select.cc @@ -0,0 +1,12 @@ +$NetBSD: patch-lily_font-select.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ + +--- lily/font-select.cc.orig 2013-06-16 18:56:07.000000000 +0000 ++++ lily/font-select.cc +@@ -17,6 +17,7 @@ + along with LilyPond. If not, see <http://www.gnu.org/licenses/>. + */ + ++#include "config.hh" + #include "dimensions.hh" + #include "all-font-metrics.hh" + #include "output-def.hh" diff --git a/print/lilypond/patches/patch-lily_global-ctor.cc b/print/lilypond/patches/patch-lily_global-ctor.cc new file mode 100644 index 00000000000..d27b8555fb3 --- /dev/null +++ b/print/lilypond/patches/patch-lily_global-ctor.cc @@ -0,0 +1,12 @@ +$NetBSD: patch-lily_global-ctor.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ + +--- lily/global-ctor.cc.orig 2013-06-16 19:28:17.000000000 +0000 ++++ lily/global-ctor.cc +@@ -17,6 +17,7 @@ + along with LilyPond. If not, see <http://www.gnu.org/licenses/>. + */ + ++#include "config.hh" + #include "global-ctor.hh" + + #include "std-vector.hh" diff --git a/print/lilypond/patches/patch-lily_grace-iterator.cc b/print/lilypond/patches/patch-lily_grace-iterator.cc new file mode 100644 index 00000000000..107fdd557d3 --- /dev/null +++ b/print/lilypond/patches/patch-lily_grace-iterator.cc @@ -0,0 +1,12 @@ +$NetBSD: patch-lily_grace-iterator.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ + +--- lily/grace-iterator.cc.orig 2013-06-16 19:04:30.000000000 +0000 ++++ lily/grace-iterator.cc +@@ -17,6 +17,7 @@ + along with LilyPond. If not, see <http://www.gnu.org/licenses/>. + */ + ++#include "config.hh" + #include "grace-iterator.hh" + #include "global-context.hh" + #include "warn.hh" diff --git a/print/lilypond/patches/patch-lily_grob-property.cc b/print/lilypond/patches/patch-lily_grob-property.cc new file mode 100644 index 00000000000..046309f5eb6 --- /dev/null +++ b/print/lilypond/patches/patch-lily_grob-property.cc @@ -0,0 +1,12 @@ +$NetBSD: patch-lily_grob-property.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ + +--- lily/grob-property.cc.orig 2013-06-16 19:15:44.000000000 +0000 ++++ lily/grob-property.cc +@@ -2,6 +2,7 @@ + Implement storage and manipulation of grob properties. + */ + ++#include "config.hh" + #include <cstring> + + #include "main.hh" diff --git a/print/lilypond/patches/patch-lily_horizontal-bracket.cc b/print/lilypond/patches/patch-lily_horizontal-bracket.cc new file mode 100644 index 00000000000..a54963ba578 --- /dev/null +++ b/print/lilypond/patches/patch-lily_horizontal-bracket.cc @@ -0,0 +1,12 @@ +$NetBSD: patch-lily_horizontal-bracket.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ + +--- lily/horizontal-bracket.cc.orig 2013-06-16 19:28:17.000000000 +0000 ++++ lily/horizontal-bracket.cc +@@ -17,6 +17,7 @@ + along with LilyPond. If not, see <http://www.gnu.org/licenses/>. + */ + ++#include "config.hh" + #include "horizontal-bracket.hh" + + #include "lookup.hh" diff --git a/print/lilypond/patches/patch-lily_includable-lexer.cc b/print/lilypond/patches/patch-lily_includable-lexer.cc new file mode 100644 index 00000000000..e5d8bd9fc76 --- /dev/null +++ b/print/lilypond/patches/patch-lily_includable-lexer.cc @@ -0,0 +1,12 @@ +$NetBSD: patch-lily_includable-lexer.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ + +--- lily/includable-lexer.cc.orig 2013-06-16 19:23:45.000000000 +0000 ++++ lily/includable-lexer.cc +@@ -17,6 +17,7 @@ + along with LilyPond. If not, see <http://www.gnu.org/licenses/>. + */ + ++#include "config.hh" + #include "includable-lexer.hh" + + #include <sstream> diff --git a/print/lilypond/patches/patch-lily_input.cc b/print/lilypond/patches/patch-lily_input.cc new file mode 100644 index 00000000000..1f18f90c4f7 --- /dev/null +++ b/print/lilypond/patches/patch-lily_input.cc @@ -0,0 +1,13 @@ +$NetBSD: patch-lily_input.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ + +--- lily/input.cc.orig 2013-06-16 18:50:37.000000000 +0000 ++++ lily/input.cc +@@ -142,7 +142,7 @@ string + Input::line_number_string () const + { + if (source_file_) +- return to_string (source_file_->get_line (start_)); ++ return ::to_string (source_file_->get_line (start_)); + return "?"; + } + diff --git a/print/lilypond/patches/patch-lily_instrument-name-engraver.cc b/print/lilypond/patches/patch-lily_instrument-name-engraver.cc new file mode 100644 index 00000000000..deefe90e471 --- /dev/null +++ b/print/lilypond/patches/patch-lily_instrument-name-engraver.cc @@ -0,0 +1,12 @@ +$NetBSD: patch-lily_instrument-name-engraver.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ + +--- lily/instrument-name-engraver.cc.orig 2013-06-16 18:49:53.000000000 +0000 ++++ lily/instrument-name-engraver.cc +@@ -17,6 +17,7 @@ + along with LilyPond. If not, see <http://www.gnu.org/licenses/>. + */ + ++#include "config.hh" + #include "align-interface.hh" + #include "axis-group-interface.hh" + #include "engraver.hh" diff --git a/print/lilypond/patches/patch-lily_interval-minefield.cc b/print/lilypond/patches/patch-lily_interval-minefield.cc new file mode 100644 index 00000000000..b2c98399efb --- /dev/null +++ b/print/lilypond/patches/patch-lily_interval-minefield.cc @@ -0,0 +1,12 @@ +$NetBSD: patch-lily_interval-minefield.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ + +--- lily/interval-minefield.cc.orig 2013-06-16 18:46:53.000000000 +0000 ++++ lily/interval-minefield.cc +@@ -18,6 +18,7 @@ + along with LilyPond. If not, see <http://www.gnu.org/licenses/>. + */ + ++#include "config.hh" + #include "interval-minefield.hh" + #include "grob.hh" + Interval_minefield::Interval_minefield (Interval feasible_placements, Real bulk) diff --git a/print/lilypond/patches/patch-lily_key-signature-interface.cc b/print/lilypond/patches/patch-lily_key-signature-interface.cc new file mode 100644 index 00000000000..b98c15ae6ca --- /dev/null +++ b/print/lilypond/patches/patch-lily_key-signature-interface.cc @@ -0,0 +1,12 @@ +$NetBSD: patch-lily_key-signature-interface.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ + +--- lily/key-signature-interface.cc.orig 2013-06-16 19:28:17.000000000 +0000 ++++ lily/key-signature-interface.cc +@@ -19,6 +19,7 @@ + along with LilyPond. If not, see <http://www.gnu.org/licenses/>. + */ + ++#include "config.hh" + #include "accidental-interface.hh" + #include "font-interface.hh" + #include "international.hh" diff --git a/print/lilypond/patches/patch-lily_keyword.cc b/print/lilypond/patches/patch-lily_keyword.cc new file mode 100644 index 00000000000..95472028706 --- /dev/null +++ b/print/lilypond/patches/patch-lily_keyword.cc @@ -0,0 +1,12 @@ +$NetBSD: patch-lily_keyword.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ + +--- lily/keyword.cc.orig 2013-06-16 19:26:46.000000000 +0000 ++++ lily/keyword.cc +@@ -2,6 +2,7 @@ + keyword.cc -- keywords and identifiers + */ + ++#include "config.hh" + #include "keyword.hh" + + #include <cstring> diff --git a/print/lilypond/patches/patch-lily_least-squares.cc b/print/lilypond/patches/patch-lily_least-squares.cc new file mode 100644 index 00000000000..e4a690dff48 --- /dev/null +++ b/print/lilypond/patches/patch-lily_least-squares.cc @@ -0,0 +1,12 @@ +$NetBSD: patch-lily_least-squares.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ + +--- lily/least-squares.cc.orig 2013-06-16 19:19:17.000000000 +0000 ++++ lily/least-squares.cc +@@ -17,6 +17,7 @@ + along with LilyPond. If not, see <http://www.gnu.org/licenses/>. + */ + ++#include "config.hh" + #include "least-squares.hh" + + #include "warn.hh" diff --git a/print/lilypond/patches/patch-lily_ledger-line-engraver.cc b/print/lilypond/patches/patch-lily_ledger-line-engraver.cc new file mode 100644 index 00000000000..eba37d52d72 --- /dev/null +++ b/print/lilypond/patches/patch-lily_ledger-line-engraver.cc @@ -0,0 +1,12 @@ +$NetBSD: patch-lily_ledger-line-engraver.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ + +--- lily/ledger-line-engraver.cc.orig 2013-06-16 19:28:17.000000000 +0000 ++++ lily/ledger-line-engraver.cc +@@ -17,6 +17,7 @@ + along with LilyPond. If not, see <http://www.gnu.org/licenses/>. + */ + ++#include "config.hh" + #include "pointer-group-interface.hh" + #include "spanner.hh" + #include "engraver.hh" diff --git a/print/lilypond/patches/patch-lily_lexer.ll b/print/lilypond/patches/patch-lily_lexer.ll new file mode 100644 index 00000000000..64e15f7d87b --- /dev/null +++ b/print/lilypond/patches/patch-lily_lexer.ll @@ -0,0 +1,12 @@ +$NetBSD: patch-lily_lexer.ll,v 1.1 2013/06/16 20:46:52 joerg Exp $ + +--- lily/lexer.ll.orig 2013-06-16 19:42:27.000000000 +0000 ++++ lily/lexer.ll +@@ -41,6 +41,7 @@ + + + ++#include "config.hh" + #include <cstdio> + #include <cctype> + #include <cerrno> diff --git a/print/lilypond/patches/patch-lily_lily-lexer-scheme.cc b/print/lilypond/patches/patch-lily_lily-lexer-scheme.cc new file mode 100644 index 00000000000..ce21e1436b0 --- /dev/null +++ b/print/lilypond/patches/patch-lily_lily-lexer-scheme.cc @@ -0,0 +1,12 @@ +$NetBSD: patch-lily_lily-lexer-scheme.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ + +--- lily/lily-lexer-scheme.cc.orig 2013-06-16 19:27:04.000000000 +0000 ++++ lily/lily-lexer-scheme.cc +@@ -18,6 +18,7 @@ + along with LilyPond. If not, see <http://www.gnu.org/licenses/>. + */ + ++#include "config.hh" + #include "lily-lexer.hh" + + LY_DEFINE (ly_lexer_keywords, "ly:lexer-keywords", diff --git a/print/lilypond/patches/patch-lily_lily-lexer.cc b/print/lilypond/patches/patch-lily_lily-lexer.cc new file mode 100644 index 00000000000..810af681e7e --- /dev/null +++ b/print/lilypond/patches/patch-lily_lily-lexer.cc @@ -0,0 +1,12 @@ +$NetBSD: patch-lily_lily-lexer.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ + +--- lily/lily-lexer.cc.orig 2013-06-16 18:55:24.000000000 +0000 ++++ lily/lily-lexer.cc +@@ -17,6 +17,7 @@ + along with LilyPond. If not, see <http://www.gnu.org/licenses/>. + */ + ++#include "config.hh" + #include "lily-lexer.hh" + + #include <cctype> diff --git a/print/lilypond/patches/patch-lily_lilypond-version.cc b/print/lilypond/patches/patch-lily_lilypond-version.cc new file mode 100644 index 00000000000..13160afe79a --- /dev/null +++ b/print/lilypond/patches/patch-lily_lilypond-version.cc @@ -0,0 +1,12 @@ +$NetBSD: patch-lily_lilypond-version.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ + +--- lily/lilypond-version.cc.orig 2013-06-16 19:22:55.000000000 +0000 ++++ lily/lilypond-version.cc +@@ -17,6 +17,7 @@ + along with LilyPond. If not, see <http://www.gnu.org/licenses/>. + */ + ++#include "config.hh" + #include <ctype.h> + + #include "lilypond-version.hh" diff --git a/print/lilypond/patches/patch-lily_line-spanner.cc b/print/lilypond/patches/patch-lily_line-spanner.cc new file mode 100644 index 00000000000..6fd14699ace --- /dev/null +++ b/print/lilypond/patches/patch-lily_line-spanner.cc @@ -0,0 +1,12 @@ +$NetBSD: patch-lily_line-spanner.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ + +--- lily/line-spanner.cc.orig 2013-06-16 19:07:21.000000000 +0000 ++++ lily/line-spanner.cc +@@ -17,6 +17,7 @@ + along with LilyPond. If not, see <http://www.gnu.org/licenses/>. + */ + ++#include "config.hh" + #include "align-interface.hh" + #include "axis-group-interface.hh" + #include "font-interface.hh" diff --git a/print/lilypond/patches/patch-lily_main.cc b/print/lilypond/patches/patch-lily_main.cc new file mode 100644 index 00000000000..082b2647b58 --- /dev/null +++ b/print/lilypond/patches/patch-lily_main.cc @@ -0,0 +1,12 @@ +$NetBSD: patch-lily_main.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ + +--- lily/main.cc.orig 2013-06-16 19:28:17.000000000 +0000 ++++ lily/main.cc +@@ -17,6 +17,7 @@ + along with LilyPond. If not, see <http://www.gnu.org/licenses/>. + */ + ++#include "config.hh" + #include "main.hh" + + #include <cassert> diff --git a/print/lilypond/patches/patch-lily_mensural-ligature.cc b/print/lilypond/patches/patch-lily_mensural-ligature.cc new file mode 100644 index 00000000000..007bce7c615 --- /dev/null +++ b/print/lilypond/patches/patch-lily_mensural-ligature.cc @@ -0,0 +1,13 @@ +$NetBSD: patch-lily_mensural-ligature.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ + +--- lily/mensural-ligature.cc.orig 2013-06-16 19:09:43.000000000 +0000 ++++ lily/mensural-ligature.cc +@@ -168,7 +168,7 @@ internal_brew_primitive (Grob *me) + duration_log--; + case MLP_BREVIS: + duration_log--; +- suffix = to_string (duration_log) + color ++ suffix = ::to_string (duration_log) + color + + (duration_log < -1 ? "lig" : "") + "mensural"; + index = prefix + "s"; + out = fm->find_by_name (index + "r" + suffix); diff --git a/print/lilypond/patches/patch-lily_midi-chunk.cc b/print/lilypond/patches/patch-lily_midi-chunk.cc new file mode 100644 index 00000000000..c9e9e2bc96e --- /dev/null +++ b/print/lilypond/patches/patch-lily_midi-chunk.cc @@ -0,0 +1,12 @@ +$NetBSD: patch-lily_midi-chunk.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ + +--- lily/midi-chunk.cc.orig 2013-06-16 19:28:17.000000000 +0000 ++++ lily/midi-chunk.cc +@@ -18,6 +18,7 @@ + along with LilyPond. If not, see <http://www.gnu.org/licenses/>. + */ + ++#include "config.hh" + #include "midi-chunk.hh" + + #include "midi-item.hh" diff --git a/print/lilypond/patches/patch-lily_midi-stream.cc b/print/lilypond/patches/patch-lily_midi-stream.cc new file mode 100644 index 00000000000..3dc551f9a89 --- /dev/null +++ b/print/lilypond/patches/patch-lily_midi-stream.cc @@ -0,0 +1,12 @@ +$NetBSD: patch-lily_midi-stream.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ + +--- lily/midi-stream.cc.orig 2013-06-16 19:28:17.000000000 +0000 ++++ lily/midi-stream.cc +@@ -17,6 +17,7 @@ + along with LilyPond. If not, see <http://www.gnu.org/licenses/>. + */ + ++#include "config.hh" + #include "midi-stream.hh" + + #include <cerrno> diff --git a/print/lilypond/patches/patch-lily_midi-walker.cc b/print/lilypond/patches/patch-lily_midi-walker.cc new file mode 100644 index 00000000000..106609952fe --- /dev/null +++ b/print/lilypond/patches/patch-lily_midi-walker.cc @@ -0,0 +1,12 @@ +$NetBSD: patch-lily_midi-walker.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ + +--- lily/midi-walker.cc.orig 2013-06-16 19:26:10.000000000 +0000 ++++ lily/midi-walker.cc +@@ -18,6 +18,7 @@ + along with LilyPond. If not, see <http://www.gnu.org/licenses/>. + */ + ++#include "config.hh" + #include "midi-walker.hh" + + #include "audio-column.hh" diff --git a/print/lilypond/patches/patch-lily_misc.cc b/print/lilypond/patches/patch-lily_misc.cc new file mode 100644 index 00000000000..b3536722947 --- /dev/null +++ b/print/lilypond/patches/patch-lily_misc.cc @@ -0,0 +1,12 @@ +$NetBSD: patch-lily_misc.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ + +--- lily/misc.cc.orig 2013-06-16 19:28:17.000000000 +0000 ++++ lily/misc.cc +@@ -18,6 +18,7 @@ + along with LilyPond. If not, see <http://www.gnu.org/licenses/>. + */ + ++#include "config.hh" + #include "misc.hh" + #include "warn.hh" + diff --git a/print/lilypond/patches/patch-lily_music-wrapper-iterator.cc b/print/lilypond/patches/patch-lily_music-wrapper-iterator.cc new file mode 100644 index 00000000000..9ac88572b36 --- /dev/null +++ b/print/lilypond/patches/patch-lily_music-wrapper-iterator.cc @@ -0,0 +1,12 @@ +$NetBSD: patch-lily_music-wrapper-iterator.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ + +--- lily/music-wrapper-iterator.cc.orig 2013-06-16 19:26:26.000000000 +0000 ++++ lily/music-wrapper-iterator.cc +@@ -17,6 +17,7 @@ + along with LilyPond. If not, see <http://www.gnu.org/licenses/>. + */ + ++#include "config.hh" + #include "music-wrapper-iterator.hh" + #include "music-wrapper.hh" + #include "music.hh" diff --git a/print/lilypond/patches/patch-lily_note-collision.cc b/print/lilypond/patches/patch-lily_note-collision.cc new file mode 100644 index 00000000000..9b01a98bfce --- /dev/null +++ b/print/lilypond/patches/patch-lily_note-collision.cc @@ -0,0 +1,12 @@ +$NetBSD: patch-lily_note-collision.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ + +--- lily/note-collision.cc.orig 2013-06-16 19:10:25.000000000 +0000 ++++ lily/note-collision.cc +@@ -17,6 +17,7 @@ + along with LilyPond. If not, see <http://www.gnu.org/licenses/>. + */ + ++#include "config.hh" + #include "note-collision.hh" + + #include "axis-group-interface.hh" diff --git a/print/lilypond/patches/patch-lily_note-head.cc b/print/lilypond/patches/patch-lily_note-head.cc new file mode 100644 index 00000000000..30696c2c3be --- /dev/null +++ b/print/lilypond/patches/patch-lily_note-head.cc @@ -0,0 +1,13 @@ +$NetBSD: patch-lily_note-head.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ + +--- lily/note-head.cc.orig 2013-06-16 19:28:18.000000000 +0000 ++++ lily/note-head.cc +@@ -38,7 +38,7 @@ internal_print (Grob *me, string *font_c + { + string style = robust_symbol2string (me->get_property ("style"), "default"); + +- string suffix = to_string (min (robust_scm2int (me->get_property ("duration-log"), 2), 2)); ++ string suffix = ::to_string (min (robust_scm2int (me->get_property ("duration-log"), 2), 2)); + if (style != "default") + suffix = robust_scm2string (me->get_property ("glyph-name"), ""); + diff --git a/print/lilypond/patches/patch-lily_note-performer.cc b/print/lilypond/patches/patch-lily_note-performer.cc new file mode 100644 index 00000000000..1ec9ff53cbd --- /dev/null +++ b/print/lilypond/patches/patch-lily_note-performer.cc @@ -0,0 +1,12 @@ +$NetBSD: patch-lily_note-performer.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ + +--- lily/note-performer.cc.orig 2013-06-16 19:28:18.000000000 +0000 ++++ lily/note-performer.cc +@@ -17,6 +17,7 @@ + along with LilyPond. If not, see <http://www.gnu.org/licenses/>. + */ + ++#include "config.hh" + #include "performer.hh" + #include "audio-item.hh" + #include "audio-column.hh" diff --git a/print/lilypond/patches/patch-lily_ottava-bracket.cc b/print/lilypond/patches/patch-lily_ottava-bracket.cc new file mode 100644 index 00000000000..f50d3375db9 --- /dev/null +++ b/print/lilypond/patches/patch-lily_ottava-bracket.cc @@ -0,0 +1,12 @@ +$NetBSD: patch-lily_ottava-bracket.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ + +--- lily/ottava-bracket.cc.orig 2013-06-16 19:16:55.000000000 +0000 ++++ lily/ottava-bracket.cc +@@ -17,6 +17,7 @@ + along with LilyPond. If not, see <http://www.gnu.org/licenses/>. + */ + ++#include "config.hh" + #include "axis-group-interface.hh" + #include "text-interface.hh" + #include "spanner.hh" diff --git a/print/lilypond/patches/patch-lily_page-breaking-scheme.cc b/print/lilypond/patches/patch-lily_page-breaking-scheme.cc new file mode 100644 index 00000000000..6cddfe72723 --- /dev/null +++ b/print/lilypond/patches/patch-lily_page-breaking-scheme.cc @@ -0,0 +1,12 @@ +$NetBSD: patch-lily_page-breaking-scheme.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ + +--- lily/page-breaking-scheme.cc.orig 2013-06-16 18:45:30.000000000 +0000 ++++ lily/page-breaking-scheme.cc +@@ -17,6 +17,7 @@ + along with LilyPond. If not, see <http://www.gnu.org/licenses/>. + */ + ++#include "config.hh" + #include "paper-book.hh" + #include "page-turn-page-breaking.hh" + #include "one-line-page-breaking.hh" diff --git a/print/lilypond/patches/patch-lily_page-layout-problem.cc b/print/lilypond/patches/patch-lily_page-layout-problem.cc new file mode 100644 index 00000000000..36451da19d3 --- /dev/null +++ b/print/lilypond/patches/patch-lily_page-layout-problem.cc @@ -0,0 +1,12 @@ +$NetBSD: patch-lily_page-layout-problem.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ + +--- lily/page-layout-problem.cc.orig 2013-06-16 18:52:33.000000000 +0000 ++++ lily/page-layout-problem.cc +@@ -17,6 +17,7 @@ + along with LilyPond. If not, see <http://www.gnu.org/licenses/>. + */ + ++#include "config.hh" + #include "page-layout-problem.hh" + + #include "align-interface.hh" diff --git a/print/lilypond/patches/patch-lily_page-spacing-result.cc b/print/lilypond/patches/patch-lily_page-spacing-result.cc new file mode 100644 index 00000000000..fdfdfbfd05b --- /dev/null +++ b/print/lilypond/patches/patch-lily_page-spacing-result.cc @@ -0,0 +1,12 @@ +$NetBSD: patch-lily_page-spacing-result.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ + +--- lily/page-spacing-result.cc.orig 2013-06-16 19:12:54.000000000 +0000 ++++ lily/page-spacing-result.cc +@@ -18,6 +18,7 @@ + along with LilyPond. If not, see <http://www.gnu.org/licenses/>. + */ + ++#include "config.hh" + #include "page-spacing-result.hh" + #include <cstdio> + diff --git a/print/lilypond/patches/patch-lily_page-turn-page-breaking.cc b/print/lilypond/patches/patch-lily_page-turn-page-breaking.cc new file mode 100644 index 00000000000..7940127301e --- /dev/null +++ b/print/lilypond/patches/patch-lily_page-turn-page-breaking.cc @@ -0,0 +1,13 @@ +$NetBSD: patch-lily_page-turn-page-breaking.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ + +--- lily/page-turn-page-breaking.cc.orig 2013-06-16 19:28:18.000000000 +0000 ++++ lily/page-turn-page-breaking.cc +@@ -232,7 +232,7 @@ Page_turn_page_breaking::solve () + for (vsize i = 0; i < last_break_position (); i++) + { + calc_subproblem (i); +- progress_indication (string ("[") + to_string (i + 1) + "]"); ++ progress_indication (string ("[") + ::to_string (i + 1) + "]"); + } + progress_indication ("\n"); + diff --git a/print/lilypond/patches/patch-lily_pango-font-scheme.cc b/print/lilypond/patches/patch-lily_pango-font-scheme.cc new file mode 100644 index 00000000000..cbeb6948095 --- /dev/null +++ b/print/lilypond/patches/patch-lily_pango-font-scheme.cc @@ -0,0 +1,13 @@ +$NetBSD: patch-lily_pango-font-scheme.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ + +--- lily/pango-font-scheme.cc.orig 2013-06-16 19:18:02.000000000 +0000 ++++ lily/pango-font-scheme.cc +@@ -17,6 +17,8 @@ + along with LilyPond. If not, see <http://www.gnu.org/licenses/>. + */ + ++#include "config.hh" ++ + #define PANGO_ENABLE_BACKEND // ugh, why necessary? + + #include <pango/pangoft2.h> diff --git a/print/lilypond/patches/patch-lily_pango-select.cc b/print/lilypond/patches/patch-lily_pango-select.cc new file mode 100644 index 00000000000..fcecbace397 --- /dev/null +++ b/print/lilypond/patches/patch-lily_pango-select.cc @@ -0,0 +1,12 @@ +$NetBSD: patch-lily_pango-select.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ + +--- lily/pango-select.cc.orig 2013-06-16 19:28:18.000000000 +0000 ++++ lily/pango-select.cc +@@ -17,6 +17,7 @@ + along with LilyPond. If not, see <http://www.gnu.org/licenses/>. + */ + ++#include "config.hh" + #include "dimensions.hh" + #include "all-font-metrics.hh" + #include "output-def.hh" diff --git a/print/lilypond/patches/patch-lily_paper-book-scheme.cc b/print/lilypond/patches/patch-lily_paper-book-scheme.cc new file mode 100644 index 00000000000..b87b5ed7b5b --- /dev/null +++ b/print/lilypond/patches/patch-lily_paper-book-scheme.cc @@ -0,0 +1,12 @@ +$NetBSD: patch-lily_paper-book-scheme.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ + +--- lily/paper-book-scheme.cc.orig 2013-06-16 19:10:50.000000000 +0000 ++++ lily/paper-book-scheme.cc +@@ -17,6 +17,7 @@ + along with LilyPond. If not, see <http://www.gnu.org/licenses/>. + */ + ++#include "config.hh" + #include "paper-book.hh" + #include "ly-module.hh" + #include "output-def.hh" diff --git a/print/lilypond/patches/patch-lily_paper-book.cc b/print/lilypond/patches/patch-lily_paper-book.cc new file mode 100644 index 00000000000..288ca17063a --- /dev/null +++ b/print/lilypond/patches/patch-lily_paper-book.cc @@ -0,0 +1,12 @@ +$NetBSD: patch-lily_paper-book.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ + +--- lily/paper-book.cc.orig 2013-06-16 19:22:05.000000000 +0000 ++++ lily/paper-book.cc +@@ -17,6 +17,7 @@ + along with LilyPond. If not, see <http://www.gnu.org/licenses/>. + */ + ++#include "config.hh" + #include "paper-book.hh" + + #include "grob.hh" diff --git a/print/lilypond/patches/patch-lily_paper-column-engraver.cc b/print/lilypond/patches/patch-lily_paper-column-engraver.cc new file mode 100644 index 00000000000..b489626675b --- /dev/null +++ b/print/lilypond/patches/patch-lily_paper-column-engraver.cc @@ -0,0 +1,22 @@ +$NetBSD: patch-lily_paper-column-engraver.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ + +--- lily/paper-column-engraver.cc.orig 2013-06-16 19:08:16.000000000 +0000 ++++ lily/paper-column-engraver.cc +@@ -49,7 +49,7 @@ void + Paper_column_engraver::finalize () + { + if (! (breaks_ % 8)) +- progress_indication ("[" + to_string (breaks_) + "]"); ++ progress_indication ("[" + ::to_string (breaks_) + "]"); + + if (!made_columns_) + { +@@ -267,7 +267,7 @@ Paper_column_engraver::stop_translation_ + breaks_++; + + if (! (breaks_ % 8)) +- progress_indication ("[" + to_string (breaks_) + "]"); ++ progress_indication ("[" + ::to_string (breaks_) + "]"); + } + + context ()->get_score_context ()->unset_property (ly_symbol2scm ("forbidBreak")); diff --git a/print/lilypond/patches/patch-lily_paper-column.cc b/print/lilypond/patches/patch-lily_paper-column.cc new file mode 100644 index 00000000000..1e2b0d67267 --- /dev/null +++ b/print/lilypond/patches/patch-lily_paper-column.cc @@ -0,0 +1,13 @@ +$NetBSD: patch-lily_paper-column.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ + +--- lily/paper-column.cc.orig 2013-06-16 19:06:43.000000000 +0000 ++++ lily/paper-column.cc +@@ -227,7 +227,7 @@ Paper_column::print (SCM p) + { + Paper_column *me = dynamic_cast<Paper_column *> (unsmob_grob (p)); + +- string r = to_string (Paper_column::get_rank (me)); ++ string r = ::to_string (Paper_column::get_rank (me)); + + Moment *mom = unsmob_moment (me->get_property ("when")); + string when = mom ? mom->to_string () : "?/?"; diff --git a/print/lilypond/patches/patch-lily_paper-outputter-scheme.cc b/print/lilypond/patches/patch-lily_paper-outputter-scheme.cc new file mode 100644 index 00000000000..dba7b8a6f19 --- /dev/null +++ b/print/lilypond/patches/patch-lily_paper-outputter-scheme.cc @@ -0,0 +1,12 @@ +$NetBSD: patch-lily_paper-outputter-scheme.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ + +--- lily/paper-outputter-scheme.cc.orig 2013-06-16 19:27:50.000000000 +0000 ++++ lily/paper-outputter-scheme.cc +@@ -17,6 +17,7 @@ + along with LilyPond. If not, see <http://www.gnu.org/licenses/>. + */ + ++#include "config.hh" + #include "paper-outputter.hh" + + #include "international.hh" diff --git a/print/lilypond/patches/patch-lily_paper-outputter.cc b/print/lilypond/patches/patch-lily_paper-outputter.cc new file mode 100644 index 00000000000..e19f218dbb5 --- /dev/null +++ b/print/lilypond/patches/patch-lily_paper-outputter.cc @@ -0,0 +1,12 @@ +$NetBSD: patch-lily_paper-outputter.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ + +--- lily/paper-outputter.cc.orig 2013-06-16 18:44:44.000000000 +0000 ++++ lily/paper-outputter.cc +@@ -18,6 +18,7 @@ + along with LilyPond. If not, see <http://www.gnu.org/licenses/>. + */ + ++#include "config.hh" + #include "paper-outputter.hh" + + #include <cmath> diff --git a/print/lilypond/patches/patch-lily_paper-score-scheme.cc b/print/lilypond/patches/patch-lily_paper-score-scheme.cc new file mode 100644 index 00000000000..461bdff92c8 --- /dev/null +++ b/print/lilypond/patches/patch-lily_paper-score-scheme.cc @@ -0,0 +1,12 @@ +$NetBSD: patch-lily_paper-score-scheme.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ + +--- lily/paper-score-scheme.cc.orig 2013-06-16 19:56:35.000000000 +0000 ++++ lily/paper-score-scheme.cc +@@ -17,6 +17,7 @@ + along with LilyPond. If not, see <http://www.gnu.org/licenses/>. + */ + ++#include "config.hh" + #include "paper-score.hh" + + LY_DEFINE (ly_paper_score_paper_systems, "ly:paper-score-paper-systems", diff --git a/print/lilypond/patches/patch-lily_paper-score.cc b/print/lilypond/patches/patch-lily_paper-score.cc new file mode 100644 index 00000000000..a4789aba609 --- /dev/null +++ b/print/lilypond/patches/patch-lily_paper-score.cc @@ -0,0 +1,12 @@ +$NetBSD: patch-lily_paper-score.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ + +--- lily/paper-score.cc.orig 2013-06-16 18:58:54.000000000 +0000 ++++ lily/paper-score.cc +@@ -17,6 +17,7 @@ + along with LilyPond. If not, see <http://www.gnu.org/licenses/>. + */ + ++#include "config.hh" + #include "paper-score.hh" + + #include "all-font-metrics.hh" diff --git a/print/lilypond/patches/patch-lily_performance-scheme.cc b/print/lilypond/patches/patch-lily_performance-scheme.cc new file mode 100644 index 00000000000..3ddd51ee782 --- /dev/null +++ b/print/lilypond/patches/patch-lily_performance-scheme.cc @@ -0,0 +1,12 @@ +$NetBSD: patch-lily_performance-scheme.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ + +--- lily/performance-scheme.cc.orig 2013-06-16 18:43:44.000000000 +0000 ++++ lily/performance-scheme.cc +@@ -17,6 +17,7 @@ + along with LilyPond. If not, see <http://www.gnu.org/licenses/>. + */ + ++#include "config.hh" + #include "performance.hh" + + LY_DEFINE (ly_performance_write, "ly:performance-write", diff --git a/print/lilypond/patches/patch-lily_performance.cc b/print/lilypond/patches/patch-lily_performance.cc new file mode 100644 index 00000000000..c97c74a7338 --- /dev/null +++ b/print/lilypond/patches/patch-lily_performance.cc @@ -0,0 +1,21 @@ +$NetBSD: patch-lily_performance.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ + +--- lily/performance.cc.orig 2013-06-16 19:28:18.000000000 +0000 ++++ lily/performance.cc +@@ -17,6 +17,7 @@ + along with LilyPond. If not, see <http://www.gnu.org/licenses/>. + */ + ++#include "config.hh" + #include "performance.hh" + + #include <ctime> +@@ -56,7 +57,7 @@ Performance::output (Midi_stream &midi_s + for (vsize i = 0; i < audio_staffs_.size (); i++) + { + Audio_staff *s = audio_staffs_[i]; +- debug_output ("[" + to_string (i), true); ++ debug_output ("[" + ::to_string (i), true); + s->output (midi_stream, i, ports_); + debug_output ("]", false); + } diff --git a/print/lilypond/patches/patch-lily_performer-group.cc b/print/lilypond/patches/patch-lily_performer-group.cc new file mode 100644 index 00000000000..d4d470b899a --- /dev/null +++ b/print/lilypond/patches/patch-lily_performer-group.cc @@ -0,0 +1,12 @@ +$NetBSD: patch-lily_performer-group.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ + +--- lily/performer-group.cc.orig 2013-06-16 18:53:39.000000000 +0000 ++++ lily/performer-group.cc +@@ -18,6 +18,7 @@ + along with LilyPond. If not, see <http://www.gnu.org/licenses/>. + */ + ++#include "config.hh" + #include "performer-group.hh" + + #include "context.hh" diff --git a/print/lilypond/patches/patch-lily_piano-pedal-performer.cc b/print/lilypond/patches/patch-lily_piano-pedal-performer.cc new file mode 100644 index 00000000000..a8cdbbf5d5e --- /dev/null +++ b/print/lilypond/patches/patch-lily_piano-pedal-performer.cc @@ -0,0 +1,12 @@ +$NetBSD: patch-lily_piano-pedal-performer.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ + +--- lily/piano-pedal-performer.cc.orig 2013-06-16 18:48:08.000000000 +0000 ++++ lily/piano-pedal-performer.cc +@@ -17,6 +17,7 @@ + along with LilyPond. If not, see <http://www.gnu.org/licenses/>. + */ + ++#include "config.hh" + #include "performer.hh" + + #include "audio-item.hh" diff --git a/print/lilypond/patches/patch-lily_pointer-group-interface-scheme.cc b/print/lilypond/patches/patch-lily_pointer-group-interface-scheme.cc new file mode 100644 index 00000000000..2e8390d8ecc --- /dev/null +++ b/print/lilypond/patches/patch-lily_pointer-group-interface-scheme.cc @@ -0,0 +1,12 @@ +$NetBSD: patch-lily_pointer-group-interface-scheme.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ + +--- lily/pointer-group-interface-scheme.cc.orig 2013-06-16 19:28:18.000000000 +0000 ++++ lily/pointer-group-interface-scheme.cc +@@ -17,6 +17,7 @@ + along with LilyPond. If not, see <http://www.gnu.org/licenses/>. + */ + ++#include "config.hh" + #include "pointer-group-interface.hh" + #include "grob.hh" + diff --git a/print/lilypond/patches/patch-lily_pointer-group-interface.cc b/print/lilypond/patches/patch-lily_pointer-group-interface.cc new file mode 100644 index 00000000000..b59e190b7cc --- /dev/null +++ b/print/lilypond/patches/patch-lily_pointer-group-interface.cc @@ -0,0 +1,12 @@ +$NetBSD: patch-lily_pointer-group-interface.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ + +--- lily/pointer-group-interface.cc.orig 2013-06-16 19:23:13.000000000 +0000 ++++ lily/pointer-group-interface.cc +@@ -17,6 +17,7 @@ + along with LilyPond. If not, see <http://www.gnu.org/licenses/>. + */ + ++#include "config.hh" + #include "pointer-group-interface.hh" + + #include "grob-array.hh" diff --git a/print/lilypond/patches/patch-lily_property-iterator.cc b/print/lilypond/patches/patch-lily_property-iterator.cc new file mode 100644 index 00000000000..a69b225f1a6 --- /dev/null +++ b/print/lilypond/patches/patch-lily_property-iterator.cc @@ -0,0 +1,12 @@ +$NetBSD: patch-lily_property-iterator.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ + +--- lily/property-iterator.cc.orig 2013-06-16 19:28:18.000000000 +0000 ++++ lily/property-iterator.cc +@@ -17,6 +17,7 @@ + along with LilyPond. If not, see <http://www.gnu.org/licenses/>. + */ + ++#include "config.hh" + #include "property-iterator.hh" + + #include "context-def.hh" diff --git a/print/lilypond/patches/patch-lily_pure-from-neighbor-interface.cc b/print/lilypond/patches/patch-lily_pure-from-neighbor-interface.cc new file mode 100644 index 00000000000..311266c4329 --- /dev/null +++ b/print/lilypond/patches/patch-lily_pure-from-neighbor-interface.cc @@ -0,0 +1,12 @@ +$NetBSD: patch-lily_pure-from-neighbor-interface.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ + +--- lily/pure-from-neighbor-interface.cc.orig 2013-06-16 19:22:25.000000000 +0000 ++++ lily/pure-from-neighbor-interface.cc +@@ -17,6 +17,7 @@ + along with LilyPond. If not, see <http://www.gnu.org/licenses/>. + */ + ++#include "config.hh" + #include "axis-group-interface.hh" + #include "grob.hh" + #include "grob-array.hh" diff --git a/print/lilypond/patches/patch-lily_quote-iterator.cc b/print/lilypond/patches/patch-lily_quote-iterator.cc new file mode 100644 index 00000000000..ebe473ae049 --- /dev/null +++ b/print/lilypond/patches/patch-lily_quote-iterator.cc @@ -0,0 +1,12 @@ +$NetBSD: patch-lily_quote-iterator.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ + +--- lily/quote-iterator.cc.orig 2013-06-16 19:20:57.000000000 +0000 ++++ lily/quote-iterator.cc +@@ -17,6 +17,7 @@ + along with LilyPond. If not, see <http://www.gnu.org/licenses/>. + */ + ++#include "config.hh" + #include "music-wrapper-iterator.hh" + + #include "context.hh" diff --git a/print/lilypond/patches/patch-lily_rest.cc b/print/lilypond/patches/patch-lily_rest.cc new file mode 100644 index 00000000000..7ee1e9519b7 --- /dev/null +++ b/print/lilypond/patches/patch-lily_rest.cc @@ -0,0 +1,13 @@ +$NetBSD: patch-lily_rest.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ + +--- lily/rest.cc.orig 2013-06-16 19:00:53.000000000 +0000 ++++ lily/rest.cc +@@ -169,7 +169,7 @@ Rest::glyph_name (Grob *me, int durlog, + actual_style = ""; + } + +- return ("rests." + to_string (durlog) + (is_ledgered ? "o" : "") ++ return ("rests." + ::to_string (durlog) + (is_ledgered ? "o" : "") + + actual_style); + } + diff --git a/print/lilypond/patches/patch-lily_rhythmic-music-iterator.cc b/print/lilypond/patches/patch-lily_rhythmic-music-iterator.cc new file mode 100644 index 00000000000..cf53c2ecba5 --- /dev/null +++ b/print/lilypond/patches/patch-lily_rhythmic-music-iterator.cc @@ -0,0 +1,12 @@ +$NetBSD: patch-lily_rhythmic-music-iterator.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ + +--- lily/rhythmic-music-iterator.cc.orig 2013-06-16 18:51:27.000000000 +0000 ++++ lily/rhythmic-music-iterator.cc +@@ -17,6 +17,7 @@ + along with LilyPond. If not, see <http://www.gnu.org/licenses/>. + */ + ++#include "config.hh" + #include "rhythmic-music-iterator.hh" + + #include "context.hh" diff --git a/print/lilypond/patches/patch-lily_sequential-iterator.cc b/print/lilypond/patches/patch-lily_sequential-iterator.cc new file mode 100644 index 00000000000..b905785daa4 --- /dev/null +++ b/print/lilypond/patches/patch-lily_sequential-iterator.cc @@ -0,0 +1,12 @@ +$NetBSD: patch-lily_sequential-iterator.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ + +--- lily/sequential-iterator.cc.orig 2013-06-16 18:49:30.000000000 +0000 ++++ lily/sequential-iterator.cc +@@ -17,6 +17,7 @@ + along with LilyPond. If not, see <http://www.gnu.org/licenses/>. + */ + ++#include "config.hh" + #include "sequential-iterator.hh" + #include "music.hh" + #include "translator-group.hh" diff --git a/print/lilypond/patches/patch-lily_simple-music-iterator.cc b/print/lilypond/patches/patch-lily_simple-music-iterator.cc new file mode 100644 index 00000000000..1fe45c9684c --- /dev/null +++ b/print/lilypond/patches/patch-lily_simple-music-iterator.cc @@ -0,0 +1,12 @@ +$NetBSD: patch-lily_simple-music-iterator.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ + +--- lily/simple-music-iterator.cc.orig 2013-06-16 19:07:39.000000000 +0000 ++++ lily/simple-music-iterator.cc +@@ -17,6 +17,7 @@ + along with LilyPond. If not, see <http://www.gnu.org/licenses/>. + */ + ++#include "config.hh" + #include "simple-music-iterator.hh" + + #include "music.hh" diff --git a/print/lilypond/patches/patch-lily_simple-spacer.cc b/print/lilypond/patches/patch-lily_simple-spacer.cc new file mode 100644 index 00000000000..cda751f9067 --- /dev/null +++ b/print/lilypond/patches/patch-lily_simple-spacer.cc @@ -0,0 +1,12 @@ +$NetBSD: patch-lily_simple-spacer.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ + +--- lily/simple-spacer.cc.orig 2013-06-16 19:01:36.000000000 +0000 ++++ lily/simple-spacer.cc +@@ -20,6 +20,7 @@ + along with LilyPond. If not, see <http://www.gnu.org/licenses/>. + */ + ++#include "config.hh" + #include <cstdio> + + #include "column-x-positions.hh" diff --git a/print/lilypond/patches/patch-lily_simultaneous-music-iterator.cc b/print/lilypond/patches/patch-lily_simultaneous-music-iterator.cc new file mode 100644 index 00000000000..44d08242f76 --- /dev/null +++ b/print/lilypond/patches/patch-lily_simultaneous-music-iterator.cc @@ -0,0 +1,21 @@ +$NetBSD: patch-lily_simultaneous-music-iterator.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ + +--- lily/simultaneous-music-iterator.cc.orig 2013-06-16 19:28:18.000000000 +0000 ++++ lily/simultaneous-music-iterator.cc +@@ -17,6 +17,7 @@ + along with LilyPond. If not, see <http://www.gnu.org/licenses/>. + */ + ++#include "config.hh" + #include "simultaneous-music-iterator.hh" + #include "music.hh" + #include "context.hh" +@@ -63,7 +64,7 @@ Simultaneous_music_iterator::construct_c + + SCM name = ly_symbol2scm (get_outlet ()->context_name ().c_str ()); + Context *c = (j && create_separate_contexts_) +- ? get_outlet ()->find_create_context (name, to_string (j), SCM_EOL) ++ ? get_outlet ()->find_create_context (name, ::to_string (j), SCM_EOL) + : get_outlet (); + + if (!c) diff --git a/print/lilypond/patches/patch-lily_slur-configuration.cc b/print/lilypond/patches/patch-lily_slur-configuration.cc new file mode 100644 index 00000000000..ad6cb914fa3 --- /dev/null +++ b/print/lilypond/patches/patch-lily_slur-configuration.cc @@ -0,0 +1,12 @@ +$NetBSD: patch-lily_slur-configuration.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ + +--- lily/slur-configuration.cc.orig 2013-06-16 19:28:18.000000000 +0000 ++++ lily/slur-configuration.cc +@@ -17,6 +17,7 @@ + along with LilyPond. If not, see <http://www.gnu.org/licenses/>. + */ + ++#include "config.hh" + #include "slur-configuration.hh" + + #include "item.hh" diff --git a/print/lilypond/patches/patch-lily_slur-performer.cc b/print/lilypond/patches/patch-lily_slur-performer.cc new file mode 100644 index 00000000000..3af0fd4edcf --- /dev/null +++ b/print/lilypond/patches/patch-lily_slur-performer.cc @@ -0,0 +1,12 @@ +$NetBSD: patch-lily_slur-performer.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ + +--- lily/slur-performer.cc.orig 2013-06-16 19:24:05.000000000 +0000 ++++ lily/slur-performer.cc +@@ -17,6 +17,7 @@ + along with LilyPond. If not, see <http://www.gnu.org/licenses/>. + */ + ++#include "config.hh" + #include "performer.hh" + #include "audio-item.hh" + #include "audio-column.hh" diff --git a/print/lilypond/patches/patch-lily_slur.cc b/print/lilypond/patches/patch-lily_slur.cc new file mode 100644 index 00000000000..bd009e702e2 --- /dev/null +++ b/print/lilypond/patches/patch-lily_slur.cc @@ -0,0 +1,12 @@ +$NetBSD: patch-lily_slur.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ + +--- lily/slur.cc.orig 2013-06-16 18:48:41.000000000 +0000 ++++ lily/slur.cc +@@ -18,6 +18,7 @@ + along with LilyPond. If not, see <http://www.gnu.org/licenses/>. + */ + ++#include "config.hh" + #include "slur.hh" + #include "grob-info.hh" + #include "grob-array.hh" diff --git a/print/lilypond/patches/patch-lily_source-file.cc b/print/lilypond/patches/patch-lily_source-file.cc new file mode 100644 index 00000000000..2424d75de4e --- /dev/null +++ b/print/lilypond/patches/patch-lily_source-file.cc @@ -0,0 +1,23 @@ +$NetBSD: patch-lily_source-file.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ + +--- lily/source-file.cc.orig 2013-06-16 19:14:53.000000000 +0000 ++++ lily/source-file.cc +@@ -18,6 +18,7 @@ + along with LilyPond. If not, see <http://www.gnu.org/licenses/>. + */ + ++#include "config.hh" + #if GCC_MAJOR < 4 + #define _GLIBCXX_HAVE_MBSTATE_T + #include <wchar.h> +@@ -181,8 +182,8 @@ Source_file::file_line_column_string (ch + int l, ch, col, offset; + get_counts (context_str0, &l, &ch, &col, &offset); + +- return name_string () + ":" + to_string (l) +- + ":" + to_string (col); ++ return name_string () + ":" + ::to_string (l) ++ + ":" + ::to_string (col); + } + } + diff --git a/print/lilypond/patches/patch-lily_sources.cc b/print/lilypond/patches/patch-lily_sources.cc new file mode 100644 index 00000000000..726cb83dfaf --- /dev/null +++ b/print/lilypond/patches/patch-lily_sources.cc @@ -0,0 +1,12 @@ +$NetBSD: patch-lily_sources.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ + +--- lily/sources.cc.orig 2013-06-16 19:28:18.000000000 +0000 ++++ lily/sources.cc +@@ -17,6 +17,7 @@ + along with LilyPond. If not, see <http://www.gnu.org/licenses/>. + */ + ++#include "config.hh" + #include "sources.hh" + + #include "config.hh" diff --git a/print/lilypond/patches/patch-lily_spacing-basic.cc b/print/lilypond/patches/patch-lily_spacing-basic.cc new file mode 100644 index 00000000000..09ac871a56f --- /dev/null +++ b/print/lilypond/patches/patch-lily_spacing-basic.cc @@ -0,0 +1,12 @@ +$NetBSD: patch-lily_spacing-basic.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ + +--- lily/spacing-basic.cc.orig 2013-06-16 18:45:13.000000000 +0000 ++++ lily/spacing-basic.cc +@@ -17,6 +17,7 @@ + along with LilyPond. If not, see <http://www.gnu.org/licenses/>. + */ + ++#include "config.hh" + #include "spacing-spanner.hh" + + #include "spacing-options.hh" diff --git a/print/lilypond/patches/patch-lily_spacing-loose-columns.cc b/print/lilypond/patches/patch-lily_spacing-loose-columns.cc new file mode 100644 index 00000000000..d8325c84e63 --- /dev/null +++ b/print/lilypond/patches/patch-lily_spacing-loose-columns.cc @@ -0,0 +1,12 @@ +$NetBSD: patch-lily_spacing-loose-columns.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ + +--- lily/spacing-loose-columns.cc.orig 2013-06-16 18:57:45.000000000 +0000 ++++ lily/spacing-loose-columns.cc +@@ -17,6 +17,7 @@ + along with LilyPond. If not, see <http://www.gnu.org/licenses/>. + */ + ++#include "config.hh" + #include "system.hh" + #include "paper-column.hh" + #include "column-x-positions.hh" diff --git a/print/lilypond/patches/patch-lily_spacing-options.cc b/print/lilypond/patches/patch-lily_spacing-options.cc new file mode 100644 index 00000000000..b7bf6d9884e --- /dev/null +++ b/print/lilypond/patches/patch-lily_spacing-options.cc @@ -0,0 +1,12 @@ +$NetBSD: patch-lily_spacing-options.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ + +--- lily/spacing-options.cc.orig 2013-06-16 19:02:52.000000000 +0000 ++++ lily/spacing-options.cc +@@ -18,6 +18,7 @@ + along with LilyPond. If not, see <http://www.gnu.org/licenses/>. + */ + ++#include "config.hh" + #include "spacing-options.hh" + #include "spacing-spanner.hh" + #include "grob.hh" diff --git a/print/lilypond/patches/patch-lily_spacing-spanner.cc b/print/lilypond/patches/patch-lily_spacing-spanner.cc new file mode 100644 index 00000000000..fea5b18bf0d --- /dev/null +++ b/print/lilypond/patches/patch-lily_spacing-spanner.cc @@ -0,0 +1,12 @@ +$NetBSD: patch-lily_spacing-spanner.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ + +--- lily/spacing-spanner.cc.orig 2013-06-16 19:05:36.000000000 +0000 ++++ lily/spacing-spanner.cc +@@ -17,6 +17,7 @@ + along with LilyPond. If not, see <http://www.gnu.org/licenses/>. + */ + ++#include "config.hh" + #include "spacing-spanner.hh" + + #include <math.h> diff --git a/print/lilypond/patches/patch-lily_span-bar-stub-engraver.cc b/print/lilypond/patches/patch-lily_span-bar-stub-engraver.cc new file mode 100644 index 00000000000..1491ab846da --- /dev/null +++ b/print/lilypond/patches/patch-lily_span-bar-stub-engraver.cc @@ -0,0 +1,12 @@ +$NetBSD: patch-lily_span-bar-stub-engraver.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ + +--- lily/span-bar-stub-engraver.cc.orig 2013-06-16 19:21:44.000000000 +0000 ++++ lily/span-bar-stub-engraver.cc +@@ -17,6 +17,7 @@ + along with LilyPond. If not, see <http://www.gnu.org/licenses/>. + */ + ++#include "config.hh" + #include <algorithm> + + #include "align-interface.hh" diff --git a/print/lilypond/patches/patch-lily_stem.cc b/print/lilypond/patches/patch-lily_stem.cc new file mode 100644 index 00000000000..72548a941d5 --- /dev/null +++ b/print/lilypond/patches/patch-lily_stem.cc @@ -0,0 +1,12 @@ +$NetBSD: patch-lily_stem.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ + +--- lily/stem.cc.orig 2013-06-16 19:03:50.000000000 +0000 ++++ lily/stem.cc +@@ -37,6 +37,7 @@ + internal_height and internal_pure_height for all subsequent iterations. + */ + ++#include "config.hh" + #include "stem.hh" + #include "spanner.hh" + diff --git a/print/lilypond/patches/patch-lily_system-start-delimiter.cc b/print/lilypond/patches/patch-lily_system-start-delimiter.cc new file mode 100644 index 00000000000..6048215981a --- /dev/null +++ b/print/lilypond/patches/patch-lily_system-start-delimiter.cc @@ -0,0 +1,13 @@ +$NetBSD: patch-lily_system-start-delimiter.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ + +--- lily/system-start-delimiter.cc.orig 2013-06-16 18:42:09.000000000 +0000 ++++ lily/system-start-delimiter.cc +@@ -169,7 +169,7 @@ System_start_delimiter::staff_brace (Gro + } + while (hi - lo > 1); + +- Stencil stil (fm->find_by_name ("brace" + to_string (lo))); ++ Stencil stil (fm->find_by_name ("brace" + ::to_string (lo))); + stil.translate_axis (-b[X_AXIS].length () / 2, X_AXIS); + + stil.translate_axis (-0.2, X_AXIS); diff --git a/print/lilypond/patches/patch-lily_system.cc b/print/lilypond/patches/patch-lily_system.cc new file mode 100644 index 00000000000..5826bd25c3a --- /dev/null +++ b/print/lilypond/patches/patch-lily_system.cc @@ -0,0 +1,21 @@ +$NetBSD: patch-lily_system.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ + +--- lily/system.cc.orig 2013-06-16 18:54:24.000000000 +0000 ++++ lily/system.cc +@@ -17,6 +17,7 @@ + along with LilyPond. If not, see <http://www.gnu.org/licenses/>. + */ + ++#include "config.hh" + #include "system.hh" + + #include "align-interface.hh" +@@ -222,7 +223,7 @@ System::get_paper_systems () + scm_vector_set_x (lines, scm_from_int (i), + system->get_paper_system ()); + +- debug_output (to_string (i) + "]", false); ++ debug_output (::to_string (i) + "]", false); + } + return lines; + } diff --git a/print/lilypond/patches/patch-lily_tempo-performer.cc b/print/lilypond/patches/patch-lily_tempo-performer.cc new file mode 100644 index 00000000000..ce96e39267e --- /dev/null +++ b/print/lilypond/patches/patch-lily_tempo-performer.cc @@ -0,0 +1,12 @@ +$NetBSD: patch-lily_tempo-performer.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ + +--- lily/tempo-performer.cc.orig 2013-06-16 19:10:03.000000000 +0000 ++++ lily/tempo-performer.cc +@@ -17,6 +17,7 @@ + along with LilyPond. If not, see <http://www.gnu.org/licenses/>. + */ + ++#include "config.hh" + #include "performer.hh" + + #include "audio-item.hh" diff --git a/print/lilypond/patches/patch-lily_tie-configuration.cc b/print/lilypond/patches/patch-lily_tie-configuration.cc new file mode 100644 index 00000000000..254d2622484 --- /dev/null +++ b/print/lilypond/patches/patch-lily_tie-configuration.cc @@ -0,0 +1,12 @@ +$NetBSD: patch-lily_tie-configuration.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ + +--- lily/tie-configuration.cc.orig 2013-06-16 18:59:33.000000000 +0000 ++++ lily/tie-configuration.cc +@@ -18,6 +18,7 @@ + along with LilyPond. If not, see <http://www.gnu.org/licenses/>. + */ + ++#include "config.hh" + #include "tie-configuration.hh" + + #include "warn.hh" diff --git a/print/lilypond/patches/patch-lily_tie-performer.cc b/print/lilypond/patches/patch-lily_tie-performer.cc new file mode 100644 index 00000000000..20094c9aef3 --- /dev/null +++ b/print/lilypond/patches/patch-lily_tie-performer.cc @@ -0,0 +1,12 @@ +$NetBSD: patch-lily_tie-performer.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ + +--- lily/tie-performer.cc.orig 2013-06-16 19:28:18.000000000 +0000 ++++ lily/tie-performer.cc +@@ -17,6 +17,7 @@ + along with LilyPond. If not, see <http://www.gnu.org/licenses/>. + */ + ++#include "config.hh" + #include "performer.hh" + + #include "audio-item.hh" diff --git a/print/lilypond/patches/patch-lily_time-signature.cc b/print/lilypond/patches/patch-lily_time-signature.cc new file mode 100644 index 00000000000..55780ef6b5d --- /dev/null +++ b/print/lilypond/patches/patch-lily_time-signature.cc @@ -0,0 +1,25 @@ +$NetBSD: patch-lily_time-signature.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ + +--- lily/time-signature.cc.orig 2013-06-16 18:56:50.000000000 +0000 ++++ lily/time-signature.cc +@@ -77,7 +77,7 @@ Time_signature::special_time_signature ( + return numbered_time_signature (me, n, d); + } + +- string char_name = style + to_string (n) + to_string (d); ++ string char_name = style + ::to_string (n) + ::to_string (d); + me->set_property ("font-encoding", ly_symbol2scm ("fetaMusic")); + Stencil out = Font_interface::get_default_font (me) + ->find_by_name ("timesig." + char_name); +@@ -100,9 +100,9 @@ Time_signature::numbered_time_signature + chain); + + SCM sn = Text_interface::interpret_markup (me->layout ()->self_scm (), chain, +- ly_string2scm (to_string (num))); ++ ly_string2scm (::to_string (num))); + SCM sd = Text_interface::interpret_markup (me->layout ()->self_scm (), chain, +- ly_string2scm (to_string (den))); ++ ly_string2scm (::to_string (den))); + + Stencil n = *unsmob_stencil (sn); + Stencil d = *unsmob_stencil (sd); diff --git a/print/lilypond/patches/patch-lily_translator-dispatch-list.cc b/print/lilypond/patches/patch-lily_translator-dispatch-list.cc index 46b2c42e14d..dea161805cc 100644 --- a/print/lilypond/patches/patch-lily_translator-dispatch-list.cc +++ b/print/lilypond/patches/patch-lily_translator-dispatch-list.cc @@ -1,10 +1,18 @@ -$NetBSD: patch-lily_translator-dispatch-list.cc,v 1.1 2013/04/01 12:20:47 joerg Exp $ +$NetBSD: patch-lily_translator-dispatch-list.cc,v 1.2 2013/06/16 20:46:52 joerg Exp $ Issue 2208. ---- lily/translator-dispatch-list.cc.orig 2013-03-31 15:00:57.000000000 +0000 +--- lily/translator-dispatch-list.cc.orig 2013-01-04 13:41:56.000000000 +0000 +++ lily/translator-dispatch-list.cc -@@ -32,7 +32,7 @@ Engraver_dispatch_list::apply (Grob_info +@@ -17,6 +17,7 @@ + along with LilyPond. If not, see <http://www.gnu.org/licenses/>. + */ + ++#include "config.hh" + #include "translator-dispatch-list.hh" + #include "engraver.hh" + +@@ -32,7 +33,7 @@ Engraver_dispatch_list::apply (Grob_info if (e.engraver_ == origin) continue; diff --git a/print/lilypond/patches/patch-lily_tuplet-bracket.cc b/print/lilypond/patches/patch-lily_tuplet-bracket.cc new file mode 100644 index 00000000000..94537d4b63b --- /dev/null +++ b/print/lilypond/patches/patch-lily_tuplet-bracket.cc @@ -0,0 +1,12 @@ +$NetBSD: patch-lily_tuplet-bracket.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ + +--- lily/tuplet-bracket.cc.orig 2013-06-16 19:17:24.000000000 +0000 ++++ lily/tuplet-bracket.cc +@@ -40,6 +40,7 @@ + todo: handle breaking elegantly. + */ + ++#include "config.hh" + #include "tuplet-bracket.hh" + #include "axis-group-interface.hh" + #include "line-interface.hh" diff --git a/print/lilypond/patches/patch-lily_tuplet-number.cc b/print/lilypond/patches/patch-lily_tuplet-number.cc new file mode 100644 index 00000000000..75f48cd63d1 --- /dev/null +++ b/print/lilypond/patches/patch-lily_tuplet-number.cc @@ -0,0 +1,12 @@ +$NetBSD: patch-lily_tuplet-number.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ + +--- lily/tuplet-number.cc.orig 2013-06-16 19:03:29.000000000 +0000 ++++ lily/tuplet-number.cc +@@ -18,6 +18,7 @@ + along with LilyPond. If not, see <http://www.gnu.org/licenses/>. + */ + ++#include "config.hh" + #include "tuplet-bracket.hh" + #include "moment.hh" + #include "paper-column.hh" diff --git a/print/lilypond/patches/patch-lily_volta-repeat-iterator.cc b/print/lilypond/patches/patch-lily_volta-repeat-iterator.cc new file mode 100644 index 00000000000..bfa37724f13 --- /dev/null +++ b/print/lilypond/patches/patch-lily_volta-repeat-iterator.cc @@ -0,0 +1,22 @@ +$NetBSD: patch-lily_volta-repeat-iterator.cc,v 1.1 2013/06/16 20:46:52 joerg Exp $ + +--- lily/volta-repeat-iterator.cc.orig 2013-06-16 19:24:27.000000000 +0000 ++++ lily/volta-repeat-iterator.cc +@@ -94,7 +94,7 @@ Volta_repeat_iterator::next_element (boo + { + if (alt_count_) + { +- string repstr = to_string (rep_count_ - alt_count_ + done_count_) + "."; ++ string repstr = ::to_string (rep_count_ - alt_count_ + done_count_) + "."; + if (done_count_ > 1) + { + add_repeat_command (scm_list_n (ly_symbol2scm ("volta"), SCM_BOOL_F, SCM_UNDEFINED)); +@@ -104,7 +104,7 @@ Volta_repeat_iterator::next_element (boo + } + + if (done_count_ == 1 && alt_count_ < rep_count_) +- repstr = "1.--" + to_string (rep_count_ - alt_count_ + done_count_) + "."; ++ repstr = "1.--" + ::to_string (rep_count_ - alt_count_ + done_count_) + "."; + + if (done_count_ <= alt_count_) + add_repeat_command (scm_list_n (ly_symbol2scm ("volta"), |