<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/6815520ba39e0863964d2344a9cd3358e22f9272">https://github.com/macports/macports-ports/commit/6815520ba39e0863964d2344a9cd3358e22f9272</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 6815520ba39e0863964d2344a9cd3358e22f9272
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Fri Jun 15 00:21:02 2018 -0500
<span style='display:block; white-space:pre;color:#404040;'> minivmac*: Use Cocoa instead of Carbon
</span>---
emulators/minivmac-devel/Portfile | 3 +-
emulators/minivmac/Portfile | 10 +-
emulators/minivmac/files/SaveDialogDisable.patch | 111 +++++++++++++++++++++
emulators/minivmac/files/patch-src-MYOSGLUE.c.diff | 67 -------------
emulators/minivmac/files/patch-src-MYOSGLUE.m.diff | 74 --------------
5 files changed, 119 insertions(+), 146 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/minivmac-devel/Portfile b/emulators/minivmac-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 013d468..6419961 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/emulators/minivmac-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/emulators/minivmac-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -62,7 +62,7 @@ if {${subport} eq ${name}} {
</span> } else {
livecheck.type none
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 1
</span> supported_archs i386 ppc
# distname ${my_name}${my_version}-${branch}
distname ${my_name}${my_version}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -136,6 +136,7 @@ if {${subport} eq ${name}} {
</span> -homepage https://www.macports.org \
-cl \
-eol unx \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ -api cco \
</span> -sony-sum 1 \
-sony-tag 1
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/minivmac/Portfile b/emulators/minivmac/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6cdefbe..a2e5653 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/emulators/minivmac/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/emulators/minivmac/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -58,7 +58,7 @@ if {${subport} eq ${name}} {
</span> } else {
livecheck.type none
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 1
</span> supported_archs i386 ppc
distname ${my_name}-${my_version}
use_zip yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -128,6 +128,7 @@ if {${subport} eq ${name}} {
</span> -homepage https://www.macports.org \
-cl \
-eol unx \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ -api cco \
</span> -sony-sum 1 \
-sony-tag 1
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -268,9 +269,10 @@ if {${subport} eq ${name}} {
</span> move ${build.dir}/${my_variation} ${build.dir}/${my_variation_dir}
if {${subport} eq "${my_name}-bootstrap${my_suffix}"} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Change the "export" function so that exported files are written to the same
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # directory as Mini vMac, instead of prompting for a location.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${build.dir}/${my_variation_dir} "patch -p0 < ${filespath}/patch-src-MYOSGLUE.c.diff"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Change the "export" function so that exported files
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # are written to the "out" directory instead of
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # prompting for a location.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${build.dir}/${my_variation_dir} "patch -p0 < ${filespath}/SaveDialogDisable.patch"
</span> }
# Use the right compiler.
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/minivmac/files/SaveDialogDisable.patch b/emulators/minivmac/files/SaveDialogDisable.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..99245ed
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/emulators/minivmac/files/SaveDialogDisable.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,111 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Backport the effects of the "-svd 0" configuration flag introduced in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+36.00alpha20180520.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/CNFGRAPI.h.orig 2018-06-18 10:41:10.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/CNFGRAPI.h 2018-06-18 15:48:56.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -19,6 +19,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define RomFileName "vMac.ROM"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define EnableDragDrop 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define SaveDialogEnable 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define EnableAltKeysMode 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define SwapCommandControl 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define VarFullScreen 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/OSGLUCCO.m.orig 2017-07-06 21:15:00.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/OSGLUCCO.m 2018-06-18 15:45:47.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3960,6 +3960,67 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if IncludeSonyNew && ! SaveDialogEnable
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++LOCALFUNC blnr FindOrMakeNamedChildDirPath(NSString *parentPath,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ char *ChildName, NSString **childPath)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ NSString *r;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ BOOL isDir;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Boolean isDirectory;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ NSFileManager *fm = [NSFileManager defaultManager];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ blnr v = falseblnr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (FindNamedChildPath(parentPath, ChildName, &r)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if ([fm fileExistsAtPath:r isDirectory: &isDir])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (isDir) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ *childPath = r;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ v = trueblnr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ NSString *RslvPath = MyResolveAlias(r, &isDirectory);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (nil != RslvPath) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (isDirectory) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ *childPath = RslvPath;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ v = trueblnr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if ([fm respondsToSelector:@selector(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++createDirectoryAtURL:withIntermediateDirectories:attributes:error:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ )])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if ([fm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ createDirectoryAtPath:r
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ withIntermediateDirectories:NO
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ attributes:nil
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ error:nil])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ *childPath = r;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ v = trueblnr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ } else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if ([fm respondsToSelector:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ @selector(createDirectoryAtURL:attributes:)])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if ([fm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ createDirectoryAtPath:r
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ attributes:nil])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ *childPath = r;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ v = trueblnr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ } else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /* fail */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return v;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @interface MyNSSavePanel : NSObject
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ - (NSInteger)runModalForDirectory:(NSString *)path
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file:(NSString *)filename;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3969,6 +4030,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if IncludeSonyNew
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LOCALPROC MakeNewDisk(ui5b L, NSString *drivename)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if SaveDialogEnable
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NSInteger result = NSCancelButton;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NSSavePanel *panel = [NSSavePanel savePanel];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4026,12 +4088,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NSString* filePath = [[panel URL] path];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MakeNewDisk0(L, filePath);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else /* SaveDialogEnable */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ NSString *sPath;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- NSString *sPath =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [myAppDir stringByAppendingPathComponent: drivename];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- MakeNewDisk0(L, sPath);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (FindOrMakeNamedChildDirPath(MyDataPath, "out", &sPath)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ NSString *filePath =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ [sPath stringByAppendingPathComponent: drivename];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ MakeNewDisk0(L, filePath);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif /* SaveDialogEnable */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/minivmac/files/patch-src-MYOSGLUE.c.diff b/emulators/minivmac/files/patch-src-MYOSGLUE.c.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index f0e3418..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/emulators/minivmac/files/patch-src-MYOSGLUE.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,67 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/MYOSGLUE.c.orig 2012-05-27 04:47:25.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/MYOSGLUE.c 2013-05-21 06:49:37.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3436,55 +3436,19 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if IncludeSonyNew
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LOCALPROC MakeNewDisk(ui5b L, CFStringRef NewDiskName)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- NavDialogRef theSaveDialog;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- NavDialogCreationOptions dialogOptions;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- NavReplyRecord theReply;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- NavEventUPP gEventProc = NewNavEventUPP(NavigationEventProc);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (noErr == NavGetDefaultDialogCreationOptions(&dialogOptions)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- dialogOptions.modality = kWindowModalityAppModal;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- dialogOptions.saveFileName = NewDiskName;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (noErr == NavCreatePutFileDialog(&dialogOptions,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- 'TEXT', 'MPS ',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- gEventProc, NULL,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- &theSaveDialog))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- MyBeginDialog();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- (void) NavDialogRun(theSaveDialog);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- MyEndDialog();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (noErr == NavDialogGetReply(theSaveDialog,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- &theReply))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (theReply.validRecord) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- long itemsInList;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- AEKeyword keyword;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- DescType typeCode;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- FSRef theRef;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- Size actualSize;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (noErr == AECountItems(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- &theReply.selection, &itemsInList))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (itemsInList == 1) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (noErr == AEGetNthPtr(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- &theReply.selection, 1, typeFSRef,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- &keyword, &typeCode, (Ptr)&theRef,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- sizeof(FSRef), &actualSize))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ProcessSerialNumber currentProcess = {0, kCurrentProcess};
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ FSRef fsRef;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ FSRef theRef;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (noErr == GetProcessBundleLocation(¤tProcess,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ &fsRef))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (noErr == FSGetCatalogInfo(&fsRef, kFSCatInfoNone,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ NULL, NULL, NULL, &theRef))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ReportStandardOpenDiskError(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MakeNewDisk0(&theRef,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- theReply.saveFileName, L));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ NewDiskName, L));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- (void) NavDisposeReply(&theReply);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- NavDialogDispose(theSaveDialog);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- DisposeNavEventUPP(gEventProc);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/minivmac/files/patch-src-MYOSGLUE.m.diff b/emulators/minivmac/files/patch-src-MYOSGLUE.m.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 86686d6..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/emulators/minivmac/files/patch-src-MYOSGLUE.m.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,74 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/MYOSGLUE.m.orig 2014-03-03 04:22:46.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/MYOSGLUE.m 2014-05-22 06:54:51.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3506,70 +3506,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if IncludeSonyNew
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LOCALPROC MakeNewDisk(ui5b L, NSString *drivename)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- NSInteger result = NSCancelButton;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- NSSavePanel *panel = [NSSavePanel savePanel];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- DisconnectKeyCodes3();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ForceShowCursor();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if ([panel respondsToSelector:@selector(setNameFieldStringValue:)])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [panel setNameFieldStringValue: drivename];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /* available as of OS X 10.6 */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [panel performSelector:@selector(setNameFieldStringValue:)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- withObject: drivename];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [((MyNSSavePanel *)panel)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- setNameFieldStringValue: drivename];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- result = [panel runModal];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- } else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if ([panel
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- respondsToSelector: @selector(runModalForDirectory:file:)])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- result = [panel runModalForDirectory: nil file: drivename];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- compiler warns deprecated. To avoid warning, and
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- to still work if removed from SDK, use NSInvocation.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- NSString *sDirName = nil;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- SEL sel = @selector(runModalForDirectory:file:);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- NSInvocation* invoc =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [NSInvocation invocationWithMethodSignature:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [panel methodSignatureForSelector: sel]];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [invoc setTarget:panel];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [invoc setSelector:sel];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [invoc setArgument:&sDirName atIndex:2];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [invoc setArgument:&drivename atIndex:3];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [invoc invoke];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [invoc getReturnValue: &result];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /* an easier way ? seems to work */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- result = [((MyNSSavePanel *)panel)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- runModalForDirectory: nil file: drivename];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- } else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /* fail */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [MyWindow makeKeyWindow];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (NSOKButton == result) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- NSString* filePath = [[panel URL] path];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- MakeNewDisk0(L, filePath);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- NSString *sPath =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [myAppDir stringByAppendingPathComponent: drivename];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- MakeNewDisk0(L, sPath);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ MakeNewDisk0(L, [[[[NSBundle mainBundle] bundlePath] stringByDeletingLastPathComponent] stringByAppendingPathComponent:drivename]);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>