Created attachment 1290 [details] [review]
Patches for Cygwin/X

Those patches are in the CYGWIN branch and were already pulled to HEAD

Comment on attachment 1290 [details] [review]
Patches for Cygwin/X

Approved for checkin into X11R6.8.x in the 2004-11-12 release-wranglers call.

ago:
I am having a problem with applying the patch to the X11R6.8.x stable branch - I
am getting a reject in xc/programs/Xserver/hw/xwin/winmouse.c which I am unable
to resolve as something in the current branch version of winmouse.c is
completely different from the version in the patch - can you try to make a new
patch, attach it here and then commit it yourself, please ?

Created attachment 1547 [details] [review]
Changes to hw/xwin since 6.8.1

This includes only the changes to hw/xwin

Created attachment 1548 [details] [review]
changes to !hw/xwin since 6.8.1

commit attachment 1547 [details] [review] and 1548 to XORG-6_8-BRANCH

/cvs/xorg/xc/ChangeLog,v  <--  ChangeLog
new revision: 1.365.2.92; previous revision: 1.365.2.91
/cvs/xorg/xc/programs/Xserver/Imakefile,v  <--  Imakefile
new revision: 1.19.2.1; previous revision: 1.19
/cvs/xorg/xc/programs/Xserver/hw/xwin/ChangeLog,v  <--  ChangeLog
new revision: 1.6.2.1; previous revision: 1.6
/cvs/xorg/xc/programs/Xserver/hw/xwin/Imakefile,v  <--  Imakefile
new revision: 1.3.4.1; previous revision: 1.3
/cvs/xorg/xc/programs/Xserver/hw/xwin/InitOutput.c,v  <--  InitOutput.c
new revision: 1.4.4.1; previous revision: 1.4
/cvs/xorg/xc/programs/Xserver/hw/xwin/XWin.rc,v  <--  XWin.rc
new revision: 1.3.4.1; previous revision: 1.3
/cvs/xorg/xc/programs/Xserver/hw/xwin/win.h,v  <--  win.h
new revision: 1.4.2.1; previous revision: 1.4
/cvs/xorg/xc/programs/Xserver/hw/xwin/winclipboardthread.c,v  <-- 
winclipboardthread.c
new revision: 1.4.2.1; previous revision: 1.4
/cvs/xorg/xc/programs/Xserver/hw/xwin/winclipboardwndproc.c,v  <-- 
winclipboardwndproc.c
new revision: 1.4.2.1; previous revision: 1.4
/cvs/xorg/xc/programs/Xserver/hw/xwin/winclipboardxevents.c,v  <-- 
winclipboardxevents.c
new revision: 1.4.2.1; previous revision: 1.4
/cvs/xorg/xc/programs/Xserver/hw/xwin/winconfig.c,v  <--  winconfig.c
new revision: 1.4.4.1; previous revision: 1.4
/cvs/xorg/xc/programs/Xserver/hw/xwin/wincreatewnd.c,v  <--  wincreatewnd.c
new revision: 1.3.4.1; previous revision: 1.3
/cvs/xorg/xc/programs/Xserver/hw/xwin/winmessages.h,v  <--  winmessages.h
new revision: 1.2.4.1; previous revision: 1.2
/cvs/xorg/xc/programs/Xserver/hw/xwin/winmouse.c,v  <--  winmouse.c
new revision: 1.3.4.1; previous revision: 1.3
/cvs/xorg/xc/programs/Xserver/hw/xwin/winmultiwindowwm.c,v  <--  winmultiwindowwm.c
new revision: 1.3.4.1; previous revision: 1.3
/cvs/xorg/xc/programs/Xserver/hw/xwin/winmultiwindowwndproc.c,v  <-- 
winmultiwindowwndproc.c
new revision: 1.3.4.1; previous revision: 1.3
/cvs/xorg/xc/programs/Xserver/hw/xwin/winprocarg.c,v  <--  winprocarg.c
new revision: 1.3.4.1; previous revision: 1.3
/cvs/xorg/xc/programs/Xserver/hw/xwin/winresource.h,v  <--  winresource.h
new revision: 1.2.4.1; previous revision: 1.2
/cvs/xorg/xc/programs/Xserver/hw/xwin/winshadddnl.c,v  <--  winshadddnl.c
new revision: 1.3.4.1; previous revision: 1.3
/cvs/xorg/xc/programs/Xserver/hw/xwin/winwin32rootlesswndproc.c,v  <-- 
winwin32rootlesswndproc.c
new revision: 1.3.2.1; previous revision: 1.3
/cvs/xorg/xc/programs/Xserver/hw/xwin/winwndproc.c,v  <--  winwndproc.c
new revision: 1.3.4.1; previous revision: 1.3

Created attachment 1656 [details] [review]
[FIXED_X11R68x] more patches from CYGWIN branch

Comment on attachment 1656 [details] [review]
[FIXED_X11R68x] more patches from CYGWIN branch

Approved for checkin into X11R6.8.x stable branch in the 2005-01-10 Xorg
release-wranglers phone call.

Comment on attachment 1656 [details] [review]
[FIXED_X11R68x] more patches from CYGWIN branch

Patch checked-in into X11R6.8.x stable branch:

/cvs/xorg/xc/ChangeLog,v  <--  ChangeLog
new revision: 1.365.2.122; previous revision: 1.365.2.121
cvs commit: Using deprecated info format strings.  Convert your scripts to use
the new argument format and remove '1's from your info file format strings.
/cvs/xorg/xc/programs/Xserver/hw/xwin/ChangeLog,v  <--	ChangeLog
new revision: 1.6.2.2; previous revision: 1.6.2.1
/cvs/xorg/xc/programs/Xserver/hw/xwin/winkeybd.h,v  <--  winkeybd.h
new revision: 1.3.4.1; previous revision: 1.3
/cvs/xorg/xc/programs/Xserver/hw/xwin/winkeyhook.c,v  <--  winkeyhook.c
new revision: 1.2.4.1; previous revision: 1.2
/cvs/xorg/xc/programs/Xserver/hw/xwin/winmultiwindowclass.c,v  <-- 
winmultiwindowclass.c
new revision: 1.3.4.1; previous revision: 1.3
/cvs/xorg/xc/programs/Xserver/hw/xwin/winmultiwindowwindow.c,v	<-- 
winmultiwindowwindow.c
new revision: 1.3.4.1; previous revision: 1.3
/cvs/xorg/xc/programs/Xserver/hw/xwin/winmultiwindowwm.c,v  <-- 
winmultiwindowwm.c
new revision: 1.3.4.2; previous revision: 1.3.4.1
/cvs/xorg/xc/programs/Xserver/hw/xwin/winwndproc.c,v  <--  winwndproc.c
new revision: 1.3.4.2; previous revision: 1.3.4.1
cvs commit: Using deprecated info format strings.  Convert your scripts to use
the new argument format and remove '1's from your info file format strings.
Mailing the commit message to xorg-commit@lists.freedesktop.org...

mass update: this bug was applied to the stable 6.8 branch but NOT to HEAD!

The changes were from CYGWIN branch which is merged to HEAD on quite often. The
changes are in HEAD, maybe not with the same commitlog or patch id

CYGWIN branch and HEAD are synced. The changes are already in HEAD.

marking as fixed