Author: branden
Date: 2003-06-26 21:15:16 -0500 (Thu, 26 Jun 2003)
New Revision: 266
Added:
branches/4.1.0/sarge/debian/held-patches/078_xie_pex5_deprecation.diff
branches/4.1.0/sarge/debian/patches/071_VESA_GTF_1400x1050_modes.diff
branches/4.1.0/sarge/debian/patches/072_neomagic_2380_swcursor.diff
branches/4.1.0/sarge/debian/patches/073_xaw_ascii_sink_and_passwords.diff
branches/4.1.0/sarge/debian/patches/074_xaw_textaction_flashing_paren_fix.diff
branches/4.1.0/sarge/debian/patches/075_xaw_textaction_freed_memory_deref_fix.diff
branches/4.1.0/sarge/debian/patches/076_xaw_readtext_fix.diff
branches/4.1.0/sarge/debian/patches/077_xset_manpage.diff
Modified:
branches/4.1.0/sarge/debian/changelog
branches/4.1.0/sarge/debian/control
branches/4.1.0/sarge/debian/patches/000_stolen_from_HEAD.diff
branches/4.1.0/sarge/debian/patches/001_linux_cf.diff
branches/4.1.0/sarge/debian/shell-lib.sh
branches/4.1.0/sarge/debian/xlibs.conffiles
Log:
Check in the work that was done on 4.1.0 after the -17 release, but
abandoned for the 4.2.0 packaging effort.
Modified: branches/4.1.0/sarge/debian/changelog
==============================================================================
--- branches/4.1.0/sarge/debian/changelog 2003-06-27 02:01:10 UTC (rev
265)
+++ branches/4.1.0/sarge/debian/changelog 2003-06-27 02:15:16 UTC (rev
266)
@@ -1,3 +1,36 @@
+xfree86 (4.1.0-17pre18v1) unstable; urgency=low
+
+ + i810 patch
+ + glide patch
+ + savage patch
+
+ * patch #000_stolen_from_HEAD:
+ + Trident VT switch and Xv fixes (Alan Hourihane).
+ + Fix IBM-reported bug that could cause PCI bus lockouts with second
+ generation integrated Mach64 controllers (Marc La France).
+ + added a bunch of PCI data to xf86PciInfo.h
+
+ * patch #001: define "XFree86CustomVersion" Imake symbol to "Debian"
+ * patch #071
+ * patch #072: (Closes: #130024)
+ * patch #073
+ * patch #074
+ * patch #075
+ * patch #076
+ * patch #077
+ * patch #078
+
+ * debian/control: xserver-common conflicts with xserver-{rage128,sis}; these
+ obsolete packages expect outdated behavior regarding /etc/X11/Xserver.
+ This change smooths potato upgrades. (Closes: #148937)
+ * debian/shell-lib.sh: update analyze_path() to list all contents of the
+ parent directory when a file being searched for is not found; this is to
+ help the dpkg maintainers troubleshoot the ever-elusive
+ "missing-symlink-to-directory" problem
+ * debian/xlibs.conffiles: put leading slash on riscpc symbols file
+
+ -- Branden Robinson <[EMAIL PROTECTED]> Sat, 15 Jun 2002 19:03:47 -0500
+
xfree86 (4.1.0-17) unstable; urgency=low
* patch #069: set the r128 driver's pitch increment to 8 * 32 instead of 8 *
Modified: branches/4.1.0/sarge/debian/control
==============================================================================
--- branches/4.1.0/sarge/debian/control 2003-06-27 02:01:10 UTC (rev 265)
+++ branches/4.1.0/sarge/debian/control 2003-06-27 02:15:16 UTC (rev 266)
@@ -783,7 +783,7 @@
Architecture: any
Depends: debconf (>= 1.0.21), xfree86-common (>> 4.0), ${shlibs:Depends}
Suggests: xserver-xfree86 | xserver, xfonts-base, xfonts-100dpi |
xfonts-75dpi, xfonts-scalable, configlet-frontends
-Conflicts: xbase (<< 3.3.2.3a-2), xsun-utils, xbase-clients (<< 3.3.6-1),
suidmanager (<< 0.50), configlet (<= 0.9.22), xserver-3dlabs (<< 3.3.6-35),
xserver-8514 (<< 3.3.6-35), xserver-agx (<< 3.3.6-35), xserver-common-v3 (<<
3.3.6-35), xserver-fbdev (<< 3.3.6-35), xserver-i128 (<< 3.3.6-35),
xserver-mach32 (<< 3.3.6-35), xserver-mach64 (<< 3.3.6-35), xserver-mach8 (<<
3.3.6-35), xserver-mono (<< 3.3.6-35), xserver-p9000 (<< 3.3.6-35), xserver-s3
(<< 3.3.6-35), xserver-s3v (<< 3.3.6-35), xserver-svga (<< 3.3.6-35),
xserver-tga (<< 3.3.6-35), xserver-vga16 (<< 3.3.6-35), xserver-w32 (<<
3.3.6-35), xserver-xsun (<< 3.3.6-35), xserver-xsun-mono (<< 3.3.6-35),
xserver-xsun24 (<< 3.3.6-35)
+Conflicts: xbase (<< 3.3.2.3a-2), xsun-utils, xbase-clients (<< 3.3.6-1),
suidmanager (<< 0.50), configlet (<= 0.9.22), xserver-3dlabs (<< 3.3.6-35),
xserver-8514 (<< 3.3.6-35), xserver-agx (<< 3.3.6-35), xserver-common-v3 (<<
3.3.6-35), xserver-fbdev (<< 3.3.6-35), xserver-i128 (<< 3.3.6-35),
xserver-mach32 (<< 3.3.6-35), xserver-mach64 (<< 3.3.6-35), xserver-mach8 (<<
3.3.6-35), xserver-mono (<< 3.3.6-35), xserver-p9000 (<< 3.3.6-35), xserver-s3
(<< 3.3.6-35), xserver-s3v (<< 3.3.6-35), xserver-svga (<< 3.3.6-35),
xserver-tga (<< 3.3.6-35), xserver-vga16 (<< 3.3.6-35), xserver-w32 (<<
3.3.6-35), xserver-xsun (<< 3.3.6-35), xserver-xsun-mono (<< 3.3.6-35),
xserver-xsun24 (<< 3.3.6-35), xserver-rage128, xserver-sis
Replaces: xbase (<< 3.3.2.3a-2), xserver-vga16 (<< 3.3.2.3a-2), xserver-agx
(<< 3.3.2.3a-9), xserver-mach32 (<< 3.3.2.3a-9), xserver-mach64 (<<
3.3.2.3a-9), xserver-p9000 (<< 3.3.2.3a-9), xserver-s3 (<< 3.3.2.3a-9),
xserver-s3v (<< 3.3.2.3a-9), xserver-tga (<< 3.3.2.3a-9), xserver-w32 (<<
3.3.2.3a-9), xsun-utils
Description: files and utilities common to all X servers
The X server is the hardware interface of the X Window System. Its job is to
Added: branches/4.1.0/sarge/debian/held-patches/078_xie_pex5_deprecation.diff
==============================================================================
--- branches/4.1.0/sarge/debian/held-patches/078_xie_pex5_deprecation.diff
2003-06-27 02:01:10 UTC (rev 265)
+++ branches/4.1.0/sarge/debian/held-patches/078_xie_pex5_deprecation.diff
2003-06-27 02:15:16 UTC (rev 266)
@@ -0,0 +1,42 @@
+This patch by Mike Harris, I think.
+
+--- xc/programs/Xserver/PEX5/pexmodule.c.deprecation-notices Fri Jun 22
02:55:13 2001
++++ xc/programs/Xserver/PEX5/pexmodule.c Fri Jun 22 02:55:50 2001
+@@ -2,6 +2,7 @@
+
+ #include "xf86Module.h"
+ #include "PEX.h"
++#include "xf86.h"
+
+ static MODULESETUPPROTO(pex5Setup);
+
+@@ -35,5 +36,9 @@
+ pex5Setup(pointer module, pointer opts, int *errmaj, int *errmin)
+ {
+ LoadExtension(&pex5Ext, FALSE);
++
++ ErrorF("** The PEX extension has been officially deprecated and **\n"
++ "** will be disabled in a future release of XFree86. **\n");
+
+ /* Need a non-NULL return value to indicate success */
+ return (pointer)1;
+--- xc/programs/Xserver/XIE/xiemodule.c.deprecation-notices Fri Jun 22
02:45:44 2001
++++ xc/programs/Xserver/XIE/xiemodule.c Fri Jun 22 02:56:26 2001
+@@ -2,6 +2,7 @@
+
+ #include "xf86Module.h"
+ #include "XIE.h"
++#include "xf86.h"
+
+ static MODULESETUPPROTO(xieSetup);
+
+@@ -36,5 +37,9 @@
+ xieSetup(pointer module, pointer opts, int *errmaj, int *errmin)
+ {
+ LoadExtension(&XieExt, FALSE);
++
++ ErrorF("** The XIE extension has been officially deprecated and **\n"
++ "** will be disabled in a future release of XFree86. **\n");
+
+ /* Need a non-NULL return value to indicate success */
+ return (pointer)1;
Modified: branches/4.1.0/sarge/debian/patches/000_stolen_from_HEAD.diff
==============================================================================
--- branches/4.1.0/sarge/debian/patches/000_stolen_from_HEAD.diff
2003-06-27 02:01:10 UTC (rev 265)
+++ branches/4.1.0/sarge/debian/patches/000_stolen_from_HEAD.diff
2003-06-27 02:15:16 UTC (rev 266)
@@ -41,6 +41,10 @@
the register reference just says it must be a multiple of 64 bytes.
- The second change probes the pitch from the framebuffer device when
using the default mode from console instead of taking a guess.
+* Alan Hourihane:
+ - fix typo in trident driver's VT switching code
+ - Xv fix to trident driver
+* added a bunch of PCI data to xf86PciInfo.h
These diffs have been hacked on manually to make them apply to xf-4_1-branch.
@@ -1715,7 +1719,7 @@
if (xData) Xfree (xData);
--- xc/programs/Xserver/hw/xfree86/drivers/ati/r128_driver.c~ Tue Apr 9
12:25:29 2002
+++ xc/programs/Xserver/hw/xfree86/drivers/ati/r128_driver.c Tue Apr 9
12:27:06 2002
-@@ -1110,7 +1110,7 @@
+@@ -1109,7 +1109,7 @@
NULL, /* linePitches */
8 * 64, /* minPitch */
8 * 1024, /* maxPitch */
@@ -1724,7 +1728,7 @@
128, /* minHeight */
2048, /* maxHeight */
pScrn->display->virtualX,
-@@ -1120,7 +1120,7 @@
+@@ -1119,7 +1119,7 @@
if (modesFound < 1 && info->FBDev) {
fbdevHWUseBuildinMode(pScrn);
@@ -1733,3 +1737,348 @@
modesFound = 1;
}
+--- xc/programs/Xserver/hw/xfree86/drivers/trident/trident_dac.c
2001/05/23 20:33:41 1.45.2.1
++++ xc/programs/Xserver/hw/xfree86/drivers/trident/trident_dac.c
2001/11/03 15:17:25
+@@ -163,7 +163,7 @@
+
+ /* Unprotect */
+ OUTB(0x3C4, 0x11);
+- protect = INB(0x3C4);
++ protect = INB(0x3C5);
+ OUTB(0x3C5, 0x92);
+
+ OUTB(0x3C4, 0x0B); INB(0x3C5); /* Ensure we are in New Mode */
+@@ -588,9 +588,10 @@
+ }
+
+ /* Video */
+- pReg->tridentRegs3C4[SSetup] = 0x00;
++ OUTB(0x3C4,0x20);
++ pReg->tridentRegs3C4[SSetup] = INB(0x3C5) | 0x4;
+ pReg->tridentRegs3C4[SKey] = 0x00;
+- pReg->tridentRegs3C4[SPKey] = 0x00;
++ pReg->tridentRegs3C4[SPKey] = 0xC0;
+
+ /* restore */
+ OUTB(0x3C4, 0x11);
+--- xc/programs/Xserver/hw/xfree86/common/xf86PciInfo.h~ Wed Jun 5
01:39:20 2002
++++ xc/programs/Xserver/hw/xfree86/common/xf86PciInfo.h Wed Jun 5
02:03:57 2002
+@@ -93,6 +93,7 @@
+ #define PCI_VENDOR_LEADTEK 0x107D
+ #define PCI_VENDOR_CONTAQ 0x1080
+ #define PCI_VENDOR_FOREX 0x1083
++#define PCI_VENDOR_SBS 0x108A
+ #define PCI_VENDOR_OLICOM 0x108D
+ #define PCI_VENDOR_SUN 0x108E
+ #define PCI_VENDOR_DIAMOND 0x1092
+@@ -199,6 +200,7 @@
+
+ /* ATI */
+ #define PCI_CHIP_MACH32 0x4158
++#define PCI_CHIP_R200_BB 0x4242
+ #define PCI_CHIP_MACH64CT 0x4354
+ #define PCI_CHIP_MACH64CX 0x4358
+ #define PCI_CHIP_MACH64ET 0x4554
+@@ -218,6 +220,7 @@
+ #define PCI_CHIP_MACH64GV 0x4756
+ #define PCI_CHIP_MACH64GW 0x4757
+ #define PCI_CHIP_MACH64GX 0x4758
++#define PCI_CHIP_MACH64GY 0x4759
+ #define PCI_CHIP_MACH64GZ 0x475A
+ #define PCI_CHIP_MACH64LB 0x4C42
+ #define PCI_CHIP_MACH64LD 0x4C44
+@@ -228,8 +231,12 @@
+ #define PCI_CHIP_MACH64LM 0x4C4D
+ #define PCI_CHIP_MACH64LN 0x4C4E
+ #define PCI_CHIP_MACH64LP 0x4C50
++#define PCI_CHIP_MACH64LQ 0x4C51
+ #define PCI_CHIP_MACH64LR 0x4C52
+ #define PCI_CHIP_MACH64LS 0x4C53
++#define PCI_CHIP_RADEON_LW 0x4C57
++#define PCI_CHIP_RADEON_LY 0x4C59
++#define PCI_CHIP_RADEON_LZ 0x4C5A
+ #define PCI_CHIP_RAGE128MF 0x4D46
+ #define PCI_CHIP_RAGE128ML 0x4D4C
+ #define PCI_CHIP_RAGE128PD 0x5044
+@@ -241,11 +248,21 @@
+ #define PCI_CHIP_RADEON_QF 0x5146
+ #define PCI_CHIP_RADEON_QG 0x5147
+ #define PCI_CHIP_RADEON_VE 0x5159
++#define PCI_CHIP_R200_QL 0x514C
++#define PCI_CHIP_R200_QN 0x514E
++#define PCI_CHIP_R200_QO 0x514F
++#define PCI_CHIP_RV200_QW 0x5157
++#define PCI_CHIP_RADEON_QY 0x5159
++#define PCI_CHIP_RADEON_QZ 0x515A
++#define PCI_CHIP_R200_Ql 0x516C
+ #define PCI_CHIP_RAGE128RE 0x5245
+ #define PCI_CHIP_RAGE128RF 0x5246
+ #define PCI_CHIP_RAGE128RG 0x5247
+ #define PCI_CHIP_RAGE128RK 0x524B
+ #define PCI_CHIP_RAGE128RL 0x524C
++#define PCI_CHIP_RAGE128TF 0x5446
++#define PCI_CHIP_RAGE128TL 0x544C
++#define PCI_CHIP_RAGE128TR 0x5452
+ #define PCI_CHIP_MACH64VT 0x5654
+ #define PCI_CHIP_MACH64VU 0x5655
+ #define PCI_CHIP_MACH64VV 0x5656
+@@ -323,6 +340,7 @@
+ /* AMD */
+ #define PCI_CHIP_79C970 0x2000
+ #define PCI_CHIP_53C974 0x2020
++#define PCI_CHIP_AMD761 0x700E
+
+ /* Trident */
+ #define PCI_CHIP_8400 0x8400
+@@ -331,6 +349,7 @@
+ #define PCI_CHIP_8520 0x8520
+ #define PCI_CHIP_8600 0x8600
+ #define PCI_CHIP_8620 0x8620
++#define PCI_CHIP_8820 0x8820
+ #define PCI_CHIP_9320 0x9320
+ #define PCI_CHIP_9388 0x9388
+ #define PCI_CHIP_9397 0x9397
+@@ -359,10 +378,12 @@
+ #define PCI_CHIP_MGAG200_PCI 0x0520
+ #define PCI_CHIP_MGAG200 0x0521
+ #define PCI_CHIP_MGAG400 0x0525
++#define PCI_CHIP_MGAG550 0x2527
+ #define PCI_CHIP_IMPRESSION 0x0D10
+ #define PCI_CHIP_MGAG100_PCI 0x1000
+ #define PCI_CHIP_MGAG100 0x1001
+
++#define PCI_CARD_G400_TH 0x2179
+ #define PCI_CARD_MILL_G200_SD 0xff00
+ #define PCI_CARD_PROD_G100_SD 0xff01
+ #define PCI_CARD_MYST_G200_SD 0xff02
+@@ -469,6 +490,15 @@
+ #define PCI_CHIP_I128_T2R 0x493D
+ #define PCI_CHIP_I128_T2R4 0x5348
+
++/* Sun */
++#define PCI_CHIP_EBUS 0x1000
++#define PCI_CHIP_HAPPY_MEAL 0x1001
++#define PCI_CHIP_SIMBA� 0x5000
++#define PCI_CHIP_PSYCHO 0x8000
++#define PCI_CHIP_SCHIZO 0x8001
++#define PCI_CHIP_SABRE� 0xA000
++#define PCI_CHIP_HUMMINGBIRD 0xA001
++
+ /* BrookTree */
+ #define PCI_CHIP_BT848 0x0350
+ #define PCI_CHIP_BT849 0x0351
+@@ -599,6 +629,8 @@
+ /* Intel */
+ #define PCI_CHIP_I815_BRIDGE 0x1130
+ #define PCI_CHIP_I815 0x1132
++#define PCI_CHIP_I830_M_BRIDGE 0x3575
++#define PCI_CHIP_I830_M 0x3577
+ #define PCI_CHIP_I810_BRIDGE 0x7120
+ #define PCI_CHIP_I810 0x7121
+ #define PCI_CHIP_I810_DC100_BRIDGE 0x7122
+@@ -606,6 +638,7 @@
+ #define PCI_CHIP_I810_E_BRIDGE 0x7124
+ #define PCI_CHIP_I810_E 0x7125
+ #define PCI_CHIP_I740_AGP 0x7800
++#define PCI_CHIP_460GX_SAC 0x84E0
+
+ /* Silicon Motion Inc. */
+ #define PCI_CHIP_SMI910 0x910
+@@ -673,6 +706,7 @@
+ {PCI_VENDOR_LEADTEK, "Leadtek"},
+ {PCI_VENDOR_CONTAQ, "Contaq"},
+ {PCI_VENDOR_FOREX, "FOREX"},
++ {PCI_VENDOR_SBS, "SBS Technologies"}, /* Formerly Bit 3 Computer Corp */
+ {PCI_VENDOR_OLICOM, "Olicom"},
+ {PCI_VENDOR_SUN, "Sun"},
+ {PCI_VENDOR_DIAMOND, "Diamond"},
+@@ -745,7 +779,7 @@
+ #endif
+
+ /* Increase this as required */
+-#define MAX_DEV_PER_VENDOR 64
++#define MAX_DEV_PER_VENDOR 80
+
+ typedef struct {
+ unsigned short VendorID;
+@@ -793,6 +827,7 @@
+ #endif
+ {PCI_VENDOR_ATI, {
+ {PCI_CHIP_MACH32, "Mach32",0},
++ {PCI_CHIP_R200_BB, "Radeon 8500 BB",0},
+ {PCI_CHIP_MACH64CT, "Mach64 CT",0},
+ {PCI_CHIP_MACH64CX, "Mach64 CX",0},
+ {PCI_CHIP_MACH64ET, "Mach64 ET",0},
+@@ -812,6 +847,7 @@
+ {PCI_CHIP_MACH64GV, "Mach64 GV",0},
+ {PCI_CHIP_MACH64GW, "Mach64 GW",0},
+ {PCI_CHIP_MACH64GX, "Mach64 GX",0},
++ {PCI_CHIP_MACH64GY, "Mach64 GY",0},
+ {PCI_CHIP_MACH64GZ, "Mach64 GZ",0},
+ {PCI_CHIP_MACH64LB, "Mach64 LB",0},
+ {PCI_CHIP_MACH64LD, "Mach64 LD",0},
+@@ -822,6 +858,7 @@
+ {PCI_CHIP_MACH64LM, "Mach64 LM",0},
+ {PCI_CHIP_MACH64LN, "Mach64 LN",0},
+ {PCI_CHIP_MACH64LP, "Mach64 LP",0},
++ {PCI_CHIP_MACH64LQ, "Mach64 LQ",0},
+ {PCI_CHIP_MACH64LR, "Mach64 LR",0},
+ {PCI_CHIP_MACH64LS, "Mach64 LS",0},
+ {PCI_CHIP_RAGE128MF, "Rage 128 Mobility
MF",0},
+@@ -830,11 +867,24 @@
+ {PCI_CHIP_RAGE128PF, "Rage 128 Pro PF",0},
+ {PCI_CHIP_RAGE128PP, "Rage 128 Pro PP",0},
+ {PCI_CHIP_RAGE128PR, "Rage 128 Pro PR",0},
++ {PCI_CHIP_RAGE128TF, "Rage 128 Pro TF",0},
++ {PCI_CHIP_RAGE128TL, "Rage 128 Pro TL",0},
++ {PCI_CHIP_RAGE128TR, "Rage 128 Pro TR",0},
+ {PCI_CHIP_RADEON_QD, "Radeon QD",0},
+ {PCI_CHIP_RADEON_QE, "Radeon QE",0},
+ {PCI_CHIP_RADEON_QF, "Radeon QF",0},
+ {PCI_CHIP_RADEON_QG, "Radeon QG",0},
+ {PCI_CHIP_RADEON_VE, "Radeon VE",0},
++ {PCI_CHIP_R200_QL "Radeon 8500 QL",0},
++ {PCI_CHIP_R200_QN "Radeon 8500 QN",0},
++ {PCI_CHIP_R200_QO "Radeon 8500 QO",0},
++ {PCI_CHIP_RV200_QW "Radeon 7500 QW",0},
++ {PCI_CHIP_RADEON_QY "Radeon VE QY",0},
++ {PCI_CHIP_RADEON_QZ "Radeon VE QZ",0},
++ {PCI_CHIP_R200_Ql "Radeon 8500 Ql",0},
++ {PCI_CHIP_RADEON_LW "Radeon Mobility M7
LW",0},
++ {PCI_CHIP_RADEON_LY "Radeon Mobility M6
LY",0},
++ {PCI_CHIP_RADEON_LZ "Radeon Mobility M6
LZ",0},
+ {PCI_CHIP_RAGE128RE, "Rage 128 RE",0},
+ {PCI_CHIP_RAGE128RF, "Rage 128 RF",0},
+ {PCI_CHIP_RAGE128RK, "Rage 128 RK",0},
+@@ -951,6 +1001,7 @@
+ {PCI_CHIP_8520, "CyberBlade/DSTN/i1",0},
+ {PCI_CHIP_8600, "CyberBlade/Ai1",0},
+ {PCI_CHIP_8620,
"CyberBlade/DSTN/Ai1",0},
++ {PCI_CHIP_8820 "CyberBlade/XP/Ai1",0},
+ {0x0000, NULL,0}}},
+ #ifdef VENDOR_INCLUDE_NONVIDEO
+ {PCI_VENDOR_ALI, {
+@@ -965,7 +1016,8 @@
+ {PCI_CHIP_MGA2164_AGP, "MGA 2164W AGP",0},
+ {PCI_CHIP_MGAG200_PCI, "MGA G200 PCI",0},
+ {PCI_CHIP_MGAG200, "MGA G200 AGP",0},
+- {PCI_CHIP_MGAG400, "MGA G400 AGP",0},
++ {PCI_CHIP_MGAG400, "MGA G400/G450 AGP",0},
++ {PCI_CHIP_MGAG550, "MGA G550 AGP",0},
+ {PCI_CHIP_MGAG100_PCI, "MGA G100 PCI",0},
+ {PCI_CHIP_MGAG100, "MGA G100 AGP",0},
+ {0x0000, NULL,0}}},
+@@ -1124,6 +1176,11 @@
+ {PCI_VENDOR_FOREX, {
+ {0x0000, NULL,0}}},
+ #endif
++#ifdef VENDOR_INCLUDE_NONVIDEO
++ {PCI_VENDOR_SBS, {
++ {0x0040 "dataBLIZZARD",0 },
++ {0x0000 NULL,0}}},
++#endif
+ {PCI_VENDOR_OLICOM, {
+ {0x0001, "OC-3136",0 },
+ {0x0011, "OC-2315",0 },
+@@ -1133,10 +1190,13 @@
+ {0x0021, "OC-6151",0 },
+ {0x0000, NULL,0}}},
+ {PCI_VENDOR_SUN, {
+- {0x1000, "EBUS",0 },
+- {0x1001, "Happy Meal",0 },
+- {0x5000, "Advanced PCI bridge",0
},
+- {0x8000, "PCI Bus Module",0 },
++ {PCI_CHIP_EBUS "EBUS",0 },
++ {PCI_CHIP_HAPPY_MEAL "Happy Meal",0 },
++ {PCI_CHIP_SIMBA "Simba Advanced PCI
bridge",0 },
++ {PCI_CHIP_PSYCHO "U2P PCI host bridge
(Psycho)",0 },
++ {PCI_CHIP_SCHIZO "PCI host bridge
(Schizo)",0 },
++ {PCI_CHIP_SABRE "UltraSPARC IIi host
bridge (Sabre)",0 },
++ {PCI_CHIP_HUMMINGBIRD "UltraSPARC IIi host
bridge (Hummingbird)",0 },
+ {0x0000, NULL,0}}},
+ {PCI_VENDOR_CMD, {
+ {0x0640, "640A",0 },
+@@ -1473,6 +1533,8 @@
+ {0x0486, "82430ZX Aries",0},
+ {0x04A3, "82434LX/NX pci cache mem
controller",0},
+ {0x0960, "960RD processor/bridge",0},
++ {0x0964, "960RD processor/bridge",0},
++ {PCI_CHIP_I815_BRIDGE, "i815 Bridge",0},
+ {0x1221, "82092AA",0},
+ {0x1222, "82092AA",0},
+ {0x1223, "SAA7116",0},
+@@ -1485,8 +1547,11 @@
+ {0x1234, "82371MX bus-master IDE controller",0},
+ {0x1235, "82437MX",0},
+ {0x1237, "82441FX Natoma",0},
++ {0x123D, "683053 Programmable Interrupt
Controller",0},
++ {0x123F, "460GX Integrated Hot-Plug
Controller",0},
+ {0x124B, "82380FB",0},
+ {0x1250, "82439",0},
++ {PCI_CHIP_I830_M_BRIDGE, "i830M Bridge",0},
+ {0x7000, "82371 pci-isa bridge",0},
+ {0x7010, "82371 bus-master IDE controller",0},
+ {0x7020, "82371 bus-master IDE controller",0},
+@@ -1496,6 +1561,9 @@
+ {0x7111, "82371AB PIIX4 IDE",0},
+ {0x7112, "82371AB PIIX4 USB",0},
+ {0x7113, "82371AB PIIX4 ACPI",0},
++ {PCI_CHIP_I810_BRIDGE, "i810 Bridge",0},
++ {PCI_CHIP_I810_DC100_BRIDGE, "i810-dc100
Bridge",0},
++ {PCI_CHIP_I810_E_BRIDGE, "i810e Bridge",0},
+ {0x7180, "82443LX PAC Host",0},
+ {0x7181, "82443LX PAC AGP",0},
+ {0x7190, "82443BX Host",0},
+@@ -1504,13 +1572,24 @@
+ {0x71a0, "82443GX Host",0},
+ {0x71a1, "82443GX AGP",0},
+ {0x71a2, "82443GX Host (no AGP)",0},
++ {0x7600, "82372FB PCI-to-ISA (LPC) bridge",0},
++ {0x7601, "82372FB IDE",0},
++ {0x7602, "82372FB USB",0},
++ {0x7603, "82372FB SMBus",0},
+ {0x84C4, "P6",0},
+ {0x84C5, "82450GX20",0},
++ {0x84CB, "460GX PCI Expander Bridge",0},
++ {PCI_CHIP_460GX_SAC, "84460GX System Address
Controller",0},
++ {0x84E1, "460GX System Data Controller",0},
++ {0x84E2, "460GX AGP Bridge",0},
++ {0x84E3, "460GX Memory Access Controller",0},
++ {0x84E4, "460GX Memory Data Controller",0},
+ {PCI_CHIP_I740_AGP, "i740 (AGP)",0},
+ {PCI_CHIP_I815_BRIDGE, "i815 Bridge",0},
+ {PCI_CHIP_I815, "i815",0},
+ {PCI_CHIP_I810_BRIDGE, "i810 Bridge",0},
+ {PCI_CHIP_I810, "i810",0},
++ {PCI_CHIP_I830_M, "i830M",0},
+ {PCI_CHIP_I810_DC100_BRIDGE, "i810-dc100
Bridge",0},
+ {PCI_CHIP_I810_DC100, "i810-dc100",0},
+ {PCI_CHIP_I810_E_BRIDGE,"i810e Bridge",0},
+@@ -1671,6 +1750,7 @@
+ { 0x0127, "Permedia3 Create!",0, NF },
+ { 0x0134, "Oxygen GVX1 PCI",0, NF },
+ { 0x0136, "Oxygen GVX210 AGP",0, NF },
++ { 0x0139, "Oxygen GVX1 Pro AGP",0, NF },
+ { 0x0140, "Oxygen VX1-16 AGP",0, NF },
+ { 0x0144, "Oxygen VX1-4X AGP",0, NF },
+ { 0x0400, "Oxygen GVX420 AGP",0, NF },
+@@ -1749,8 +1829,11 @@
+ {PCI_VENDOR_INTEL, {
+ #ifdef VENDOR_INCLUDE_NONVIDEO
+ { 0x0009, "PCI 10/100Mb/s ethernet card",0, NF },
++ { 0x0040, "PRO/100 S Desktop Adapter PCI 10/100Mb/s
ethernet card",0, NF },
+ /* Seattle AL440BX is 0x8080, is anything else ? */
+ { 0x8080, "motherboard",0, NF },
++ { 0x3013, "Integrated LAN (82562ET)",0, NF },
++ { 0x4541, "Eastern (D815EEA) motherboard",0, NF },
+ { 0x4d55, "Maui (MU) motherboard",0, NF },
+ #endif
+ { 0x0000, (char *)NULL,0, NF } } },
+@@ -1765,6 +1848,7 @@
+ { PCI_CARD_MILL_G200_SG, "Millennium G200 SG",0, NF },
+ { PCI_CARD_MARV_G200_SD, "Marvel G200 SD",0, NF },
+ { 0x1001, "Productiva G100 SG",0, NF },
++ { PCI_CARD_G400_TH, "G400 Twin Head",0, NF },
+ { 0x0000, (char *)NULL,0, NF } } },
+ { PCI_VENDOR_SIS, {
+ { 0x6306, "530 based motherboard",0, NF },
Modified: branches/4.1.0/sarge/debian/patches/001_linux_cf.diff
==============================================================================
--- branches/4.1.0/sarge/debian/patches/001_linux_cf.diff 2003-06-27
02:01:10 UTC (rev 265)
+++ branches/4.1.0/sarge/debian/patches/001_linux_cf.diff 2003-06-27
02:15:16 UTC (rev 266)
@@ -1,5 +1,5 @@
---- xc/config/cf/linux.cf~ Sun Oct 21 21:03:03 2001
-+++ xc/config/cf/linux.cf Sun Oct 21 21:17:22 2001
+--- xc/config/cf/linux.cf~ Tue Jun 4 23:02:56 2002
++++ xc/config/cf/linux.cf Tue Jun 4 23:03:36 2002
@@ -123,8 +123,8 @@
# define LinkGLToUsrLib NO
# define SharedLibFont NO
@@ -11,7 +11,13 @@
# define BuildRman NO
# define BuildHtmlManPages NO
# define FSUseSyslog YES
-@@ -143,22 +143,31 @@
+@@ -138,27 +138,37 @@
+ */
+
+ # ifdef DebianMaintainer
++# define XFree86CustomVersion "Debian"
+ # define BuilderEMailAddr "[EMAIL PROTECTED]"
+ # define XFree86Devel YES
# define BuildAllSpecsDocs YES
/* we build-depend on libfreetype6-dev (FreeType 2.x) */
# define BuildFreetype2Library NO
@@ -52,7 +58,7 @@
#endif /* LinuxDebian */
#if LinuxDistribution == LinuxRedHat
-@@ -260,22 +269,30 @@
+@@ -260,22 +270,30 @@
/* The DRM module requires kernel services that appeared in late 2.1.x
kernels and are known to be present in 2.2.x kernels. */
#ifndef BuildXF86DRI
@@ -88,7 +94,7 @@
# else
# define BuildXF86DRI NO
# endif
-@@ -283,10 +300,13 @@
+@@ -283,10 +301,13 @@
/*
* Build shared libGL and the DRI modules without -fPIC. This improves
@@ -104,7 +110,7 @@
#endif
/* The DRM module requires kernel services that appeared in late 2.1.x
-@@ -515,12 +535,19 @@
+@@ -515,12 +536,19 @@
# define LdCmd /usr/alpha-linuxecoff/bin/ld -m alpha
# define AsmDefines -DUSE_GAS -U__ELF__
# endif /* AlphaArchitecture */
@@ -129,7 +135,7 @@
# endif /* ia64Architecture */
# ifdef i386Architecture
# define CcCmd gcc -b i486-linuxaout
-@@ -553,6 +580,14 @@
+@@ -553,6 +581,14 @@
# define LdCmd ld
# define AsmDefines -D__ELF__
# endif /* ia64Architecture */
@@ -144,7 +150,7 @@
# ifdef i386Architecture
# define CcCmd gcc -b i486-linux
# define AsCmd /usr/i486-linux/bin/as
-@@ -576,8 +611,12 @@
+@@ -576,8 +612,12 @@
#endif
#if UseElfFormat
# ifndef DoLoadableServer
@@ -157,7 +163,7 @@
#endif
#ifndef CppCmd
# define CppCmd /lib/cpp
-@@ -642,7 +681,7 @@
+@@ -642,7 +682,7 @@
#ifdef Arm32Architecture
# define DefaultCCOptions -fsigned-char
# ifndef OptimizedCDebugFlags
@@ -166,7 +172,7 @@
# endif
# define LinuxMachineDefines -D__arm__ -D__arm32__ -U__arm -Uarm
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET
-@@ -651,9 +690,9 @@
+@@ -651,9 +691,9 @@
#ifdef ia64Architecture
# ifndef OptimizedCDebugFlags
@@ -178,7 +184,7 @@
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET
# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64
#endif /* ia64Architecture */
-@@ -662,11 +701,9 @@
+@@ -662,11 +702,9 @@
# ifndef OptimizedCDebugFlags
# define OptimizedCDebugFlags -O2
# endif
@@ -191,7 +197,7 @@
#endif /* Mc68020Architecture */
#ifdef PpcArchitecture
-@@ -699,6 +736,13 @@
+@@ -699,6 +737,13 @@
# define OptimizedCDebugFlags -O2
# endif
# define LinuxMachineDefines -D__mips__
Added: branches/4.1.0/sarge/debian/patches/071_VESA_GTF_1400x1050_modes.diff
==============================================================================
--- branches/4.1.0/sarge/debian/patches/071_VESA_GTF_1400x1050_modes.diff
2003-06-27 02:01:10 UTC (rev 265)
+++ branches/4.1.0/sarge/debian/patches/071_VESA_GTF_1400x1050_modes.diff
2003-06-27 02:15:16 UTC (rev 266)
@@ -0,0 +1,33 @@
+Note that the two 1400x1050 modes were already built into the server
+(unless the code that handles extramodes is buggy), but were not defined in
+the vesamodes file.
+
+--- xc/programs/Xserver/hw/xfree86/etc/extramodes~ Tue Jun 4 22:28:01 2002
++++ xc/programs/Xserver/hw/xfree86/etc/extramodes Tue Jun 4 22:29:15 2002
+@@ -4,9 +4,9 @@
+ // $XFree86$
+ //
+
+-# 1400x1050 @ 60Hz (VESA GFT) hsync: 65.5kHz
++# 1400x1050 @ 60Hz (VESA GTF) hsync: 65.5kHz
+ ModeLine "1400x1050" 122.0 1400 1488 1640 1880 1050 1052 1064 1082 +hsync
+vsync
+
+-# 1400x1050 @ 75Hz (VESA GFT) hsync: 82.2kHz
++# 1400x1050 @ 75Hz (VESA GTF) hsync: 82.2kHz
+ ModeLine "1400x1050" 155.8 1400 1464 1784 1912 1050 1052 1064 1090 +hsync
+vsync
+
+--- xc/programs/Xserver/hw/xfree86/etc/vesamodes~ Tue Jun 4 22:26:16 2002
++++ xc/programs/Xserver/hw/xfree86/etc/vesamodes Tue Jun 4 22:27:49 2002
+@@ -75,6 +75,12 @@
+ # 1280x1024 @ 85Hz (VESA) hsync: 91.1kHz
+ ModeLine "1280x1024" 157.5 1280 1344 1504 1728 1024 1025 1028 1072 +hsync
+vsync
+
++# 1400x1050 @ 60Hz (VESA GTF) hsync: 65.5kHz
++ModeLine "1400x1050" 122.0 1400 1488 1640 1880 1050 1052 1064 1082 +hsync
+vsync
++
++# 1400x1050 @ 75Hz (VESA GTF) hsync: 82.2kHz
++ModeLine "1400x1050" 155.8 1400 1464 1784 1912 1050 1052 1064 1090 +hsync
+vsync
++
+ # 1600x1200 @ 60Hz (VESA) hsync: 75.0kHz
+ ModeLine "1600x1200" 162.0 1600 1664 1856 2160 1200 1201 1204 1250 +hsync
+vsync
+
Added: branches/4.1.0/sarge/debian/patches/072_neomagic_2380_swcursor.diff
==============================================================================
--- branches/4.1.0/sarge/debian/patches/072_neomagic_2380_swcursor.diff
2003-06-27 02:01:10 UTC (rev 265)
+++ branches/4.1.0/sarge/debian/patches/072_neomagic_2380_swcursor.diff
2003-06-27 02:15:16 UTC (rev 266)
@@ -0,0 +1,18 @@
+This patch by [EMAIL PROTECTED] Also see Debian #130024.
+
+--- xc/programs/Xserver/hw/xfree86/drivers/neomagic/neo_driver.c~ Tue Jun
4 22:37:53 2002
++++ xc/programs/Xserver/hw/xfree86/drivers/neomagic/neo_driver.c Tue Jun
4 22:37:46 2002
+@@ -917,6 +917,13 @@
+ memcpy(nPtr->Options, NEOOptions, sizeof(NEOOptions));
+ }
+
++ /* Neomagic 256XL+ needs hardware-cursor disabled by default <[EMAIL
PROTECTED]> */
++ if (nPtr->NeoChipset == NM2380) { /* Neomagic 256XL+ */
++ nPtr->swCursor = TRUE;
++ xf86DrvMsg(pScrn->scrnIndex, X_CONFIG,
++ "NeoMagic 256XL+ (NM2380) - defaulting to software
cursor\n");
++ }
++
+ xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, nPtr->Options);
+
+ xf86GetOptValBool(nPtr->Options, OPTION_NOLINEAR_MODE,&nPtr->noLinear);
Added: branches/4.1.0/sarge/debian/patches/073_xaw_ascii_sink_and_passwords.diff
==============================================================================
--- branches/4.1.0/sarge/debian/patches/073_xaw_ascii_sink_and_passwords.diff
2003-06-27 02:01:10 UTC (rev 265)
+++ branches/4.1.0/sarge/debian/patches/073_xaw_ascii_sink_and_passwords.diff
2003-06-27 02:15:16 UTC (rev 266)
@@ -0,0 +1,32 @@
+This patch by Tim Waugh <[EMAIL PROTECTED]>.
+
+This hack fixes an Xaw bug with password entry in vnc. It is a temporary
+solution until someone with greater X knowledge can solve the problem
+correctly.
+
+Also see <http://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=19231>.
+
+--- xc/lib/Xaw/AsciiSink.c.echo Wed Oct 18 17:40:55 2000
++++ xc/lib/Xaw/AsciiSink.c Wed Oct 18 17:59:59 2000
+@@ -741,6 +741,9 @@
+ int width, height, line_width = -1;
+ XGCValues values;
+
++ if (!sink->ascii_sink.echo)
++ return;
++
+ /* pass 1: clear clipping areas */
+ /* XXX Don't use XDrawImageString because the font may be italic, and
+ will get incorrectly drawn. Probably, it could be a good idea to
+@@ -1277,6 +1280,11 @@
+ XawTextEntity *entity;
+ XawTextProperty *property;
+ #endif
++
++ /* This is a gross hack. Someone who knows X internals should look
++ * at what the right fix should be. */
++ if (!sink->ascii_sink.echo)
++ x = 2;
+
+ if (XtIsRealized((Widget)ctx)) {
+ int fheight;
Added:
branches/4.1.0/sarge/debian/patches/074_xaw_textaction_flashing_paren_fix.diff
==============================================================================
---
branches/4.1.0/sarge/debian/patches/074_xaw_textaction_flashing_paren_fix.diff
2003-06-27 02:01:10 UTC (rev 265)
+++
branches/4.1.0/sarge/debian/patches/074_xaw_textaction_flashing_paren_fix.diff
2003-06-27 02:15:16 UTC (rev 266)
@@ -0,0 +1,64 @@
+This patch by Jonathan Kamens <[EMAIL PROTECTED]>.
+
+The current version of the Xaw library in XFree86 has this nifty whiz-bang
+feature to make it look more like Emacs -- when you type a right-paren, it
+flashes the cursor briefly back to the open paren that you're closing.
+
+This is all well and good unless you happen to type something in the half
+second during which the cursor is over the open paren. I do this all the
+time, because I type very fast (80 WPM). If you do this, your cursor, and
+any text that you subsequently type, will end up in the wrong place. How
+irritating.
+
+I will attach a patch which prevents this from happening by immediately
+ceasing and desisting from processing pending events during the cursor
+flash if/when the first event on the queue is either not an X event or is a
+KeyPress or ButtonPress event, thus indicating that additional input has
+been entered by the user and it should be processed.
+
+This is equivalent to Emacs' behavior -- if Emacs gets additional input
+while it is showing you an open paren, it immediately moves back to the
+correct input location and processes the new input.
+
+You should submit my patch back to the maintainers of XFree86. I'm not
+doing it because I see that RedHat has modified the block of code that I'm
+patching, so the patch I'm submitting should probably be submitted to the
+XFree86 maintainers along with RedHat's other modifications.
+
+Reproducible: Always
+Steps to Reproduce:
+Run xedit. Type some text. Type an open paren. Type some more text.
+Type a close paren and then immediately type some more text while the
+cursor is flashing back to the open paren. It helps to do this over a
+dialup connection or some other slow network connection rather than
+directly on a local display -- the delay in transmitting of events caused
+by the slow connection seems to make the problem more obvious.
+
+Also see <http://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=31540>.
+
+--- xc/lib/Xaw/TextAction.c.orig Mon Mar 12 13:22:20 2001
++++ xc/lib/Xaw/TextAction.c Mon Mar 12 13:33:16 2001
+@@ -3121,6 +3121,7 @@
+ XawTextPosition insertPos = ctx->text.insertPos, pos, tmp, last;
+ char left, right = text.ptr[0];
+ int level = 0;
++ XtAppContext app_context = XtWidgetToApplicationContext(w);
+
+ left = right == ')' ? '(' : right == ']' ? '[' : '{';
+
+@@ -3151,8 +3152,14 @@
+ EndAction(ctx);
+
+ XSync(XtDisplay(w), False);
+- while (XtAppPending(XtWidgetToApplicationContext(w)) & XtIMXEvent)
++ while (XtAppPending(app_context) & XtIMXEvent) {
++ XEvent ev;
++ if (! XtAppPeekEvent(app_context, &ev))
++ break;
++ if (ev.type == KeyPress || ev.type == ButtonPress)
++ break;
+ XtAppProcessEvent(XtWidgetToApplicationContext(w), XtIMXEvent);
++ }
+ FD_ZERO(&fds);
+ FD_SET(ConnectionNumber(XtDisplay(w)), &fds);
+ (void)select(FD_SETSIZE, &fds, NULL, NULL, &tmval);
Added:
branches/4.1.0/sarge/debian/patches/075_xaw_textaction_freed_memory_deref_fix.diff
==============================================================================
---
branches/4.1.0/sarge/debian/patches/075_xaw_textaction_freed_memory_deref_fix.diff
2003-06-27 02:01:10 UTC (rev 265)
+++
branches/4.1.0/sarge/debian/patches/075_xaw_textaction_freed_memory_deref_fix.diff
2003-06-27 02:15:16 UTC (rev 266)
@@ -0,0 +1,21 @@
+This patch by Jonathan Kamens <[EMAIL PROTECTED]>.
+
+Memory being dereferenced after it is freed.
+
+Also see <http://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=31618>
+
+--- xc/lib/Xaw/TextAction.c~ Mon Mar 12 21:36:55 2001
++++ xc/lib/Xaw/TextAction.c Mon Mar 12 22:11:23 2001
+@@ -2925,9 +2925,11 @@
+ || event->xfocus.detail == NotifyPointer)
+ return;
+
+- if (i < num_focus && focus[i].widget)
++ if (i < num_focus && focus[i].widget) {
+ XtRemoveCallback(focus[i].widget, XtNdestroyCallback,
+ DestroyFocusCallback, (XtPointer)&focus[i]);
++ focus[i].widget = NULL;
++ }
+
+ /* Let the input method know focus has left.*/
+ _XawImUnsetFocus(w);
Added: branches/4.1.0/sarge/debian/patches/076_xaw_readtext_fix.diff
==============================================================================
--- branches/4.1.0/sarge/debian/patches/076_xaw_readtext_fix.diff
2003-06-27 02:01:10 UTC (rev 265)
+++ branches/4.1.0/sarge/debian/patches/076_xaw_readtext_fix.diff
2003-06-27 02:15:16 UTC (rev 266)
@@ -0,0 +1,102 @@
+This patch by Jonathan Kamens <[EMAIL PROTECTED]>.
+
+I found that the function MoveLine in lib/Xaw/TextAction.c sometimes attempts
+to read uninitialized memory when I hit ctrl-N in a Text widget to move to the
+next line.
+
+This occurs because the call to XawTextSourceRead returns a text block whos
+"length" field is set to "-1". I couldn't figure out whether this indicates a
+bug in the ReadText function in lib/Xaw/AsciiSrc.c. It was occurring there
+because of the line near the end "count = piece->used - (pos - start)"; in this
+case, piece->used was 703, pos was 704, and start was 0, thus causing "count"
+and thus subsequently text->length to be set to -1.
+
+1) Fix the ReadText functions in AsciiSrc.c and MultiSrc.c so that they return
+correct information when they were unable to read any data (i.e., they were
+asked to read data from the end of the source).
+
+2) Fix the comments above the ReadText functions so that they correctly
+document their return values.
+
+3) Fix the documentation in xc/doc/specs/Xaw so that it correctly documents
+what text source read functions are supposed to return.
+
+diff -ru xc/doc/specs/Xaw.orig/TextSource xc/doc/specs/Xaw/TextSource
+--- xc/doc/specs/Xaw.orig/TextSource Tue Mar 27 07:54:42 2001
++++ xc/doc/specs/Xaw/TextSource Tue Mar 27 07:55:24 2001
+@@ -122,8 +122,9 @@
+ Specifies the maximum number of characters the TextSrc should
+ return to the application in \fItext_return\fP.
+ .LP
+-This function returns the actual number of characters read from the
+-text buffer. The function is not required to return \fIlength\fP
++This function returns the text position immediately after the
++characters read from the
++text buffer. The function is not required to read \fIlength\fP
+ characters if that many characters are in the file, it may break at
+ any point that is convenient to the internal structure of the
+ source. It may take several calls to \fBRead\fP before the desired
+diff -ru xc/lib/Xaw.orig/AsciiSrc.c xc/lib/Xaw/AsciiSrc.c
+--- xc/lib/Xaw.orig/AsciiSrc.c Tue Mar 27 07:49:35 2001
++++ xc/lib/Xaw/AsciiSrc.c Tue Mar 27 07:54:20 2001
+@@ -343,7 +343,7 @@
+ *
+ * Parameters:
+ * w - AsciiSource widget
+- * pos - position of the text to retreive.
++ * pos - position of the text to retreive.
+ * text - text block that will contain returned text
+ * length - maximum number of characters to read
+ *
+@@ -351,7 +351,7 @@
+ * This function reads the source.
+ *
+ * Returns:
+- * The number of characters read into the buffer
++ * The character position following the retrieved text.
+ */
+ static XawTextPosition
+ ReadText(Widget w, XawTextPosition pos, XawTextBlock *text, int length)
+@@ -418,7 +418,7 @@
+ text->firstPos = pos;
+ text->ptr = piece->text + (pos - start);
+ count = piece->used - (pos - start);
+- text->length = (length > count) ? count : length;
++ text->length = Max(0, (length > count) ? count : length);
+ text->format = XawFmt8Bit;
+
+ return (pos + text->length);
+diff -ru xc/lib/Xaw.orig/MultiSrc.c xc/lib/Xaw/MultiSrc.c
+--- xc/lib/Xaw.orig/MultiSrc.c Tue Mar 27 07:49:35 2001
++++ xc/lib/Xaw/MultiSrc.c Tue Mar 27 07:54:09 2001
+@@ -319,7 +319,7 @@
+ * This function reads the source.
+ *
+ * Returns:
+- * The number of characters read into the buffer
++ * The character position following the retrieved text.
+ */
+ static XawTextPosition
+ ReadText(Widget w, XawTextPosition pos, XawTextBlock *text, int length)
+@@ -332,7 +332,7 @@
+ text->firstPos = pos;
+ text->ptr = (char *)(piece->text + (pos - start));
+ count = piece->used - (pos - start);
+- text->length = (length > count) ? count : length;
++ text->length = Max(0, (length > count) ? count : length);
+
+ return (pos + text->length);
+ }
+diff -ru xc/lib/Xaw.orig/TextSrc.c xc/lib/Xaw/TextSrc.c
+--- xc/lib/Xaw.orig/TextSrc.c Tue Mar 27 07:49:35 2001
++++ xc/lib/Xaw/TextSrc.c Tue Mar 27 07:50:54 2001
+@@ -401,6 +401,9 @@
+ *
+ * Description:
+ * This function reads the source.
++ *
++ * Returns:
++ * The character position following the retrieved text.
+ */
+ /*ARGSUSED*/
+ static XawTextPosition
Added: branches/4.1.0/sarge/debian/patches/077_xset_manpage.diff
==============================================================================
--- branches/4.1.0/sarge/debian/patches/077_xset_manpage.diff 2003-06-27
02:01:10 UTC (rev 265)
+++ branches/4.1.0/sarge/debian/patches/077_xset_manpage.diff 2003-06-27
02:15:16 UTC (rev 266)
@@ -0,0 +1,218 @@
+This patch by Branden Robinson.
+
+--- xc/programs/xset/xset.man~ Tue Jun 4 23:29:41 2002
++++ xc/programs/xset/xset.man Tue Jun 4 23:52:02 2002
+@@ -1,11 +1,11 @@
+ .\" $Xorg: xset.man,v 1.3 2000/08/17 19:55:03 cpqbld Exp $
+ .\" Copyright 1988, 1998 The Open Group
+-.\"
++.\"
+ .\" All Rights Reserved.
+-.\"
++.\"
+ .\" The above copyright notice and this permission notice shall be included
+ .\" in all copies or substantial portions of the Software.
+-.\"
++.\"
+ .\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ .\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ .\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+@@ -13,14 +13,14 @@
+ .\" OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ .\" ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ .\" OTHER DEALINGS IN THE SOFTWARE.
+-.\"
++.\"
+ .\" Except as contained in this notice, the name of The Open Group shall
+ .\" not be used in advertising or otherwise to promote the sale, use or
+ .\" other dealings in this Software without prior written authorization
+ .\" from The Open Group.
+-.\"
++.\"
+ .\" $XFree86: xc/programs/xset/xset.man,v 3.12 2001/01/24 00:06:49 dawes Exp $
+-.\"
++.\"
+ .TH XSET 1 __xorgversion__
+ .SH NAME
+ xset - user preference utility for X
+@@ -51,14 +51,14 @@
+ .B b
+ The \fBb\fP option controls bell volume, pitch and duration.
+ This option accepts up to three numerical parameters, a preceding
+-dash(-), or a 'on/off' flag. If no parameters are
+-given, or the 'on' flag is used, the system defaults will be used.
+-If the dash or 'off' are given, the bell will be turned
++dash(-), or a \(oqon/off\(cq flag. If no parameters are
++given, or the \(oqon\(cq flag is used, the system defaults will be used.
++If the dash or \(oqoff\(cq are given, the bell will be turned
+ off.
+ If only one numerical parameter is given, the
+ bell volume will be set to that value, as a percentage of its maximum.
+ Likewise, the second numerical
+-parameter specifies the bell pitch, in hertz, and
++parameter specifies the bell pitch, in Hertz, and
+ the third numerical parameter
+ specifies the duration in milliseconds. Note that not
+ all hardware can vary the bell characteristics. The X server will set
+@@ -82,9 +82,9 @@
+ .B c
+ The \fBc\fP option controls key click.
+ This option can take an optional value, a preceding dash(-),
+-or an 'on/off' flag.
+-If no parameter or the 'on' flag is given, the system defaults
+-will be used. If the dash or 'off' flag is used, keyclick will be
++or an \(oqon/off\(cq flag.
++If no parameter or the \(oqon\(cq flag is given, the system defaults
++will be used. If the dash or \(oqoff\(cq flag is used, keyclick will be
+ disabled.
+ If a value from 0 to 100 is given, it is used to
+ indicate volume, as a percentage of the maximum.
+@@ -100,17 +100,15 @@
+ .TP 8
+ .B dpms \fIflags...\fP
+ The \fBdpms\fP option allows the DPMS (Energy Star) parameters to be
+-set. The option can take up to three numerical values, or the `force'
+-flag followed by a DPMS state. The `force' flags forces the server
++set. The option can take up to three numerical values, or the \(oqforce\(cq
++flag followed by a DPMS state. The \(oqforce\(cq flags forces the server
+ to immediately switch to the DPMS state specified. The DPMS state can
+-be one of `standby', `suspend', or `off'. When numerical values are
+-given, they set the inactivity period
+-(in units of seconds)
+-before the three modes are activated.
+-The first value given is for the `standby' mode, the second is for the
+-`suspend' mode, and the third is for the `off' mode. Setting these
+-values implicitly enables the DPMS features. A value of zero disables
+-a particular mode.
++be one of \(oqstandby\(cq, \(oqsuspend\(cq, or \(oqoff\(cq. When numerical
++values are given, they set the inactivity period (in units of seconds)
++before the three modes are activated. The first value given is for the
++\(oqstandby\(cq mode, the second is for the \(oqsuspend\(cq mode, and the
++third is for the \(oqoff\(cq mode. Setting these values implicitly enables
++the DPMS features. A value of zero disables a particular mode.
+ .TP 8
+ .B fp= \fIpath,...\fP
+ The \fBfp=\fP sets the font path to the entries given in the path argument.
+@@ -135,40 +133,42 @@
+ .PP
+ .TP 8
+ .B "\+fp \fRor\fP fp\+"
+-This \fB\+fp\fP and \fBfp\+\fP options prepend and append elements to the
+-current font path, respectively. They must be followed by a comma-separated
++This \fB\+fp\fP and \fBfp\+\fP options prepend and append elements to the
++current font path, respectively. They must be followed by a comma-separated
+ list of entries.
+ .PP
+ .TP 8
+ .B led
+ The \fBled\fP option controls the keyboard LEDs.
+ This controls the turning on or off of one or all of the LEDs.
+-It accepts an optional integer, a preceding dash(-) or an 'on/off' flag.
+-If no parameter or the 'on' flag is given, all LEDs are turned on.
+-If a preceding dash or the flag 'off' is given, all LEDs are turned off.
++It accepts an optional integer, a preceding dash(-) or an \(oqon/off\(cq flag.
++If no parameter or the \(oqon\(cq flag is given, all LEDs are turned on.
++If a preceding dash or the flag \(oqoff\(cq is given, all LEDs are turned off.
+ If a value between 1 and 32 is given, that LED will be turned on or off
+ depending on the existence of a preceding dash.
+-A common LED which can be controlled is the ``Caps Lock'' LED. ``xset
+-led 3'' would turn led #3 on. ``xset -led 3'' would turn it off.
++A common LED which can be controlled is the \(oqCaps Lock\(cq LED.
++\(oqxset led 3\(cq would turn led #3 on. \(oqxset -led 3\(cq would turn it
off.
+ The particular LED values may refer to different LEDs on different
+ hardware.
+ .PP
+ .TP 8
+ .B m
+ The \fBm\fP option controls the mouse parameters.
+-The parameters for the mouse are `acceleration' and `threshold'.
++The parameters for the mouse are \(oqacceleration\(cq and
++\(oqthreshold\(cq.
+ The acceleration can be specified as an integer, or as a simple
+ fraction.
+ The mouse, or whatever pointer the machine is connected to,
+-will go `acceleration' times as fast when it travels more than `threshold'
++will go \(oqacceleration\(cq times as fast when it travels more than
++\(oqthreshold\(cq
+ pixels in a short time. This way, the mouse can be used for precise
+ alignment when it is moved slowly, yet it can be set to travel across
+ the screen in a flick of the wrist when desired. One or both
+-parameters for the
++parameters for the
+ .B m
+ option can be omitted, but if only one is
+ given, it will be interpreted as the acceleration.
+-If no parameters or the flag 'default' is used, the system defaults will
++If no parameters or the flag \(oqdefault\(cq is used, the system defaults will
+ be set.
+ .PP
+ .TP 8
+@@ -184,40 +184,43 @@
+ .PP
+ .TP 8
+ .B r
+-The \fBr\fP option controls the autorepeat.
+-If a preceding dash or the 'off' flag is used, autorepeat will be disabled.
+-If no parameters or the 'on' flag is used, autorepeat will be enabled.
+-If a specific keycode is specified as a parameter, autorepeat for that
+-keycode is enabled or disabled.
+-If the server supports the XFree86-Misc extension,
+-or the XKB extension, then a parameter
+-of 'rate' is accepted and should be followed by zero, one or two numeric
+-values. The first specifies the delay before autorepeat starts and
+-the second specifies the repeat rate. In the case that the server
+-supports the XKB extension, the delay is the number of milliseconds
+-before autorepeat starts, and the rate is the number of repeats
+-per second. If the rate or delay is not given, it will be set
+-to the default value.
++The \fBr\fP option controls keyboard autorepeat. If a preceding dash or
++the \(oqoff\(cq flag is used, autorepeat will be disabled. If no
++parameters are supplied, or if the \(oqon\(cq flag is used, autorepeat will
++be enabled. If a specific keycode is specified as a parameter, autorepeat
++for that keycode is toggled (enabled if it is currently disabled, and vice
++versa), \fIif autorepeat makes sense for the supplied keycode\fP. For
++instance, keycodes less than 8 are typically not valid for this command.
++If the server supports the XFree86-Misc extension or the XKB extension,
++then a parameter of \(oqrate\(cq is accepted and should be followed by
++zero, one or two numeric values. The first specifies the delay before
++autorepeat starts and the second specifies the repeat rate. In the case
++that the server supports the XKB extension, the delay is the number of
++milliseconds before autorepeat starts, and the rate is the number of
++repeats per second. If the rate or delay is not given, it will be set to
++the default value.
+ .PP
+ .TP 8
+ .B s
+ The \fBs\fP option lets you set the screen saver parameters.
+-This option accepts up to two numerical parameters, a 'blank/noblank'
+-flag, an 'expose/noexpose' flag, an 'on/off' flag, an 'activate/reset' flag,
+-or the 'default' flag.
+-If no parameters or the 'default' flag is used, the system will be set
++This option accepts up to two numerical parameters, a \(oqblank/noblank\(cq
++flag, an \(oqexpose/noexpose\(cq flag, an
++\(oqon/off\(cq flag, an
++\(oqactivate/reset\(cq flag,
++or the \(oqdefault\(cq flag.
++If no parameters or the \(oqdefault\(cq flag is used, the system will be set
+ to its default screen saver characteristics.
+-The 'on/off' flags simply turn the screen saver functions on or off.
+-The 'activate' flag forces activation of screen saver even if the screen
++The \(oqon/off\(cq flags simply turn the screen saver functions on or off.
++The \(oqactivate\(cq flag forces activation of screen saver even if the screen
+ saver had been turned off.
+-The 'reset' flag forces deactivation of screen saver if it is active.
+-The 'blank' flag sets the
++The \(oqreset\(cq flag forces deactivation of screen saver if it is active.
++The \(oqblank\(cq flag sets the
+ preference to blank the video (if the hardware can do so) rather than
+-display a background pattern, while 'noblank' sets the
++display a background pattern, while \(oqnoblank\(cq sets the
+ preference to display a pattern rather than blank the video.
+-The 'expose' flag sets the
++The \(oqexpose\(cq flag sets the
+ preference to allow window exposures (the server can freely discard
+-window contents), while 'noexpose' sets the preference to disable
++window contents), while \(oqnoexpose\(cq sets the preference to disable
+ screen saver unless the server can regenerate the screens without
+ causing exposure events.
+ The length and period
Modified: branches/4.1.0/sarge/debian/shell-lib.sh
==============================================================================
--- branches/4.1.0/sarge/debian/shell-lib.sh 2003-06-27 02:01:10 UTC (rev
265)
+++ branches/4.1.0/sarge/debian/shell-lib.sh 2003-06-27 02:15:16 UTC (rev
266)
@@ -65,10 +65,11 @@
message "Analyzing $1:"
for F in $(echo "$1" | tr / \ ); do
if [ -e /$G$F ]; then
- ls -dl /$G$F >&2
+ ls -dl /$G$F /$G$F.dpkg-* >&2
G=$G$F/
else
- message "/$G$F: nonexistent"
+ message "/$G$F: nonexistent; directory contents of /$G:"
+ ls -l /$G
break
fi
done
Modified: branches/4.1.0/sarge/debian/xlibs.conffiles
==============================================================================
--- branches/4.1.0/sarge/debian/xlibs.conffiles 2003-06-27 02:01:10 UTC (rev
265)
+++ branches/4.1.0/sarge/debian/xlibs.conffiles 2003-06-27 02:15:16 UTC (rev
266)
@@ -48,7 +48,7 @@
/etc/X11/xkb/keycodes/ibm
/etc/X11/xkb/keycodes/macintosh
/etc/X11/xkb/keycodes/powerpcps2
-etc/X11/xkb/keycodes/riscpc
+/etc/X11/xkb/keycodes/riscpc
/etc/X11/xkb/keycodes/sgi/indigo
/etc/X11/xkb/keycodes/sgi/indy
/etc/X11/xkb/keycodes/sgi/iris
