From 1f6879c5d5a75cbc6e8c8ba3f256e4d98fbf9842 Mon Sep 17 00:00:00 2001 From: Elliot Nunn Date: Tue, 1 Oct 2019 17:23:28 +0800 Subject: [PATCH] Remove trailing Git version number from patchsets --- bin/flatten | 2 ++ patchset/Cube-E/1-include-file-shims.patch | 3 --- patchset/Cube-E/2-build-system.patch | 3 --- patchset/Cube-E/3-amphibian-dna.patch | 3 --- patchset/Cube-E/4-appletalk.patch | 3 --- patchset/Cube-E/5-vm.patch | 3 --- patchset/Cube-E/6-source.patch | 3 --- patchset/Custer/1-rip-out-include-file-deps.patch | 3 --- patchset/Custer/2-mpw-tools.patch | 3 --- patchset/Custer/3-makefile-fixes.patch | 3 --- patchset/Custer/4-update-c-compiler.patch | 3 --- .../5-universal-interfaces-3.4.1-excluding-assembly.patch | 3 --- patchset/Custer/6-amphibian-dna.patch | 3 --- patchset/Custer/7-semi-amphibian-dna.patch | 3 --- patchset/Custer/8-source.patch | 3 --- patchset/NewWorld-Cube-E/1-include-file-shims.patch | 3 --- patchset/NewWorld-Cube-E/2-build-system.patch | 3 --- patchset/NewWorld-Cube-E/3-amphibian-dna.patch | 3 --- patchset/NewWorld-Cube-E/4-appletalk.patch | 3 --- patchset/NewWorld-Cube-E/5-vm.patch | 3 --- patchset/NewWorld-Cube-E/6-source.patch | 3 --- patchset/NewWorld-Cube-E/7-filthy-hacks-for-newworld-rom.patch | 3 --- patchset/Vanilla/1-mpw-tools.patch | 3 --- patchset/Vanilla/2-makefile-fixes.patch | 3 --- patchset/Vanilla/3-brave-attempt.patch | 3 --- 25 files changed, 2 insertions(+), 72 deletions(-) diff --git a/bin/flatten b/bin/flatten index 6fa28a2..cfd01b0 100755 --- a/bin/flatten +++ b/bin/flatten @@ -80,6 +80,8 @@ for do_edit in patchnames: o.write(next_line) else: o.write(next_line) + elif diff_line == '-- \n': + break else: o.write(diff_line) diff --git a/patchset/Cube-E/1-include-file-shims.patch b/patchset/Cube-E/1-include-file-shims.patch index 70dd611..eb1f175 100644 --- a/patchset/Cube-E/1-include-file-shims.patch +++ b/patchset/Cube-E/1-include-file-shims.patch @@ -187,6 +187,3 @@ new file mode 100644 @@ -0,0 +1 @@ +TEXTMPS \ No newline at end of file --- -2.18.0 - diff --git a/patchset/Cube-E/2-build-system.patch b/patchset/Cube-E/2-build-system.patch index 4104de3..8f267ca 100644 --- a/patchset/Cube-E/2-build-system.patch +++ b/patchset/Cube-E/2-build-system.patch @@ -31144,6 +31144,3 @@ new file mode 100644 + $"2E32" /* .2 */ +}; + --- -2.18.0 - diff --git a/patchset/Cube-E/3-amphibian-dna.patch b/patchset/Cube-E/3-amphibian-dna.patch index e202150..b39c30e 100644 --- a/patchset/Cube-E/3-amphibian-dna.patch +++ b/patchset/Cube-E/3-amphibian-dna.patch @@ -30854,6 +30854,3 @@ new file mode 100644 + $"FFF2 0188 0000 4CDF 0103 4E75" /* ......L...Nu */ +}; + --- -2.18.0 - diff --git a/patchset/Cube-E/4-appletalk.patch b/patchset/Cube-E/4-appletalk.patch index 6ac0c73..4163a70 100644 --- a/patchset/Cube-E/4-appletalk.patch +++ b/patchset/Cube-E/4-appletalk.patch @@ -12449,6 +12449,3 @@ diff --git a/Misc/APTK57.rsrc.rdump b/Misc/APTK57.rsrc.rdump }; data 'STR#' (-16504, purgeable) { --- -2.18.0 - diff --git a/patchset/Cube-E/5-vm.patch b/patchset/Cube-E/5-vm.patch index 65891be..814020e 100644 --- a/patchset/Cube-E/5-vm.patch +++ b/patchset/Cube-E/5-vm.patch @@ -3054,6 +3054,3 @@ diff --git a/Misc/VM.rsrc.rdump b/Misc/VM.rsrc.rdump }; data 'ckid' (128, "Projector") { --- -2.18.0 - diff --git a/patchset/Cube-E/6-source.patch b/patchset/Cube-E/6-source.patch index 1426a0f..d84b2fc 100644 --- a/patchset/Cube-E/6-source.patch +++ b/patchset/Cube-E/6-source.patch @@ -18536,6 +18536,3 @@ new file mode 100644 @@ -0,0 +1 @@ +TEXTMPS \ No newline at end of file --- -2.18.0 - diff --git a/patchset/Custer/1-rip-out-include-file-deps.patch b/patchset/Custer/1-rip-out-include-file-deps.patch index b7a1d59..9f09609 100644 --- a/patchset/Custer/1-rip-out-include-file-deps.patch +++ b/patchset/Custer/1-rip-out-include-file-deps.patch @@ -4823,6 +4823,3 @@ diff --git a/Toolbox/WindowMgr/WindowMgr.make b/Toolbox/WindowMgr/WindowMgr.make - "{WindowMgrDir}StandardWDEF.a" +"{ObjDir}StandardWDEF.a.o" ƒ "{WindowMgrDir}StandardWDEF.a" Asm {StdAOpts} -o "{Targ}" "{WindowMgrDir}StandardWDEF.a" --- -2.18.0 - diff --git a/patchset/Custer/2-mpw-tools.patch b/patchset/Custer/2-mpw-tools.patch index eec8be1..ab0d6e3 100644 --- a/patchset/Custer/2-mpw-tools.patch +++ b/patchset/Custer/2-mpw-tools.patch @@ -13499,6 +13499,3 @@ new file mode 100644 + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ +}; + --- -2.18.0 - diff --git a/patchset/Custer/3-makefile-fixes.patch b/patchset/Custer/3-makefile-fixes.patch index c966d41..d1e6084 100644 --- a/patchset/Custer/3-makefile-fixes.patch +++ b/patchset/Custer/3-makefile-fixes.patch @@ -315,6 +315,3 @@ new file mode 100644 @@ -0,0 +1 @@ +TEXTMPS \ No newline at end of file --- -2.18.0 - diff --git a/patchset/Custer/4-update-c-compiler.patch b/patchset/Custer/4-update-c-compiler.patch index 4fca033..cd8690d 100644 --- a/patchset/Custer/4-update-c-compiler.patch +++ b/patchset/Custer/4-update-c-compiler.patch @@ -52752,6 +52752,3 @@ diff --git a/Tools/C.rdump b/Tools/C.rdump - $"2066 6F72 2053 4D00" /* for SM. */ -}; - --- -2.18.0 - diff --git a/patchset/Custer/5-universal-interfaces-3.4.1-excluding-assembly.patch b/patchset/Custer/5-universal-interfaces-3.4.1-excluding-assembly.patch index 5a892d9..c516f42 100644 --- a/patchset/Custer/5-universal-interfaces-3.4.1-excluding-assembly.patch +++ b/patchset/Custer/5-universal-interfaces-3.4.1-excluding-assembly.patch @@ -990144,6 +990144,3 @@ new file mode 100644 + $"2023 3233" /* #23 */ +}; + --- -2.18.0 - diff --git a/patchset/Custer/6-amphibian-dna.patch b/patchset/Custer/6-amphibian-dna.patch index ac451e3..0c2c386 100644 --- a/patchset/Custer/6-amphibian-dna.patch +++ b/patchset/Custer/6-amphibian-dna.patch @@ -5825,6 +5825,3 @@ new file mode 100644 @@ -0,0 +1 @@ +OBJ MPS \ No newline at end of file --- -2.18.0 - diff --git a/patchset/Custer/7-semi-amphibian-dna.patch b/patchset/Custer/7-semi-amphibian-dna.patch index ad33be8..9c136c1 100644 --- a/patchset/Custer/7-semi-amphibian-dna.patch +++ b/patchset/Custer/7-semi-amphibian-dna.patch @@ -161588,6 +161588,3 @@ new file mode 100644 + $"0007 1887 0200 0435 0000 01D8 0001" /* .......5...... */ +}; + --- -2.18.0 - diff --git a/patchset/Custer/8-source.patch b/patchset/Custer/8-source.patch index 5ea8aa2..8129648 100644 --- a/patchset/Custer/8-source.patch +++ b/patchset/Custer/8-source.patch @@ -51308,6 +51308,3 @@ diff --git a/Toolbox/WindowMgr/WindowMgrExtensions.a b/Toolbox/WindowMgr/WindowM move.l a1,-(sp) ;pass it on the stack to IvalCommon move.l (a1),a1 add #rgnBBox,a1 ;advance to the bounding box --- -2.18.0 - diff --git a/patchset/NewWorld-Cube-E/1-include-file-shims.patch b/patchset/NewWorld-Cube-E/1-include-file-shims.patch index 70dd611..eb1f175 100644 --- a/patchset/NewWorld-Cube-E/1-include-file-shims.patch +++ b/patchset/NewWorld-Cube-E/1-include-file-shims.patch @@ -187,6 +187,3 @@ new file mode 100644 @@ -0,0 +1 @@ +TEXTMPS \ No newline at end of file --- -2.18.0 - diff --git a/patchset/NewWorld-Cube-E/2-build-system.patch b/patchset/NewWorld-Cube-E/2-build-system.patch index cbd1e71..36c6f2f 100644 --- a/patchset/NewWorld-Cube-E/2-build-system.patch +++ b/patchset/NewWorld-Cube-E/2-build-system.patch @@ -31144,6 +31144,3 @@ new file mode 100644 + $"2E32" /* .2 */ +}; + --- -2.18.0 - diff --git a/patchset/NewWorld-Cube-E/3-amphibian-dna.patch b/patchset/NewWorld-Cube-E/3-amphibian-dna.patch index b37cad0..303a00e 100644 --- a/patchset/NewWorld-Cube-E/3-amphibian-dna.patch +++ b/patchset/NewWorld-Cube-E/3-amphibian-dna.patch @@ -5469,6 +5469,3 @@ new file mode 100644 + $"FFF2 0188 0000 4CDF 0103 4E75" /* ......L...Nu */ +}; + --- -2.18.0 - diff --git a/patchset/NewWorld-Cube-E/4-appletalk.patch b/patchset/NewWorld-Cube-E/4-appletalk.patch index 40d30d1..ab206df 100644 --- a/patchset/NewWorld-Cube-E/4-appletalk.patch +++ b/patchset/NewWorld-Cube-E/4-appletalk.patch @@ -12439,6 +12439,3 @@ diff --git a/Misc/APTK57.rsrc.rdump b/Misc/APTK57.rsrc.rdump }; data 'STR#' (-16504, purgeable) { --- -2.18.0 - diff --git a/patchset/NewWorld-Cube-E/5-vm.patch b/patchset/NewWorld-Cube-E/5-vm.patch index 65891be..814020e 100644 --- a/patchset/NewWorld-Cube-E/5-vm.patch +++ b/patchset/NewWorld-Cube-E/5-vm.patch @@ -3054,6 +3054,3 @@ diff --git a/Misc/VM.rsrc.rdump b/Misc/VM.rsrc.rdump }; data 'ckid' (128, "Projector") { --- -2.18.0 - diff --git a/patchset/NewWorld-Cube-E/6-source.patch b/patchset/NewWorld-Cube-E/6-source.patch index c9dca37..304fce8 100644 --- a/patchset/NewWorld-Cube-E/6-source.patch +++ b/patchset/NewWorld-Cube-E/6-source.patch @@ -18495,6 +18495,3 @@ new file mode 100644 @@ -0,0 +1 @@ +TEXTMPS \ No newline at end of file --- -2.18.0 - diff --git a/patchset/NewWorld-Cube-E/7-filthy-hacks-for-newworld-rom.patch b/patchset/NewWorld-Cube-E/7-filthy-hacks-for-newworld-rom.patch index b360044..e827800 100644 --- a/patchset/NewWorld-Cube-E/7-filthy-hacks-for-newworld-rom.patch +++ b/patchset/NewWorld-Cube-E/7-filthy-hacks-for-newworld-rom.patch @@ -875,6 +875,3 @@ diff --git a/Toolbox/MenuMgr/MenuMgrExtensions.a b/Toolbox/MenuMgr/MenuMgrExtens bset #MenuBarInvalidBit,MenuBarInvalidByte ; set the invalid bit rts --- -2.18.0 - diff --git a/patchset/Vanilla/1-mpw-tools.patch b/patchset/Vanilla/1-mpw-tools.patch index 693fa61..a22cb5b 100644 --- a/patchset/Vanilla/1-mpw-tools.patch +++ b/patchset/Vanilla/1-mpw-tools.patch @@ -13499,6 +13499,3 @@ new file mode 100644 + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ +}; + --- -2.18.0 - diff --git a/patchset/Vanilla/2-makefile-fixes.patch b/patchset/Vanilla/2-makefile-fixes.patch index fc0df55..4c68ad6 100644 --- a/patchset/Vanilla/2-makefile-fixes.patch +++ b/patchset/Vanilla/2-makefile-fixes.patch @@ -248,6 +248,3 @@ new file mode 100644 @@ -0,0 +1 @@ +TEXTMPS \ No newline at end of file --- -2.18.0 - diff --git a/patchset/Vanilla/3-brave-attempt.patch b/patchset/Vanilla/3-brave-attempt.patch index 5941c39..7d50bad 100644 --- a/patchset/Vanilla/3-brave-attempt.patch +++ b/patchset/Vanilla/3-brave-attempt.patch @@ -1784,6 +1784,3 @@ diff --git a/OS/IoPrimitives/ImmgPrimitives.a b/OS/IoPrimitives/ImmgPrimitives.a MACHINE MC68020 ;

--- -2.18.0 -