[36496] trunk/dports/kde/kdenetwork3

[takanori at macports.org]

Revision: 36496
          http://trac.macosforge.org/projects/macports/changeset/36496
Author:   takanori at macports.org
Date:     2008-05-04 02:39:02 -0700 (Sun, 04 May 2008)

Log Message:
-----------
kdenetwork3: Avoid redefinition of 'CARD32' (#15194)

Modified Paths:
--------------
    trunk/dports/kde/kdenetwork3/Portfile

Added Paths:
-----------
    trunk/dports/kde/kdenetwork3/files/patch-krfb_libvncserver_rfb.h.diff

Modified: trunk/dports/kde/kdenetwork3/Portfile
===================================================================
--- trunk/dports/kde/kdenetwork3/Portfile	2008-05-04 08:20:37 UTC (rev 36495)
+++ trunk/dports/kde/kdenetwork3/Portfile	2008-05-04 09:39:02 UTC (rev 36496)
@@ -39,7 +39,7 @@
 extract.only	${distname}.tar.bz2
 post-extract	{ system "cd ${worksrcpath} && bzcat -dc ${distpath}/${kdeadmin}.tar.bz2 | tar xf -" }
 
-patchfiles	kdenetwork3.patch
+patchfiles	kdenetwork3.patch patch-krfb_libvncserver_rfb.h.diff
 patch		{
 		foreach file $patchfiles {
 		    system "cd ${worksrcpath} && sed -e 's, at FINKPREFIX@,${prefix},g' ${filespath}/${file} | patch -p1"

Added: trunk/dports/kde/kdenetwork3/files/patch-krfb_libvncserver_rfb.h.diff
===================================================================
--- trunk/dports/kde/kdenetwork3/files/patch-krfb_libvncserver_rfb.h.diff	                        (rev 0)
+++ trunk/dports/kde/kdenetwork3/files/patch-krfb_libvncserver_rfb.h.diff	2008-05-04 09:39:02 UTC (rev 36496)
@@ -0,0 +1,13 @@
+--- kdenetwork-3.5.8/krfb/libvncserver/rfb.h	2005-09-10 17:20:13.000000000 +0900
++++ kdenetwork-3.5.8-new/krfb/libvncserver/rfb.h	2008-05-04 17:59:50.000000000 +0900
+@@ -38,9 +38,7 @@
+ #include "keysym.h"
+ 
+ /* TODO: this stuff has to go into autoconf */
+-typedef unsigned char CARD8;
+-typedef unsigned short CARD16;
+-typedef unsigned int CARD32;
++#include <X11/Xmd.h>
+ typedef CARD32 Pixel;
+ /* typedef CARD32 KeySym; */
+ #ifndef __osf__

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080504/04951337/attachment.html