fix 409255 - patch for now until upstream direction is clear

Package-Manager: portage-2.1.10.49/cvs/Linux x86_64

4 files changed, 47 insertions, 7 deletions

diff --git a/app-misc/sleepyhead/ChangeLog b/app-misc/sleepyhead/ChangeLog
index 1af3691d2028..215d05372aa3 100644
--- a/app-misc/sleepyhead/ChangeLog
+++ b/app-misc/sleepyhead/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-misc/sleepyhead
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/sleepyhead/ChangeLog,v 1.1 2012/03/19 22:39:03 rich0 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/sleepyhead/ChangeLog,v 1.2 2012/03/22 13:27:26 rich0 Exp $
+
+  22 Mar 2012; Richard Freeman <rich0@gentoo.org> sleepyhead-0.9.2.2.ebuild,
+  +files/zlib-of.patch:
+  fix 409255 - patch for now until upstream direction is clear
 
 *sleepyhead-0.9.2.2 (19 Mar 2012)
 
diff --git a/app-misc/sleepyhead/Manifest b/app-misc/sleepyhead/Manifest
index 565125020899..4e8e7bd033ff 100644
--- a/app-misc/sleepyhead/Manifest
+++ b/app-misc/sleepyhead/Manifest
@@ -3,14 +3,15 @@ Hash: SHA256
 
 AUX gitfix.patch 602 RMD160 219d379c44f005a361a24b0ac6c16f9ffcdf6ab7 SHA1 65ee5f99f99dfb708f3c14985539597db33b20ed SHA256 37aa5bbf7c6710f4a73ce1c2b51b7262ef7eb872bb035d014678c71d1392a74a
 AUX prs1-64fix.patch 497 RMD160 75c9dca36837b29c1f23b34f796b1e62357bf1fe SHA1 244398fd9ba7df35dc33e76b1cb11370e142d514 SHA256 ff6c5ea462f2dfbe1b6d16bdcd6f3639c788830498ebca0718be9b744ba6daf5
+AUX zlib-of.patch 1999 RMD160 778aca7cb398d2444a3a213117ba2975bc96fa3a SHA1 c1e83e08510e4ff2f69c227bfa914e8944e0ff34 SHA256 4057025ba4cd365a4d087316c20450829309eb3feabd107b2511fecb6fe38d87
 DIST sleepyhead-0.9.2.2.tgz 1399077 RMD160 eb1520706d16602ad917693cdcef89af61cb276b SHA1 15376f0c3e7855f561a156d3928c9f655e25d8da SHA256 49bcc7cf2b8351026a1f30b44d71a8500b9c74c6f6ac1aeeb14ca3b039ee7123
-EBUILD sleepyhead-0.9.2.2.ebuild 1101 RMD160 03c06630ddc7d249448b15c785403b98f97b27bb SHA1 624516f364675ac46338904f7e716444bff3271c SHA256 8c5bb8577ef900ba8548ce5469d866f374dc5b3b0683f247d460f67ef4b7187f
-MISC ChangeLog 406 RMD160 ad8cb2b6bd19342fe510261486db498faf896a05 SHA1 30512581e15667a467cb52e44f1425ba04073aa8 SHA256 b42e25fb703bd3bdf3f99eb74b603a7db4a19c609940afcd383bb7a465f85f93
+EBUILD sleepyhead-0.9.2.2.ebuild 1137 RMD160 48914b2385c0f93d1c89c9ca4c366b35ab665932 SHA1 7600bfb86319d4be2dd782c916fbcaf44f6b4bed SHA256 5ded65f5ee556a3db7dda902f1e1c5d39846c07ac332ed0401a94e270d1331da
+MISC ChangeLog 571 RMD160 f4bff4a61449fdd75a4a314e45adfb620d3ff771 SHA1 15ed14926c7c7a94762f357bcba595fd0a118600 SHA256 f7236544a958478bedd9d74feb6043b4e0a503ceb7b54c7bbd22fa10432f6436
 MISC metadata.xml 304 RMD160 fe32926664d515ebd947a9c735109e4d60d533d1 SHA1 6d1749d1b90b271fe5d64d06e9eeb5e248a4034f SHA256 1b7ceae99e0186803b6a20fe8f9ee62eddb24cb13091634ea6ad2b63bf7eabee
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk9ntY8ACgkQCMFw3lXsEjq+jgD+N0AKcJAj7QormRDnPT39KYOk
-cC/NtOLtZuzqDglM03QA/0ev/EgKuCfPbevD5nSlekpG9v5ieYAYbagRsAJ2zTQT
-=hiMN
+iF4EAREIAAYFAk9rKMQACgkQCMFw3lXsEjrs5wEAh/QwoK86MkagLHVPFCssykcK
+lzB1EfqHFPkXKZgQ7JQA/irab9P1dKplHLBp7AU4ASvh/xQc8i1EDQOeDlKgBqoS
+=FzFb
 -----END PGP SIGNATURE-----
