diff options
| author | abs <abs> | 2009-08-21 08:27:29 +0000 |
|---|---|---|
| committer | abs <abs> | 2009-08-21 08:27:29 +0000 |
| commit | 181bcf6a639d6ac23ba299acfd72d51df73369e0 (patch) | |
| tree | db99476750a56f2dd149219f7856c056a956365b /net/kdenetwork3 | |
| parent | a136e29bdc10c261e12010e61efd90354bb90342 (diff) | |
| download | pkgsrc-181bcf6a639d6ac23ba299acfd72d51df73369e0.tar.gz | |
fix build on NetBSD.amd64 using x11 from base (tested on modular x11)
- krfb/libvncserver/rfb.h had cope apparently copied from X11's Xmd.h,
but it missed setting LONG64, resulting in a mismatched typedef for CARD32
bump pkgrevision. Found on Alex's new kde3 playbox.
Diffstat (limited to 'net/kdenetwork3')
| -rw-r--r-- | net/kdenetwork3/Makefile | 4 | ||||
| -rw-r--r-- | net/kdenetwork3/distinfo | 4 | ||||
| -rw-r--r-- | net/kdenetwork3/patches/patch-am | 28 |
3 files changed, 28 insertions, 8 deletions
diff --git a/net/kdenetwork3/Makefile b/net/kdenetwork3/Makefile index ad4a06a50f7..cfe1c6d72cb 100644 --- a/net/kdenetwork3/Makefile +++ b/net/kdenetwork3/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.70 2009/05/20 00:58:25 wiz Exp $ +# $NetBSD: Makefile,v 1.71 2009/08/21 08:27:29 abs Exp $ DISTNAME= kdenetwork-${_KDE_VERSION} -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= net COMMENT= Network modules for the KDE integrated X11 desktop diff --git a/net/kdenetwork3/distinfo b/net/kdenetwork3/distinfo index db1b808859c..d29ba45d91e 100644 --- a/net/kdenetwork3/distinfo +++ b/net/kdenetwork3/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.47 2008/08/27 12:12:04 markd Exp $ +$NetBSD: distinfo,v 1.48 2009/08/21 08:27:29 abs Exp $ SHA1 (kdenetwork-3.5.10.tar.bz2) = eb280bffaf4642bfda442cc6a9fb38dc4163b720 RMD160 (kdenetwork-3.5.10.tar.bz2) = f888f53746f1e734d3c15c09eac1c2b9c0564b20 @@ -10,5 +10,5 @@ SHA1 (patch-af) = d1955d7712b980db173f765586e6dc373cf3eea0 SHA1 (patch-ag) = 6fad1af3bd383c01f80b7fa4da64184ad7172bb3 SHA1 (patch-ah) = f13a567b6be1bd04e9d50185bab995f1a8a4d231 SHA1 (patch-ai) = 27ff86fa25381bcb05c321b4f54acc225e9b90dd -SHA1 (patch-am) = 9d25f54aedcf4c703a7092ffa8e0ac00578e9f6d +SHA1 (patch-am) = a2f7d40793eed9122a9d8bf7f2ae0efc326bbae5 SHA1 (patch-an) = 8a086d1fef4eb4f96380438a87fecfe76d147b04 diff --git a/net/kdenetwork3/patches/patch-am b/net/kdenetwork3/patches/patch-am index 5c81005ac92..a88fe6fc076 100644 --- a/net/kdenetwork3/patches/patch-am +++ b/net/kdenetwork3/patches/patch-am @@ -1,8 +1,28 @@ -$NetBSD: patch-am,v 1.6 2008/08/27 12:12:04 markd Exp $ +$NetBSD: patch-am,v 1.7 2009/08/21 08:27:29 abs Exp $ ---- krfb/libvncserver/rfb.h.orig 2005-09-10 20:20:13.000000000 +1200 +--- krfb/libvncserver/rfb.h.orig 2008-08-19 19:13:37.000000000 +0100 +++ krfb/libvncserver/rfb.h -@@ -62,7 +60,7 @@ typedef unsigned long KeySym; +@@ -41,6 +41,19 @@ extern "C" + typedef unsigned char CARD8; + typedef unsigned short CARD16; + ++/* Copied from Xmd.h */ ++#if defined (_LP64) || \ ++ defined(__alpha) || defined(__alpha__) || \ ++ defined(__ia64__) || defined(ia64) || \ ++ defined(__sparc64__) || \ ++ defined(__s390x__) || \ ++ (defined(__hppa__) && defined(__LP64__)) || \ ++ defined(__amd64__) || defined(amd64) || \ ++ defined(__powerpc64__) || \ ++ (defined(sgi) && (_MIPS_SZLONG == 64)) ++#define LONG64 /* 32/64-bit architecture */ ++#endif ++ + #ifdef LONG64 + typedef unsigned long CARD64; + typedef unsigned int CARD32; +@@ -69,7 +82,7 @@ typedef unsigned long KeySym; #ifdef __linux__ #include <endian.h> @@ -11,7 +31,7 @@ $NetBSD: patch-am,v 1.6 2008/08/27 12:12:04 markd Exp $ #include <sys/types.h> #include <machine/endian.h> #ifndef _BYTE_ORDER -@@ -76,7 +74,7 @@ typedef unsigned long KeySym; +@@ -83,7 +96,7 @@ typedef unsigned long KeySym; #if defined(__sparc) /* SPARC here (big endian) */ #define _BYTE_ORDER 4321 |