[arch-commits] Commit in libofa/trunk (4 files)

[Andrea Scarpino]

    Date: Wednesday, May 19, 2010 @ 12:11:07
  Author: andrea
Revision: 80563

gcc 4.5 fix (FS#19524)

Added:
  libofa/trunk/gcc4.3.patch
  libofa/trunk/gcc4.5.patch
Modified:
  libofa/trunk/PKGBUILD
Deleted:
  libofa/trunk/libofa-0.9.3-gcc-4.3.patch

----------------------------+
 PKGBUILD                   |   26 +++++++++++++++++++-------
 gcc4.3.patch               |   35 +++++++++++++++++++++++++++++++++++
 gcc4.5.patch               |   10 ++++++++++
 libofa-0.9.3-gcc-4.3.patch |   35 -----------------------------------
 4 files changed, 64 insertions(+), 42 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-05-19 16:00:32 UTC (rev 80562)
+++ PKGBUILD	2010-05-19 16:11:07 UTC (rev 80563)
@@ -1,5 +1,7 @@
 # $Id$
-# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Tobias Powalowski <tpowa at archlinux.org>
+
 pkgname=libofa
 pkgver=0.9.3
 pkgrel=2
@@ -10,17 +12,27 @@
 depends=('expat' 'curl' 'fftw' 'gcc-libs')
 makedepends=('pkgconfig')
 options=('!libtool')
-source=(http://www.musicip.com/dns/files/$pkgname-$pkgver.tar.gz
-	gcc-4.patch libofa-0.9.3-gcc-4.3.patch)
-md5sums=('51507d2c4b432bd2755f48d58471696e' 'a6f78b90bd0f4354d022a71c3e58ef6c'\
-         'dd57db13770b8f8d196e8a3d3a50e713')
+source=("http://musicip-libofa.googlecode.com/files/$pkgname-$pkgver.tar.gz"
+	'gcc-4.patch'
+	'gcc4.3.patch'
+	'gcc4.5.patch')
+sha1sums=('3dec8e1dcea937f74b4165e9ffd4d4f355e4594a'
+          'cb19377d0634c03d2a49cfc61915cec918c341f7'
+          'cae08bdc12de923d5e032696702a0530ae6eafc1'
+	  '754d69d66ab46219035ccafeeb3ff62433cca4f2')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  patch -Np0 -i ../gcc-4.patch || return 1
-  patch -Np1 -i ../libofa-0.9.3-gcc-4.3.patch || return 1
+  patch -Np0 -i ${srcdir}/gcc-4.patch || return 1
+  patch -Np1 -i ${srcdir}/gcc4.3.patch || return 1
+  patch -Np1 -i ${srcdir}/gcc4.5.patch || return 1
   ./configure --prefix=/usr || return 1
   make || return 1
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
   make DESTDIR=${pkgdir} install || return 1
+
   install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
 }

