From 0152f440e9b8deffa91dfea22e3588ae800de462 Mon Sep 17 00:00:00 2001
From: Rmys <muscnsl@hotmail.com>
Date: Sat, 18 Jan 2020 14:27:32 +0300
Subject: [PATCH] tcltk

---
 programming/language/tcl/tcltk/actions.py           |  2 +-
 .../tcl/tcltk/files/tk-8.6.4-no-fonts-fix.patch     | 12 ++++++++++++
 .../language/tcl/tcltk/files/tk-8.6.9-conf.patch    | 11 +++++++++++
 programming/language/tcl/tcltk/pspec.xml            | 13 ++++++++++---
 4 files changed, 34 insertions(+), 4 deletions(-)
 create mode 100644 programming/language/tcl/tcltk/files/tk-8.6.4-no-fonts-fix.patch
 create mode 100644 programming/language/tcl/tcltk/files/tk-8.6.9-conf.patch

diff --git a/programming/language/tcl/tcltk/actions.py b/programming/language/tcl/tcltk/actions.py
index 6c245962c0..624522afe4 100644
--- a/programming/language/tcl/tcltk/actions.py
+++ b/programming/language/tcl/tcltk/actions.py
@@ -44,4 +44,4 @@ def install():
 
     pisitools.dosym("/usr/bin/wish8.6", "/usr/bin/wish")
 
-    pisitools.dodoc("ChangeLog", "changes", "license.terms", "README")
+    pisitools.dodoc("ChangeLog", "changes", "license.terms", "README*")
diff --git a/programming/language/tcl/tcltk/files/tk-8.6.4-no-fonts-fix.patch b/programming/language/tcl/tcltk/files/tk-8.6.4-no-fonts-fix.patch
new file mode 100644
index 0000000000..205a5318a8
--- /dev/null
+++ b/programming/language/tcl/tcltk/files/tk-8.6.4-no-fonts-fix.patch
@@ -0,0 +1,12 @@
+diff -pruN tk8.6.4.orig/unix/tkUnixRFont.c tk8.6.4/unix/tkUnixRFont.c
+--- tk8.6.4.orig/unix/tkUnixRFont.c	2015-02-27 02:13:18.000000000 +0900
++++ tk8.6.4/unix/tkUnixRFont.c	2015-06-10 14:35:20.639365954 +0900
+@@ -259,7 +259,7 @@ InitFont(
+      */
+ 
+     set = FcFontSort(0, pattern, FcTrue, NULL, &result);
+-    if (!set) {
++    if (!set || set->nfont == 0) {
+ 	ckfree(fontPtr);
+ 	return NULL;
+     }
diff --git a/programming/language/tcl/tcltk/files/tk-8.6.9-conf.patch b/programming/language/tcl/tcltk/files/tk-8.6.9-conf.patch
new file mode 100644
index 0000000000..d5b690069c
--- /dev/null
+++ b/programming/language/tcl/tcltk/files/tk-8.6.9-conf.patch
@@ -0,0 +1,11 @@
+--- tk8.6.9/unix/tcl.m4
++++ tk8.6.9/unix/tcl.m4
+@@ -1407,7 +1407,7 @@
+ 	    # get rid of the warnings.
+ 	    #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
+ 
+-	    SHLIB_LD='${CC} ${CFLAGS} ${LDFLAGS} -shared'
++	    SHLIB_LD='${CC} ${CFLAGS} ${LDFLAGS} -shared -Wl,-soname,${@}'
+ 	    DL_OBJS="tclLoadDl.o"
+ 	    DL_LIBS="-ldl"
+ 	    LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
diff --git a/programming/language/tcl/tcltk/pspec.xml b/programming/language/tcl/tcltk/pspec.xml
index bcfd9226a7..bd97e3f482 100644
--- a/programming/language/tcl/tcltk/pspec.xml
+++ b/programming/language/tcl/tcltk/pspec.xml
@@ -12,7 +12,7 @@
         <IsA>library</IsA>
         <Summary>An X11 toolkit implemented with the Tcl scripting language</Summary>
         <Description>Tk is an X Windows widget set designed to work closely with the tcl scripting language. It allows you to write simple programs with full featured GUIs in only a little more time then it takes to write a text based interface.</Description>
-        <Archive sha1sum="7d674881bcfda5acb937bea084b10fe271463632" type="targz">mirrors://sourceforge/tcl/tk8.6.8-src.tar.gz</Archive>
+        <Archive sha1sum="8f6fb6276e8b82509a2637e7798b7e58da0bd164" type="targz">mirrors://sourceforge/tcl/tk8.6.10-src.tar.gz</Archive>
         <BuildDependencies>
             <Dependency>tcl-devel</Dependency>
             <Dependency>libX11-devel</Dependency>
@@ -21,8 +21,8 @@
             <Dependency>fontconfig-devel</Dependency>
         </BuildDependencies>
         <Patches>
-            <Patch level="1">tk-8.6.1-conf.patch</Patch>
-            <Patch level="1">tk-8.6.1-fix-xft.patch</Patch>
+            <Patch level="1">tk-8.6.9-conf.patch</Patch>
+            <Patch level="1">tk-8.6.4-no-fonts-fix.patch</Patch>
             <Patch level="1">tk-8.6.1-make.patch</Patch>
         </Patches>
     </Source>
@@ -63,6 +63,13 @@
     </Package>
 
     <History>
+        <Update release="6">
+            <Date>2020-01-18</Date>
+            <Version>8.6.10</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
+        </Update>
         <Update release="5">
             <Date>2018-07-27</Date>
             <Version>8.6.8</Version>