CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Jan Nieuwenhuizen <[EMAIL PROTECTED]> 05/05/31 13:55:27
Modified files:
make : lilypond.fedora.spec.in
lily : lexer.ll
. : configure.in config.hh.in ChangeLog
Log message:
(reloc_b): Add --enable-argv0-relocation.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/make/lilypond.fedora.spec.in.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/lexer.ll.diff?tr1=1.169&tr2=1.170&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/configure.in.diff?tr1=1.153&tr2=1.154&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/config.hh.in.diff?tr1=1.44&tr2=1.45&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3690&tr2=1.3691&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3690 lilypond/ChangeLog:1.3691
--- lilypond/ChangeLog:1.3690 Tue May 31 13:51:42 2005
+++ lilypond/ChangeLog Tue May 31 13:55:27 2005
@@ -1,3 +1,7 @@
+2005-05-31 Jan Nieuwenhuizen <[EMAIL PROTECTED]>
+
+ * configure.in (reloc_b): Add --enable-argv0-relocation.
+
2005-05-31 Han-Wen Nienhuys <[EMAIL PROTECTED]>
* scm/font.scm (make-century-schoolbook-tree): use Sans for sans
@@ -39,6 +43,10 @@
2005-05-30 Jan Nieuwenhuizen <[EMAIL PROTECTED]>
+ * lily/lexer.ll: Skip UTF-8 BOM at BOF.
+
+ * make/lilypond.fedora.spec.in: Fix source url.
+
* cygwin: Update from mingw patches.
* scm/editor.scm (editor-command-template-alist): Use jedit
Index: lilypond/config.hh.in
diff -u lilypond/config.hh.in:1.44 lilypond/config.hh.in:1.45
--- lilypond/config.hh.in:1.44 Thu May 12 11:32:49 2005
+++ lilypond/config.hh.in Tue May 31 13:55:27 2005
@@ -7,6 +7,9 @@
#define PACKAGE_DATADIR DATADIR "/" PACKAGE
+/* dynamic relocation? */
+#define ARGV0_RELOCATION 0
+
/* default lilypond locale dir */
#define LOCALEDIR "@LOCALEDIR@"
Index: lilypond/configure.in
diff -u lilypond/configure.in:1.153 lilypond/configure.in:1.154
--- lilypond/configure.in:1.153 Sat May 14 23:58:42 2005
+++ lilypond/configure.in Tue May 31 13:55:27 2005
@@ -27,6 +27,11 @@
[ --enable-gui compile with experimental GNOME output module.
Default: off],
[gui_b=$enableval])
+reloc_b=no
+AC_ARG_ENABLE(relocation,
+ [ --enable-relocation compile with dynamic relocation. Default: off],
+ [reloc_b=$enableval])
+
# must come before any header checks
STEPMAKE_COMPILE
@@ -76,6 +81,10 @@
STEPMAKE_GTK2(gtk+-2.0, REQUIRED, 2.4.0)
fi # $gui_b
+if test "$reloc_b" = "yes"; then
+ AC_DEFINE(ARGV0_RELOCATION)
+fi # $reloc_b
+
STEPMAKE_FREETYPE2(freetype2, REQUIRED, 0)
#STEPMAKE_PANGO(pango, REQUIRED, 1.6.0)
STEPMAKE_PANGO_FT2(pangoft2, REQUIRED, 1.6.0)
Index: lilypond/lily/lexer.ll
diff -u lilypond/lily/lexer.ll:1.169 lilypond/lily/lexer.ll:1.170
--- lilypond/lily/lexer.ll:1.169 Thu Apr 14 20:02:25 2005
+++ lilypond/lily/lexer.ll Tue May 31 13:55:26 2005
@@ -142,6 +142,7 @@
ESCAPED [nt\\'"]
EXTENDER __
HYPHEN --
+BOM_UTF8 \357\273\277
%%
@@ -149,6 +150,16 @@
// windows-suck-suck-suck
}
+<INITIAL,chords,lyrics,figures,notes>{BOM_UTF8} {
+ if (this->lexloc->line_number () != 1 || this->lexloc->column_number () != 0)
+ {
+ LexerError (_ ("stray UTF-8 BOM encountered").to_str0 ());
+ exit (1);
+ }
+ if (be_verbose_global)
+ message (_ ("Skipping UTF-8 BOM"));
+}
+
<INITIAL,chords,figures,incl,lyrics,markup,notes>{
"%{" {
yy_push_state (longcomment);
@@ -188,7 +199,7 @@
String s (YYText () + 1);
s = s.left_string (s.index_last ('\"'));
- yy_pop_state();
+ yy_pop_state ();
this->here_input().source_file_->name_ = s;
message (_f ("Renaming input to: `%s'", s.to_str0 ()));
progress_indication ("\n");
Index: lilypond/make/lilypond.fedora.spec.in
diff -u lilypond/make/lilypond.fedora.spec.in:1.15
lilypond/make/lilypond.fedora.spec.in:1.16
--- lilypond/make/lilypond.fedora.spec.in:1.15 Thu May 12 13:41:34 2005
+++ lilypond/make/lilypond.fedora.spec.in Tue May 31 13:55:26 2005
@@ -8,9 +8,9 @@
Release: 1
License: GPL
Group: Applications/Publishing
-Source0: ftp.lilypond.org:/pub/LilyPond/development/[EMAIL PROTECTED]@.tar.gz
+Source0: http://lilypond.org/download/development/[EMAIL PROTECTED]@.tar.gz
Summary: Create and print music notation
-URL: http://www.lilypond.org/
+URL: http://lilypond.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -30,7 +30,7 @@
%description
LilyPond lets you create music notation. It produces
-beautiful sheet music from a high-level description file.
+beautiful sheet music from a high-level description file.
%package documentation
Summary: All LilyPond documentation, in HTML
@@ -38,7 +38,7 @@
# BuildArchitectures: noarch
%description documentation
-Documentation and example files of LilyPond. An index is available at
+Documentation and example files of LilyPond. An index is available at
%{docdir}/web/Documentation/out-www/index.html
%prep
@@ -194,5 +194,3 @@
%{docdir}
%{_datadir}/omf/lilypond/@TOPLEVEL_VERSION@
-
-
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
