diff options
| author | tnn <tnn@pkgsrc.org> | 2015-10-23 09:53:35 +0000 |
|---|---|---|
| committer | tnn <tnn@pkgsrc.org> | 2015-10-23 09:53:35 +0000 |
| commit | bb7d2aefa5b99ed747ba4a4fe9579ffa4ee234b7 (patch) | |
| tree | 9e48dcc23145f0c1a74307fcd6465f1e171d166f /x11/liblbxutil | |
| parent | 6dc21bc0e1a5241f80f6b4cf43de9dce12f9b300 (diff) | |
| download | pkgsrc-bb7d2aefa5b99ed747ba4a4fe9579ffa4ee234b7.tar.gz | |
Fix build on Darwin. Although why anyone would want to use this I do not
know, this is just to fix the modular-xorg meta package.
Diffstat (limited to 'x11/liblbxutil')
| -rw-r--r-- | x11/liblbxutil/distinfo | 4 | ||||
| -rw-r--r-- | x11/liblbxutil/patches/patch-src_delta_lbxdelta.c | 22 | ||||
| -rw-r--r-- | x11/liblbxutil/patches/patch-src_lbx__zlib_lbx__zlib.h | 32 |
3 files changed, 57 insertions, 1 deletions
diff --git a/x11/liblbxutil/distinfo b/x11/liblbxutil/distinfo index 602e203bab6..b8ac58a86d8 100644 --- a/x11/liblbxutil/distinfo +++ b/x11/liblbxutil/distinfo @@ -1,5 +1,7 @@ -$NetBSD: distinfo,v 1.4 2015/07/02 12:38:32 rodent Exp $ +$NetBSD: distinfo,v 1.5 2015/10/23 09:53:35 tnn Exp $ SHA1 (liblbxutil-1.1.0.tar.bz2) = 99616bab0ca0afeaa9c0a19222091b1ff4f18680 RMD160 (liblbxutil-1.1.0.tar.bz2) = d719285993a86ac0b364997e9261373d5aad9912 Size (liblbxutil-1.1.0.tar.bz2) = 268278 bytes +SHA1 (patch-src_delta_lbxdelta.c) = 399d055096e9e55feed25246baccf99f6aee7751 +SHA1 (patch-src_lbx__zlib_lbx__zlib.h) = 021125caeb75bf489090fcc9d8358e13470ceb6a diff --git a/x11/liblbxutil/patches/patch-src_delta_lbxdelta.c b/x11/liblbxutil/patches/patch-src_delta_lbxdelta.c new file mode 100644 index 00000000000..cec0c8633ae --- /dev/null +++ b/x11/liblbxutil/patches/patch-src_delta_lbxdelta.c @@ -0,0 +1,22 @@ +$NetBSD: patch-src_delta_lbxdelta.c,v 1.1 2015/10/23 09:53:35 tnn Exp $ + +--- src/delta/lbxdelta.c.orig 2009-12-04 22:42:12.000000000 +0000 ++++ src/delta/lbxdelta.c +@@ -47,12 +47,12 @@ extern struct ReqStats LbxRequestStats[L + /* Copied from xc/programs/Xserver/include/xorg/os.h */ + #ifndef _HAVE_XALLOC_DECLS + #define _HAVE_XALLOC_DECLS +-#include <X11/Xdefs.h> + +-extern pointer Xalloc(unsigned long /*amount*/); +-extern pointer Xcalloc(unsigned long /*amount*/); +-extern pointer Xrealloc(pointer /*ptr*/, unsigned long /*amount*/); +-extern void Xfree(pointer /*ptr*/); ++#include <stdlib.h> ++#define Xalloc malloc ++#define Xcalloc calloc ++#define Xrealloc realloc ++#define Xfree free + #endif + + /* diff --git a/x11/liblbxutil/patches/patch-src_lbx__zlib_lbx__zlib.h b/x11/liblbxutil/patches/patch-src_lbx__zlib_lbx__zlib.h new file mode 100644 index 00000000000..abca1712389 --- /dev/null +++ b/x11/liblbxutil/patches/patch-src_lbx__zlib_lbx__zlib.h @@ -0,0 +1,32 @@ +$NetBSD: patch-src_lbx__zlib_lbx__zlib.h,v 1.1 2015/10/23 09:53:35 tnn Exp $ + +--- src/lbx_zlib/lbx_zlib.h.orig 2009-11-03 05:52:21.000000000 +0000 ++++ src/lbx_zlib/lbx_zlib.h +@@ -129,16 +129,17 @@ extern int FlushIovBuf ( int fd, struct + #define _HAVE_XALLOC_DECLS + #include <X11/Xdefs.h> + +-extern pointer Xalloc(unsigned long /*amount*/); +-extern pointer Xcalloc(unsigned long /*amount*/); +-extern pointer Xrealloc(pointer /*ptr*/, unsigned long /*amount*/); +-extern void Xfree(pointer /*ptr*/); ++#include <stdlib.h> ++#define Xalloc malloc ++#define Xcalloc calloc ++#define Xrealloc realloc ++#define Xfree free + #endif + + /* lbx_zlib.c */ +-unsigned long stream_out_compressed; +-unsigned long stream_out_uncompressed; +-unsigned long stream_out_plain; +-unsigned long stream_in_compressed; +-unsigned long stream_in_uncompressed; +-unsigned long stream_in_plain; ++extern unsigned long stream_out_compressed; ++extern unsigned long stream_out_uncompressed; ++extern unsigned long stream_out_plain; ++extern unsigned long stream_in_compressed; ++extern unsigned long stream_in_uncompressed; ++extern unsigned long stream_in_plain; |