[arch-commits] Commit in muse/trunk (4 files)
Eric Bélanger
eric at archlinux.org
Fri Sep 25 06:16:35 UTC 2009
Date: Friday, September 25, 2009 @ 02:16:35
Author: eric
Revision: 53030
upgpkg: muse 1.0rc3-1
Upstream update, Fixed glibc 2.10 crash (close FS#15466), Shortened description, Cleaned up depends, Added .install file to update icon cache
Added:
muse/trunk/muse-glibc2.10.patch
muse/trunk/muse.install
Modified:
muse/trunk/PKGBUILD
Deleted:
muse/trunk/gcc43_build_fixes.patch
-------------------------+
PKGBUILD | 23 +++++----
gcc43_build_fixes.patch | 108 ----------------------------------------------
muse-glibc2.10.patch | 27 +++++++++++
muse.install | 11 ++++
4 files changed, 51 insertions(+), 118 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2009-09-25 05:55:07 UTC (rev 53029)
+++ PKGBUILD 2009-09-25 06:16:35 UTC (rev 53030)
@@ -2,27 +2,30 @@
# Maintainer: damir <damir at archlinux.org>
pkgname=muse
-pkgver=0.9
-pkgrel=3
-pkgdesc="MusE is a MIDI/Audio sequencer with recording and editing capabilities. MusE aims to be a complete multitrack virtual studio for Linux."
-arch=(i686 x86_64)
+pkgver=1.0rc3
+pkgrel=1
+pkgdesc="A MIDI/Audio sequencer with recording and editing capabilities"
+arch=('i686' 'x86_64')
url="http://muse-sequencer.org/"
license=('GPL')
-depends=('jack-audio-connection-kit' 'gcc-libs' 'qt3' 'glibc' 'fluidsynth' 'graphviz' 'libsamplerate')
+depends=('qt3' 'fluidsynth' 'graphviz' 'libsamplerate')
makedepends=('jade')
options=('!libtool')
-source=(http://downloads.sourceforge.net/sourceforge/lmuse/$pkgname-$pkgver.tar.gz gcc43_build_fixes.patch)
-md5sums=('04fbefa4a5eba62cb72d6d7035a0601b' '2188bcd64781e51256645837f86a3330')
+install=muse.install
+source=(http://downloads.sourceforge.net/sourceforge/lmuse/$pkgname-$pkgver.tar.gz muse-glibc2.10.patch)
+md5sums=('533a638539a85318034a2764740d11d9' '91ca69e979c9fe0a3c43eae21b996a74')
+sha1sums=('5e1e162d2ba5b73cc9c2d20ee3eb543fa72f783c' '5ab945077f17e485101e91aabe9303c69509c483')
build() {
- cd $srcdir/$pkgname-$pkgver
+ cd "$srcdir/$pkgname-$pkgver"
. /etc/profile.d/qt3.sh
- patch -Np1 -i ../gcc43_build_fixes.patch || return 1
+ unset LDFLAGS
+ (cd muse ; patch -p0 < ../../muse-glibc2.10.patch) || return 1
./configure --prefix=/usr --enable-maintainer-mode \
--disable-doxy-treeview \
--enable-optimize \
--enable-vst \
--disable-suid-build || return 1
make || return 1
- make prefix=$pkgdir/usr install || return 1
+ make DESTDIR="$pkgdir" install || return 1
}
Deleted: gcc43_build_fixes.patch
===================================================================
--- gcc43_build_fixes.patch 2009-09-25 05:55:07 UTC (rev 53029)
+++ gcc43_build_fixes.patch 2009-09-25 06:16:35 UTC (rev 53030)
@@ -1,108 +0,0 @@
-#! /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"
Added: muse-glibc2.10.patch
===================================================================
--- muse-glibc2.10.patch (rev 0)
+++ muse-glibc2.10.patch 2009-09-25 06:16:35 UTC (rev 53030)
@@ -0,0 +1,27 @@
+--- memory.cpp 2003/10/27 18:51:22 1.1.1.1
++++ memory.cpp 2009/07/15 21:49:27 1.1.1.1.2.1
+@@ -1,7 +1,7 @@
+ //=========================================================
+ // MusE
+ // Linux Music Editor
+-// $Id: memory.cpp,v 1.1.1.1 2003/10/27 18:51:22 wschweer Exp $
++// $Id: memory.cpp,v 1.1.1.1.2.1 2009/07/15 21:49:27 spamatica Exp $
+ //
+ // (C) Copyright 2003 Werner Schweer (ws at seh.de)
+ //=========================================================
+@@ -48,7 +48,14 @@
+ {
+ // printf("grow memory idx %d\n", idx);
+
+- int esize = (idx+1) * sizeof(int);
++// int esize = (idx+1) * sizeof(int);
++ int esize = (idx+1) * sizeof(int)+2;
++ // (rj) changed to +2 due to bug 2819312
++ // "1.0rc3 malloc problem w/glibc-2.10 on x86_64 (with fix)"
++ // the change apparently allows muse to launch with this
++ // configuration. It is however uncertain that this is the right fix.
++ // Probably it means that nelem will not become bigger than
++ // the allowed number of elements
+
+ Chunk* n = new Chunk;
+ n->next = chunks[idx];
Added: muse.install
===================================================================
--- muse.install (rev 0)
+++ muse.install 2009-09-25 06:16:35 UTC (rev 53030)
@@ -0,0 +1,11 @@
+post_install() {
+ gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
More information about the arch-commits
mailing list