3 files changed, 34 insertions, 1 deletions

diff --git a/gnu/local.mk b/gnu/local.mk
index aa51ca503e2..fd063ec5f18 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -2469,6 +2469,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/tbb-other-arches.patch                   \
   %D%/packages/patches/tclxml-3.2-install.patch                 \
   %D%/packages/patches/tcsh-fix-autotest.patch                  \
+  %D%/packages/patches/tkremind-fix-fontchooser.patch           \
   %D%/packages/patches/teensy-loader-cli-help.patch             \
   %D%/packages/patches/tensorflow-c-api-fix.patch               \
   %D%/packages/patches/texinfo-headings-single.patch            \
diff --git a/gnu/packages/calendar.scm b/gnu/packages/calendar.scm
index 40ffdcb945c..cc27a4bb5d4 100644
--- a/gnu/packages/calendar.scm
+++ b/gnu/packages/calendar.scm
@@ -341,7 +341,8 @@ command-line interface} and a @acronym{TUI, textual user interface} named
                                         ".")
                            ".tar.gz"))
        (sha256
-        (base32 "1hp24d48nhlv6f7p6sj4qnqc9pyfgyhjah8w9426bzkqkqb31j9c"))))
+        (base32 "1hp24d48nhlv6f7p6sj4qnqc9pyfgyhjah8w9426bzkqkqb31j9c"))
+       (patches (search-patches "tkremind-fix-fontchooser.patch"))))
     (properties
      `((output-synopsis "tcl" "graphical front-end to Remind calendar program")))
     (build-system gnu-build-system)
diff --git a/gnu/packages/patches/tkremind-fix-fontchooser.patch b/gnu/packages/patches/tkremind-fix-fontchooser.patch
new file mode 100644
index 00000000000..2ac57774979
--- /dev/null
+++ b/gnu/packages/patches/tkremind-fix-fontchooser.patch
@@ -0,0 +1,31 @@
+Fix tkremind fontchooser issues.
+
+1. Pass -name to wish to set the window class explicitly.  Without this,
+   wrap-program renames tkremind to .tkremind-real, and Tk uses the script
+   basename as the window class.  A class starting with "." breaks the
+   fontchooser which interprets it as a window path.
+
+2. Fix bug in SetHeadingFont: it references Option(HeadingFont) before it
+   is set, causing "can't read Option(HeadingFont): no such variable" when
+   selecting a heading font.  Use the just-configured HeadingFont instead.
+
+diff --git a/scripts/tkremind.in b/scripts/tkremind.in
+--- a/scripts/tkremind.in
++++ b/scripts/tkremind.in
+@@ -13,7 +13,7 @@
+ #--------------------------------------------------------------
+
+ # the next line restarts using wish \
+-exec wish "$0" "$@"
++exec wish "$0" -name Tkremind "$@"
+
+ tk appname tkremind
+
+@@ -5190,7 +5190,7 @@ proc SetHeadingFont {font} {
+     global tmpOpt
+     font configure HeadingFont {*}[font actual $font]
+-    font configure BoldFont {*}$Option(HeadingFont) -weight bold
++    font configure BoldFont {*}[font actual HeadingFont] -weight bold
+     set tmpOpt(HeadingFont) [font actual $font]
+     raise .opt
+ }