aboutsummaryrefslogtreecommitdiff
path: root/textproc/stardict3/files/patch-lib__src__libcommon.h
diff options
context:
space:
mode:
authorMax Brazhnikov <makc@FreeBSD.org>2013-10-02 20:50:35 +0000
committerMax Brazhnikov <makc@FreeBSD.org>2013-10-02 20:50:35 +0000
commit8347912df88c7bcd0678afeb92538cd31752ad41 (patch)
tree8fdc125a64f89ea968cf383b8ea32a9ec2f4c74f /textproc/stardict3/files/patch-lib__src__libcommon.h
parentb27ddd34064cd217a78102f0b5ca33609b3950b2 (diff)
downloadports-8347912df88c7bcd0678afeb92538cd31752ad41.tar.gz
ports-8347912df88c7bcd0678afeb92538cd31752ad41.zip
- Update patches to fix build on 8.x (with old zlib) and 10 (unistd.h)
- gnomehack -> pathfix - Convert LIB_DEPENDS to new syntax - Support staging
Notes
Notes: svn path=/head/; revision=329107
Diffstat (limited to 'textproc/stardict3/files/patch-lib__src__libcommon.h')
-rw-r--r--textproc/stardict3/files/patch-lib__src__libcommon.h13
1 files changed, 8 insertions, 5 deletions
diff --git a/textproc/stardict3/files/patch-lib__src__libcommon.h b/textproc/stardict3/files/patch-lib__src__libcommon.h
index 44667b4e0c4f..8f263bfc942c 100644
--- a/textproc/stardict3/files/patch-lib__src__libcommon.h
+++ b/textproc/stardict3/files/patch-lib__src__libcommon.h
@@ -1,11 +1,14 @@
---- ./lib/src/libcommon.h.orig 2011-07-08 12:32:09.000000000 +0000
-+++ ./lib/src/libcommon.h 2012-12-11 07:48:00.604014902 +0000
-@@ -188,7 +188,7 @@
+--- ./lib/src/libcommon.h.orig 2012-01-13 06:21:34.000000000 +0000
++++ ./lib/src/libcommon.h 2013-10-02 15:13:21.563936478 +0000
+@@ -188,7 +188,11 @@
}
namespace zip {
--typedef ResourceWrapper<void, void*, int, gzclose> gzFile;
-+typedef ResourceWrapper<struct gzFile_s, struct gzFile_s *, int, gzclose> gzFileWrapper;
++#if ZLIB_VERNUM > 0x1250
++typedef ResourceWrapper<gzFile_s, gzFile, int, gzclose> gzFile;
++#else
+ typedef ResourceWrapper<void, void*, int, gzclose> gzFile;
++#endif
}
/* Create a new temporary file. Return file name in file name encoding.