[99712] trunk/dports
jmr at macports.org
jmr at macports.org
Wed Nov 14 09:47:14 PST 2012
Revision: 99712
https://trac.macports.org/changeset/99712
Author: jmr at macports.org
Date: 2012-11-14 09:47:13 -0800 (Wed, 14 Nov 2012)
Log Message:
-----------
tcl, tk: update to 8.5.13 (resolves #20799, #35692)
Modified Paths:
--------------
trunk/dports/lang/tcl/Portfile
trunk/dports/x11/tk/Portfile
Added Paths:
-----------
trunk/dports/x11/tk/files/
trunk/dports/x11/tk/files/return-types.patch
Modified: trunk/dports/lang/tcl/Portfile
===================================================================
--- trunk/dports/lang/tcl/Portfile 2012-11-14 17:36:55 UTC (rev 99711)
+++ trunk/dports/lang/tcl/Portfile 2012-11-14 17:47:13 UTC (rev 99712)
@@ -3,8 +3,7 @@
PortSystem 1.0
name tcl
-version 8.5.12
-revision 2
+version 8.5.13
# Tk (x11/tk) port depends on this version
categories lang
license Tcl/Tk
@@ -21,8 +20,9 @@
homepage http://www.tcl.tk/
master_sites sourceforge:project/tcl/Tcl/${version}
-checksums rmd160 ada42e22f7b12413c88d9ec7dbd3789926f362d2 \
- sha256 20ba7a10a30571983afd3599f19b441adb5222b21f1d2b27d0fba3ed8d4707c2
+checksums md5 fa3a9bf9b2d6ed2431f1baa46f4058b8 \
+ sha1 65b677dc699426233b926edfa9e304d456da7cad \
+ rmd160 20cfb8adebd77a6d037f67a9af7e88d80032b3c2
dist_subdir tcltk
distname ${name}${version}-src
@@ -44,13 +44,19 @@
# dont enable threads by default as Tcl uses thread-local storage which makes
# passing Tcl_Obj* around between threads fatal
-variant threads description {add multithreading and corefoundation support} {
+variant threads description {add multithreading support} {
configure.args-append --enable-threads
- # dont enable core-foundation by default as it is not fork()-safe and
- # software e.g. using tk and fork() will crash
- configure.args-delete --disable-corefoundation
}
+platform macosx {
+ # CF is not fork()-safe and software e.g. using tk and fork() will crash
+ variant corefoundation description {Enable CoreFoundation support (not fork-safe)} {
+ configure.args-delete --disable-corefoundation
+ }
+ # tk +quartz crashes at launch without CF support
+ default_variants +corefoundation
+}
+
variant memdebug description {enable memory debugging support} {
configure.args-append --enable-symbols=mem
}
Modified: trunk/dports/x11/tk/Portfile
===================================================================
--- trunk/dports/x11/tk/Portfile 2012-11-14 17:36:55 UTC (rev 99711)
+++ trunk/dports/x11/tk/Portfile 2012-11-14 17:47:13 UTC (rev 99712)
@@ -3,7 +3,7 @@
PortSystem 1.0
name tk
-version 8.5.12
+version 8.5.13
categories x11
license Tcl/Tk
maintainers mww openmaintainer
@@ -15,14 +15,6 @@
Ousterhout, Addison-Wesley, ISBN 0-201-63337-X.
platforms darwin
-# tk/aqua can't build 64-bit, ticket #20799
-if {[variant_isset quartz]} {
- supported_archs i386 ppc
- # Lion has no QuickDraw headers outside the 10.6 SDK, ticket #32329
- if {${os.major} >= 11} {
- macosx_deployment_target 10.6
- }
-}
master_sites sourceforge:tcl
dist_subdir tcltk
@@ -31,12 +23,14 @@
# suck in Tcl as well so we can use it internally.
distfiles-append tcl${version}-src${extract.suffix}
-checksums tk8.5.12-src.tar.gz \
- rmd160 fc864df9f1e1ebd4b4375cc46572834095e77372 \
- sha256 c453d820925bf526bbe8a0d1c17ab3168b076fcb9844bea797ad75e3b9ad9291 \
- tcl8.5.12-src.tar.gz \
- rmd160 ada42e22f7b12413c88d9ec7dbd3789926f362d2 \
- sha256 20ba7a10a30571983afd3599f19b441adb5222b21f1d2b27d0fba3ed8d4707c2
+checksums tk${version}-src.tar.gz \
+ md5 1fc7dbb7495160756dbc805224afa360 \
+ sha1 a7dc1a979201376d7e7d48ec9280839ebb52a09f \
+ rmd160 f832c61d5006f9ddef93a63db9789d158b1d6202 \
+ tcl${version}-src.tar.gz \
+ md5 fa3a9bf9b2d6ed2431f1baa46f4058b8 \
+ sha1 65b677dc699426233b926edfa9e304d456da7cad \
+ rmd160 20cfb8adebd77a6d037f67a9af7e88d80032b3c2
depends_build port:pkgconfig
@@ -49,6 +43,9 @@
worksrcdir ${name}${version}/unix
+patchfiles return-types.patch
+patch.dir ${worksrcpath}/..
+
post-patch {
reinplace s|@TCL_SRC_DIR@|${worksrcpath}/../../tcl${version}/|g ${worksrcpath}/Makefile.in
}
@@ -67,12 +64,17 @@
configure.args-append --enable-64bit
}
-variant quartz {
- depends_lib-delete port:Xft2 port:xorg-libXScrnSaver
- configure.args-append --enable-aqua
- post-destroot {
- delete ${destroot}${prefix}/include/X11
+platform macosx {
+ variant quartz {
+ depends_lib-delete port:Xft2 port:xorg-libXScrnSaver port:fontconfig
+ configure.ldflags-delete -lfontconfig
+ configure.args-append --enable-aqua
+ post-destroot {
+ delete ${destroot}${prefix}/include/X11
+ }
}
+
+ default_variants +quartz
}
platform darwin {
Added: trunk/dports/x11/tk/files/return-types.patch
===================================================================
--- trunk/dports/x11/tk/files/return-types.patch (rev 0)
+++ trunk/dports/x11/tk/files/return-types.patch 2012-11-14 17:47:13 UTC (rev 99712)
@@ -0,0 +1,36 @@
+--- macosx/tkMacOSXClipboard.c.orig 2012-11-07 02:08:56.000000000 +1100
++++ macosx/tkMacOSXClipboard.c 2012-11-15 04:23:12.000000000 +1100
+@@ -168,6 +168,7 @@ XSetSelectionOwner(
+ changeCount = [pb declareTypes:[NSArray array] owner:NSApp];
+ }
+ }
++ return Success;
+ }
+
+ /*
+@@ -194,7 +195,6 @@ TkMacOSXSelDeadWindow(
+ if (winPtr && winPtr == (TkWindow *)clipboardOwner) {
+ clipboardOwner = NULL;
+ }
+- return Success;
+ }
+
+ /*
+--- macosx/tkMacOSXDraw.c.orig 2012-11-07 02:08:56.000000000 +1100
++++ macosx/tkMacOSXDraw.c 2012-11-15 04:29:46.000000000 +1100
+@@ -347,6 +347,7 @@ TkPutImage(
+ TkMacOSXDbgMsg("Invalid destination drawable");
+ }
+ TkMacOSXRestoreDrawingContext(&dc);
++ return Success;
+ }
+
+ /*
+@@ -744,7 +745,6 @@ DrawCGImage(
+ } else {
+ TkMacOSXDbgMsg("Drawing of empty CGImage requested");
+ }
+- return Success;
+ }
+
+ /*
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20121114/bba2f86e/attachment.html>
More information about the macports-changes
mailing list