[arch-commits] Commit in musicbrainz/repos (3 files)

[Andrea Scarpino]

    Date: Saturday, April 18, 2009 @ 07:56:19
  Author: andrea
Revision: 35940

Merged revisions 356,35939 via svnmerge from 
svn+ssh://archlinux.org/srv/svn-packages/musicbrainz/trunk

........
  r356 | aaron | 2008-04-19 00:56:27 +0200 (Sat, 19 Apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........
  r35939 | andrea | 2009-04-18 13:55:55 +0200 (Sat, 18 Apr 2009) | 1 line
  
  upgpkg: musicbrainz 2.1.5-2
........

Added:
  musicbrainz/repos/extra-i686/gcc4.3.patch
    (from rev 35939, musicbrainz/trunk/gcc4.3.patch)
Modified:
  musicbrainz/repos/extra-i686/	(properties)
  musicbrainz/repos/extra-i686/PKGBUILD

--------------+
 PKGBUILD     |   17 ++++++++++-------
 gcc4.3.patch |   57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 67 insertions(+), 7 deletions(-)


Property changes on: musicbrainz/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /musicbrainz/trunk:1
   + /musicbrainz/trunk:1-35939

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-04-18 11:55:55 UTC (rev 35939)
+++ extra-i686/PKGBUILD	2009-04-18 11:56:19 UTC (rev 35940)
@@ -6,23 +6,26 @@
 
 pkgname=musicbrainz
 pkgver=2.1.5
-pkgrel=1
-pkgdesc="MusicBrainz is the second generation incarnation of the CD Index"
+pkgrel=2
+pkgdesc="The second generation incarnation of the CD Index"
 arch=(i686 x86_64)
 license=('LGPL')
 depends=('gcc' 'expat>=2.0')
-makedepends=('python>=2.5')
+makedepends=('python')
 options=('!libtool')
-source=(ftp://ftp.musicbrainz.org/pub/musicbrainz/libmusicbrainz-${pkgver}.tar.gz)
+source=(ftp://ftp.musicbrainz.org/pub/$pkgname/libmusicbrainz-${pkgver}.tar.gz
+	'gcc4.3.patch')
 url="http://www.musicbrainz.org/index.html"
 
 build() {
-  cd ${startdir}/src/lib${pkgname}-${pkgver}
+  cd ${srcdir}/lib${pkgname}-${pkgver}
+
+  patch -p1 -i ${srcdir}/gcc4.3.patch
   ./configure --prefix=/usr
   make || return 1
-  make DESTDIR=${startdir}/pkg install
+  make DESTDIR=${pkgdir} install
 
   cd python
-  python setup.py install --root=${startdir}/pkg
+  python setup.py install --root=${pkgdir} || return 1
 }
 md5sums=('d5e19bb77edd6ea798ce206bd05ccc5f')

Copied: musicbrainz/repos/extra-i686/gcc4.3.patch (from rev 35939, musicbrainz/trunk/gcc4.3.patch)
===================================================================
--- extra-i686/gcc4.3.patch	                        (rev 0)
+++ extra-i686/gcc4.3.patch	2009-04-18 11:56:19 UTC (rev 35940)
@@ -0,0 +1,57 @@
+diff -Naur libmusicbrainz-2.1.4-orig/lib/c_wrapper.cpp libmusicbrainz-2.1.4/lib/c_wrapper.cpp
+--- libmusicbrainz-2.1.4-orig/lib/c_wrapper.cpp	2003-10-16 16:21:10.000000000 -0600
++++ libmusicbrainz-2.1.4/lib/c_wrapper.cpp	2007-12-16 09:45:21.000000000 -0600
+@@ -24,6 +24,7 @@
+ #include "musicbrainz.h"
+ #include "trm.h"
+ #include "mb_c.h"
++#include <cstring>
+ 
+ extern "C"
+ {
+diff -Naur libmusicbrainz-2.1.4-orig/lib/comhttpsocket.cpp libmusicbrainz-2.1.4/lib/comhttpsocket.cpp
+--- libmusicbrainz-2.1.4-orig/lib/comhttpsocket.cpp	2006-05-11 12:46:54.000000000 -0600
++++ libmusicbrainz-2.1.4/lib/comhttpsocket.cpp	2007-12-16 09:46:28.000000000 -0600
+@@ -20,6 +20,7 @@
+ #endif
+ #include <stdlib.h>
+ #include <assert.h>
++#include <cstring>
+ 
+ const char* g_strCOMVer = "libmusicbrainz/"VERSION;
+ 
+diff -Naur libmusicbrainz-2.1.4-orig/lib/comsocket.cpp libmusicbrainz-2.1.4/lib/comsocket.cpp
+--- libmusicbrainz-2.1.4-orig/lib/comsocket.cpp	2006-05-11 12:46:54.000000000 -0600
++++ libmusicbrainz-2.1.4/lib/comsocket.cpp	2007-12-16 09:46:08.000000000 -0600
+@@ -37,6 +37,7 @@
+ #include <netinet/tcp.h>
+ #include <errno.h>
+ #include <stdio.h>
++#include <cstring>
+ #include <sys/time.h>
+ #include <sys/types.h>
+ #include <unistd.h>
+diff -Naur libmusicbrainz-2.1.4-orig/lib/http.cpp libmusicbrainz-2.1.4/lib/http.cpp
+--- libmusicbrainz-2.1.4-orig/lib/http.cpp	2007-12-16 09:52:48.000000000 -0600
++++ libmusicbrainz-2.1.4/lib/http.cpp	2007-12-16 09:52:36.000000000 -0600
+@@ -31,6 +31,8 @@
+ #endif
+ #include <fcntl.h>    
+ #include <errno.h>    
++#include <cstring>
++#include <cstdlib>
+ 
+ #ifdef WIN32
+ #include <winsock.h>
+diff -Naur libmusicbrainz-2.1.4-orig/lib/sigclient.cpp libmusicbrainz-2.1.4/lib/sigclient.cpp
+--- libmusicbrainz-2.1.4-orig/lib/sigclient.cpp	2006-05-11 12:46:54.000000000 -0600
++++ libmusicbrainz-2.1.4/lib/sigclient.cpp	2007-12-16 09:54:48.000000000 -0600
+@@ -33,6 +33,8 @@
+ #pragma warning(disable:4786)
+ #endif
+ 
++#include <cstring>
++
+ #include "sigclient.h"
+ #include "comhttpsocket.h"
+