[gentoo-commits] repo/user/bleeding-edge:master commit in: net-misc/tigervnc/files/

[Jan Psota]

commit:     6cbfd3348bda1e12d471a5cbf612417ebd521f53
Author:     Jan Psota <jasiupsota <AT> gmail <DOT> com>
AuthorDate: Thu Aug 16 18:46:04 2018 +0000
Commit:     Jan Psota <jasiupsota <AT> gmail <DOT> com>
CommitDate: Thu Aug 16 18:46:04 2018 +0000
URL:        https://gitweb.gentoo.org/repo/user/bleeding-edge.git/commit/?id=6cbfd334

net-misc/tigervnc-9999 missing files added to git

 .../files/tigervnc-9999-030_manpages.patch         | 55 +++++++++++++
 .../files/tigervnc-9999-055_xstartup.patch         | 33 ++++++++
 net-misc/tigervnc/files/xserver120.patch           | 91 ++++++++++++++++++++++
 3 files changed, 179 insertions(+)

diff --git a/net-misc/tigervnc/files/tigervnc-9999-030_manpages.patch b/net-misc/tigervnc/files/tigervnc-9999-030_manpages.patch
new file mode 100644
index 0000000..8a30f18
--- /dev/null
+++ b/net-misc/tigervnc/files/tigervnc-9999-030_manpages.patch
@@ -0,0 +1,55 @@
+diff --git a/unix/vncserver b/unix/vncserver
+index 9e7a6ac5..139f9601 100755
+--- a/unix/vncserver
++++ b/unix/vncserver
+@@ -684,6 +684,7 @@ sub Usage
+ 	"                 [-geometry <width>x<height>]\n".
+ 	"                 [-pixelformat rgbNNN|bgrNNN]\n".
+ 	"                 [-fp <font-path>]\n".
++	"                 [-cc <visual>]\n".
+ 	"                 [-fg]\n".
+ 	"                 [-autokill]\n".
+ 	"                 [-noxstartup]\n".
+diff --git a/vncviewer/vncviewer.cxx b/vncviewer/vncviewer.cxx
+index f076565f..05669a42 100644
+--- a/vncviewer/vncviewer.cxx
++++ b/vncviewer/vncviewer.cxx
+@@ -352,6 +352,11 @@ static void usage(const char *programName)
+           "       %s [parameters] -listen [port] [parameters]\n"
+           "       %s [parameters] [.tigervnc file]\n",
+           programName, programName, programName);
++  fprintf(stderr,"\n"
++	  "Options:\n\n"
++	  "  -display Xdisplay - Specifies the X display for the viewer window\n"
++	  "  -geometry geometry - Standard X position and sizing specification.\n");
++
+   fprintf(stderr,"\n"
+           "Parameters can be turned on with -<param> or off with -<param>=0\n"
+           "Parameters which take a value can be specified as "
+diff --git a/vncviewer/vncviewer.man b/vncviewer/vncviewer.man
+index 729c01d6..07dc58f1 100644
+--- a/vncviewer/vncviewer.man
++++ b/vncviewer/vncviewer.man
+@@ -240,6 +240,10 @@ This option specifies the preferred encoding to use from one of "Tight", "ZRLE",
+ Disable lossy JPEG compression in Tight encoding. Default is off.
+ .
+ .TP
++.B \-ImprovedHextile
++Try harder to compress data (default).
++.
++.TP
+ .B \-QualityLevel \fIlevel\fP
+ JPEG quality level. 0 = Low, 9 = High. May be adjusted automatically if
+ \fB-AutoSelect\fP is turned on. Default is 8.
+@@ -296,6 +300,11 @@ respectively.
+ .B \-AlertOnFatalError
+ Display a dialog with any fatal error before exiting. Default is on.
+ 
++.
++.TP
++.B \-ZlibLevel
++Zlib compression level.
++
+ .SH FILES
+ .TP
+ $HOME/.vnc/default.tigervnc

diff --git a/net-misc/tigervnc/files/tigervnc-9999-055_xstartup.patch b/net-misc/tigervnc/files/tigervnc-9999-055_xstartup.patch
new file mode 100644
index 0000000..8b50d8c
--- /dev/null
+++ b/net-misc/tigervnc/files/tigervnc-9999-055_xstartup.patch
@@ -0,0 +1,33 @@
+diff --git a/unix/vncserver b/unix/vncserver
+index 9e7a6ac5..fff53bdb 100755
+--- a/unix/vncserver
++++ b/unix/vncserver
+@@ -63,27 +63,7 @@ $defaultXStartup
+     = ("#!/bin/sh\n\n".
+        "unset SESSION_MANAGER\n".
+        "unset DBUS_SESSION_BUS_ADDRESS\n".
+-       "OS=`uname -s`\n".
+-       "if [ \$OS = 'Linux' ]; then\n".
+-       "  case \"\$WINDOWMANAGER\" in\n".
+-       "    \*gnome\*)\n".
+-       "      if [ -e /etc/SuSE-release ]; then\n".
+-       "        PATH=\$PATH:/opt/gnome/bin\n".
+-       "        export PATH\n".
+-       "      fi\n".
+-       "      ;;\n".
+-       "  esac\n".
+-       "fi\n".
+-       "if [ -x /etc/X11/xinit/xinitrc ]; then\n".
+-       "  exec /etc/X11/xinit/xinitrc\n".
+-       "fi\n".
+-       "if [ -f /etc/X11/xinit/xinitrc ]; then\n".
+-       "  exec sh /etc/X11/xinit/xinitrc\n".
+-       "fi\n".
+-       "[ -r \$HOME/.Xresources ] && xrdb \$HOME/.Xresources\n".
+-       "xsetroot -solid grey\n".
+-       "xterm -geometry 80x24+10+10 -ls -title \"\$VNCDESKTOP Desktop\" &\n".
+-       "twm &\n");
++       "exec /etc/X11/xinit/xinitrc\n");
+ 
+ $defaultConfig
+     = ("## Supported server options to pass to vncserver upon invocation can be listed\n".

diff --git a/net-misc/tigervnc/files/xserver120.patch b/net-misc/tigervnc/files/xserver120.patch
new file mode 100644
index 0000000..e823a65
--- /dev/null
+++ b/net-misc/tigervnc/files/xserver120.patch
@@ -0,0 +1,91 @@
+diff -urpN xorg-server-1.20.0.orig/configure.ac xorg-server-1.20.0/configure.ac
+--- xorg-server-1.20.0.orig/configure.ac	2018-05-10 09:32:34.000000000 -0700
++++ xorg-server-1.20.0/configure.ac	2018-06-13 19:04:47.536413626 -0700
+@@ -74,6 +74,7 @@ dnl forcing an entire recompile.x
+ AC_CONFIG_HEADERS(include/version-config.h)
+ 
+ AM_PROG_AS
++AC_PROG_CXX
+ AC_PROG_LN_S
+ LT_PREREQ([2.2])
+ LT_INIT([disable-static win32-dll])
+@@ -1777,6 +1778,10 @@ if test "x$XVFB" = xyes; then
+ 	AC_SUBST([XVFB_SYS_LIBS])
+ fi
+ 
++dnl Xvnc DDX
++AC_SUBST([XVNC_CPPFLAGS], ["-DHAVE_DIX_CONFIG_H $XSERVER_CFLAGS"])
++AC_SUBST([XVNC_LIBS], ["$FB_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $DRI3_LIB $PRESENT_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $MAIN_LIB"])
++AC_SUBST([XVNC_SYS_LIBS], ["$GLX_SYS_LIBS"])
+ 
+ dnl Xnest DDX
+ 
+@@ -1812,6 +1817,8 @@ if test "x$XORG" = xauto; then
+ fi
+ AC_MSG_RESULT([$XORG])
+ 
++AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version])
++
+ if test "x$XORG" = xyes; then
+ 	XORG_DDXINCS='-I$(top_srcdir)/hw/xfree86 -I$(top_srcdir)/hw/xfree86/include -I$(top_srcdir)/hw/xfree86/common'
+ 	XORG_OSINCS='-I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/os'
+@@ -2029,7 +2036,6 @@ if test "x$XORG" = xyes; then
+ 	AC_DEFINE(XORG_SERVER, 1, [Building Xorg server])
+ 	AC_DEFINE(XORGSERVER, 1, [Building Xorg server])
+ 	AC_DEFINE(XFree86Server, 1, [Building XFree86 server])
+-	AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version])
+ 	AC_DEFINE(NEED_XF86_TYPES, 1, [Need XFree86 typedefs])
+ 	AC_DEFINE(NEED_XF86_PROTOTYPES, 1, [Need XFree86 helper functions])
+ 	AC_DEFINE(__XSERVERNAME__, "Xorg", [Name of X server])
+@@ -2565,6 +2571,7 @@ hw/dmx/Makefile
+ hw/dmx/man/Makefile
+ hw/vfb/Makefile
+ hw/vfb/man/Makefile
++hw/vnc/Makefile
+ hw/xnest/Makefile
+ hw/xnest/man/Makefile
+ hw/xwin/Makefile
+diff -urpN xorg-server-1.20.0.orig/hw/Makefile.am xorg-server-1.20.0/hw/Makefile.am
+--- xorg-server-1.20.0.orig/hw/Makefile.am	2018-05-10 09:32:34.000000000 -0700
++++ xorg-server-1.20.0/hw/Makefile.am	2018-06-13 19:04:47.536413626 -0700
+@@ -38,7 +38,8 @@ SUBDIRS =			\
+ 	$(DMX_SUBDIRS)		\
+ 	$(KDRIVE_SUBDIRS)	\
+ 	$(XQUARTZ_SUBDIRS)	\
+-	$(XWAYLAND_SUBDIRS)
++	$(XWAYLAND_SUBDIRS)	\
++	vnc
+ 
+ DIST_SUBDIRS = dmx xfree86 vfb xnest xwin xquartz kdrive xwayland
+ 
+diff -urpN xorg-server-1.20.0.orig/include/os.h xorg-server-1.20.0/include/os.h
+--- xorg-server-1.20.0.orig/include/os.h	2018-05-10 09:32:36.000000000 -0700
++++ xorg-server-1.20.0/include/os.h	2018-06-13 19:04:47.537413618 -0700
+@@ -633,7 +633,7 @@ LogSetDisplay(void);
+ extern _X_EXPORT void
+ LogClose(enum ExitCode error);
+ extern _X_EXPORT Bool
+-LogSetParameter(LogParameter param, int value);
++LogSetParameter(enum _LogParameter param, int value);
+ extern _X_EXPORT void
+ LogVWrite(int verb, const char *f, va_list args)
+ _X_ATTRIBUTE_PRINTF(2, 0);
+diff -urpN xorg-server-1.20.0.orig/mi/miinitext.c xorg-server-1.20.0/mi/miinitext.c
+--- xorg-server-1.20.0.orig/mi/miinitext.c	2018-05-10 09:32:37.000000000 -0700
++++ xorg-server-1.20.0/mi/miinitext.c	2018-06-13 19:05:14.742200675 -0700
+@@ -107,8 +107,15 @@ SOFTWARE.
+ #include "os.h"
+ #include "globals.h"
+ 
++#ifdef TIGERVNC
++extern void vncExtensionInit(INITARGS);
++#endif
++
+ /* List of built-in (statically linked) extensions */
+ static const ExtensionModule staticExtensions[] = {
++#ifdef TIGERVNC
++    {vncExtensionInit, "VNC-EXTENSION", NULL},
++#endif
+     {GEExtensionInit, "Generic Event Extension", &noGEExtension},
+     {ShapeExtensionInit, "SHAPE", NULL},
+ #ifdef MITSHM