pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/x11/libXfont Fix a silly build failure on HP-UX. For r...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/2a9f869a7f97
branches:  trunk
changeset: 537937:2a9f869a7f97
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Mon Jan 21 13:56:28 2008 +0000

description:
Fix a silly build failure on HP-UX. For reasons unknown, libXfont
(or actually the bundled t1lib) provides it's "own" implementation of
stdio.h as t1stdio.h. For this reason they take care not to include stdio.h
to avoid conflicts. But they do include stdlib.h which on HP-UX
recursively includes stdio.h. Fix by not including stdlib.h on HP-UX.

diffstat:

 x11/libXfont/distinfo         |   3 ++-
 x11/libXfont/patches/patch-ac |  15 +++++++++++++++
 2 files changed, 17 insertions(+), 1 deletions(-)

diffs (32 lines):

diff -r 4238b1b432d6 -r 2a9f869a7f97 x11/libXfont/distinfo
--- a/x11/libXfont/distinfo     Mon Jan 21 13:55:29 2008 +0000
+++ b/x11/libXfont/distinfo     Mon Jan 21 13:56:28 2008 +0000
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.8 2008/01/20 18:24:51 joerg Exp $
+$NetBSD: distinfo,v 1.9 2008/01/21 13:56:28 tnn Exp $
 
 SHA1 (libXfont-1.3.1.tar.bz2) = 90153414cd3580d92cad6469166c099749cddd29
 RMD160 (libXfont-1.3.1.tar.bz2) = 13c8ed7b33ec0c4f08c032d74958e49d3c177464
 Size (libXfont-1.3.1.tar.bz2) = 564235 bytes
 SHA1 (patch-aa) = e421de2c9b67b46c2dab651ba1bab13fd08df914
 SHA1 (patch-ab) = 56339bd99f714be3d9a7d697c39eab1b13794c3b
+SHA1 (patch-ac) = de3952fb43533b3f325096e330bd0bf996bb4a47
diff -r 4238b1b432d6 -r 2a9f869a7f97 x11/libXfont/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/libXfont/patches/patch-ac     Mon Jan 21 13:56:28 2008 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-ac,v 1.1 2008/01/21 13:56:29 tnn Exp $
+
+--- src/Type1/objects.h.orig   2007-09-05 02:18:23.000000000 +0200
++++ src/Type1/objects.h
+@@ -34,8 +34,10 @@
+ #include <X11/Xdefs.h>
+ #include <X11/Xfuncproto.h>
+ #ifndef FONTMODULE
++#ifndef __hpux
+ #include <stdlib.h>
+ #endif
++#endif
+ /*SHARED*/
+ 
+ #define   Permanent(obj)    t1_Permanent(obj)



Home | Main Index | Thread Index | Old Index