Attachment #535842 for bug #658076

Lines 74-79 dnl forcing an entire recompile.x Link Here

(-)xorg-server-1.20.0.orig/configure.ac (-1 / +8 lines)
74	AC_CONFIG_HEADERS(include/version-config.h)	74	AC_CONFIG_HEADERS(include/version-config.h)
75		75
76	AM_PROG_AS	76	AM_PROG_AS
		77	AC_PROG_CXX
77	AC_PROG_LN_S	78	AC_PROG_LN_S
78	LT_PREREQ([2.2])	79	LT_PREREQ([2.2])
79	LT_INIT([disable-static win32-dll])	80	LT_INIT([disable-static win32-dll])
Lines 1777-1782 if test "x$XVFB" = xyes; then Link Here
1777	AC_SUBST([XVFB_SYS_LIBS])	1778	AC_SUBST([XVFB_SYS_LIBS])
1778	fi	1779	fi
1779		1780
		1781	dnl Xvnc DDX
		1782	AC_SUBST([XVNC_CPPFLAGS], ["-DHAVE_DIX_CONFIG_H $XSERVER_CFLAGS"])
		1783	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"])
		1784	AC_SUBST([XVNC_SYS_LIBS], ["$GLX_SYS_LIBS"])
1780		1785
1781	dnl Xnest DDX	1786	dnl Xnest DDX
1782		1787
Lines 1812-1817 if test "x$XORG" = xauto; then Link Here
1812	fi	1817	fi
1813	AC_MSG_RESULT([$XORG])	1818	AC_MSG_RESULT([$XORG])
1814		1819
		1820	AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version])
		1821
1815	if test "x$XORG" = xyes; then	1822	if test "x$XORG" = xyes; then
1816	XORG_DDXINCS='-I$(top_srcdir)/hw/xfree86 -I$(top_srcdir)/hw/xfree86/include -I$(top_srcdir)/hw/xfree86/common'	1823	XORG_DDXINCS='-I$(top_srcdir)/hw/xfree86 -I$(top_srcdir)/hw/xfree86/include -I$(top_srcdir)/hw/xfree86/common'
1817	XORG_OSINCS='-I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/os'	1824	XORG_OSINCS='-I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/os'
Lines 2029-2035 if test "x$XORG" = xyes; then Link Here
2029	AC_DEFINE(XORG_SERVER, 1, [Building Xorg server])	2036	AC_DEFINE(XORG_SERVER, 1, [Building Xorg server])
2030	AC_DEFINE(XORGSERVER, 1, [Building Xorg server])	2037	AC_DEFINE(XORGSERVER, 1, [Building Xorg server])
2031	AC_DEFINE(XFree86Server, 1, [Building XFree86 server])	2038	AC_DEFINE(XFree86Server, 1, [Building XFree86 server])
2032	AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version])
2033	AC_DEFINE(NEED_XF86_TYPES, 1, [Need XFree86 typedefs])	2039	AC_DEFINE(NEED_XF86_TYPES, 1, [Need XFree86 typedefs])
2034	AC_DEFINE(NEED_XF86_PROTOTYPES, 1, [Need XFree86 helper functions])	2040	AC_DEFINE(NEED_XF86_PROTOTYPES, 1, [Need XFree86 helper functions])
2035	AC_DEFINE(__XSERVERNAME__, "Xorg", [Name of X server])	2041	AC_DEFINE(__XSERVERNAME__, "Xorg", [Name of X server])
Lines 2565-2570 hw/dmx/Makefile Link Here
2565	hw/dmx/man/Makefile	2571	hw/dmx/man/Makefile
2566	hw/vfb/Makefile	2572	hw/vfb/Makefile
2567	hw/vfb/man/Makefile	2573	hw/vfb/man/Makefile
		2574	hw/vnc/Makefile
2568	hw/xnest/Makefile	2575	hw/xnest/Makefile
2569	hw/xnest/man/Makefile	2576	hw/xnest/man/Makefile
2570	hw/xwin/Makefile	2577	hw/xwin/Makefile

Lines 38-44 SUBDIRS = \ Link Here

(-)xorg-server-1.20.0.orig/hw/Makefile.am (-1 / +2 lines)
38	$(DMX_SUBDIRS) \	38	$(DMX_SUBDIRS) \
39	$(KDRIVE_SUBDIRS) \	39	$(KDRIVE_SUBDIRS) \
40	$(XQUARTZ_SUBDIRS) \	40	$(XQUARTZ_SUBDIRS) \
41	$(XWAYLAND_SUBDIRS)	41	$(XWAYLAND_SUBDIRS) \
		42	vnc
42		43
43	DIST_SUBDIRS = dmx xfree86 vfb xnest xwin xquartz kdrive xwayland	44	DIST_SUBDIRS = dmx xfree86 vfb xnest xwin xquartz kdrive xwayland
44		45

Lines 633-639 LogSetDisplay(void); Link Here

(-)xorg-server-1.20.0.orig/include/os.h (-1 / +1 lines)
633	extern _X_EXPORT void	633	extern _X_EXPORT void
634	LogClose(enum ExitCode error);	634	LogClose(enum ExitCode error);
635	extern _X_EXPORT Bool	635	extern _X_EXPORT Bool
636	LogSetParameter(LogParameter param, int value);	636	LogSetParameter(enum _LogParameter param, int value);
637	extern _X_EXPORT void	637	extern _X_EXPORT void
638	LogVWrite(int verb, const char *f, va_list args)	638	LogVWrite(int verb, const char *f, va_list args)
639	_X_ATTRIBUTE_PRINTF(2, 0);	639	_X_ATTRIBUTE_PRINTF(2, 0);

Lines 107-114 SOFTWARE. Link Here

(-)xorg-server-1.20.0.orig/mi/miinitext.c (+7 lines)
107	#include "os.h"	107	#include "os.h"
108	#include "globals.h"	108	#include "globals.h"
109		109
		110	#ifdef TIGERVNC
		111	extern void vncExtensionInit(INITARGS);
		112	#endif
		113
110	/* List of built-in (statically linked) extensions */	114	/* List of built-in (statically linked) extensions */
111	static const ExtensionModule staticExtensions[] = {	115	static const ExtensionModule staticExtensions[] = {
		116	#ifdef TIGERVNC
		117	{vncExtensionInit, "VNC-EXTENSION", NULL},
		118	#endif
112	{GEExtensionInit, "Generic Event Extension", &noGEExtension},	119	{GEExtensionInit, "Generic Event Extension", &noGEExtension},
113	{ShapeExtensionInit, "SHAPE", NULL},	120	{ShapeExtensionInit, "SHAPE", NULL},
114	#ifdef MITSHM	121	#ifdef MITSHM

Return to bug 658076