Message ID | 1524133923-11881-1-git-send-email-romain.naour@smile.fr |
---|---|
State | Superseded |
Headers | show |
Series | package/tk: new package | expand |
On Thu, Apr 19, 2018 at 4:02 PM, Romain Naour <romain.naour@smile.fr> wrote: > Use the same version as tcl package. > > Signed-off-by: Romain Naour <romain.naour@smile.fr> > --- > tcl and tk should be updated together. > --- > 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 eec278d..b33722e 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -1621,6 +1621,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..97c3ae6 > --- /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 license SPDX short identifier for TCL/TK license is TCL. So license string here should be just TCL. Thanks, Rahul
Hi Rahul, Le 20/04/2018 à 08:02, Rahul Bedarkar a écrit : > On Thu, Apr 19, 2018 at 4:02 PM, Romain Naour <romain.naour@smile.fr> wrote: >> Use the same version as tcl package. >> >> Signed-off-by: Romain Naour <romain.naour@smile.fr> >> --- [...] >> diff --git a/package/tk/tk.mk b/package/tk/tk.mk >> new file mode 100644 >> index 0000000..97c3ae6 >> --- /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 license > > SPDX short identifier for TCL/TK license is TCL. So license string > here should be just TCL. I copied this from tcl package. It seems tcl based package are not yet converted to SPDX license format. I'll fix that. Best regards, Romain > > Thanks, > Rahul >
diff --git a/DEVELOPERS b/DEVELOPERS index eec278d..b33722e 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1621,6 +1621,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..97c3ae6 --- /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 license +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))
Use the same version as tcl package. Signed-off-by: Romain Naour <romain.naour@smile.fr> --- tcl and tk should be updated together. --- 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