[96844] trunk/dports/devel/LibVNCServer

[pixilla at macports.org]

Revision: 96844
          https://trac.macports.org/changeset/96844
Author:   pixilla at macports.org
Date:     2012-08-19 17:55:28 -0700 (Sun, 19 Aug 2012)
Log Message:
-----------
devel/LibVNCServer:
- Fix opportunistic linking to GTK+.
- Fix universal build.

Modified Paths:
--------------
    trunk/dports/devel/LibVNCServer/Portfile

Added Paths:
-----------
    trunk/dports/devel/LibVNCServer/files/
    trunk/dports/devel/LibVNCServer/files/patch-configure.ac.diff
    trunk/dports/devel/LibVNCServer/files/patch-libvncserver-sockets.c.diff

Modified: trunk/dports/devel/LibVNCServer/Portfile
===================================================================
--- trunk/dports/devel/LibVNCServer/Portfile	2012-08-20 00:14:37 UTC (rev 96843)
+++ trunk/dports/devel/LibVNCServer/Portfile	2012-08-20 00:55:28 UTC (rev 96844)
@@ -5,6 +5,7 @@
 
 name                        LibVNCServer
 version                     0.9.9
+revision                    1
 categories                  devel
 platforms                   darwin
 maintainers                 ryandesign openmaintainer
@@ -19,6 +20,14 @@
 homepage                    http://libvncserver.sourceforge.net/
 master_sites                sourceforge:project/libvncserver/libvncserver/${version}
 
+patch.pre_args              -p1
+# Do not link against GTK+
+patchfiles                  patch-configure.ac.diff
+use_autoconf                yes
+# Don't segfault when listenSock/listen6Sock == -1
+# http://sourceforge.net/tracker/index.php?func=detail&aid=3527807&group_id=32584&atid=405860
+patchfiles-append           patch-libvncserver-sockets.c.diff
+
 checksums                   rmd160  e62e0903124abb85746bcac6498214fe09c3b4d7 \
                             sha256  cf060d3525c2fb92be2fa18bbc697fb355592b52484e60745f3bcac5c3f803f9
 

Added: trunk/dports/devel/LibVNCServer/files/patch-configure.ac.diff
===================================================================
--- trunk/dports/devel/LibVNCServer/files/patch-configure.ac.diff	                        (rev 0)
+++ trunk/dports/devel/LibVNCServer/files/patch-configure.ac.diff	2012-08-20 00:55:28 UTC (rev 96844)
@@ -0,0 +1,13 @@
+--- a/configure.ac	2012-08-19 10:50:40.000000000 -0700
++++ b/configure.ac	2012-08-19 13:45:48.000000000 -0700
+@@ -790,10 +790,6 @@
+ AC_SUBST(SDL_LIBS)
+ 
+ 
+-# Check for GTK+. if present, build the GTK+ vnc viewer example
+-PKG_CHECK_MODULES([GTK], [gtk+-2.0],,:)
+-AM_CONDITIONAL(HAVE_LIBGTK, test ! -z "$GTK_LIBS")
+-
+ AC_CANONICAL_HOST
+ MINGW=`echo $host_os | grep mingw32  2>/dev/null`
+ AM_CONDITIONAL(MINGW, test ! -z "$MINGW" )

Added: trunk/dports/devel/LibVNCServer/files/patch-libvncserver-sockets.c.diff
===================================================================
--- trunk/dports/devel/LibVNCServer/files/patch-libvncserver-sockets.c.diff	                        (rev 0)
+++ trunk/dports/devel/LibVNCServer/files/patch-libvncserver-sockets.c.diff	2012-08-20 00:55:28 UTC (rev 96844)
@@ -0,0 +1,14 @@
+--- a/libvncserver/sockets.c	2012-08-19 10:50:40.000000000 -0700
++++ b/libvncserver/sockets.c	2012-08-19 13:45:48.000000000 -0700
+@@ -402,9 +402,9 @@
+       rfbLogPerror("rfbProcessNewConnection: error in select");
+       return FALSE;
+     }
+-    if (FD_ISSET(rfbScreen->listenSock, &listen_fds)) 
++    if (rfbScreen->listenSock >= 0 && FD_ISSET(rfbScreen->listenSock, &listen_fds))
+       chosen_listen_sock = rfbScreen->listenSock;
+-    if (FD_ISSET(rfbScreen->listen6Sock, &listen_fds)) 
++    if (rfbScreen->listen6Sock >= 0 && FD_ISSET(rfbScreen->listen6Sock, &listen_fds))
+       chosen_listen_sock = rfbScreen->listen6Sock;
+ 
+     if ((sock = accept(chosen_listen_sock,
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120819/169a8d58/attachment.html>