<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/242a6b63daa25591638a75019019271a64f3fecd">https://github.com/macports/macports-ports/commit/242a6b63daa25591638a75019019271a64f3fecd</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 242a6b63daa25591638a75019019271a64f3fecd
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Mon Jul 9 05:09:26 2018 -0500
<span style='display:block; white-space:pre;color:#404040;'> minivmac-devel: Update to 36.00alpha-20180708
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> And remove patches included upstream.
</span>---
emulators/minivmac-devel/Portfile | 20 ++++++-----------
.../files/AutomaticGraphicsSwitching.patch | 25 ---------------------
emulators/minivmac-devel/files/Retina.patch | 11 ---------
emulators/minivmac-devel/files/fix-svd-0.patch | 23 -------------------
.../files/patch-autquit7-1.3.1.dsk.bsdiff | Bin 1624 -> 1546 bytes
5 files changed, 7 insertions(+), 72 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 139b4ab..282c6c4 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;'>@@ -10,7 +10,7 @@ name ${my_name}${my_suffix}
</span> set my_subport [regsub -- {-devel$} ${subport} {}]
conflicts [lsearch -all -inline -not -exact [list ${my_subport} ${my_subport}-devel] ${subport}]
epoch 4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 36.00alpha-20180610
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 36.00alpha-20180708
</span> set branch [join [lrange [split ${version} .] 0 1] .]
set my_version [strsed ${version} {g/^.*-20//}]
categories emulators aqua
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,7 +42,7 @@ if {${my_subport} eq ${my_name}} {
</span> 128K, 512K, 512Ke, SE, SE FDHD, Classic, or \
Macintosh II.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span> supported_archs noarch
depends_run port:${my_name}-plus${my_suffix}
distfiles
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -62,7 +62,7 @@ if {${my_subport} eq ${my_name}} {
</span> } else {
livecheck.type none
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span> supported_archs i386 ppc x86_64
# distname ${my_name}${my_version}-${branch}
distname ${my_name}${my_version}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -96,9 +96,9 @@ if {${my_subport} eq ${my_name}} {
</span> ${my_autoquit_distfile}
checksums ${my_src_distfile} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 04009240683beb042a25f446daea8177d19743af \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 0e4e9862a20bf39103999b749409db40907eef4ca575bc6c5e65590e816d0640 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 703188 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 70df891013add55a5cdb53c2d7052433d49f91ac \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 81249e757029e5c12ab4ccadcecea81c23e3279baa5ebf33461a96e48b461aae \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 689035 \
</span> ${my_bootstrap_distfile} \
rmd160 a15361b4b0d765e55ed84525593639b38e4a71fd \
sha256 ad08da6cfdf616d67664520eb2dd787632c502c43ff6355ac6e3a7fc8d53e811 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -294,9 +294,6 @@ if {${my_subport} eq ${my_name}} {
</span> system -W ${build.dir} "tar xf '${my_src_tarball}'"
move ${build.dir}/${my_variation} ${build.dir}/${my_variation_dir}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Fix the "-svd 0" configure flag.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${build.dir}/${my_variation_dir} "patch -p0 < ${filespath}/fix-svd-0.patch"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> if {${my_subport} eq "${my_name}-bootstrap"} {
# Don't require the discrete GPU.
system -W ${build.dir}/${my_variation_dir} "patch -p0 < ${filespath}/AutomaticGraphicsSwitching.patch"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -325,9 +322,6 @@ if {${my_subport} eq ${my_name}} {
</span> }
reinplace -E "s|-isysroot *\[^ \]+|${sdkflags}|g" ${build.dir}/${my_variation_dir}/Makefile
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Enable Retina display support.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${build.dir}/${my_variation_dir} "patch -p0 < ${filespath}/Retina.patch"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # Prevent merge error.
if {[variant_exists universal] && [variant_isset universal]} {
reinplace "s|$mnvm_target(${my_arch})|umch|" ${build.dir}/${my_variation_dir}/src/Info.plist
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -515,7 +509,7 @@ subport ${my_name}-custom${my_suffix} {
</span> # The subport is hidden because it is useful only to the port maintainer.
if {[tbool bootstrap]} {
subport ${my_name}-bootstrap${my_suffix} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- my_variations {Bootstrap} {-m Plus -as 0 -bg 1 -eci 0 -eck 0 -ecr 0 -mf 1 -sound 0 -speed a -svd 0 -var-fullscreen 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ my_variations {Bootstrap} {-m Plus -as 0 -bg 1 -eci 0 -eck 0 -ecr 0 -gse 1 -mf 1 -sound 0 -speed a -svd 0 -var-fullscreen 0}
</span>
description Mini vMac Bootstrap
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/minivmac-devel/files/AutomaticGraphicsSwitching.patch b/emulators/minivmac-devel/files/AutomaticGraphicsSwitching.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 20be305..18de05c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/emulators/minivmac-devel/files/AutomaticGraphicsSwitching.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/emulators/minivmac-devel/files/AutomaticGraphicsSwitching.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10,28 +10,3 @@ https://developer.apple.com/library/archive/technotes/tn2229/
</span> + <true/>
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/OSGLUCCO.m.orig 2018-06-09 03:53:21.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/OSGLUCCO.m 2018-06-22 06:33:03.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -51,6 +51,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- typedef struct __CFError * CFErrorRef;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define NSOpenGLPFAAllowOfflineRenderers (NSOpenGLPixelFormatAttribute)96
</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;background:#ffe0e0;'>- #if MAC_OS_X_VERSION_10_6 > MAC_OS_X_VERSION_MAX_ALLOWED
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3160,2 +3162,3 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- NSOpenGLPixelFormatAttribute attr[] = {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ NSOpenGLPFAAllowOfflineRenderers,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0};
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3164,2 +3167,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fmt = [[NSOpenGLPixelFormat alloc] initWithAttributes:attr];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if MAC_OS_X_VERSION_10_5 > MAC_OS_X_VERSION_MIN_REQUIRED
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (nil == fmt) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /* NSOpenGLPFAAllowOfflineRenderers is not supported; remove it */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ attr[0] = (NSOpenGLPixelFormatAttribute)0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ fmt = [[NSOpenGLPixelFormat alloc] initWithAttributes:attr];
</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 (nil == fmt) {
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/minivmac-devel/files/Retina.patch b/emulators/minivmac-devel/files/Retina.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 63faa15..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/emulators/minivmac-devel/files/Retina.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://www.gryphel.com/c/mail/v8.html#m86
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://www.gryphel.com/c/mail/v8.html#m88
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/Info.plist.orig 2018-06-13 13:24:32.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/Info.plist 2018-06-13 18:33:41.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -70,4 +70,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <key>LSRequiresCarbon</key>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <string>1</string>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <key>NSHighResolutionCapable</key>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <true/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- </dict>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- </plist>
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/minivmac-devel/files/fix-svd-0.patch b/emulators/minivmac-devel/files/fix-svd-0.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index fd58eaa..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/emulators/minivmac-devel/files/fix-svd-0.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,23 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Fix a bug in the "-svd 0" configuration flag that prevented it from
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-being able to create the "out" directory on 10.6 and earlier.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://gist.github.com/ryandesign/a7fdea794e1b84a01f15536fabe7f9ff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/OSGLUCCO.m.orig 2018-07-06 23:28:04.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/OSGLUCCO.m 2018-07-06 23:31:33.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4014,7 +4014,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ([fm respondsToSelector:@selector(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--createDirectoryAtURL:withIntermediateDirectories:attributes:error:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+createDirectoryAtPath:withIntermediateDirectories:attributes:error:
</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 ([fm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4028,7 +4028,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ([fm respondsToSelector:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- @selector(createDirectoryAtURL:attributes:)])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ @selector(createDirectoryAtPath:attributes:)])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ([fm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- createDirectoryAtPath:r
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/minivmac-devel/files/patch-autquit7-1.3.1.dsk.bsdiff b/emulators/minivmac-devel/files/patch-autquit7-1.3.1.dsk.bsdiff
</span><span style='display:block; white-space:pre;color:#808080;'>index bb4ef21..f684bfd 100644
</span>Binary files a/emulators/minivmac-devel/files/patch-autquit7-1.3.1.dsk.bsdiff and b/emulators/minivmac-devel/files/patch-autquit7-1.3.1.dsk.bsdiff differ
</pre><pre style='margin:0'>
</pre>