Revision bump for both arch and ~arch version. No longer link against the system libvncserver. The included libvncserver is more recent and includes fixes not yet included in the system libvncserver.

(Portage version: 2.0.51.18)

4 files changed, 0 insertions, 74 deletions

diff --git a/x11-misc/x11vnc/files/0.7-autotools.patch b/x11-misc/x11vnc/files/0.7-autotools.patch
index 97817553b534..97279172a348 100644
--- a/x11-misc/x11vnc/files/0.7-autotools.patch
+++ b/x11-misc/x11vnc/files/0.7-autotools.patch
@@ -20,28 +20,3 @@ diff -Nur x11vnc.orig/configure.ac x11vnc/configure.ac
 -AC_CHECK_HEADERS([arpa/inet.h fcntl.h netdb.h netinet/in.h stdlib.h string.h sys/socket.h sys/time.h sys/timeb.h syslog.h unistd.h])
  
  # Checks for typedefs, structures, and compiler characteristics.
-@@ -200,3 +200,2 @@
- AC_CONFIG_FILES([Makefile
--                 libvncserver/Makefile
-                  
---- x11vnc.orig/Makefile.am	2005-01-28 10:15:00.205392800 -0500
-+++ x11vnc/Makefile.am	2005-01-28 10:15:10.882769592 -0500
-@@ -1,7 +1,7 @@
- CFLAGS=-g -Wall
- 
--SUBDIRS=libvncserver x11vnc classes
--DIST_SUBDIRS=libvncserver x11vnc classes
-+SUBDIRS=x11vnc classes
-+DIST_SUBDIRS=x11vnc classes
- 
- 
- includedir=$(prefix)/include/rfb
---- x11vnc.orig/x11vnc/Makefile.am	2005-01-28 10:15:22.031074792 -0500
-+++ x11vnc/x11vnc/Makefile.am	2005-01-28 10:18:37.532354080 -0500
-@@ -1,5 +1,5 @@
- DEFINES = -I ..
--LDADD = ../libvncserver/libvncserver.a @WSOCKLIB@
-+LDADD = -lvncserver @WSOCKLIB@
- 
- man_MANS=x11vnc.1
- EXTRA_DIST=ChangeLog README tkx11vnc $(man_MANS)
diff --git a/x11-misc/x11vnc/files/0.7.1-autotools.patch b/x11-misc/x11vnc/files/0.7.1-autotools.patch
deleted file mode 100644
index 1f29e6e5b67c..000000000000
--- a/x11-misc/x11vnc/files/0.7.1-autotools.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff -Nur x11vnc-0.7.1/Makefile.am x11vnc-0.7.1-gentoo/Makefile.am
---- x11vnc-0.7.1/Makefile.am	2005-02-24 20:59:50.533338639 +0100
-+++ x11vnc-0.7.1-gentoo/Makefile.am	2005-02-24 21:00:06.460146019 +0100
-@@ -1,8 +1,8 @@
- EXTRA_DIST=tightvnc-1.3dev5-vncviewer-alpha-cursor.patch README.LibVNCServer
- CFLAGS=-g -Wall
- 
--SUBDIRS=libvncserver x11vnc classes
--DIST_SUBDIRS=libvncserver x11vnc classes
-+SUBDIRS=x11vnc classes
-+DIST_SUBDIRS=x11vnc classes
- 
- 
- includedir=$(prefix)/include/rfb
-diff -Nur x11vnc-0.7.1/configure.ac x11vnc-0.7.1-gentoo/configure.ac
---- x11vnc-0.7.1/configure.ac	2005-02-24 20:59:50.544337124 +0100
-+++ x11vnc-0.7.1-gentoo/configure.ac	2005-02-24 21:00:56.679232972 +0100
-@@ -14,6 +14,10 @@
- AC_PROG_MAKE_SET
- AC_PROG_RANLIB
- 
-+# Checks for header files.
-+AC_HEADER_STDC
-+AC_CHECK_HEADERS([arpa/inet.h fcntl.h netdb.h netinet/in.h stdlib.h string.h sys/socket.h sys/time.h sys/timeb.h syslog.h unistd.h pwd.h sys/wait.h utmpx.h])
-+
- # Options
- AH_TEMPLATE(BACKCHANNEL, [Enable BackChannel communication])
- AC_ARG_WITH(backchannel,
-@@ -211,10 +215,6 @@
- fi
- AC_SUBST(WSOCKLIB)
- 
--# Checks for header files.
--AC_HEADER_STDC
--AC_CHECK_HEADERS([arpa/inet.h fcntl.h netdb.h netinet/in.h stdlib.h string.h sys/socket.h sys/time.h sys/timeb.h syslog.h unistd.h pwd.h sys/wait.h utmpx.h])
--
- # Checks for typedefs, structures, and compiler characteristics.
- AC_C_CONST
- AC_C_INLINE
-diff -Nur x11vnc-0.7.1/x11vnc/Makefile.am x11vnc-0.7.1-gentoo/x11vnc/Makefile.am
---- x11vnc-0.7.1/x11vnc/Makefile.am	2005-02-24 20:59:50.586331343 +0100
-+++ x11vnc-0.7.1-gentoo/x11vnc/Makefile.am	2005-02-24 21:00:16.754728825 +0100
-@@ -1,5 +1,5 @@
- DEFINES = -I ..
--LDADD = ../libvncserver/libvncserver.a @WSOCKLIB@
-+LDADD = -lvncserver @WSOCKLIB@
- 
- man_MANS=x11vnc.1
- EXTRA_DIST=ChangeLog README tkx11vnc $(man_MANS)
diff --git a/x11-misc/x11vnc/files/digest-x11vnc-0.7 b/x11-misc/x11vnc/files/digest-x11vnc-0.7-r1
index 472eed59a01c..472eed59a01c 100644
--- a/x11-misc/x11vnc/files/digest-x11vnc-0.7
+++ b/x11-misc/x11vnc/files/digest-x11vnc-0.7-r1
diff --git a/x11-misc/x11vnc/files/digest-x11vnc-0.7.1 b/x11-misc/x11vnc/files/digest-x11vnc-0.7.1-r1
index bab945ccceca..bab945ccceca 100644
--- a/x11-misc/x11vnc/files/digest-x11vnc-0.7.1
+++ b/x11-misc/x11vnc/files/digest-x11vnc-0.7.1-r1