Fix building with new gcc and libzip. Bug #364747. Thanks to Billy Holmes <billy@gonoph.net>

Package-Manager: portage-2.2.0_alpha55/cvs/Linux x86_64

4 files changed, 53 insertions, 13 deletions

diff --git a/sys-fs/fuse-zip/ChangeLog b/sys-fs/fuse-zip/ChangeLog
index fb0f5bfa15c2..63126d7b017c 100644
--- a/sys-fs/fuse-zip/ChangeLog
+++ b/sys-fs/fuse-zip/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-fs/fuse-zip
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/fuse-zip/ChangeLog,v 1.4 2010/12/07 18:39:30 hwoarang Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/fuse-zip/ChangeLog,v 1.5 2011/10/19 20:05:18 hwoarang Exp $
+
+  19 Oct 2011; Markos Chandras <hwoarang@gentoo.org> fuse-zip-0.2.13.ebuild,
+  +files/libzip-fix-0.10.patch:
+  Fix building with new gcc and libzip. Bug #364747. Thanks to Billy Holmes
+  <billy@gonoph.net>
 
   07 Dec 2010; Markos Chandras <hwoarang@gentoo.org> fuse-zip-0.2.13.ebuild:
   Fix parallel build warnings. Thanks to Diego Elio Pettenò
diff --git a/sys-fs/fuse-zip/Manifest b/sys-fs/fuse-zip/Manifest
index 33c8fc69ef18..e54a54afe111 100644
--- a/sys-fs/fuse-zip/Manifest
+++ b/sys-fs/fuse-zip/Manifest
@@ -1,19 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX fuse-zip-0.2.13-as-needed.patch 459 RMD160 0367fc01fccb3e9f7cc92017224e065660cab1fe SHA1 a9401541535be0e61ee1cd444748faf29e9f5d59 SHA256 3852996160eb2248337126502843e4026ad7c739138971e04c31eaf9ac18667c
+AUX libzip-fix-0.10.patch 1263 RMD160 9bcf28862286eebf23c8baebfb0c148ff0e8c670 SHA1 d2b8f4ecfe99bdbe4b1f52b6730d36eea348fbfc SHA256 9d60fbc0af90c46fbe18ec3a09775c99625b8cbae3b8266e11efc7ab0c4ed3f6
 DIST fuse-zip-0.2.12.tar.gz 181246 RMD160 19ba72e585c6b123a77bbc8ea57daeb5adb8e4c7 SHA1 fe6f1a32d7fbc0d8c8598b8c7f56129fe5ebc173 SHA256 c77b4e461dfe83acdb3d8cfbc6fe456592314756d20061864f51a389dfcc2c69
 DIST fuse-zip-0.2.13.tar.gz 185431 RMD160 5a1dae0bc4387b2975ca27109f9b3dd8b1b34dee SHA1 9cfa00e38a59d4e06fd47bfaca75ad5e299ecc6b SHA256 e41c0746e3419db8f519fad7e819ef72ddb48ffca2de52773f038016aacd9804
 EBUILD fuse-zip-0.2.12.ebuild 804 RMD160 b251d2a7aa2062a118eef6b0de14b2857fc67030 SHA1 ea43e86af257c757d09c10ddd7aecc78e215dc47 SHA256 a55f8a204d801d642f1504d3ac0efd43069a0318385479ada5e3ace427f15a3b
