[oe-commits] Li xin : tk: upgrade 8.6.0 -> 8.6.4

[git at git.openembedded.org]

Module: meta-openembedded.git
Branch: master-next
Commit: 21d9ac9b63430afcd1212346c666123f8dbf72e2
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=21d9ac9b63430afcd1212346c666123f8dbf72e2

Author: Li xin <lixin.fnst at cn.fujitsu.com>
Date:   Mon Aug  3 12:14:33 2015 +0800

tk: upgrade 8.6.0 -> 8.6.4

update content of non-linux.diff

Signed-off-by: Li Xin <lixin.fnst at cn.fujitsu.com>
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 .../configure.use.fontconfig.with.xft.patch        |  0
 .../tcltk/{tk-8.6.0 => tk}/confsearch.diff         |  0
 .../tcltk/{tk-8.6.0 => tk}/fix-xft.diff            |  0
 .../tcltk/{tk-8.6.0 => tk}/non-linux.diff          | 22 ++--------------------
 .../tcltk/{tk-8.6.0 => tk}/tklibrary.diff          |  0
 .../tcltk/{tk-8.6.0 => tk}/tkprivate.diff          |  0
 .../tcltk/{tk_8.6.0.bb => tk_8.6.4.bb}             |  4 ++--
 7 files changed, 4 insertions(+), 22 deletions(-)

diff --git a/meta-oe/recipes-devtools/tcltk/tk-8.6.0/configure.use.fontconfig.with.xft.patch b/meta-oe/recipes-devtools/tcltk/tk/configure.use.fontconfig.with.xft.patch
similarity index 100%
rename from meta-oe/recipes-devtools/tcltk/tk-8.6.0/configure.use.fontconfig.with.xft.patch
rename to meta-oe/recipes-devtools/tcltk/tk/configure.use.fontconfig.with.xft.patch
diff --git a/meta-oe/recipes-devtools/tcltk/tk-8.6.0/confsearch.diff b/meta-oe/recipes-devtools/tcltk/tk/confsearch.diff
similarity index 100%
rename from meta-oe/recipes-devtools/tcltk/tk-8.6.0/confsearch.diff
rename to meta-oe/recipes-devtools/tcltk/tk/confsearch.diff
diff --git a/meta-oe/recipes-devtools/tcltk/tk-8.6.0/fix-xft.diff b/meta-oe/recipes-devtools/tcltk/tk/fix-xft.diff
similarity index 100%
rename from meta-oe/recipes-devtools/tcltk/tk-8.6.0/fix-xft.diff
rename to meta-oe/recipes-devtools/tcltk/tk/fix-xft.diff
diff --git a/meta-oe/recipes-devtools/tcltk/tk-8.6.0/non-linux.diff b/meta-oe/recipes-devtools/tcltk/tk/non-linux.diff
similarity index 67%
rename from meta-oe/recipes-devtools/tcltk/tk-8.6.0/non-linux.diff
rename to meta-oe/recipes-devtools/tcltk/tk/non-linux.diff
index 9309fc4..7d31f9f 100644
--- a/meta-oe/recipes-devtools/tcltk/tk-8.6.0/non-linux.diff
+++ b/meta-oe/recipes-devtools/tcltk/tk/non-linux.diff
@@ -3,7 +3,7 @@ building on non-linux Debian architectures.
 
 --- tk8.5-8.5.8.orig/unix/configure
 +++ tk8.5-8.5.8/unix/configure
-@@ -4742,6 +4742,9 @@
+@@ -4447,6 +4447,9 @@
  		if test "`uname -s`" = "AIX" ; then
  		    tcl_cv_sys_version=AIX-`uname -v`.`uname -r`
  		fi
@@ -12,16 +12,7 @@ building on non-linux Debian architectures.
 +		fi
  	    fi
  	fi
- 
-@@ -5546,7 +5549,7 @@
- fi
- 
- 	    ;;
--	Linux*)
-+	Linux*|GNU*|NetBSD-Debian)
- 	    SHLIB_CFLAGS="-fPIC"
- 	    SHLIB_LD_LIBS='${LIBS}'
- 	    SHLIB_SUFFIX=".so"
+
 --- tk8.5-8.5.8.orig/unix/tcl.m4
 +++ tk8.5-8.5.8/unix/tcl.m4
 @@ -962,6 +962,9 @@
@@ -34,12 +25,3 @@ building on non-linux Debian architectures.
  	    fi
  	fi
      ])
-@@ -1422,7 +1425,7 @@
- 	        ])
- 	    ])
- 	    ;;
--	Linux*)
-+	Linux*|GNU*|NetBSD-Debian)
- 	    SHLIB_CFLAGS="-fPIC"
- 	    SHLIB_LD_LIBS='${LIBS}'
- 	    SHLIB_SUFFIX=".so"
diff --git a/meta-oe/recipes-devtools/tcltk/tk-8.6.0/tklibrary.diff b/meta-oe/recipes-devtools/tcltk/tk/tklibrary.diff
similarity index 100%
rename from meta-oe/recipes-devtools/tcltk/tk-8.6.0/tklibrary.diff
rename to meta-oe/recipes-devtools/tcltk/tk/tklibrary.diff
diff --git a/meta-oe/recipes-devtools/tcltk/tk-8.6.0/tkprivate.diff b/meta-oe/recipes-devtools/tcltk/tk/tkprivate.diff
similarity index 100%
rename from meta-oe/recipes-devtools/tcltk/tk-8.6.0/tkprivate.diff
rename to meta-oe/recipes-devtools/tcltk/tk/tkprivate.diff
diff --git a/meta-oe/recipes-devtools/tcltk/tk_8.6.0.bb b/meta-oe/recipes-devtools/tcltk/tk_8.6.4.bb
similarity index 94%
rename from meta-oe/recipes-devtools/tcltk/tk_8.6.0.bb
rename to meta-oe/recipes-devtools/tcltk/tk_8.6.4.bb
index 14c6ce5..d8eca50 100644
--- a/meta-oe/recipes-devtools/tcltk/tk_8.6.0.bb
+++ b/meta-oe/recipes-devtools/tcltk/tk_8.6.4.bb
@@ -26,8 +26,8 @@ SRC_URI = "\
     file://fix-xft.diff \
     file://configure.use.fontconfig.with.xft.patch \
 "
-SRC_URI[md5sum] = "b883a1a3c489c17413fb602a94bf54e8"
-SRC_URI[sha256sum] = "5c708b2b6f658916df59190b27750fa1ea2bc10992108e10f961c0700f058de6"
+SRC_URI[md5sum] = "261754d7dc2a582f00e35547777e1fea"
+SRC_URI[sha256sum] = "08f99df85e5dc9c4271762163c6aabb962c8b297dc5c4c1af8bdd05fc2dd26c1"
 
 S = "${WORKDIR}/${BPN}${PV}/unix"