diff --git a/app-misc/sleepyhead/files/zlib-of.patch b/app-misc/sleepyhead/files/zlib-of.patch
new file mode 100644
index 000000000000..51b21b4a3f32
--- /dev/null
+++ b/app-misc/sleepyhead/files/zlib-of.patch
@@ -0,0 +1,34 @@
+diff --git a/quazip/ioapi.h b/quazip/ioapi.h
+index 716dd4b..a114915 100644
+--- a/quazip/ioapi.h
++++ b/quazip/ioapi.h
+@@ -37,13 +37,13 @@
+ extern "C" {

+ #endif

+ 

+-typedef voidpf (ZCALLBACK *open_file_func) OF((voidpf opaque, voidpf file, int mode));

+-typedef uLong  (ZCALLBACK *read_file_func) OF((voidpf opaque, voidpf stream, void* buf, uLong size));

+-typedef uLong  (ZCALLBACK *write_file_func) OF((voidpf opaque, voidpf stream, const void* buf, uLong size));

+-typedef uLong   (ZCALLBACK *tell_file_func) OF((voidpf opaque, voidpf stream));

+-typedef int   (ZCALLBACK *seek_file_func) OF((voidpf opaque, voidpf stream, uLong offset, int origin));

+-typedef int    (ZCALLBACK *close_file_func) OF((voidpf opaque, voidpf stream));

+-typedef int    (ZCALLBACK *testerror_file_func) OF((voidpf opaque, voidpf stream));

++typedef voidpf (ZCALLBACK *open_file_func) _Z_OF((voidpf opaque, voidpf file, int mode));

++typedef uLong  (ZCALLBACK *read_file_func) _Z_OF((voidpf opaque, voidpf stream, void* buf, uLong size));

++typedef uLong  (ZCALLBACK *write_file_func) _Z_OF((voidpf opaque, voidpf stream, const void* buf, uLong size));

++typedef uLong   (ZCALLBACK *tell_file_func) _Z_OF((voidpf opaque, voidpf stream));

++typedef int   (ZCALLBACK *seek_file_func) _Z_OF((voidpf opaque, voidpf stream, uLong offset, int origin));

++typedef int    (ZCALLBACK *close_file_func) _Z_OF((voidpf opaque, voidpf stream));

++typedef int    (ZCALLBACK *testerror_file_func) _Z_OF((voidpf opaque, voidpf stream));

+ 

+ typedef struct zlib_filefunc_def_s

+ {

+@@ -59,7 +59,7 @@ typedef struct zlib_filefunc_def_s
+ 

+ 

+ 

+-void fill_qiodevice_filefunc OF((zlib_filefunc_def* pzlib_filefunc_def));

++void fill_qiodevice_filefunc _Z_OF((zlib_filefunc_def* pzlib_filefunc_def));

+ 

+ #define ZREAD(filefunc,filestream,buf,size) ((*((filefunc).zread_file))((filefunc).opaque,filestream,buf,size))

+ #define ZWRITE(filefunc,filestream,buf,size) ((*((filefunc).zwrite_file))((filefunc).opaque,filestream,buf,size))

diff --git a/app-misc/sleepyhead/sleepyhead-0.9.2.2.ebuild b/app-misc/sleepyhead/sleepyhead-0.9.2.2.ebuild
index 1db40c6fc759..5468f97c6193 100644
--- a/app-misc/sleepyhead/sleepyhead-0.9.2.2.ebuild
+++ b/app-misc/sleepyhead/sleepyhead-0.9.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/sleepyhead/sleepyhead-0.9.2.2.ebuild,v 1.1 2012/03/19 22:39:03 rich0 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/sleepyhead/sleepyhead-0.9.2.2.ebuild,v 1.2 2012/03/22 13:27:26 rich0 Exp $
 
 EAPI=4
 inherit eutils qt4-r2
@@ -37,6 +37,7 @@ src_prepare() {
 	cd "{$S}"
 	epatch "${FILESDIR}/gitfix.patch"
 	epatch "${FILESDIR}/prs1-64fix.patch"
+	epatch "${FILESDIR}/zlib-of.patch"
 	eqmake4 SleepyHeadQT.pro
 }