Added: gcc4.3.patch
===================================================================
--- gcc4.3.patch	                        (rev 0)
+++ gcc4.3.patch	2010-05-19 16:11:07 UTC (rev 80563)
@@ -0,0 +1,35 @@
+diff -ur libofa-0.9.3.orig/examples/example.cpp libofa-0.9.3/examples/example.cpp
+--- libofa-0.9.3.orig/examples/example.cpp	2006-05-10 21:05:37.000000000 +0300
++++ libofa-0.9.3/examples/example.cpp	2008-04-16 15:51:49.000000000 +0300
+@@ -9,6 +9,8 @@
+ 
+ #include "protocol.h"
+ 
++#include <string.h>
++ 
+ AudioData* loadWaveFile(char *file);
+ AudioData* loadDataUsingLAME(char *file);
+ 
+Vain hakemistossa libofa-0.9.3/examples: example.cpp.orig
+diff -ur libofa-0.9.3.orig/examples/protocol.cpp libofa-0.9.3/examples/protocol.cpp
+--- libofa-0.9.3.orig/examples/protocol.cpp	2006-05-10 21:05:42.000000000 +0300
++++ libofa-0.9.3/examples/protocol.cpp	2008-04-16 15:51:49.000000000 +0300
+@@ -8,6 +8,7 @@
+ -------------------------------------------------------------------*/
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <cstring>
+ #include <string>
+ #include <map>
+ #include <expat.h>
+diff -ur libofa-0.9.3.orig/lib/signal_op.cpp libofa-0.9.3/lib/signal_op.cpp
+--- libofa-0.9.3.orig/lib/signal_op.cpp	2006-05-10 21:01:12.000000000 +0300
++++ libofa-0.9.3/lib/signal_op.cpp	2008-04-16 15:51:49.000000000 +0300
+@@ -12,6 +12,7 @@
+ // DATE CREATED: 1/12/06
+ 
+ 
++#include <cstdlib>
+ #include <math.h>
+ #include "signal_op.h"
+ #include "AFLIB/aflibConverter.h"

Added: gcc4.5.patch
===================================================================
--- gcc4.5.patch	                        (rev 0)
+++ gcc4.5.patch	2010-05-19 16:11:07 UTC (rev 80563)
@@ -0,0 +1,10 @@
+--- libofa-0.9.3/examples/example.cpp~	2010-05-19 18:07:19.517650317 +0200
++++ libofa-0.9.3/examples/example.cpp	2010-05-19 18:07:31.754317472 +0200
+@@ -6,6 +6,7 @@
+    No rights reserved.
+ 
+ -------------------------------------------------------------------*/
++#include <cstdio>
+ 
+ #include "protocol.h"
+ 

Deleted: libofa-0.9.3-gcc-4.3.patch
===================================================================
--- libofa-0.9.3-gcc-4.3.patch	2010-05-19 16:00:32 UTC (rev 80562)
+++ libofa-0.9.3-gcc-4.3.patch	2010-05-19 16:11:07 UTC (rev 80563)
@@ -1,35 +0,0 @@
-diff -ur libofa-0.9.3.orig/examples/example.cpp libofa-0.9.3/examples/example.cpp
---- libofa-0.9.3.orig/examples/example.cpp	2006-05-10 21:05:37.000000000 +0300
-+++ libofa-0.9.3/examples/example.cpp	2008-04-16 15:51:49.000000000 +0300
-@@ -9,6 +9,8 @@
- 
- #include "protocol.h"
- 
-+#include <string.h>
-+ 
- AudioData* loadWaveFile(char *file);
- AudioData* loadDataUsingLAME(char *file);
- 
-Vain hakemistossa libofa-0.9.3/examples: example.cpp.orig
-diff -ur libofa-0.9.3.orig/examples/protocol.cpp libofa-0.9.3/examples/protocol.cpp
---- libofa-0.9.3.orig/examples/protocol.cpp	2006-05-10 21:05:42.000000000 +0300
-+++ libofa-0.9.3/examples/protocol.cpp	2008-04-16 15:51:49.000000000 +0300
-@@ -8,6 +8,7 @@
- -------------------------------------------------------------------*/
- #include <stdio.h>
- #include <stdlib.h>
-+#include <cstring>
- #include <string>
- #include <map>
- #include <expat.h>
-diff -ur libofa-0.9.3.orig/lib/signal_op.cpp libofa-0.9.3/lib/signal_op.cpp
---- libofa-0.9.3.orig/lib/signal_op.cpp	2006-05-10 21:01:12.000000000 +0300
-+++ libofa-0.9.3/lib/signal_op.cpp	2008-04-16 15:51:49.000000000 +0300
-@@ -12,6 +12,7 @@
- // DATE CREATED: 1/12/06
- 
- 
-+#include <cstdlib>
- #include <math.h>
- #include "signal_op.h"
- #include "AFLIB/aflibConverter.h"