Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 351142 Details for
Bug 473518
net-misc/tigervnc-1.2.0 compatibility with x11-base/xorg-server-1.14.2
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
113_server_xserver114.patch
113_server_xserver114.patch (text/plain), 3.18 KB, created by
Ilya Gordeev
on 2013-06-16 18:54:44 UTC
(
hide
)
Description:
113_server_xserver114.patch
Filename:
MIME Type:
Creator:
Ilya Gordeev
Created:
2013-06-16 18:54:44 UTC
Size:
3.18 KB
patch
obsolete
>diff -up tigervnc-1.2.0/unix/xserver/configure.ac.vnc tigervnc-1.2.0/unix/xserver/configure.ac >--- tigervnc-1.2.0/unix/xserver/configure.ac.vnc 2013-01-24 13:01:31.013267503 +0100 >+++ tigervnc-1.2.0/unix/xserver/configure.ac 2013-01-24 13:08:43.283941751 +0100 >@@ -72,6 +72,7 @@ dnl forcing an entire recompile.x > AC_CONFIG_HEADERS(include/version-config.h) > > AM_PROG_AS >+AC_PROG_CXX > AC_PROG_LN_S > AC_LIBTOOL_WIN32_DLL > AC_DISABLE_STATIC >@@ -1573,6 +1574,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 $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 > >@@ -1608,6 +1613,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' >@@ -1826,7 +1833,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]) >@@ -2291,6 +2297,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 -up tigervnc-1.2.0/unix/xserver/hw/Makefile.am.vnc tigervnc-1.2.0/unix/xserver/hw/Makefile.am >--- tigervnc-1.2.0/unix/xserver/hw/Makefile.am.vnc 2013-01-10 06:06:16.000000000 +0100 >+++ tigervnc-1.2.0/unix/xserver/hw/Makefile.am 2013-01-24 13:08:43.283941751 +0100 >@@ -33,7 +33,8 @@ SUBDIRS = \ > $(XNEST_SUBDIRS) \ > $(DMX_SUBDIRS) \ > $(KDRIVE_SUBDIRS) \ >- $(XQUARTZ_SUBDIRS) >+ $(XQUARTZ_SUBDIRS) \ >+ vnc > > DIST_SUBDIRS = dmx xfree86 vfb xnest xwin xquartz kdrive > >diff -up tigervnc-1.2.0/unix/xserver/mi/miinitext.c.vnc xserver/mi/miinitext.c >--- tigervnc-1.2.0/unix/xserver/mi/miinitext.c.vnc 2013-01-10 06:06:16.000000000 +0100 >+++ tigervnc-1.2.0/unix/xserver/mi/miinitext.c 2013-01-24 13:08:43.283941751 +0100 >@@ -112,6 +112,10 @@ SOFTWARE. > #include "micmap.h" > #include "globals.h" > >+#ifdef TIGERVNC >+extern void vncExtensionInit(INITARGS); >+#endif >+ > /* The following is only a small first step towards run-time > * configurable extensions. > */ >@@ -302,6 +306,9 @@ static ExtensionModule staticExtensions[ > #ifdef XSELINUX > {SELinuxExtensionInit, SELINUX_EXTENSION_NAME, &noSELinuxExtension}, > #endif >+#ifdef TIGERVNC >+ {vncExtensionInit, "VNC-EXTENSION", NULL}, >+#endif > }; > > static ExtensionModule *ExtensionModuleList = NULL;
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 473518
:
351140
| 351142