Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=981387fcf153d35973ae95770af348f8a613a7fd
commit 981387fcf153d35973ae95770af348f8a613a7fd Author: CSÉCSY László <boo...@frugalware.org> Date: Fri Jan 2 19:02:37 2009 +0100 lilypond-2.12.1-1-i686 version bump removed patches that are no longer needed diff --git a/source/xapps-extra/lilypond/FrugalBuild b/source/xapps-extra/lilypond/FrugalBuild index a8e1df6..9426814 100644 --- a/source/xapps-extra/lilypond/FrugalBuild +++ b/source/xapps-extra/lilypond/FrugalBuild @@ -2,16 +2,16 @@ # Maintainer: CSÉCSY László <boo...@frugalware.org> pkgname=lilypond -pkgver=2.10.33 -pkgrel=3 +pkgver=2.12.1 +pkgrel=1 pkgdesc="music notation for everyone" url="http://lilypond.org/web/"; 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') +makedepends=('netpbm' 'imagemagick' 'rsync' 'zip') 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 strict-gcc.patch) +source=(http://download.linuxaudio.org/lilypond/sources/v2.12/$pkgname-$pkgver.tar.gz) options=('scriptlet') docpkg=lilypond-doc @@ -33,6 +33,4 @@ build() } # optimization OK -sha1sums=('22717aa67723067f43208e7e771d6909f8db045f'\ - 'da35df783510eb8ee06cff9da77f3faad6a2b101'\ - '7af1558a50136f56eae532c278004f70d056670f') +sha1sums=('203bead967f8409dbac00fd835d2a411694f408b') diff --git a/source/xapps-extra/lilypond/hack.patch b/source/xapps-extra/lilypond/hack.patch deleted file mode 100644 index 4a20b64..0000000 --- a/source/xapps-extra/lilypond/hack.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -Naur lilypond-2.10.11.orig/lily/font-config.cc lilypond-2.10.11/lily/font-config.cc ---- lilypond-2.10.11.orig/lily/font-config.cc 2006-11-12 00:14:44.000000000 +0100 -+++ lilypond-2.10.11/lily/font-config.cc 2007-01-14 20:50:46.000000000 +0100 -@@ -38,7 +38,7 @@ - /* - This is a terrible kludge, but there is apparently no way for - FontConfig to signal whether it needs to rescan directories. -- */ -+ - if (cache_file - && !is_file ((char const *)cache_file)) - message (_f ("Rebuilding FontConfig cache %s, this may take a while...", cache_file)); -@@ -67,12 +67,12 @@ - if (cache_file - && !is_file ((char*)cache_file)) - { -- /* inhibit future messages. */ -+ - FILE *f = fopen ((char*)cache_file, "w"); - if (f) - fclose (f); - } -- -+ */ - } - - #else diff --git a/source/xapps-extra/lilypond/strict-gcc.patch b/source/xapps-extra/lilypond/strict-gcc.patch deleted file mode 100644 index e0e0391..0000000 --- a/source/xapps-extra/lilypond/strict-gcc.patch +++ /dev/null @@ -1,67 +0,0 @@ -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 Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
