Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=35da1dd9934f6805d6f938ffe00ce2d1184a7e35
commit 35da1dd9934f6805d6f938ffe00ce2d1184a7e35 Author: CSÉCSY László <[EMAIL PROTECTED]> Date: Sun Apr 6 22:11:10 2008 +0200 lilypond-2.10.33-3-i686 rebuilt with new libtool (now explicit depend) patch from http://bugs.gentoo.org/attachment.cgi?id=147172&action=view diff --git a/source/xapps-extra/lilypond/FrugalBuild b/source/xapps-extra/lilypond/FrugalBuild index 5dc0518..a8e1df6 100644 --- a/source/xapps-extra/lilypond/FrugalBuild +++ b/source/xapps-extra/lilypond/FrugalBuild @@ -3,15 +3,15 @@ pkgname=lilypond pkgver=2.10.33 -pkgrel=2 +pkgrel=3 pkgdesc="music notation for everyone" url="http://lilypond.org/web/"; -depends=('fontforge' 'mftrace>=1.2.3' 'guile' 'texinfo' 'python' 'gettext' 'pango' 'ghostscript' 'urw-fonts' 'fontconfig' 'freetype2') +depends=('fontforge' 'mftrace>=1.2.3' 'guile>=1.8.4-2' 'texinfo' 'python' 'gettext' 'pango' 'ghostscript' 'urw-fonts' 'fontconfig' 'freetype2' 'libtool>=2.2.2') makedepends=('netpbm' 'imagemagick' 'rsync') groups=('xapps-extra') archs=('i686' 'x86_64') up2date="lynx -dump 'http://lilypond.org/web/' | grep 'Stable.*Docum' | sed 's/.* \([0-9\.]\+\) .*/\1/'" -source=(http://download.linuxaudio.org/lilypond/sources/v2.10/$pkgname-$pkgver.tar.gz hack.patch) +source=(http://download.linuxaudio.org/lilypond/sources/v2.10/$pkgname-$pkgver.tar.gz hack.patch strict-gcc.patch) options=('scriptlet') docpkg=lilypond-doc @@ -33,5 +33,6 @@ build() } # optimization OK -sha1sums=('22717aa67723067f43208e7e771d6909f8db045f' \ - 'da35df783510eb8ee06cff9da77f3faad6a2b101') +sha1sums=('22717aa67723067f43208e7e771d6909f8db045f'\ + 'da35df783510eb8ee06cff9da77f3faad6a2b101'\ + '7af1558a50136f56eae532c278004f70d056670f') diff --git a/source/xapps-extra/lilypond/strict-gcc.patch b/source/xapps-extra/lilypond/strict-gcc.patch new file mode 100644 index 0000000..e0e0391 --- /dev/null +++ b/source/xapps-extra/lilypond/strict-gcc.patch @@ -0,0 +1,67 @@ +diff -ru lilypond-2.11.42.original/flower/file-name.cc lilypond-2.11.42/flower/file-name.cc +--- lilypond-2.11.42.original/flower/file-name.cc 2008-01-02 03:39:05.000000000 +0100 ++++ lilypond-2.11.42/flower/file-name.cc 2008-03-24 20:50:40.000000000 +0100 +@@ -12,6 +12,7 @@ + #include <cstdio> + #include <cerrno> + #include <unistd.h> ++#include <limits.h> + + using namespace std; + +diff -ru lilypond-2.11.42.original/flower/include/rational.hh lilypond-2.11.42/flower/include/rational.hh +--- lilypond-2.11.42.original/flower/include/rational.hh 2008-01-02 03:39:05.000000000 +0100 ++++ lilypond-2.11.42/flower/include/rational.hh 2008-03-24 20:51:07.000000000 +0100 +@@ -10,6 +10,7 @@ + #define RATIONAL_HH + + #include "std-string.hh" ++#include <limits.h> + + /** + Rational numbers. Included is support for + and - infinity. +diff -ru lilypond-2.11.42.original/flower/include/std-vector.hh lilypond-2.11.42/flower/include/std-vector.hh +--- lilypond-2.11.42.original/flower/include/std-vector.hh 2008-01-02 03:39:05.000000000 +0100 ++++ lilypond-2.11.42/flower/include/std-vector.hh 2008-03-24 20:47:10.000000000 +0100 +@@ -22,6 +22,7 @@ + #include <algorithm> /* find, reverse, sort */ + #include <functional> /* unary_function */ + #include <cassert> ++#include <string> + + using namespace std; + +diff -ru lilypond-2.11.42.original/lily/include/lily-guile.hh lilypond-2.11.42/lily/include/lily-guile.hh +--- lilypond-2.11.42.original/lily/include/lily-guile.hh 2008-01-02 03:39:06.000000000 +0100 ++++ lilypond-2.11.42/lily/include/lily-guile.hh 2008-03-24 20:55:40.000000000 +0100 +@@ -14,7 +14,7 @@ + #endif + + #include <libguile.h> +- ++#include <string.h> + + /* + Hack for various MacOS incarnations. +diff -ru lilypond-2.11.42.original/lily/include/midi-stream.hh lilypond-2.11.42/lily/include/midi-stream.hh +--- lilypond-2.11.42.original/lily/include/midi-stream.hh 2008-01-02 03:39:06.000000000 +0100 ++++ lilypond-2.11.42/lily/include/midi-stream.hh 2008-03-24 20:54:23.000000000 +0100 +@@ -10,6 +10,7 @@ + #include <cstdio> + using namespace std; + ++#include <string.h> + #include "std-string.hh" + #include "lily-proto.hh" + +diff -ru lilypond-2.11.42.original/lily/piano-pedal-engraver.cc lilypond-2.11.42/lily/piano-pedal-engraver.cc +--- lilypond-2.11.42.original/lily/piano-pedal-engraver.cc 2008-01-02 03:39:06.000000000 +0100 ++++ lilypond-2.11.42/lily/piano-pedal-engraver.cc 2008-03-24 20:55:16.000000000 +0100 +@@ -28,6 +28,7 @@ + + #include "translator.icc" + ++#include <string.h> + + /* + TODO: _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
