-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Kurt Roeckx wrote:
> It's now failing to build on all 64 bit arches, and you really
> should have fixed this too when doing the C++ ABI transition as
> your changelog said. :)
I have created another NMU which I've uploaded to DELAYED/1-day. It
adds the gcc-4 patch to the debian/patches directory. NMU patch from
- -3.1 to -3.2 attached.
Cheers,
- -Mike
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
iD8DBQFC79y/7ZPKKRJLJvMRAmPHAJwK5P7BZV6WaNKe6EfF5tHRUbzTkACfcHTP
RXANNQjQW1UjWBO/kQ6L1R8=
=TaNI
-----END PGP SIGNATURE-----
diff -urN libmusicbrainz-2.1-2.1.1.orig/debian/changelog libmusicbrainz-2.1-2.1.1/debian/changelog
--- libmusicbrainz-2.1-2.1.1.orig/debian/changelog 2005-08-02 16:37:01.704702264 -0400
+++ libmusicbrainz-2.1-2.1.1/debian/changelog 2005-08-02 16:35:28.728975257 -0400
@@ -1,3 +1,10 @@
+libmusicbrainz-2.1 (2.1.1-3.2) unstable; urgency=low
+
+ * Non-maintainer upload
+ * Really apply 64-bit pointer patch (Closes: #316584)
+
+ -- Mike Furr <[EMAIL PROTECTED]> Tue, 2 Aug 2005 16:28:17 -0400
+
libmusicbrainz-2.1 (2.1.1-3.1) unstable; urgency=low
* Non-maintainer upload
diff -urN libmusicbrainz-2.1-2.1.1.orig/debian/patches/02-gcc4.patch libmusicbrainz-2.1-2.1.1/debian/patches/02-gcc4.patch
--- libmusicbrainz-2.1-2.1.1.orig/debian/patches/02-gcc4.patch 1969-12-31 19:00:00.000000000 -0500
+++ libmusicbrainz-2.1-2.1.1/debian/patches/02-gcc4.patch 2005-08-02 16:36:44.238007761 -0400
@@ -0,0 +1,11 @@
+--- lib/comhttpsocket.cpp.orig 2005-08-02 16:36:15.474804479 -0400
++++ lib/comhttpsocket.cpp 2005-08-02 16:36:27.830173559 -0400
+@@ -194,7 +194,7 @@
+ // advance to the data now, if there is any in this first buffer.
+ char* pData = strstr(HeaderBuffer, "\r\n\r\n");
+ if (pData) pData += 4;
+- int nOffset = (int)pData - (int)HeaderBuffer;
++ int nOffset = (long)pData - (long)HeaderBuffer;
+ if (nTotal - nOffset >= nLen) // case 1: entire requested read is in header chunk
+ {
+ memcpy(pBuffer, pData, nLen);
