<pre style='margin:0'>
Marius Schamschula (Schamschula) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/28cad1017cd20317a5330ed5920fa3f865e93a5e">https://github.com/macports/macports-ports/commit/28cad1017cd20317a5330ed5920fa3f865e93a5e</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 28cad1017cd20317a5330ed5920fa3f865e93a5e
</span>Author: Marius Schamschula <mps@macports.org>
AuthorDate: Thu Jan 4 15:37:06 2018 -0600
<span style='display:block; white-space:pre;color:#404040;'> tk: update to version 8.6.8
</span>---
x11/tk/Portfile | 13 +++---
x11/tk/files/patch-macosx-tkMacOSXDialog.c.diff | 57 -------------------------
2 files changed, 6 insertions(+), 64 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/tk/Portfile b/x11/tk/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9fb6aff..39ce804 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/tk/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/tk/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,7 +3,7 @@
</span> PortSystem 1.0
name tk
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 8.6.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 8.6.8
</span> categories x11
license Tcl/Tk
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,11 +23,11 @@ distname ${name}${version}-src
</span> distfiles-append tcl${version}-src${extract.suffix}
checksums tk${version}-src.tar.gz \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 647f3f69c625e7b879862195131eb42135e6feb6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 061de2a354f9b7c7d04de3984c90c9bc6dd3a1b8377bb45509f1ad8a8d6337aa \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 8a900988a01aa267e8c23681dfab926e36c1caa9 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 49e7bca08dde95195a27f594f7c850b088be357a7c7096e44e1158c7a5fd7b33 \
</span> tcl${version}-src.tar.gz \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 5f114bbd95c7208f929fe9ddb3432636d376844c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 7c6b8f84e37332423cfe5bae503440d88450da8cc1243496249faa5268026ba5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 53723adf560606dc0403af568b6fc0d27a4fd93d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 c43cb0c1518ce42b00e7c8f6eaddd5195c53a98f94adc717234a65cbcfd3f96a
</span>
depends_build port:pkgconfig
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,8 +40,7 @@ depends_lib port:fontconfig \
</span> worksrcdir ${name}${version}/unix
patch.dir ${workpath}/${name}${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-macosx-tkMacOSXDialog.c.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-unix-Makefile.in.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-unix-Makefile.in.diff
</span>
post-patch {
reinplace s|@TCL_SRC_DIR@|${workpath}/tcl${version}/|g ${worksrcpath}/Makefile.in
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/tk/files/patch-macosx-tkMacOSXDialog.c.diff b/x11/tk/files/patch-macosx-tkMacOSXDialog.c.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 277082b..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/tk/files/patch-macosx-tkMacOSXDialog.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,57 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://trac.macports.org/ticket/54673
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- macosx/tkMacOSXDialog.c.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ macosx/tkMacOSXDialog.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -34,7 +34,7 @@ typedef struct {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- NSMutableArray *fileTypeExtensions; // array of allowed extensions per name, e.g. "txt", "doc"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- NSMutableArray *fileTypeLabels; // displayed string, e.g. "Text document (.txt, .doc)"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- NSMutableArray *allAllowedExtensions; // set of all allowed extensions
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- NSInteger fileTypeIndex; // index of currently selected filter
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ NSUInteger fileTypeIndex; // index of currently selected filter
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } filepanelFilterInfo;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- filepanelFilterInfo filterInfo;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -270,7 +270,7 @@ static NSURL *getFileURL(NSString *directory, NSString *filename) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- - (void)selectFormat:(id)sender {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- NSPopUpButton *button = (NSPopUpButton *)sender;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- filterInfo.fileTypeIndex = [button indexOfSelectedItem];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- NSMutableArray *allowedtypes = filterInfo.fileTypeExtensions[filterInfo.fileTypeIndex];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ NSMutableArray *allowedtypes = [filterInfo.fileTypeExtensions objectAtIndex:filterInfo.fileTypeIndex];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [openpanel setAllowedFileTypes:allowedtypes];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- filterInfo.userHasSelectedFilter = true;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -279,7 +279,7 @@ static NSURL *getFileURL(NSString *directory, NSString *filename) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- - (void)saveFormat:(id)sender {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- NSPopUpButton *button = (NSPopUpButton *)sender;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- filterInfo.fileTypeIndex = [button indexOfSelectedItem];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- NSMutableArray *allowedtypes = filterInfo.fileTypeExtensions[filterInfo.fileTypeIndex];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ NSMutableArray *allowedtypes = [filterInfo.fileTypeExtensions objectAtIndex:filterInfo.fileTypeIndex];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [savepanel setAllowedFileTypes:allowedtypes];
</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;'>-@@ -717,7 +717,7 @@ Tk_GetOpenFileObjCmd(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- NSLog(@"result: %i modal: %li", result, (long)modalReturnCode);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- NSString * selectedFilter = filterInfo.fileTypeNames[filterInfo.fileTypeIndex];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ NSString * selectedFilter = [filterInfo.fileTypeNames objectAtIndex:filterInfo.fileTypeIndex];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Tcl_ObjSetVar2(interp, typeVariablePtr, NULL,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Tcl_NewStringObj([selectedFilter UTF8String], -1), TCL_GLOBAL_ONLY);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -884,7 +884,7 @@ Tk_GetSaveFileObjCmd(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [savepanel setAccessoryView:accessoryView];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [savepanel setAllowedFileTypes:filterInfo.fileTypeExtensions[filterInfo.fileTypeIndex]];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ [savepanel setAllowedFileTypes:[filterInfo.fileTypeExtensions objectAtIndex:filterInfo.fileTypeIndex]];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [savepanel setAllowsOtherFileTypes:NO];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else if (defaultType) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* If no filetypes are given, defaultextension is an alternative way
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -971,7 +971,7 @@ Tk_GetSaveFileObjCmd(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- NSLog(@"result: %i modal: %li", result, (long)modalReturnCode);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- NSString * selectedFilter = filterInfo.fileTypeNames[filterInfo.fileTypeIndex];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ NSString * selectedFilter = [filterInfo.fileTypeNames objectAtIndex:filterInfo.fileTypeIndex];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Tcl_ObjSetVar2(interp, typeVariablePtr, NULL,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Tcl_NewStringObj([selectedFilter UTF8String], -1), TCL_GLOBAL_ONLY);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span></pre><pre style='margin:0'>
</pre>