diff options
author | Richard Freeman <rich0@gentoo.org> | 2012-03-22 13:27:26 +0000 |
---|---|---|
committer | Richard Freeman <rich0@gentoo.org> | 2012-03-22 13:27:26 +0000 |
commit | a9d0d569a50cd6822a669647d92120ca5923ab05 (patch) | |
tree | e2ca63377e093f57b70de31e97c9454230e11e50 /app-misc | |
parent | amd64 stable - 409251 (diff) | |
download | gentoo-2-a9d0d569a50cd6822a669647d92120ca5923ab05.tar.gz gentoo-2-a9d0d569a50cd6822a669647d92120ca5923ab05.tar.bz2 gentoo-2-a9d0d569a50cd6822a669647d92120ca5923ab05.zip |
fix 409255 - patch for now until upstream direction is clear
(Portage version: 2.1.10.49/cvs/Linux x86_64)
Diffstat (limited to 'app-misc')
-rw-r--r-- | app-misc/sleepyhead/ChangeLog | 6 | ||||
-rw-r--r-- | app-misc/sleepyhead/files/zlib-of.patch | 34 | ||||
-rw-r--r-- | app-misc/sleepyhead/sleepyhead-0.9.2.2.ebuild | 3 |
3 files changed, 41 insertions, 2 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/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 } |