New fix to 409255.

(Portage version: 2.1.10.49/cvs/Linux x86_64)

3 files changed, 8 insertions, 37 deletions

diff --git a/app-misc/sleepyhead/ChangeLog b/app-misc/sleepyhead/ChangeLog
index 215d05372aa3..27d404ddc60b 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.2 2012/03/22 13:27:26 rich0 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/sleepyhead/ChangeLog,v 1.3 2012/03/23 20:28:24 rich0 Exp $
+
+  23 Mar 2012; Richard Freeman <rich0@gentoo.org> sleepyhead-0.9.2.2.ebuild,
+  -files/zlib-of.patch:
+  New fix to 409255.
 
   22 Mar 2012; Richard Freeman <rich0@gentoo.org> sleepyhead-0.9.2.2.ebuild,
   +files/zlib-of.patch:
diff --git a/app-misc/sleepyhead/files/zlib-of.patch b/app-misc/sleepyhead/files/zlib-of.patch
deleted file mode 100644
index 51b21b4a3f32..000000000000
--- a/app-misc/sleepyhead/files/zlib-of.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-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 5468f97c6193..7d23df4fa693 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.2 2012/03/22 13:27:26 rich0 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/sleepyhead/sleepyhead-0.9.2.2.ebuild,v 1.3 2012/03/23 20:28:24 rich0 Exp $
 
 EAPI=4
 inherit eutils qt4-r2
@@ -37,7 +37,8 @@ src_prepare() {
 	cd "{$S}"
 	epatch "${FILESDIR}/gitfix.patch"
 	epatch "${FILESDIR}/prs1-64fix.patch"
-	epatch "${FILESDIR}/zlib-of.patch"
+	sed -i '1i#define OF(x) x' quazip/ioapi.h quazip/unzip.c quazip/unzip.h \
+	   quazip/zip.c quazip/zip.h quazip/zlib.h
 	eqmake4 SleepyHeadQT.pro
 }