summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoradam <adam@pkgsrc.org>2014-11-22 15:58:44 +0000
committeradam <adam@pkgsrc.org>2014-11-22 15:58:44 +0000
commit9a2166f509932ecd5314f2300dafe1e2eb6601f1 (patch)
tree3b8ea93a99ef6dc5075a65901af3b7dd7a738c6d
parenta6b9d3152a0114f1a21a1dc8c2c9a82002d5dcf6 (diff)
downloadpkgsrc-9a2166f509932ecd5314f2300dafe1e2eb6601f1.tar.gz
Changes 8.6.3:
Cocoa: Crash after [$button destroy] Cocoa: button and scroll display fixes Cocoa: improved drawing performance Phony button clicks from browsers to plugin [text] elide changes advance epoch fix PNG transparency appearance Win: updated file dialogs OSX: Improved ttk notebook tab metrics for Yosemite [scale -digits $bigValue] segfault [scale] handling of negative resolution
-rw-r--r--x11/tk/Makefile.version4
-rw-r--r--x11/tk/distinfo9
-rw-r--r--x11/tk/patches/patch-macosx_tkMacOSXInit.c20
3 files changed, 6 insertions, 27 deletions
diff --git a/x11/tk/Makefile.version b/x11/tk/Makefile.version
index ef512faaccd..e1c514dacbe 100644
--- a/x11/tk/Makefile.version
+++ b/x11/tk/Makefile.version
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.version,v 1.14 2014/10/31 21:11:18 adam Exp $
+# $NetBSD: Makefile.version,v 1.15 2014/11/22 15:58:44 adam Exp $
# used by cad/xcircuit/Makefile
# used by devel/tcl-tclcl/Makefile
# used by lang/tcl/Makefile
@@ -7,4 +7,4 @@
TK_SONUM= 86
TK_BASEVER= 8.6
-TK_VERSION= 8.6.2
+TK_VERSION= 8.6.3
diff --git a/x11/tk/distinfo b/x11/tk/distinfo
index 5e4743096b0..709a228d72c 100644
--- a/x11/tk/distinfo
+++ b/x11/tk/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.43 2014/10/31 21:11:18 adam Exp $
+$NetBSD: distinfo,v 1.44 2014/11/22 15:58:44 adam Exp $
-SHA1 (tk8.6.2-src.tar.gz) = 138920fb55933a715f0b0ace576120734f771b80
-RMD160 (tk8.6.2-src.tar.gz) = c9d4f9eee66249e3a140b7af586f0d14a1e4d2dd
-Size (tk8.6.2-src.tar.gz) = 4246617 bytes
-SHA1 (patch-macosx_tkMacOSXInit.c) = 255322526a96a9e6cc25e91db9b1754ee6fedbb4
+SHA1 (tk8.6.3-src.tar.gz) = 244ddc0f64cc3d429c9d86135d0bbe2cf06c9360
+RMD160 (tk8.6.3-src.tar.gz) = 5d816981def3f81c2c99a243c6ce099db5e5c3ab
+Size (tk8.6.3-src.tar.gz) = 4258339 bytes
SHA1 (patch-unix_Makefile.in) = 553800ef42c328618980962c6b78d478ab4d2e2b
SHA1 (patch-unix_configure) = 97139ed28a2cb8528da5c53cfcbc8f8fb43670f6
diff --git a/x11/tk/patches/patch-macosx_tkMacOSXInit.c b/x11/tk/patches/patch-macosx_tkMacOSXInit.c
deleted file mode 100644
index ab0822b81ee..00000000000
--- a/x11/tk/patches/patch-macosx_tkMacOSXInit.c
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-macosx_tkMacOSXInit.c,v 1.1 2014/10/31 21:11:18 adam Exp $
-
-Fix for Mac crash on Yosemite because of changes in version checking,
-see Tk Source Code Check-in [e49c25c711].
-
---- macosx/tkMacOSXInit.c.orig 2014-10-31 20:34:20.000000000 +0000
-+++ macosx/tkMacOSXInit.c
-@@ -236,7 +236,11 @@ TkpInit(
- if (!uname(&name)) {
- tkMacOSXMacOSXVersion = (strtod(name.release, NULL) + 96) * 10;
- }
-- if (tkMacOSXMacOSXVersion &&
-+ /*Check for new versioning scheme on Yosemite (10.10) and later.*/
-+ if (MAC_OS_X_VERSION_MIN_REQUIRED > 100000) {
-+ tkMacOSXMacOSXVersion = MAC_OS_X_VERSION_MIN_REQUIRED/100;
-+ }
-+ if (tkMacOSXMacOSXVersion && MAC_OS_X_VERSION_MIN_REQUIRED < 100000 &&
- tkMacOSXMacOSXVersion/10 < MAC_OS_X_VERSION_MIN_REQUIRED/10) {
- Tcl_Panic("Mac OS X 10.%d or later required !",
- (MAC_OS_X_VERSION_MIN_REQUIRED/10)-100);