From bd3a42e85f0ab245d07c4ca0125e738cfb077574 Mon Sep 17 00:00:00 2001 From: Cy Schubert Date: Wed, 8 Jan 2025 08:01:50 -0800 Subject: [PATCH] mail/exmh2: After falling back to tk86 make mouse wheel work again Two patches specific to tk87 will not work with tk86. MFH: 2025Q1 --- mail/exmh2/Makefile | 2 +- mail/exmh2/files/patch-lib_exwin.tcl | 35 ---------------------------- mail/exmh2/files/patch-lib_fdisp.tcl | 11 --------- 3 files changed, 1 insertion(+), 47 deletions(-) delete mode 100644 mail/exmh2/files/patch-lib_exwin.tcl delete mode 100644 mail/exmh2/files/patch-lib_fdisp.tcl diff --git a/mail/exmh2/Makefile b/mail/exmh2/Makefile index 35a1958c9a1b..fab67fa574b7 100644 --- a/mail/exmh2/Makefile +++ b/mail/exmh2/Makefile @@ -2,7 +2,7 @@ PORTNAME= exmh PORTVERSION= 2.9.0 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES+= mail tk # XXX: Standard SF fails with a hung download MASTER_SITES= https://sourceforge.net/projects/${PORTNAME}/files/${PORTNAME}/${PORTVERSION}/ diff --git a/mail/exmh2/files/patch-lib_exwin.tcl b/mail/exmh2/files/patch-lib_exwin.tcl deleted file mode 100644 index c4e739d62e0a..000000000000 --- a/mail/exmh2/files/patch-lib_exwin.tcl +++ /dev/null @@ -1,35 +0,0 @@ ---- lib/exwin.tcl.orig 2017-11-09 20:42:24.000000000 -0800 -+++ lib/exwin.tcl 2021-09-06 06:53:11.916007000 -0700 -@@ -101,12 +101,26 @@ - } - - proc mscroll {bindtag num} { -- bind $bindtag [list %W yview scroll $num units] -- bind $bindtag [list %W yview scroll -$num units] -- bind $bindtag [list %W yview scroll 1 units] -- bind $bindtag [list %W yview scroll -1 units] -- bind $bindtag [list %W yview scroll 1 pages] -- bind $bindtag [list %W yview scroll -1 pages] -+ # Prior to tcl 8.7a5: -+ # bind $bindtag [list %W yview scroll $num units] -+ # bind $bindtag [list %W yview scroll -$num units] -+ # bind $bindtag [list %W yview scroll 1 units] -+ # bind $bindtag [list %W yview scroll -1 units] -+ # bind $bindtag [list %W yview scroll 1 pages] -+ # bind $bindtag [list %W yview scroll -1 pages] -+ -+ # tcl 8.7a5 and later. See -+ # https://core.tcl-lang.org/tips/doc/trunk/tip/474.md for more info: -+ bind $bindtag [ list tk::MouseWheel %W y %D [ expr 10/-$num ] pixels ] -+ bind $bindtag { tk::MouseWheel %W y %D -10 pixels } -+ bind $bindtag { tk::MouseWheel %W y %D -1 pixels } -+} -+ -+ -+proc fmscroll {bindtag num} { -+ bind $bindtag [ list tk::MouseWheel %W y %D [ expr 200/-$num ] units ] -+ bind $bindtag { tk::MouseWheel %W y %D [expr 200/-10 ] units } -+ bind $bindtag { tk::MouseWheel %W y %D -1 units } - } - - diff --git a/mail/exmh2/files/patch-lib_fdisp.tcl b/mail/exmh2/files/patch-lib_fdisp.tcl deleted file mode 100644 index 262d80a1cf8f..000000000000 --- a/mail/exmh2/files/patch-lib_fdisp.tcl +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/fdisp.tcl.orig 2017-11-09 20:42:24.000000000 -0800 -+++ lib/fdisp.tcl 2021-09-06 06:49:07.808426000 -0700 -@@ -254,7 +254,7 @@ - - # Enable wheelscroll if desired - if {$exwin(wheelEnabled)} { -- mscroll $fdisp(canvas) 1 -+ fmscroll $fdisp(canvas) 5 - } - - # fdisp popup color hack