From 0c0b3092a65611fdb58b63a5cdd6ee6dd70c1bf8 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Nov 19 2015 16:06:42 +0000
Subject: import tk-8.5.13-6.el7


---

diff --git a/SOURCES/tk-8.5.13-no-fonts-fix.patch b/SOURCES/tk-8.5.13-no-fonts-fix.patch
new file mode 100644
index 0000000..4d6f73e
--- /dev/null
+++ b/SOURCES/tk-8.5.13-no-fonts-fix.patch
@@ -0,0 +1,13 @@
+diff --git a/unix/tkUnixRFont.c b/unix/tkUnixRFont.c
+index fd0b556..ae681c9 100644
+--- a/unix/tkUnixRFont.c
++++ b/unix/tkUnixRFont.c
+@@ -226,7 +226,7 @@ InitFont(
+      */
+ 
+     set = FcFontSort(0, pattern, FcTrue, NULL, &result);
+-    if (!set) {
++    if (!set || set->nfont == 0) {
+ 	ckfree((char *)fontPtr);
+ 	return NULL;
+     }
diff --git a/SPECS/tk.spec b/SPECS/tk.spec
index 248cd80..6480f55 100644
--- a/SPECS/tk.spec
+++ b/SPECS/tk.spec
@@ -4,7 +4,7 @@
 Summary: The graphical toolkit for the Tcl scripting language
 Name: tk
 Version: %{vers}
-Release: 4%{?dist}
+Release: 6%{?dist}
 Epoch:   1
 License: TCL
 Group: Development/Languages
@@ -12,6 +12,8 @@ URL: http://tcl.sourceforge.net
 Source0: http://download.sourceforge.net/sourceforge/tcl/%{name}%{version}-src.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: tcl = %{epoch}:%{version}
+# require threaded TCL
+Requires: tcl >= 1:8.5.13-5
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 BuildRequires: tcl-devel = %{epoch}:%{version}, autoconf
@@ -27,6 +29,7 @@ Patch2: tk-8.5.10-conf.patch
 Patch3: tk-seg_input.patch
 # fix implicit linkage of freetype that breaks xft detection (#677692)
 Patch4: tk-8.5.9-fix-xft.patch
+Patch5: tk-8.5.13-no-fonts-fix.patch
 
 %description
 When paired with the Tcl scripting language, Tk provides a fast and powerful
@@ -52,11 +55,12 @@ The package contains the development files and man pages for tk.
 %patch2 -p1 -b .conf
 %patch3 -p1 -b .seg
 %patch4 -p1 -b .fix-xft
+%patch5 -p1 -b .no-fonts-fix
 
 %build
 cd unix
 autoconf
-%configure
+%configure --enable-threads
 make %{?_smp_mflags} TK_LIBRARY=%{_datadir}/%{name}%{majorver}
 
 %check
@@ -119,6 +123,16 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}%{majorver}/tkAppInit.c
 
 %changelog
+* Thu Jul 16 2015 Jaroslav Škarvada <jskarvad@redhat.com> - 1:8.5.13-6
+- Added requirement for threaded TCL
+  Related: rhbz#676880
+
+* Mon Jul  6 2015 Jaroslav Škarvada <jskarvad@redhat.com> - 1:8.5.13-5
+- Enabled threading
+  Resolves: rhbz#676880
+- Fixed crash if there are no fonts installed (by no-fonts-fix patch)
+  Resolves: rhbz#1218943
+
 * Fri Jan 24 2014 Daniel Mach <dmach@redhat.com> - 1:8.5.13-4
 - Mass rebuild 2014-01-24