Attachment #80269 for bug #103274

Lines 44-49 Link Here

(-)nxviewer/nxviewer/Imakefile.old (+2 lines)
44		44
45	USRLIBDIR = ../../nx-X11/exports/lib	45	USRLIBDIR = ../../nx-X11/exports/lib
46		46
		47	XPLIB =
		48
47	#ifdef SunArchitecture	49	#ifdef SunArchitecture
48	USRLIBDIR = /usr/NX/lib	50	USRLIBDIR = /usr/NX/lib
49	SUN_LIB = -lX11 -lXext -L/usr/openwin/lib	51	SUN_LIB = -lX11 -lXext -L/usr/openwin/lib

Lines 125-131 Link Here

(-)nx-X11/programs/Imakefile.old (-2 / +4 lines)
125	#if defined(NXEmbeddedXServer)	125	#if defined(NXEmbeddedXServer)
126	SUBDIRS = $(XSSRCDIR)	126	SUBDIRS = $(XSSRCDIR)
127	#else	127	#else
128	SUBDIRS = $(XSSRCDIR) nxauth	128	SUBDIRS = $(XSSRCDIR)
129	#endif	129	#endif
130	#else	130	#else
131	SUBDIRS = \	131	SUBDIRS = \
132	-- nxcomp/RenderExtension.h.orig 2005-02-19 18:23:32.000000000 +0000	132	++ nxcomp/RenderExtension.h 2005-08-27 23:16:05.000000000 +0100
Lines 68-73 Link Here
68	// The message class.	68	// The message class.
69	//	69	//
		70	class RenderMinorExtensionStore;
		71
