[tse3-0.3.1-1-x86_64 crazy <[EMAIL PROTECTED]>**20060308132224 * Version bump ( with boobaa's permission ) * Fixed depends() | up2date() | build() * removed old patches in upsream now * add 2 new patches - gcc4.patch - tse3-0.3.1-x86_64-compile-error.patch ] { hunk ./extra/source/lib/tse3/FrugalBuild 1 -# Last Modified: Sun, 19 Feb 2006 17:35:21 +0100 +# Last Modified: Tue, 07 Mar 2006 17:57:12 +0100 hunk ./extra/source/lib/tse3/FrugalBuild 6 -pkgver=0.3.0 -pkgrel=4 +pkgver=0.3.1 +pkgrel=1 hunk ./extra/source/lib/tse3/FrugalBuild 10 -depends=('libstdc++' 'alsa-lib' 'arts') +depends=('libstdc++' 'alsa-lib' 'kdemultimedia>=3.5.1') hunk ./extra/source/lib/tse3/FrugalBuild 12 -archs=('i686') -up2date="lynx -dump http://tse3.sourceforge.net/ | grep release | head -n 1 | sed 's/.* \([0-9\.]\+\) .*/\1/'" -source=(http://dl.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz gcc.patch tse3-alsa-1_0.patch) -sha1sums=('2d96f24742197f8984cd644d4c47ea9eefce7dc1' \ - '3e6532907183673ccc454a857e7326927f1ffbbc' \ - '407158ec350b100dd1c308a0df447db5704b350b') +archs=('i686' 'x86_64') +up2date="lynx -dump http://sourceforge.net/project/showfiles.php?group_id=3700 | grep -m1 .tar.gz|sed 's/.*-\(.*\).tar.gz .*/\1/'" +source=(http://dl.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz gcc4.patch \ + $pkgname-$pkgver-x86_64-compile-error.patch) +sha1sums=('5232c5b1d293445cba2b3176f08a80e6df9d6454' \ + 'f733b20c16048d4e3a669f79c69b7630a373fe00' \ + 'd6c247b359ab1ef88c2ed8094d67bd405ee84020') hunk ./extra/source/lib/tse3/FrugalBuild 20 -build() { +build() +{ hunk ./extra/source/lib/tse3/FrugalBuild 23 - Fbuild --enable-static + Fpatch gcc4.patch + [ "$CARCH" == "x86_64" ] && Fpatch $pkgname-$pkgver-x86_64-compile-error.patch + Fmake --enable-static + Fmakeinstall hunk ./extra/source/lib/tse3/gcc.patch 1 -diff -Naur tse3-0.3.0/src/tse3/app/Application.h tse3-0.3.0-grr/src/tse3/app/Application.h ---- tse3-0.3.0/src/tse3/app/Application.h 2005-05-25 15:33:05.000000000 +0200 -+++ tse3-0.3.0-grr/src/tse3/app/Application.h 2006-02-19 12:48:56.000000000 +0100 -@@ -35,12 +35,12 @@ - namespace Cmd - { - class CommandHistory; -- }; -+ } - - namespace Ins - { - class Destination; -- }; -+ } - - /** - * The App namespace contains classes that use the @ref TSE3 -diff -Naur tse3-0.3.0/src/tse3/app/Record.h tse3-0.3.0-grr/src/tse3/app/Record.h ---- tse3-0.3.0/src/tse3/app/Record.h 2005-05-25 15:33:05.000000000 +0200 -+++ tse3-0.3.0-grr/src/tse3/app/Record.h 2006-02-19 12:48:56.000000000 +0100 -@@ -36,7 +36,7 @@ - namespace Cmd - { - class CommandHistory; -- }; -+ } - - namespace App - { -diff -Naur tse3-0.3.0/src/tse3/listen/Phrase.h tse3-0.3.0-grr/src/tse3/listen/Phrase.h ---- tse3-0.3.0/src/tse3/listen/Phrase.h 2005-05-25 15:33:10.000000000 +0200 -+++ tse3-0.3.0-grr/src/tse3/listen/Phrase.h 2006-02-19 12:48:56.000000000 +0100 -@@ -17,6 +17,8 @@ - #ifndef TSE3_LISTEN_PHRASE_H - #define TSE3_LISTEN_PHRASE_H - -+#include "tse3/listen/PhraseEdit.h" -+ - namespace TSE3 - { - class Phrase; -diff -Naur tse3-0.3.0/src/tse3/Midi.h tse3-0.3.0-grr/src/tse3/Midi.h ---- tse3-0.3.0/src/tse3/Midi.h 2005-05-25 15:33:11.000000000 +0200 -+++ tse3-0.3.0-grr/src/tse3/Midi.h 2006-02-19 12:48:56.000000000 +0100 -@@ -819,6 +819,6 @@ - const MidiEvent &e1; - }; - }; --}; -+} - - #endif -diff -Naur tse3-0.3.0/src/tse3/Mutex.h tse3-0.3.0-grr/src/tse3/Mutex.h ---- tse3-0.3.0/src/tse3/Mutex.h 2005-05-25 15:33:11.000000000 +0200 -+++ tse3-0.3.0-grr/src/tse3/Mutex.h 2006-02-19 12:48:56.000000000 +0100 -@@ -315,7 +315,7 @@ - #endif - } - }; -- }; -+ } - } - - #endif -diff -Naur tse3-0.3.0/src/tse3/Notifier.h tse3-0.3.0-grr/src/tse3/Notifier.h ---- tse3-0.3.0/src/tse3/Notifier.h 2005-05-25 15:33:11.000000000 +0200 -+++ tse3-0.3.0-grr/src/tse3/Notifier.h 2006-02-19 12:48:56.000000000 +0100 -@@ -290,7 +290,7 @@ - const p4_type &p4; // (*) - }; - -- }; -+ } - - /************************************************************************** - * Public Notifier framework API -@@ -367,7 +367,7 @@ - */ - typedef Listener<interface_type> listener_type; - -- friend class listener_type; -+ friend class Listener<interface_type>; - - protected: - -@@ -602,7 +602,7 @@ - if (notifiers.erase(notifier)) notifier->detach(this); - } - -- friend class notifier_type; -+ friend class Notifier<interface_type>; - - protected: - -diff -Naur tse3-0.3.0/src/tse3/plt/Arts.cpp tse3-0.3.0-grr/src/tse3/plt/Arts.cpp ---- tse3-0.3.0/src/tse3/plt/Arts.cpp 2005-05-25 15:33:10.000000000 +0200 -+++ tse3-0.3.0-grr/src/tse3/plt/Arts.cpp 2006-02-19 12:48:20.000000000 +0100 -@@ -70,11 +70,11 @@ - - alive = true; - } -- }; -+ }; - - ArtsCommon *artsCommon = 0; - int artsCommonInit = 0; --}; -+} - - - ArtsMidiScheduler::ArtsMidiScheduler() -diff -Naur tse3-0.3.0/src/tse3/util/MulDiv.h tse3-0.3.0-grr/src/tse3/util/MulDiv.h ---- tse3-0.3.0/src/tse3/util/MulDiv.h 2005-05-25 15:33:08.000000000 +0200 -+++ tse3-0.3.0-grr/src/tse3/util/MulDiv.h 2006-02-19 12:48:56.000000000 +0100 -@@ -34,7 +34,7 @@ - * @return val * num / div (which coped with integer overflows) - */ - extern int muldiv(int val, int num, int div); -- }; -+ } - } - - #endif rmfile ./extra/source/lib/tse3/gcc.patch addfile ./extra/source/lib/tse3/gcc4.patch hunk ./extra/source/lib/tse3/gcc4.patch 1 +diff -Naur tse3-0.3.1/src/tse3/cmd/Phrase.h tse3-0.3.1-patched/src/tse3/cmd/Phrase.h +--- tse3-0.3.1/src/tse3/cmd/Phrase.h 2005-07-25 13:22:38.000000000 +0200 ++++ tse3-0.3.1-patched/src/tse3/cmd/Phrase.h 2006-03-07 17:41:50.000000000 +0100 +@@ -29,6 +29,7 @@ + class Phrase; + class Song; + class Part; ++ class PhraseEdit; + + namespace Cmd + { addfile ./extra/source/lib/tse3/tse3-0.3.1-x86_64-compile-error.patch hunk ./extra/source/lib/tse3/tse3-0.3.1-x86_64-compile-error.patch 1 +diff -Naur tse3-0.3.1/src/tse3/file/XML.cpp tse3-0.3.1-patched/src/tse3/file/XML.cpp +--- tse3-0.3.1/src/tse3/file/XML.cpp 2005-08-23 14:32:53.000000000 +0200 ++++ tse3-0.3.1-patched/src/tse3/file/XML.cpp 2006-03-07 17:13:23.000000000 +0100 +@@ -117,6 +117,13 @@ + } + + ++void TSE3::File::XmlFileWriter::element(const std::string &name, unsigned long value) ++{ ++ indent(out); ++ out << "<" << name << " value=\"" << value << "\"/>\n"; ++} ++ ++ + void TSE3::File::XmlFileWriter::element(const std::string &name, bool value) + { + indent(out); +diff -Naur tse3-0.3.1/src/tse3/file/XML.h tse3-0.3.1-patched/src/tse3/file/XML.h +--- tse3-0.3.1/src/tse3/file/XML.h 2005-08-23 14:37:53.000000000 +0200 ++++ tse3-0.3.1-patched/src/tse3/file/XML.h 2006-03-07 17:13:23.000000000 +0100 +@@ -154,6 +154,7 @@ + void element(const std::string &name, const char *value); + void element(const std::string &name, int value); + void element(const std::string &name, unsigned int value); ++ void element(const std::string &name, unsigned long value); + void element(const std::string &name, bool value); + + void comment(const std::string &comment); hunk ./extra/source/lib/tse3/tse3-alsa-1_0.patch 1 -diff -Naur tse3-0.3.0-orig/configure tse3-0.3.0/configure ---- tse3-0.3.0-orig/configure 2005-05-25 15:37:20.000000000 +0200 -+++ tse3-0.3.0/configure 2005-10-23 11:22:15.000000000 +0200 -@@ -19857,7 +19857,7 @@ - /* end confdefs.h. */ - - #include <$alsa_header_prefix/asoundlib.h> --int main() { return SND_LIB_MINOR != 5 && SND_LIB_MINOR != 9; } -+int main() { return SND_LIB_MINOR != 5 && SND_LIB_MINOR != 9 && SND_LIB_MINOR != 0; } - - _ACEOF - rm -f conftest$ac_exeext -@@ -19965,6 +19965,13 @@ - _ACEOF - - fi -+ if test "$alsa_version" = "1.0"; then -+ -+cat >>confdefs.h <<\_ACEOF -+#define TSE3_WITH_ALSA_1_0_X 1 -+_ACEOF -+ -+ fi - fi - - LDFLAGS="$ac_ldflags_save" rmfile ./extra/source/lib/tse3/tse3-alsa-1_0.patch } _______________________________________________ Frugalware-darcs mailing list Frugalware-darcs@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-darcs