summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsketch <sketch@pkgsrc.org>2003-12-19 11:32:52 +0000
committersketch <sketch@pkgsrc.org>2003-12-19 11:32:52 +0000
commit9e7812cc53bd21d0f938552425659a8298e907fb (patch)
treec88b234f05c42053a0a29af6df35737498a5c0a2
parent9d8987764d6c3f71ac1303979a5e9b0fc71b3887 (diff)
downloadpkgsrc-9e7812cc53bd21d0f938552425659a8298e907fb.tar.gz
Work around a bug in certain versions of Xmd.h which do not correctly
check for __STDC__, breaking the SIZEOF() macro.
-rw-r--r--x11/render/distinfo3
-rw-r--r--x11/render/patches/patch-aa22
2 files changed, 24 insertions, 1 deletions
diff --git a/x11/render/distinfo b/x11/render/distinfo
index 8cd09bc646b..86594df7b3b 100644
--- a/x11/render/distinfo
+++ b/x11/render/distinfo
@@ -1,4 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2003/09/19 16:33:57 wiz Exp $
+$NetBSD: distinfo,v 1.2 2003/12/19 11:32:52 sketch Exp $
SHA1 (render-0.8.tar.gz) = 73b88307fd318e0a1a7ed50c7cf7808d550cca99
Size (render-0.8.tar.gz) = 51478 bytes
+SHA1 (patch-aa) = 44f9efe2d49e07b7ff344034f7369fd10dada464
diff --git a/x11/render/patches/patch-aa b/x11/render/patches/patch-aa
new file mode 100644
index 00000000000..7da280964ac
--- /dev/null
+++ b/x11/render/patches/patch-aa
@@ -0,0 +1,22 @@
+$NetBSD: patch-aa,v 1.1 2003/12/19 11:32:52 sketch Exp $
+
+--- renderproto.h.orig 2003-04-21 18:19:22.000000000 +0100
++++ renderproto.h 2003-12-16 15:32:39.752161000 +0000
+@@ -29,6 +29,17 @@
+ #include <X11/Xmd.h>
+ #include <X11/extensions/render.h>
+
++/* Work around bug in -r1.47 of XConsortium: Xmd.h, which breaks packages
++ * dependant on x11/render for certain versions of OpenWindows */
++#undef _SIZEOF
++#undef SIZEOF
++#if ((defined(__STDC__) || defined(__cplusplus) || defined(c_plusplus)) && !defined(UNIXCPP)) || defined(ANSICPP) || defined(_LP64)
++#define _SIZEOF(x) sz_##x
++#define SIZEOF(x) _SIZEOF(x)
++#else
++#define SIZEOF(x) sz_/**/x
++#endif
++
+ #define Window CARD32
+ #define Drawable CARD32
+ #define Font CARD32