[arch-commits] Commit in muse/repos (3 files)
Eric Belanger
eric at archlinux.org
Thu Aug 21 03:06:15 UTC 2008
Date: Wednesday, August 20, 2008 @ 23:06:15
Author: eric
Revision: 9960
Merged revisions 8876-9959 via svnmerge from
svn+ssh://svn.archlinux.org/home/svn-packages/muse/trunk
........
r9959 | eric | 2008-08-20 23:05:54 -0400 (Wed, 20 Aug 2008) | 1 line
fixed build problem for gcc 4.3
........
Added:
muse/repos/extra-i686/gcc43_build_fixes.patch
(from rev 9959, muse/trunk/gcc43_build_fixes.patch)
Modified:
muse/repos/extra-i686/ (properties)
muse/repos/extra-i686/PKGBUILD
-------------------------+
PKGBUILD | 7 ++
gcc43_build_fixes.patch | 108 ++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 113 insertions(+), 2 deletions(-)
Property changes on: muse/repos/extra-i686
___________________________________________________________________
Name: svnmerge-integrated
- /muse/trunk:1-8875
+ /muse/trunk:1-9959
Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2008-08-21 03:05:54 UTC (rev 9959)
+++ extra-i686/PKGBUILD 2008-08-21 03:06:15 UTC (rev 9960)
@@ -9,13 +9,16 @@
url="http://muse-sequencer.org/"
depends=('jack-audio-connection-kit' 'gcc' 'qt3' 'glibc' 'libcap' 'fluidsynth' 'jade' 'graphviz' 'libsamplerate')
options=('!libtool')
-source=(http://switch.dl.sourceforge.net/sourceforge/lmuse/$pkgname-$pkgver.tar.gz)# vst.cpp.diff)
-md5sums=('6611cf62de9c405a0cb15af9bada1154')
+source=(http://downloads.sourceforge.net/sourceforge/lmuse/$pkgname-$pkgver.tar.gz gcc43_build_fixes.patch) # vst.cpp.diff)
+md5sums=('6611cf62de9c405a0cb15af9bada1154' '2188bcd64781e51256645837f86a3330')
build() {
cd $startdir/src/$pkgname-$pkgver
. /etc/profile.d/qt3.sh
# patch muse/vst.cpp < ../../vst.cpp.diff
+ # patch taken from Debian : fixes for gcc 4.3
+ patch -Np1 -i ../gcc43_build_fixes.patch || return 1
+
./configure --prefix=/usr --enable-maintainer-mode \
--disable-doxy-treeview \
--enable-optimize \
Copied: muse/repos/extra-i686/gcc43_build_fixes.patch (from rev 9959, muse/trunk/gcc43_build_fixes.patch)
===================================================================
--- extra-i686/gcc43_build_fixes.patch (rev 0)
+++ extra-i686/gcc43_build_fixes.patch 2008-08-21 03:06:15 UTC (rev 9960)
@@ -0,0 +1,108 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10_gcc43_build_fixes.dpatch by Daniel Kobras <kobras at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Add various includes to account for cleanup in g++ 4.3 standard
+## DP: headers. Extended version of original patch by Martin Michlmayr.
+
+ at DPATCH@
+diff -urNad muse~/muse/ctrl.cpp muse/muse/ctrl.cpp
+--- muse~/muse/ctrl.cpp 2003-11-28 22:19:07.000000000 +0100
++++ muse/muse/ctrl.cpp 2008-03-09 14:46:01.000000000 +0100
+@@ -9,6 +9,7 @@
+ //=========================================================
+
+
++#include <cstdlib>
+ #include "globals.h"
+ #include "ctrl.h"
+ #include "xml.h"
+diff -urNad muse~/muse/evdata.h muse/muse/evdata.h
+--- muse~/muse/evdata.h 2003-10-31 18:55:16.000000000 +0100
++++ muse/muse/evdata.h 2008-03-09 14:46:22.000000000 +0100
+@@ -9,6 +9,7 @@
+ #ifndef __EVDATA_H__
+ #define __EVDATA_H__
+
++#include <cstring>
+ #include <memory.h>
+
+ //---------------------------------------------------------
+diff -urNad muse~/muse/help.cpp muse/muse/help.cpp
+--- muse~/muse/help.cpp 2005-03-29 18:37:34.000000000 +0200
++++ muse/muse/help.cpp 2008-03-09 14:46:01.000000000 +0100
+@@ -6,6 +6,7 @@
+ // (C) Copyright 1999/2000 Werner Schweer (ws at seh.de)
+ //=========================================================
+
++#include <cstdlib>
+ #include <unistd.h>
+ #include <qmessagebox.h>
+ #include <qprocess.h>
+diff -urNad muse~/muse/memory.h muse/muse/memory.h
+--- muse~/muse/memory.h 2004-06-07 23:46:08.000000000 +0200
++++ muse/muse/memory.h 2008-03-09 14:46:01.000000000 +0100
+@@ -9,6 +9,7 @@
+ #ifndef __MEMORY_H__
+ #define __MEMORY_H__
+
++#include <cstdlib>
+ #include <stdio.h>
+ #include <map>
+
+diff -urNad muse~/muse/mixer/panknob.cpp muse/muse/mixer/panknob.cpp
+--- muse~/muse/mixer/panknob.cpp 2004-01-23 09:41:38.000000000 +0100
++++ muse/muse/mixer/panknob.cpp 2008-03-09 14:46:46.000000000 +0100
+@@ -6,6 +6,7 @@
+ // (C) Copyright 2000 Werner Schweer (ws at seh.de)
+ //=========================================================
+
++#include <cstring>
+ #include "../audio.h"
+ #include "panknob.h"
+
+diff -urNad muse~/muse/thread.cpp muse/muse/thread.cpp
+--- muse~/muse/thread.cpp 2005-11-07 19:45:19.000000000 +0100
++++ muse/muse/thread.cpp 2008-03-09 14:46:01.000000000 +0100
+@@ -8,6 +8,7 @@
+
+ #include "thread.h"
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <unistd.h>
+ #include <sys/mman.h>
+ #include <sys/poll.h>
+diff -urNad muse~/muse/widgets/poslabel.cpp muse/muse/widgets/poslabel.cpp
+--- muse~/muse/widgets/poslabel.cpp 2004-01-11 19:55:37.000000000 +0100
++++ muse/muse/widgets/poslabel.cpp 2008-03-09 14:46:01.000000000 +0100
+@@ -6,6 +6,7 @@
+ //=========================================================
+
+ #include <cmath>
++#include <cstdlib>
+ #include <qapplication.h>
+ #include <qstyle.h>
+
+diff -urNad muse~/synti/deicsonze/deicsonze.cpp muse/synti/deicsonze/deicsonze.cpp
+--- muse~/synti/deicsonze/deicsonze.cpp 2004-12-12 21:59:35.000000000 +0100
++++ muse/synti/deicsonze/deicsonze.cpp 2008-03-09 14:46:01.000000000 +0100
+@@ -27,6 +27,8 @@
+ // 02111-1307, USA or point your web browser to http://www.gnu.org.
+ //===========================================================================
+
++#include <cstdlib>
++#include <climits>
+ #include <cmath>
+ #include <list>
+
+diff -urNad muse~/synti/simpledrums/ssplugin.cpp muse/synti/simpledrums/ssplugin.cpp
+--- muse~/synti/simpledrums/ssplugin.cpp 2005-05-07 23:24:37.000000000 +0200
++++ muse/synti/simpledrums/ssplugin.cpp 2008-03-09 14:46:01.000000000 +0100
+@@ -10,6 +10,7 @@
+ //
+ //
+
++#include <cstdlib>
+ #include <dlfcn.h>
+ #include "ssplugin.h"
+ #include "common.h"
More information about the arch-commits
mailing list