[Buildroot] [PATCH v2 1/3] package/tcl: update license to SPDX format

[Buildroot] [PATCH v2 1/3] package/tcl: update license to SPDX format

[Romain Naour]

While at it add the license file hash.

Signed-off-by: Romain Naour <romain.naour@smile.fr>
---
 package/tcl/tcl.hash | 1 +
 package/tcl/tcl.mk   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/tcl/tcl.hash b/package/tcl/tcl.hash
index b344d26..359b543 100644
--- a/package/tcl/tcl.hash
+++ b/package/tcl/tcl.hash
@@ -1,2 +1,3 @@
 # Locally calculated
 sha256 a265409781e4b3edcc4ef822533071b34c3dc6790b893963809b9fe221befe07  tcl8.6.6-src.tar.gz
+sha256 c0a69a2bfd757361ec7e6143973b103c90409316b49e9c88db26ad6388e79f16  license.terms
diff --git a/package/tcl/tcl.mk b/package/tcl/tcl.mk
index ffef9cf..b9fb7af 100644
--- a/package/tcl/tcl.mk
+++ b/package/tcl/tcl.mk
@@ -8,7 +8,7 @@ TCL_VERSION_MAJOR = 8.6
 TCL_VERSION = $(TCL_VERSION_MAJOR).6
 TCL_SOURCE = tcl$(TCL_VERSION)-src.tar.gz
 TCL_SITE = http://downloads.sourceforge.net/project/tcl/Tcl/$(TCL_VERSION)
-TCL_LICENSE = tcl license
+TCL_LICENSE = TCL
 TCL_LICENSE_FILES = license.terms
 TCL_SUBDIR = unix
 TCL_INSTALL_STAGING = YES
-- 
2.7.4

[Buildroot] [PATCH v2 2/3] package/tcllib: update license to SPDX format

[Romain Naour]

While at it add the license file hash.

Signed-off-by: Romain Naour <romain.naour@smile.fr>
---
 package/tcllib/tcllib.hash | 1 +
 package/tcllib/tcllib.mk   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/tcllib/tcllib.hash b/package/tcllib/tcllib.hash
index eb990a2..d08b5a1 100644
--- a/package/tcllib/tcllib.hash
+++ b/package/tcllib/tcllib.hash
@@ -1,2 +1,3 @@
 # Locally computed:
 sha256  0db9e17d6c0f44d3ca2df2ea5023e35c0f3767e7008c3cb26d201446eb68add1  tcllib-1.13.tar.bz2
+sha256  530ec70eb11a455bd582d86b6d74c2dd7cc367d90b8bbdd59fcb43ae02f95a4b  license.terms
diff --git a/package/tcllib/tcllib.mk b/package/tcllib/tcllib.mk
index bd98dd6..dfa35c8 100644
--- a/package/tcllib/tcllib.mk
+++ b/package/tcllib/tcllib.mk
@@ -7,7 +7,7 @@
 TCLLIB_VERSION = 1.13
 TCLLIB_SOURCE = tcllib-$(TCLLIB_VERSION).tar.bz2
 TCLLIB_SITE = http://downloads.sourceforge.net/project/tcllib/tcllib/$(TCLLIB_VERSION)
-TCLLIB_LICENSE = tcl license
+TCLLIB_LICENSE = TCL
 TCLLIB_LICENSE_FILES = license.terms
 TCLLIB_DEPENDENCIES = host-tcl
 TCLLIB_CONF_ENV = ac_cv_path_tclsh="$(HOST_DIR)/bin/tclsh$(TCL_VERSION_MAJOR)"
-- 
2.7.4

[Buildroot] [PATCH v2 3/3] package/tk: new package

[Romain Naour]

Use the same version as tcl package.

Signed-off-by: Romain Naour <romain.naour@smile.fr>
---
tcl and tk should be updated together.

v2: use SPDX license format
---
 DEVELOPERS           |  1 +
 package/Config.in    |  1 +
 package/tk/Config.in | 18 ++++++++++++++++++
 package/tk/tk.hash   |  3 +++
 package/tk/tk.mk     | 31 +++++++++++++++++++++++++++++++
 5 files changed, 54 insertions(+)
 create mode 100644 package/tk/Config.in
 create mode 100644 package/tk/tk.hash
 create mode 100644 package/tk/tk.mk

diff --git a/DEVELOPERS b/DEVELOPERS
index 3bb5f32..63361b6 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -1617,6 +1617,7 @@ F:	package/stress-ng/
 F:	package/supertux/
 F:	package/supertuxkart/
 F:	package/terminology/
+F:	package/tk/
 F:	package/upower/
 F:	package/xenomai/
 
diff --git a/package/Config.in b/package/Config.in
index ddbbcff..ecd9b8f 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -302,6 +302,7 @@ comment "Graphic libraries"
 	source "package/sdl2_mixer/Config.in"
 	source "package/sdl2_net/Config.in"
 	source "package/sdl2_ttf/Config.in"
