Author: branden Date: 2004-06-27 19:22:43 -0500 (Sun, 27 Jun 2004) New Revision: 1583
Modified: trunk/debian/CHANGESETS trunk/debian/changelog trunk/debian/patches/000_stolen_from_HEAD.diff trunk/debian/patches/802_gnu_disable_vt_switching.diff Log: Grab OS/2 updates from XFree86 CVS as of 2003-03-24 to ease pending merges. Resync patch #802. Modified: trunk/debian/CHANGESETS =================================================================== --- trunk/debian/CHANGESETS 2004-06-27 23:44:14 UTC (rev 1582) +++ trunk/debian/CHANGESETS 2004-06-28 00:22:43 UTC (rev 1583) @@ -73,4 +73,8 @@ (Closes: #256099) 1576 +Grab OS/2 updates from XFree86 CVS as of 2003-03-24 to ease pending +merges. Resync patch #802. + 1583 + vim:set ai et sts=4 sw=4 tw=80: Modified: trunk/debian/changelog =================================================================== --- trunk/debian/changelog 2004-06-27 23:44:14 UTC (rev 1582) +++ trunk/debian/changelog 2004-06-28 00:22:43 UTC (rev 1583) @@ -42,6 +42,9 @@ * Update Japanese debconf template translations (thanks, Kenshi Muto). (Closes: #256099) + * Grab OS/2 updates from XFree86 CVS as of 2003-03-24 to ease pending + merges. Resync patch #802. + Changes by Fabio Massimo Di Nitto: * Update French debconf template translations (thanks, Christian Perrier). @@ -50,7 +53,7 @@ * Update Brazilian Portuguese debconf template translations (thanks, Andre Luis Lopes). (Closes: #255963) - -- Branden Robinson <[EMAIL PROTECTED]> Thu, 24 Jun 2004 23:10:58 -0500 + -- Branden Robinson <[EMAIL PROTECTED]> Sun, 27 Jun 2004 19:18:53 -0500 xfree86 (4.3.0.dfsg.1-5) unstable; urgency=low Modified: trunk/debian/patches/000_stolen_from_HEAD.diff =================================================================== --- trunk/debian/patches/000_stolen_from_HEAD.diff 2004-06-27 23:44:14 UTC (rev 1582) +++ trunk/debian/patches/000_stolen_from_HEAD.diff 2004-06-28 00:22:43 UTC (rev 1583) @@ -13,6 +13,11 @@ 8. Fix for non-PC keyboard bug introduced by changes to make SysRq generate the same keycode as PrtScrn (Ivan Pascal). +xc/programs/Xserver/hw/xfree86/common/xf86Events.c @ 3.148 +xc/programs/Xserver/hw/xfree86/loader/xf86sym.c @ 1.230 + 26. Updates for building on OS/2 (#5650, Frank Giessler). + [This change not completely applied.] + xc/programs/Xserver/hw/xfree86/drivers/rendition/rendition.c @ 1.51 981. Disable cuase of SEGV's in rendition driver (Marc La France). @@ -367,16 +372,41 @@ /* * Now start talking to the server to setup all other information... -diff -urN xc.orig/programs/Xserver/hw/xfree86/common/xf86Events.c xc/programs/Xserver/hw/xfree86/common/xf86Events.c ---- xc.orig/programs/Xserver/hw/xfree86/common/xf86Events.c 2003-02-20 15:20:52.000000000 +1100 -+++ xc/programs/Xserver/hw/xfree86/common/xf86Events.c 2003-04-09 01:58:14.000000000 +1000 +Index: xc/programs/Xserver/hw/xfree86/common/xf86Events.c +=================================================================== +RCS file: /cvs/xc/programs/Xserver/hw/xfree86/common/xf86Events.c,v +retrieving revision 3.146 +retrieving revision 3.148 +diff -u -r3.146 -r3.148 +--- xc/programs/Xserver/hw/xfree86/common/xf86Events.c 20 Feb 2003 04:20:52 -0000 3.146 ++++ xc/programs/Xserver/hw/xfree86/common/xf86Events.c 25 Mar 2003 04:18:20 -0000 3.148 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Events.c,v 3.146 2003/02/20 04:20:52 dawes Exp $ */ -+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Events.c,v 3.147 2003/03/06 17:39:34 dawes Exp $ */ ++/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Events.c,v 3.148 2003/03/25 04:18:20 dawes Exp $ */ /* * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany. * -@@ -535,6 +535,17 @@ +@@ -25,6 +25,10 @@ + + /* [JCH-96/01/21] Extended std reverse map to four buttons. */ + ++#ifdef __UNIXOS2__ ++#define I_NEED_OS2_H ++#endif ++ + #include "X.h" + #include "Xpoll.h" + #include "Xproto.h" +@@ -315,7 +319,7 @@ + CloseDownClient(server); + } + break; +-#if !defined(__SOL8__) && (!defined(sun) || defined(i386)) ++#if !defined(__SOL8__) && !defined(__UNIXOS2__) && (!defined(sun) || defined(i386)) + case ACTION_SWITCHSCREEN: + if (VTSwitchEnabled && !xf86Info.dontVTSwitch && arg) { + int vtno = *((int *) arg); +@@ -535,6 +539,17 @@ } /* @@ -394,7 +424,7 @@ * and now get some special keysequences */ -@@ -829,17 +840,6 @@ +@@ -829,17 +844,6 @@ #endif /* @@ -3659,15 +3689,53 @@ } +#endif /* _XF86_FOURCC_H_ */ -Index: xc/programs/Xserver/hw/xfree86/loader/xf86sym.c -=================================================================== -RCS file: /cvs/xc/programs/Xserver/hw/xfree86/loader/xf86sym.c,v -retrieving revision 1.231 -retrieving revision 1.232 -diff -u -r1.231 -r1.232 ---- xc/programs/Xserver/hw/xfree86/loader/xf86sym.c 3 Apr 2003 16:16:02 -0000 1.231 -+++ xc/programs/Xserver/hw/xfree86/loader/xf86sym.c 23 Apr 2003 21:51:52 -0000 1.232 -@@ -569,6 +569,8 @@ +--- xc/programs/Xserver/hw/xfree86/loader/xf86sym.c~ 2004-06-27 19:14:47.000000000 -0500 ++++ xc/programs/Xserver/hw/xfree86/loader/xf86sym.c 2004-06-27 19:14:56.000000000 -0500 +@@ -1,4 +1,4 @@ +-/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/xf86sym.c,v 1.227.2.1 2003/03/13 04:10:47 tsi Exp $ */ ++/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/xf86sym.c,v 1.230 2003/03/25 04:18:22 dawes Exp $ */ + + /* + * +@@ -108,14 +108,18 @@ + #endif + + #if defined(__GNUC__) ++#ifndef __UNIXOS2__ + extern long __div64(long, long); ++#endif + extern long __divdf3(long, long); + extern long __divdi3(long, long); + extern long __divsf3(long, long); + extern long __divsi3(long, long); + extern long __moddi3(long, long); + extern long __modsi3(long, long); ++#ifndef __UNIXOS2__ + extern long __mul64(long, long); ++#endif + extern long __muldf3(long, long); + extern long __muldi3(long, long); + extern long __mulsf3(long, long); +@@ -124,14 +128,18 @@ + extern long __udivsi3(long, long); + extern long __umoddi3(long, long); + extern long __umodsi3(long, long); ++#ifndef __UNIXOS2__ + #pragma weak __div64 ++#endif + #pragma weak __divdf3 + #pragma weak __divdi3 + #pragma weak __divsf3 + #pragma weak __divsi3 + #pragma weak __moddi3 + #pragma weak __modsi3 ++#ifndef __UNIXOS2__ + #pragma weak __mul64 ++#endif + #pragma weak __muldf3 + #pragma weak __muldi3 + #pragma weak __mulsf3 +@@ -569,6 +577,8 @@ SYMFUNC(xf86XVFreeVideoAdaptorRec) SYMFUNC(xf86XVFillKeyHelper) SYMFUNC(xf86XVClipVideoHelper) @@ -3676,6 +3744,25 @@ /* xf86xvmc.c */ SYMFUNC(xf86XvMCScreenInit) +@@ -1037,14 +1047,18 @@ + # endif + #endif + #if defined(__GNUC__) ++#ifndef __UNIXOS2__ + SYMFUNC(__div64) ++#endif + SYMFUNC(__divdf3) + SYMFUNC(__divdi3) + SYMFUNC(__divsf3) + SYMFUNC(__divsi3) + SYMFUNC(__moddi3) + SYMFUNC(__modsi3) ++#ifndef __UNIXOS2__ + SYMFUNC(__mul64) ++#endif + SYMFUNC(__muldf3) + SYMFUNC(__muldi3) + SYMFUNC(__mulsf3) --- xc/programs/xdm/access.c~ 2004-05-07 15:10:12.000000000 -0500 +++ xc/programs/xdm/access.c 2004-05-07 15:10:18.000000000 -0500 @@ -290,7 +290,7 @@ Modified: trunk/debian/patches/802_gnu_disable_vt_switching.diff =================================================================== --- trunk/debian/patches/802_gnu_disable_vt_switching.diff 2004-06-27 23:44:14 UTC (rev 1582) +++ trunk/debian/patches/802_gnu_disable_vt_switching.diff 2004-06-28 00:22:43 UTC (rev 1583) @@ -4,19 +4,19 @@ Not submitted to XFree86. ---- xc/programs/Xserver/hw/xfree86/common/xf86Events.c.old 2003-04-11 15:03:23.000000000 +0200 -+++ xc/programs/Xserver/hw/xfree86/common/xf86Events.c 2003-04-11 15:04:55.000000000 +0200 -@@ -316,6 +316,9 @@ - } +--- xc/programs/Xserver/hw/xfree86/common/xf86Events.c~ 2004-06-27 19:03:05.000000000 -0500 ++++ xc/programs/Xserver/hw/xfree86/common/xf86Events.c 2004-06-27 19:03:08.000000000 -0500 +@@ -321,6 +321,9 @@ break; - #if !defined(__SOL8__) && (!defined(sun) || defined(i386)) + #if !defined(__SOL8__) && !defined(__UNIXOS2__) && (!defined(sun) || defined(i386)) + case ACTION_SWITCHSCREEN: +#ifndef VT_ACTIVATE +#warning missing VT_ACTIVATE ioctl; vt switching is disabled. +#else - case ACTION_SWITCHSCREEN: if (VTSwitchEnabled && !xf86Info.dontVTSwitch && arg) { int vtno = *((int *) arg); -@@ -344,6 +347,7 @@ + #if defined(QNX4) +@@ -348,6 +351,7 @@ ErrorF("Failed to switch consoles (%s)\n", strerror(errno)); } break;