diff --git a/patchset/Cube-E/6-source.patch b/patchset/Cube-E/6-source.patch index 4a5895f..c9dca37 100644 --- a/patchset/Cube-E/6-source.patch +++ b/patchset/Cube-E/6-source.patch @@ -14695,7 +14695,15 @@ diff --git a/Resources/Sys.r b/Resources/Sys.r 'ICN#', { 3, 3; -16415, -16415; 5, -5696; -16494, -16494; -16509, -16509 }; } }; -@@ -885,7 +880,34 @@ +@@ -842,6 +837,7 @@ + resource 'MACS' (0, purgeable) { VersionString }; + + resource 'FREF' (6) { 'zsys', -16494, "" }; // System File for 7.0 ++ resource 'FREF' (7) { 'gbly', 3, "" }; // System Enabler for 7.0 + resource 'FREF' (0) { 'ZSYS', 3, "" }; // System File for 6.0.x & other systemish files + resource 'FREF' (1) { 'FNDR', 3, "" }; // Finder + resource 'FREF' (2) { 'INIT', -16415, "" }; // standard INIT +@@ -885,7 +881,34 @@ "PowerBook 100", // 24 Asahi "PowerBook 140", // 25 TimLC "Macintosh Quadra 950", // 26 Zydeco <13> Leave 4 trailing spaces for the Installer @@ -14731,7 +14739,7 @@ diff --git a/Resources/Sys.r b/Resources/Sys.r } }; type 'dbex' { integer=0; }; // nothing -@@ -927,7 +949,7 @@ +@@ -927,7 +950,7 @@ $0006, $0007, $0008, $0009, $000A, $000B, $000C, $000D, $000E, $000F, $0010, $0011, @@ -14740,7 +14748,7 @@ diff --git a/Resources/Sys.r b/Resources/Sys.r }; }; -@@ -953,7 +975,7 @@ +@@ -953,7 +976,7 @@ // Picasso Macintosh icon (loaded by System Error Handler) resource 'cicn' (-16396, purgeable) { @@ -14749,7 +14757,24 @@ diff --git a/Resources/Sys.r b/Resources/Sys.r // mask $"0007FF80 00080000 00087E20 00080120" $"00080120 04080120 0C080120 08080120" -@@ -1129,7 +1151,7 @@ +@@ -1078,16 +1101,7 @@ + + 'clut', 127; // 8 standard QuickDraw colors; green is fixed + +- 'atlk', 1; // AppleTalk +- 'atlk', 3; // AppleTalk + 'atlk', 10; // EtherTalk driver (LC ROM only) +- 'ltlk', 0; // AppleTalk +- 'ltlk', 1; // AppleTalk +- 'ltlk', 2; // AppleTalk +- 'ltlk', 3; // AppleTalk +- 'DRVR', 10; // AppleTalk +- 'DRVR', 40; // AppleTalk +- 'DRVR', 9; // AppleTalk + 'INIT', 18; // AppleTalk + 'lmgr', 0; // AppleTalk + +@@ -1129,7 +1143,7 @@ IncSys "ParityINIT.a.rsrc" codeAs 'INIT' (10, sysHeap, locked); @@ -14758,7 +14783,7 @@ diff --git a/Resources/Sys.r b/Resources/Sys.r resource 'mcky' (0, sysHeap, purgeable) { { 255, 255, 255, 255, 255, 255, 255, 255 } }; -@@ -1168,8 +1190,8 @@ +@@ -1168,8 +1182,8 @@ //__________________________________________________________________________________________________ // AppleTalk @@ -14769,7 +14794,7 @@ diff --git a/Resources/Sys.r b/Resources/Sys.r // ^^ incorporates the following: // IncSys "AppleTalk.rsrc" not 'vers'; -@@ -1180,16 +1202,16 @@ +@@ -1180,16 +1194,16 @@ "Your system has been placed in AppleTalk zone “", "”. " @@ -14790,7 +14815,7 @@ diff --git a/Resources/Sys.r b/Resources/Sys.r "then click the selected AppleTalk connection icon.", } }; -@@ -1241,6 +1263,10 @@ +@@ -1241,6 +1255,10 @@ "The Router could not run. " "The Router file is damaged. " "Please reinstall the Router.", @@ -14801,7 +14826,7 @@ diff --git a/Resources/Sys.r b/Resources/Sys.r } }; //__________________________________________________________________________________________________ -@@ -1908,6 +1934,7 @@ resource 'STR ' (-16391, purgeable) { "Font Cache" }; +@@ -1908,6 +1926,7 @@ resource 'STR ' (-16391, purgeable) { "Font Cache" }; data 'FONT' (384, "Geneva", purgeable) {}; IncSys "SystemFonts.rsrc" 'FONT' (393) as 'FONT' (393, purgeable); IncSys "SystemFonts.rsrc" 'FONT' (396) as 'FONT' (396, purgeable); @@ -14809,7 +14834,7 @@ diff --git a/Resources/Sys.r b/Resources/Sys.r resource 'FOND' (4, "Monaco", purgeable) { FakeFONDFlags, 4, FakeFONDFields, 1, { 9, plain, 521; }, FakeFONDTables -@@ -1954,7 +1981,7 @@ resource 'STR#' (glyphNameResID, purgeable) { { +@@ -1954,7 +1973,7 @@ resource 'STR#' (glyphNameResID, purgeable) { { //__________________________________________________________________________________________________ // Gestalt @@ -14818,7 +14843,7 @@ diff --git a/Resources/Sys.r b/Resources/Sys.r //__________________________________________________________________________________________________ // pslt • Nubus pseudo-slot mapping definitions -@@ -2121,16 +2148,24 @@ resource 'pslt' (gestaltEclipse33, purgeable) { +@@ -2121,16 +2140,24 @@ resource 'pslt' (gestaltEclipse33, purgeable) { IncSys "International.rsrc" 'kcs#' (0) as 'kcs#' (0, sysHeap, purgeable); IncSys "International.rsrc" 'kcs4' (0) as 'kcs4' (0, sysHeap, purgeable); @@ -14847,7 +14872,7 @@ diff --git a/Resources/Sys.r b/Resources/Sys.r //__________________________________________________________________________________________________ // List Mgr -@@ -2540,13 +2575,6 @@ resource 'ppci' (-16409) +@@ -2540,13 +2567,6 @@ resource 'ppci' (-16409) IncSys "Scheduler.rsrc"; IncSys "DAHandler.rsrc"; @@ -14861,7 +14886,7 @@ diff --git a/Resources/Sys.r b/Resources/Sys.r //__________________________________________________________________________________________________ // QuickDraw -@@ -3101,16 +3129,6 @@ resource 'ppci' (-16409) +@@ -3101,16 +3121,6 @@ resource 'ppci' (-16409) } }; //__________________________________________________________________________________________________ @@ -14878,7 +14903,7 @@ diff --git a/Resources/Sys.r b/Resources/Sys.r // Virtual Memory include $$Shell("Misc")"VM.rsrc" not 'ckid'; -@@ -3165,7 +3183,7 @@ data 'ppat' (18, sysheap, purgeable) { +@@ -3165,7 +3175,7 @@ data 'ppat' (18, sysheap, purgeable) { // color desktop pattern = dithered gray resource 'ppat' (16, sysHeap, purgeable) { $"AA55AA55AA55AA55", // black & white pattern @@ -14887,7 +14912,7 @@ diff --git a/Resources/Sys.r b/Resources/Sys.r // 4-bit color image $"10101010" $"01010101" -@@ -3540,78 +3558,4 @@ data 'ppat' (18, sysheap, purgeable) { +@@ -3540,78 +3550,4 @@ data 'ppat' (18, sysheap, purgeable) { #if hasAppleEventMgr IncSys "AppleEventMgr.rsrc";