70	class RenderExtensionMessage : public Message	72	class RenderExtensionMessage : public Message
71	{	73	{
72	friend class RenderExtensionStore;	74	friend class RenderExtensionStore;





	if (xkbi->flags&XkbMapPending)
	     changes= xkbi->changes;
	else bzero(&changes,sizeof(changes));
	XkbNoteMapChanges(&changes,event,XKB_XLIB_MAP_MASK);
	LockDisplay(dpy);
	if ((rtrn=XkbGetMapChanges(dpy,xkbi->desc,&changes))!=Success) {
++ nx-X11/lib/FS/FSOpenFont.c

    char       *name;
    Font       *otherid;
{
    long nbytes;
    fsOpenBitmapFontReq *req;
    fsOpenBitmapFontReply reply;
    Font        fid;
++ nx-X11/lib/X11/imThaiFlt.c

  ( \
   ((c)<=0x7F) ? \
     (wchar_t)(c) : \
     ((0x0A1<=(c)) ? ((wchar_t)(c)-0xA0+0x0E00) : 0))

/*
 * Macros to save and recall last input character in XIC
++ nx-X11/programs/Xserver/xkb/xkbUtils.c

{
XkbStatePtr	state= &xkbi->state;
XkbControlsPtr	ctrls= xkbi->desc->ctrls;
unsigned char		grp;

    state->mods= (state->base_mods|state->latched_mods);
    state->mods|= state->locked_mods;
++ nx-X11/programs/Xserver/xkb/xkbUtils.c



    grp= state->locked_group;
    if (grp>=ctrls->num_groups)
	state->locked_group= XkbAdjustGroup(grp,ctrls);

    grp= state->locked_group+state->base_group+state->latched_group;
    if (grp>=ctrls->num_groups)
	 state->group= XkbAdjustGroup(grp,ctrls);
    else state->group= grp;
    XkbComputeCompatState(xkbi);

Lines 2621-2628 Link Here

(-)nx-X11/programs/Xserver/xkb/xkb.c.orig (-2 / +1 lines)
2621	stuff->maxKeyCode= xkb->max_key_code;	2621	stuff->maxKeyCode= xkb->max_key_code;
2622	}	2622	}
2623	else {	2623	else {
2624	if ((stuff->minKeyCode<XkbMinLegalKeyCode)\|\|	2624	if (!XkbIsLegalKeycode(stuff->minKeyCode)) {
2625	(stuff->maxKeyCode>XkbMaxLegalKeyCode)) {
2626	client->errorValue= _XkbErrCode3(2,stuff->minKeyCode,	2625	client->errorValue= _XkbErrCode3(2,stuff->minKeyCode,
2627	stuff->maxKeyCode);	2626	stuff->maxKeyCode);
2628	return BadValue;	2627	return BadValue;

Lines 58-64 Link Here

(-)nx-X11/lib/X11/XlcDL.c.orig (-1 / +1 lines)
58	#ifdef _LP64	58	#ifdef _LP64
59	# if defined(__sparcv9)	59	# if defined(__sparcv9)
60	# define _MACH64_NAME "sparcv9"	60	# define _MACH64_NAME "sparcv9"
61	# elif defined(__ia64__)	61	# elif defined(__ia64__) \|\| defined(__amd64__)
62	# undef MACH64_NAME	62	# undef MACH64_NAME
63	# else	63	# else
64	# error "Unknown architecture"	64	# error "Unknown architecture"

Return to bug 103274

Lines 428-434 Link Here

(-)nx-X11/lib/X11/XKBBind.c.orig (-10 / +10 lines)
428		428
429	if (xkbi->flags&XkbMapPending)	429	if (xkbi->flags&XkbMapPending)
430	changes= xkbi->changes;	430	changes= xkbi->changes;
431	else bzero(&changes,sizeof(XkbChangesRec));	431	else bzero(&changes,sizeof(changes));
432	XkbNoteMapChanges(&changes,event,XKB_XLIB_MAP_MASK);	432	XkbNoteMapChanges(&changes,event,XKB_XLIB_MAP_MASK);
433	LockDisplay(dpy);	433	LockDisplay(dpy);
434	if ((rtrn=XkbGetMapChanges(dpy,xkbi->desc,&changes))!=Success) {	434	if ((rtrn=XkbGetMapChanges(dpy,xkbi->desc,&changes))!=Success) {
435	-- nx-X11/lib/FS/FSOpenFont.c	435	++ nx-X11/lib/FS/FSOpenFont.c
Lines 62-68 FSOpenBitmapFont(svr, hint, fmask, name, Link Here
62	char *name;	62	char *name;
63	Font *otherid;	63	Font *otherid;
64	{	64	{
65	unsigned char nbytes;	65	long nbytes;
66	fsOpenBitmapFontReq *req;	66	fsOpenBitmapFontReq *req;
67	fsOpenBitmapFontReply reply;	67	fsOpenBitmapFontReply reply;
68	Font fid;	68	Font fid;
69	-- nx-X11/lib/X11/imThaiFlt.c	69	++ nx-X11/lib/X11/imThaiFlt.c
Lines 588-594 Private Bool ThaiComposeConvert(); Link Here
588	( \	588	( \
589	((c)<=0x7F) ? \	589	((c)<=0x7F) ? \
590	(wchar_t)(c) : \	590	(wchar_t)(c) : \
591	((0x0A1<=(c)&&(c)<=0x0FF) ? ((wchar_t)(c)-0xA0+0x0E00) : 0))	591	((0x0A1<=(c)) ? ((wchar_t)(c)-0xA0+0x0E00) : 0))
592		592
593	/*	593	/*
594	* Macros to save and recall last input character in XIC	594	* Macros to save and recall last input character in XIC
595	-- nx-X11/programs/Xserver/xkb/xkbUtils.c	595	++ nx-X11/programs/Xserver/xkb/xkbUtils.c
Lines 855-861 XkbComputeDerivedState(xkbi) Link Here
855	{	855	{
856	XkbStatePtr state= &xkbi->state;	856	XkbStatePtr state= &xkbi->state;
857	XkbControlsPtr ctrls= xkbi->desc->ctrls;	857	XkbControlsPtr ctrls= xkbi->desc->ctrls;
858	char grp;	858	unsigned char grp;
859		859
860	state->mods= (state->base_mods\|state->latched_mods);	860	state->mods= (state->base_mods\|state->latched_mods);
861	state->mods\|= state->locked_mods;	861	state->mods\|= state->locked_mods;
862	-- nx-X11/programs/Xserver/xkb/xkbUtils.c	862	++ nx-X11/programs/Xserver/xkb/xkbUtils.c
Lines 866-876 char grp; Link Here
866		866
867		867
868	grp= state->locked_group;	868	grp= state->locked_group;
869	if ((grp>=ctrls->num_groups) \|\| (grp<0))	869	if (grp>=ctrls->num_groups)
870	state->locked_group= XkbAdjustGroup(grp,ctrls);	870	state->locked_group= XkbAdjustGroup(grp,ctrls);
871		871
872	grp= state->locked_group+state->base_group+state->latched_group;	872	grp= state->locked_group+state->base_group+state->latched_group;
873	if ((grp>=ctrls->num_groups) \|\| (grp<0))	873	if (grp>=ctrls->num_groups)
874	state->group= XkbAdjustGroup(grp,ctrls);	874	state->group= XkbAdjustGroup(grp,ctrls);
875	else state->group= grp;	875	else state->group= grp;
876	XkbComputeCompatState(xkbi);	876	XkbComputeCompatState(xkbi);