-EBUILD fuse-zip-0.2.13.ebuild 1060 RMD160 d1c6dcd9573a957ddb4bcf39eb5c9d8f93424b6d SHA1 b4d8b330d1a8af5fa1811c2534b9e5d9ebebba2e SHA256 b8c121f86747825a54bd8642aa6b9e64baa78ba30d93aeb156002e1ee9839fcc
-MISC ChangeLog 1213 RMD160 3643a195e25cf07a3fff124eff7ec549d0856df6 SHA1 e5b825ec855dd9c26850d4efdf26c4e02ab8ff09 SHA256 7cd9426460a58f3597e9de11d6dde17cf184fa7bf14facfb86444292a28bd626
+EBUILD fuse-zip-0.2.13.ebuild 1138 RMD160 a1f5cdcc889f4fae8bac6936fb9103047c83e123 SHA1 1dd3d9c653df2f20e1e5fd691ab42db58061bf31 SHA256 e9ad5cb602cae989630c5e0a0f31b50d88e26225ee6b89ec8ff9b7f27317e312
+MISC ChangeLog 1420 RMD160 558b3dade96bcaa14015f924a61d95cf47642fe2 SHA1 2175b24cd6256cf178886d970ccf434322e68fa6 SHA256 4207d2bba9946479bc762d9ebe2940ba23770a362967a9d172e3c0810d6a800d
 MISC metadata.xml 278 RMD160 85ae612f4b725d8857a7fe0808090691c0e58fbd SHA1 c97840692a46e7d54f22bfcfd0a564a8d08033dd SHA256 07a0afc4dfc12865b213ef6815169e0524357989b213ac40bc9436dea94c3160
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iJwEAQEIAAYFAk59s3YACgkQfXuS5UK5QB2TiAP6AqfLAiuhvGZc6aZfOlAi1f+D
-HENRgFHgWFGGhaPpQBeGNueViaM/IvBFZxnU2xPuq6v/i7esCi7CRzK1ZndQPwpx
-kRWiS5svsvh1x1L1rqxGabBj+udYBVw2ylqazc2OGGLH2SH4D3Lam1xrLFtGC2GD
-GtQl2DhcsrKhZZztgXI=
-=DZyu
+iQIcBAEBCgAGBQJOny1BAAoJEPqDWhW0r/LCTnQP/R+ua6dZcb1yh0EvPdZ+12ZP
+RhUw7xChdLr95leayJddOjlf32P92ISlYfpUT9JmIszBDd4EDBEaYDJlQpemlQko
+aJAe+dkg9T/O8k5uIo0wrZt9wCURy29zlvi60rHVR2q6reO4Jm/bPUBbUFFcTJmH
+0rXNdEPuzmTZ0r2981PTIPu5C5IBSwlhMPUm20CizTixg6mv4exP76tBcrCTzlYF
+UP5kMPf90QdifombWx2RCxz9AirTvRhS6vTXsXwla4wOSbtybjRCw/iat+Djdk5B
+zDyXxNpL8tanLwxQpcoLtVxTF97iWbz3c0C8aqdOVwzLrQisFSVUk1w3PYZCrJJr
+fsZvGpZ2Gj1qbLpdSrYv4qQ0o+uKNS750RXaI4fecblYfj/96+ql467V7Z65djuj
+J0k9pi8pYsxF+pdqtjBKB0mafiPbETU0Zg6FlHPSuBwrqmzZ/Fn661d8eVm7LhIN
+UdS+C/Pgnj4TdqF7qxMZaWu39WmFdnwHIxesdij30o2KeUzn5EcWr7luc4nEcHnO
+Zx2euYWHlbltDpJx6u1SjTQozOiZk49ybRWXGMOMm2I6MMml4WATKQjalpML06lv
+Pt1Y9xkRqxPNfk0emtVku/+mpQo3QQQlLjWimiJgrKkhmJ17EnPJv0bcVJQOxNe5
+wQ4URlyubTxLppOMHPg8
+=IA1P
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/fuse-zip/files/libzip-fix-0.10.patch b/sys-fs/fuse-zip/files/libzip-fix-0.10.patch
new file mode 100644
index 000000000000..f2348e5f1bab
--- /dev/null
+++ b/sys-fs/fuse-zip/files/libzip-fix-0.10.patch
@@ -0,0 +1,24 @@
+diff -ru fuse-zip-0.2.13/lib/bigBuffer.cpp fuse-zip-0.2.13.new//lib/bigBuffer.cpp
+--- fuse-zip-0.2.13/lib/bigBuffer.cpp	2010-12-06 12:34:32.000000000 -0500
++++ fuse-zip-0.2.13.new//lib/bigBuffer.cpp	2011-09-28 21:40:01.294946957 -0400
+@@ -236,7 +236,7 @@
+     len = offset;
+ }
+ 
+-ssize_t BigBuffer::zipUserFunctionCallback(void *state, void *data, size_t len, enum zip_source_cmd cmd) {
++zip_int64_t BigBuffer::zipUserFunctionCallback(void *state, void *data, zip_uint64_t len, enum zip_source_cmd cmd) {
+     CallBackStruct *b = (CallBackStruct*)state;
+     switch (cmd) {
+         case ZIP_SOURCE_OPEN: {
+diff -ru fuse-zip-0.2.13/lib/bigBuffer.h fuse-zip-0.2.13.new//lib/bigBuffer.h
+--- fuse-zip-0.2.13/lib/bigBuffer.h	2010-12-06 12:34:32.000000000 -0500
++++ fuse-zip-0.2.13.new//lib/bigBuffer.h	2011-09-28 21:40:23.203719133 -0400
+@@ -52,7 +52,7 @@
+      * never called because read() always successfull.
+      * See zip_source_function(3) for details.
+      */
+-    static ssize_t zipUserFunctionCallback(void *state, void *data, size_t len, enum zip_source_cmd cmd);
++    static zip_int64_t zipUserFunctionCallback(void *state, void *data, zip_uint64_t len, enum zip_source_cmd cmd);
+ 
+     /**
+      * Return number of chunks needed to keep 'offset' bytes.
diff --git a/sys-fs/fuse-zip/fuse-zip-0.2.13.ebuild b/sys-fs/fuse-zip/fuse-zip-0.2.13.ebuild
index 1c272802ccc1..07ad3501b8a6 100644
--- a/sys-fs/fuse-zip/fuse-zip-0.2.13.ebuild
+++ b/sys-fs/fuse-zip/fuse-zip-0.2.13.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/fuse-zip/fuse-zip-0.2.13.ebuild,v 1.2 2010/12/07 18:39:30 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/fuse-zip/fuse-zip-0.2.13.ebuild,v 1.3 2011/10/19 20:05:18 hwoarang Exp $
 
 EAPI=2
 
@@ -24,8 +24,10 @@ RESTRICT="test"
 src_prepare() {
 	# Fix strip than installing fuse-zip
 	sed -i -e 's/install -m 755 -s/install -m 755/' Makefile || die "sed failed"
-	# ix broken makefile
+	# fix broken makefile
 	epatch "${FILESDIR}"/"${P}"-as-needed.patch
+	# fix building with libzip-0.10
+	epatch "${FILESDIR}"/libzip-fix-0.10.patch
 	#enable parallel build
 	sed -i -e "s:make :\$\(MAKE\) :" Makefile || die "sed failed"
 }