Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/text
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv17408/text
Modified Files:
lilypond-devel.info lilypond-devel.patch
Log Message:
Lilypond needs to use texinfo-legacy (Hisashi T Fujinaka <[email protected]>)
Index: lilypond-devel.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.7/stable/main/finkinfo/text/lilypond-devel.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- lilypond-devel.patch 1 Mar 2013 21:40:30 -0000 1.2
+++ lilypond-devel.patch 2 Jun 2013 01:12:13 -0000 1.3
@@ -1,6 +1,6 @@
-diff -ruN lilypond-2.15.42-orig/config.make.in lilypond-2.15.42/config.make.in
---- lilypond-2.15.42-orig/config.make.in 2012-08-02 13:43:07.000000000
-0400
-+++ lilypond-2.15.42/config.make.in 2013-02-20 20:43:31.000000000 -0500
+diff -Naur lilypond-2.17.15.orig/config.make.in lilypond-2.17.15/config.make.in
+--- lilypond-2.17.15.orig/config.make.in 2013-04-05 10:45:11.000000000
-0700
++++ lilypond-2.17.15/config.make.in 2013-04-05 10:45:47.000000000 -0700
@@ -27,7 +27,7 @@
PANGO_FT2_LIBS = @PANGO_FT2_LIBS@
CXXABI_LIBS = @CXXABI_LIBS@
@@ -19,152 +19,3 @@
package_libdir = $(libdir)/$(package)
package_docdir = $(docdir)/$(package)
package_omfdir = $(omfdir)/$(package)
-From 4256f121bdbb6310cbb7162f1d38632dfec11519 Mon Sep 17 00:00:00 2001
-From: David Kastrup <[email protected]>
-Date: Thu, 21 Feb 2013 10:38:14 +0100
-Subject: [PATCH] Issue 2088: Replace automatic pointer-to-member function
- conversions
-
-Those are a GCC extension and thus a portability problem.
----
- lily/GNUmakefile | 3 ---
- lily/include/lily-proto.hh | 5 ++---
- lily/include/translator-group.hh | 2 +-
- lily/translator-dispatch-list.cc | 2 +-
- 4 files changed, 4 insertions(+), 8 deletions(-)
-
-diff --git a/lily/GNUmakefile b/lily/GNUmakefile
-index e67a883..ba19ac9 100644
---- a/lily/GNUmakefile
-+++ b/lily/GNUmakefile
-@@ -6,9 +6,6 @@ NAME = lilypond
- MODULE_LIBS=$(depth)/flower
- MODULE_INCLUDES= $(depth)/flower/include
-
--# need this to convert between function pointers and member function pointers.
--MODULE_CXXFLAGS= -Wno-pmf-conversions
--
-
- HELP2MAN_EXECS = lilypond
- STEPMAKE_TEMPLATES=c c++ executable po help2man
-diff --git a/lily/include/lily-proto.hh b/lily/include/lily-proto.hh
-index e726c4a..53e863c 100644
---- a/lily/include/lily-proto.hh
-+++ b/lily/include/lily-proto.hh
-@@ -198,8 +198,7 @@ class Translator_group;
- class Transposed_music;
- class yyFlexLexer;
-
--typedef void (*Engraver_void_function_engraver_grob_info) (Engraver *,
-- Grob_info);
--typedef void (*Translator_void_method_ptr) (Translator *);
-+typedef void (Engraver::*Engraver_void_function_engraver_grob_info)
(Grob_info);
-+typedef void (Translator::*Translator_void_method_ptr) ();
-
- #endif /* LILY_PROTO_HH */
-diff --git a/lily/include/translator-group.hh
b/lily/include/translator-group.hh
-index e5004c2..ad044de 100644
---- a/lily/include/translator-group.hh
-+++ b/lily/include/translator-group.hh
-@@ -43,7 +43,7 @@ struct Translator_method_binding
- void invoke ()
- {
- if (method_)
-- (*method_) (translator_);
-+ (translator_->*method_) ();
- }
- };
-
-diff --git a/lily/translator-dispatch-list.cc
b/lily/translator-dispatch-list.cc
-index 6c74b25..dffaa09 100644
---- a/lily/translator-dispatch-list.cc
-+++ b/lily/translator-dispatch-list.cc
-@@ -32,7 +32,7 @@ Engraver_dispatch_list::apply (Grob_info gi)
- if (e.engraver_ == origin)
- continue;
-
-- (*e.function_) (e.engraver_, gi);
-+ (e.engraver_->*e.function_) (gi);
- }
- }
-
---
-1.7.11.1
-
-From 22581154dd1af254e4b9113e04b620d6e7c99296 Mon Sep 17 00:00:00 2001
-From: David Kastrup <[email protected]>
-Date: Sat, 23 Feb 2013 09:56:06 +0100
-Subject: [PATCH] Issue 3201: Don't initialize dim_cache_ array via
- constructor syntax
-
-This is not valid C++ and not even a documented GCC extension. It is
-probabably an oversight that GCC appears to be able to interpret this
-in some manner.
-
-Also creates a custom copy constructor for Dimension_cache for the
-sole purpose of being able to initialize a Dimension_cache array
-element-wise from a Dimension_cache array in the copy constructor of
-Grob. C++ clearly is lacking in some departments.
----
- lily/dimension-cache.cc | 10 ++++++++++
- lily/grob.cc | 5 ++++-
- lily/include/dimension-cache.hh | 1 +
- 3 files changed, 15 insertions(+), 1 deletion(-)
-
-diff --git a/lily/dimension-cache.cc b/lily/dimension-cache.cc
-index 2d2fce4..4538f17 100644
---- a/lily/dimension-cache.cc
-+++ b/lily/dimension-cache.cc
-@@ -30,6 +30,16 @@ Dimension_cache::Dimension_cache (Dimension_cache const &d)
- extent_ = d.extent_ ? new Interval (*d.extent_) : 0;
- }
-
-+Dimension_cache &
-+Dimension_cache::operator = (Dimension_cache const &d)
-+{
-+ clear ();
-+ offset_ = d.offset_ ? new Real (*d.offset_) : 0;
-+ parent_ = d.parent_;
-+ extent_ = d.extent_ ? new Interval (*d.extent_) : 0;
-+ return *this;
-+}
-+
- Dimension_cache::Dimension_cache ()
- {
- init ();
-diff --git a/lily/grob.cc b/lily/grob.cc
-index 4c54cbc..8ece3cd 100644
---- a/lily/grob.cc
-+++ b/lily/grob.cc
-@@ -87,13 +87,16 @@ Grob::Grob (SCM basicprops)
- }
-
- Grob::Grob (Grob const &s)
-- : dim_cache_ (s.dim_cache_)
- {
- original_ = (Grob *) & s;
- self_scm_ = SCM_EOL;
-
- immutable_property_alist_ = s.immutable_property_alist_;
- mutable_property_alist_ = SCM_EOL;
-+
-+ for (Axis a = X_AXIS; a < NO_AXES; incr (a))
-+ dim_cache_ [a] = s.dim_cache_ [a];
-+
- interfaces_ = s.interfaces_;
- object_alist_ = SCM_EOL;
-
-diff --git a/lily/include/dimension-cache.hh b/lily/include/dimension-cache.hh
-index 581bcff..6210be1 100644
---- a/lily/include/dimension-cache.hh
-+++ b/lily/include/dimension-cache.hh
-@@ -36,6 +36,7 @@ class Dimension_cache
- friend class Grob;
-
- Dimension_cache (Dimension_cache const &);
-+ Dimension_cache & operator = (Dimension_cache const &d);
- ~Dimension_cache ();
- Dimension_cache ();
- };
---
-1.7.11.1
Index: lilypond-devel.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.7/stable/main/finkinfo/text/lilypond-devel.info,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- lilypond-devel.info 1 Mar 2013 21:40:30 -0000 1.6
+++ lilypond-devel.info 2 Jun 2013 01:12:13 -0000 1.7
@@ -1,5 +1,5 @@
Package: lilypond-devel
-Version: 2.17.13
+Version: 2.17.18
Revision: 1
Maintainer: Matthias Neeracher <[email protected]>
GCC: 4.0
@@ -21,7 +21,7 @@
mftrace (>= 1.2.14-1004),
pango1-xft2-ft219-dev (>= 1.24.5-7),
pkgconfig,
- texinfo (>= 4.13-1001),
+ texinfo-legacy,
texi2html (>= 1.82-1),
netpbm-bin,
imagemagick,
@@ -47,9 +47,9 @@
Conflicts: lilypond, lilypond-devel
Replaces: lilypond
Source:
http://download.linuxaudio.org/lilypond/sources/v2.17/lilypond-%v.tar.gz
-Source-MD5: 6311e759cb3a576572119a8ccd5d28f3
+Source-MD5: e797422dc1e565e496f0e2a6483478bd
PatchFile: %n.patch
-PatchFile-MD5: 905b02333b51a793416b5b48a5e530a0
+PatchFile-MD5: 5dc8b727c2d88d46542713e5571f25b8
SetCFLAGS: -MD
SetLDFLAGS: -lexpat -L%p/lib/pango-ft219/lib
ConfigureParams: --infodir='$(prefix)/share/info'
--mandir='$(prefix)/share/man' --with-ncsb-dir=%p/share/fonts/urw-fonts
@@ -60,6 +60,7 @@
export GUILE=%p/bin/guile-1.8
export GUILE_CONFIG=guile-1.8-config
export FLEX=/usr/bin/flex
+export MAKEINFO=%p/opt/texinfo-legacy/bin/makeinfo
PERL=/usr/bin/perl
./autogen.sh %c
mkdir mf/out
------------------------------------------------------------------------------
Get 100% visibility into Java/.NET code with AppDynamics Lite
It's a free troubleshooting tool designed for production
Get down to code-level detail for bottlenecks, with <2% overhead.
Download for free and get started troubleshooting in minutes.
http://p.sf.net/sfu/appdyn_d2d_ap2
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