+	source "package/tk/Config.in"
 
 comment "Other GUIs"
 	source "package/qt/Config.in"
diff --git a/package/tk/Config.in b/package/tk/Config.in
new file mode 100644
index 0000000..507b0bf
--- /dev/null
+++ b/package/tk/Config.in
@@ -0,0 +1,18 @@
+config BR2_PACKAGE_TK
+	bool "tk"
+	depends on BR2_USE_MMU # tcl
+	depends on BR2_TOOLCHAIN_HAS_THREADS # tcl
+	depends on !BR2_STATIC_LIBS # tcl
+	depends on BR2_PACKAGE_XORG7
+	select BR2_PACKAGE_TCL
+	select BR2_PACKAGE_XLIB_LIBX11
+	select BR2_PACKAGE_XLIB_LIBXFT
+	help
+	  A windowing toolkit for use with tcl
+
+	  http://www.tcl.tk
+
+comment "tk needs a toolchain w/ threads, dynamic library"
+	depends on BR2_USE_MMU
+	depends on BR2_PACKAGE_XORG7
+	depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
diff --git a/package/tk/tk.hash b/package/tk/tk.hash
new file mode 100644
index 0000000..5fc0b6f
--- /dev/null
+++ b/package/tk/tk.hash
@@ -0,0 +1,3 @@
+# Locally calculated
+sha256 d62c371a71b4744ed830e3c21d27968c31dba74dd2c45f36b9b071e6d88eb19d  tk8.6.6-src.tar.gz
+sha256 2cde822b93ca16ae535c954b7dfe658b4ad10df2a193628d1b358f1765e8b198  license.terms
diff --git a/package/tk/tk.mk b/package/tk/tk.mk
new file mode 100644
index 0000000..102d368
--- /dev/null
+++ b/package/tk/tk.mk
@@ -0,0 +1,31 @@
+################################################################################
+#
+# tk
+#
+################################################################################
+
+TK_VERSION_MAJOR = 8.6
+TK_VERSION = $(TK_VERSION_MAJOR).6
+TK_SOURCE = tk$(TK_VERSION)-src.tar.gz
+TK_SITE = http://downloads.sourceforge.net/project/tcl/Tcl/$(TK_VERSION)
+TK_LICENSE = TCL
+TK_LICENSE_FILES = license.terms
+TK_SUBDIR = unix
+TK_INSTALL_STAGING = YES
+
+TK_DEPENDENCIES = tcl xlib_libX11 xlib_libXft
+
+# hopefully our strtod is not buggy
+TK_CONF_ENV = tcl_cv_strtod_buggy=no
+
+TK_CONF_OPTS = --disable-rpath \
+	--with-tcl=$(BUILD_DIR)/tcl-$(TCL_VERSION)/unix \
+	--x-includes=$(STAGING_DIR)/usr/include \
+	--x-libraries=$(STAGING_DIR)/usr/lib
+
+define TK_WISH_SYMLINK
+	ln -sf /usr/bin/wish$(TK_VERSION_MAJOR) $(TARGET_DIR)/usr/bin/wish
+endef
+TK_POST_INSTALL_TARGET_HOOKS += TK_WISH_SYMLINK
+
+$(eval $(autotools-package))
-- 
2.7.4

[Buildroot] [PATCH v2 1/3] package/tcl: update license to SPDX format

[Thomas Petazzoni]

Hello,

On Fri, 20 Apr 2018 10:28:59 +0200, Romain Naour wrote:
> While at it add the license file hash.
> 
> Signed-off-by: Romain Naour <romain.naour@smile.fr>
> ---
>  package/tcl/tcl.hash | 1 +
>  package/tcl/tcl.mk   | 2 +-
>  2 files changed, 2 insertions(+), 1 deletion(-)

Entire series applied to master. Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com

[Buildroot] [PATCH v2 3/3] package/tk: new package

[Thomas Petazzoni]

Hello,

On Fri, 20 Apr 2018 10:29:01 +0200, Romain Naour wrote:
> Use the same version as tcl package.
> 
> Signed-off-by: Romain Naour <romain.naour@smile.fr>
> ---
> tcl and tk should be updated together.

Perhaps it would be useful to add a comment both in tcl.mk and tk.mk
near the VERSION variable, to let people know that when one is updated,
the other should be updated as well. 

To be done as a follow-up patch :)

Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com

[Buildroot] [PATCH v2 1/3] package/tcl: update license to SPDX format

[Peter Korsgaard]

>>>>> "Romain" == Romain Naour <romain.naour@smile.fr> writes:

 > While at it add the license file hash.
 > Signed-off-by: Romain Naour <romain.naour@smile.fr>

Committed to 2018.02.x, thanks.

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH v2 2/3] package/tcllib: update license to SPDX format

[Peter Korsgaard]

>>>>> "Romain" == Romain Naour <romain.naour@smile.fr> writes:

 > While at it add the license file hash.
 > Signed-off-by: Romain Naour <romain.naour@smile.fr>

Committed to 2018.02.x, thanks.

-- 
Bye, Peter Korsgaard