Fri Oct 23 09:53:35 2015 UTC ()
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.
(tnn)
diff -r1.4 -r1.5 pkgsrc/x11/liblbxutil/distinfo
diff -r0 -r1.1 pkgsrc/x11/liblbxutil/patches/patch-src_delta_lbxdelta.c
diff -r0 -r1.1 pkgsrc/x11/liblbxutil/patches/patch-src_lbx__zlib_lbx__zlib.h
--- pkgsrc/x11/liblbxutil/Attic/distinfo 2015/07/02 12:38:32 1.4
+++ pkgsrc/x11/liblbxutil/Attic/distinfo 2015/10/23 09:53:35 1.5
| @@ -1,5 +1,7 @@ | | | @@ -1,5 +1,7 @@ |
| 1 | $NetBSD: distinfo,v 1.4 2015/07/02 12:38:32 rodent Exp $ | | 1 | $NetBSD: distinfo,v 1.5 2015/10/23 09:53:35 tnn Exp $ |
| 2 | | | 2 | |
| 3 | SHA1 (liblbxutil-1.1.0.tar.bz2) = 99616bab0ca0afeaa9c0a19222091b1ff4f18680 | | 3 | SHA1 (liblbxutil-1.1.0.tar.bz2) = 99616bab0ca0afeaa9c0a19222091b1ff4f18680 |
| 4 | RMD160 (liblbxutil-1.1.0.tar.bz2) = d719285993a86ac0b364997e9261373d5aad9912 | | 4 | RMD160 (liblbxutil-1.1.0.tar.bz2) = d719285993a86ac0b364997e9261373d5aad9912 |
| 5 | Size (liblbxutil-1.1.0.tar.bz2) = 268278 bytes | | 5 | Size (liblbxutil-1.1.0.tar.bz2) = 268278 bytes |
| | | 6 | SHA1 (patch-src_delta_lbxdelta.c) = 399d055096e9e55feed25246baccf99f6aee7751 |
| | | 7 | SHA1 (patch-src_lbx__zlib_lbx__zlib.h) = 021125caeb75bf489090fcc9d8358e13470ceb6a |
$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
/*
$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;