From 5a293cf439d706b7f8beb0a1893201638d9e768a Mon Sep 17 00:00:00 2001 From: Yi Zhao Date: Thu, 12 Dec 2019 13:56:15 +0800 Subject: tk: upgrade 8.6.9 -> 8.6.10 Drop patches that were merged upstream: configure.use.fontconfig.with.xft.patch non-linux.diff tklibrary.diff Refresh patches: confsearch.diff fix-xft.diff Signed-off-by: Yi Zhao Signed-off-by: Khem Raj --- .../tk/configure.use.fontconfig.with.xft.patch | 13 --- meta-oe/recipes-devtools/tcltk/tk/confsearch.diff | 14 ++-- meta-oe/recipes-devtools/tcltk/tk/fix-xft.diff | 4 +- meta-oe/recipes-devtools/tcltk/tk/non-linux.diff | 27 ------ meta-oe/recipes-devtools/tcltk/tk/tklibrary.diff | 22 ----- meta-oe/recipes-devtools/tcltk/tk_8.6.10.bb | 93 +++++++++++++++++++++ meta-oe/recipes-devtools/tcltk/tk_8.6.9.bb | 96 ---------------------- 7 files changed, 102 insertions(+), 167 deletions(-) delete mode 100644 meta-oe/recipes-devtools/tcltk/tk/configure.use.fontconfig.with.xft.patch delete mode 100644 meta-oe/recipes-devtools/tcltk/tk/non-linux.diff delete mode 100644 meta-oe/recipes-devtools/tcltk/tk/tklibrary.diff create mode 100644 meta-oe/recipes-devtools/tcltk/tk_8.6.10.bb delete mode 100644 meta-oe/recipes-devtools/tcltk/tk_8.6.9.bb (limited to 'meta-oe/recipes-devtools/tcltk') diff --git a/meta-oe/recipes-devtools/tcltk/tk/configure.use.fontconfig.with.xft.patch b/meta-oe/recipes-devtools/tcltk/tk/configure.use.fontconfig.with.xft.patch deleted file mode 100644 index a0c157f5ad..0000000000 --- a/meta-oe/recipes-devtools/tcltk/tk/configure.use.fontconfig.with.xft.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/configure.in.orig 2014-05-10 14:35:39.859147385 +0000 -+++ b/configure.in 2014-05-10 14:36:20.282925184 +0000 -@@ -554,8 +554,8 @@ - dnl make sure package configurator (xft-config or pkg-config - dnl says that xft is present. - found_xft=yes -- XFT_CFLAGS=`pkg-config --cflags xft 2>/dev/null` || found_xft="no" -- XFT_LIBS=`pkg-config --libs xft 2>/dev/null` || found_xft="no" -+ XFT_CFLAGS=`pkg-config --cflags xft fontconfig 2>/dev/null` || found_xft="no" -+ XFT_LIBS=`pkg-config --libs xft fontconfig 2>/dev/null` || found_xft="no" - AC_MSG_RESULT([$found_xft]) - dnl make sure that compiling against Xft header file doesn't bomb - if test "$found_xft" = "yes" ; then diff --git a/meta-oe/recipes-devtools/tcltk/tk/confsearch.diff b/meta-oe/recipes-devtools/tcltk/tk/confsearch.diff index 8cc07bcfac..229acf3e7a 100644 --- a/meta-oe/recipes-devtools/tcltk/tk/confsearch.diff +++ b/meta-oe/recipes-devtools/tcltk/tk/confsearch.diff @@ -16,31 +16,31 @@ Index: a/unix/configure =================================================================== --- a/unix/configure.orig +++ b/unix/configure -@@ -1432,6 +1432,7 @@ echo "$as_me: error: ${with_tclconfig} d +@@ -1431,6 +1431,7 @@ echo "$as_me: error: ${with_tclconfig} d `ls -d /usr/local/lib 2>/dev/null` \ `ls -d /usr/contrib/lib 2>/dev/null` \ `ls -d /usr/pkg/lib 2>/dev/null` \ + `ls -d /usr/share/tcltk/tcl8.6 2>/dev/null` \ + `ls -d /usr/lib/tcl8.6 2>/dev/null` \ `ls -d /usr/lib 2>/dev/null` \ `ls -d /usr/lib64 2>/dev/null` \ - `ls -d /usr/local/lib/tcl8.6 2>/dev/null` \ Index: a/unix/tcl.m4 =================================================================== --- a/unix/tcl.m4.orig +++ b/unix/tcl.m4 -@@ -94,6 +94,7 @@ AC_DEFUN([SC_PATH_TCLCONFIG], [ +@@ -93,6 +93,7 @@ AC_DEFUN([SC_PATH_TCLCONFIG], [ `ls -d /usr/local/lib 2>/dev/null` \ `ls -d /usr/contrib/lib 2>/dev/null` \ `ls -d /usr/pkg/lib 2>/dev/null` \ + `ls -d /usr/share/tcltk/tcl8.6 2>/dev/null` \ + `ls -d /usr/lib/tcl8.6 2>/dev/null` \ `ls -d /usr/lib 2>/dev/null` \ `ls -d /usr/lib64 2>/dev/null` \ - `ls -d /usr/local/lib/tcl8.6 2>/dev/null` \ -@@ -227,6 +228,7 @@ AC_DEFUN([SC_PATH_TKCONFIG], [ +@@ -226,6 +227,7 @@ AC_DEFUN([SC_PATH_TKCONFIG], [ `ls -d /usr/local/lib 2>/dev/null` \ `ls -d /usr/contrib/lib 2>/dev/null` \ `ls -d /usr/pkg/lib 2>/dev/null` \ -+ `ls -d /usr/share/tcltk/tk8.6 2>/dev/null` \ ++ `ls -d /usr/share/tcltk/tcl8.6 2>/dev/null` \ + `ls -d /usr/lib/tk8.6 2>/dev/null` \ `ls -d /usr/lib 2>/dev/null` \ `ls -d /usr/lib64 2>/dev/null` \ - `ls -d /usr/local/lib/tk8.6 2>/dev/null` \ diff --git a/meta-oe/recipes-devtools/tcltk/tk/fix-xft.diff b/meta-oe/recipes-devtools/tcltk/tk/fix-xft.diff index d1bb7105c6..4aa5d6b894 100644 --- a/meta-oe/recipes-devtools/tcltk/tk/fix-xft.diff +++ b/meta-oe/recipes-devtools/tcltk/tk/fix-xft.diff @@ -8,8 +8,8 @@ - XFT_LIBS=`xft-config --libs 2>/dev/null` || found_xft="no" - if test "$found_xft" = "no" ; then found_xft=yes - XFT_CFLAGS=`pkg-config --cflags xft 2>/dev/null` || found_xft="no" - XFT_LIBS=`pkg-config --libs xft 2>/dev/null` || found_xft="no" + XFT_CFLAGS=`pkg-config --cflags xft fontconfig 2>/dev/null` || found_xft="no" + XFT_LIBS=`pkg-config --libs xft fontconfig 2>/dev/null` || found_xft="no" - fi AC_MSG_RESULT([$found_xft]) dnl make sure that compiling against Xft header file doesn't bomb diff --git a/meta-oe/recipes-devtools/tcltk/tk/non-linux.diff b/meta-oe/recipes-devtools/tcltk/tk/non-linux.diff deleted file mode 100644 index 7d31f9fdca..0000000000 --- a/meta-oe/recipes-devtools/tcltk/tk/non-linux.diff +++ /dev/null @@ -1,27 +0,0 @@ -Patch by Sergei Golovan (originally by Mike Markley and Chris Waters) fixes -building on non-linux Debian architectures. - ---- tk8.5-8.5.8.orig/unix/configure -+++ tk8.5-8.5.8/unix/configure -@@ -4447,6 +4447,9 @@ - if test "`uname -s`" = "AIX" ; then - tcl_cv_sys_version=AIX-`uname -v`.`uname -r` - fi -+ if test "`uname -s`" = "NetBSD" -a -f /etc/debian_version ; then -+ tcl_cv_sys_version=NetBSD-Debian -+ fi - fi - fi - ---- tk8.5-8.5.8.orig/unix/tcl.m4 -+++ tk8.5-8.5.8/unix/tcl.m4 -@@ -962,6 +962,9 @@ - if test "`uname -s`" = "AIX" ; then - tcl_cv_sys_version=AIX-`uname -v`.`uname -r` - fi -+ if test "`uname -s`" = "NetBSD" -a -f /etc/debian_version ; then -+ tcl_cv_sys_version=NetBSD-Debian -+ fi - fi - fi - ]) diff --git a/meta-oe/recipes-devtools/tcltk/tk/tklibrary.diff b/meta-oe/recipes-devtools/tcltk/tk/tklibrary.diff deleted file mode 100644 index ee38c2a1a5..0000000000 --- a/meta-oe/recipes-devtools/tcltk/tk/tklibrary.diff +++ /dev/null @@ -1,22 +0,0 @@ ---- tk8.5-8.5.8.orig/unix/configure -+++ tk8.5-8.5.8/unix/configure -@@ -11070,7 +11070,7 @@ - TCL_STUB_FLAGS="-DUSE_TCL_STUBS" - fi - --TK_LIBRARY='$(prefix)/lib/tk$(VERSION)' -+test -z "$TK_LIBRARY" && TK_LIBRARY='$(prefix)/lib/tk$(VERSION)' - PRIVATE_INCLUDE_DIR='$(includedir)' - HTML_DIR='$(DISTDIR)/html' - TK_PKG_DIR='tk$(VERSION)' ---- tk8.5-8.5.8.orig/unix/configure.in -+++ tk8.5-8.5.8/unix/configure.in -@@ -607,7 +607,7 @@ - TCL_STUB_FLAGS="-DUSE_TCL_STUBS" - fi - --TK_LIBRARY='$(prefix)/lib/tk$(VERSION)' -+test -z "$TK_LIBRARY" && TK_LIBRARY='$(prefix)/lib/tk$(VERSION)' - PRIVATE_INCLUDE_DIR='$(includedir)' - HTML_DIR='$(DISTDIR)/html' - TK_PKG_DIR='tk$(VERSION)' diff --git a/meta-oe/recipes-devtools/tcltk/tk_8.6.10.bb b/meta-oe/recipes-devtools/tcltk/tk_8.6.10.bb new file mode 100644 index 0000000000..b564e12603 --- /dev/null +++ b/meta-oe/recipes-devtools/tcltk/tk_8.6.10.bb @@ -0,0 +1,93 @@ +SUMMARY = "Tool Command Language ToolKit Extension" +HOMEPAGE = "http://tcl.sourceforge.net" +SECTION = "devel/tcltk" + +# http://www.tcl.tk/software/tcltk/license.html +LICENSE = "tcl" +LIC_FILES_CHKSUM = "file://${S}/../license.terms;md5=c88f99decec11afa967ad33d314f87fe \ + file://${S}/../compat/license.terms;md5=c88f99decec11afa967ad33d314f87fe \ + file://${S}/../doc/license.terms;md5=c88f99decec11afa967ad33d314f87fe \ + file://${S}/../library/license.terms;md5=c88f99decec11afa967ad33d314f87fe \ + file://${S}/../macosx/license.terms;md5=c88f99decec11afa967ad33d314f87fe \ + file://${S}/../tests/license.terms;md5=c88f99decec11afa967ad33d314f87fe \ + file://${S}/../unix/license.terms;md5=c88f99decec11afa967ad33d314f87fe \ + file://${S}/../win/license.terms;md5=c88f99decec11afa967ad33d314f87fe \ + file://${S}/../xlib/license.terms;md5=c88f99decec11afa967ad33d314f87fe \ +" + +DEPENDS = "tcl virtual/libx11 libxt" + +SRC_URI = "\ + ${SOURCEFORGE_MIRROR}/tcl/${BPN}${PV}-src.tar.gz \ + file://confsearch.diff;striplevel=2 \ + file://tkprivate.diff;striplevel=2 \ + file://fix-xft.diff \ +" +SRC_URI[md5sum] = "602a47ad9ecac7bf655ada729d140a94" +SRC_URI[sha256sum] = "63df418a859d0a463347f95ded5cd88a3dd3aaa1ceecaeee362194bc30f3e386" + +S = "${WORKDIR}/${BPN}${PV}/unix" + +# Short version format: "8.6" +VER = "${@os.path.splitext(d.getVar('PV'))[0]}" + +LDFLAGS += "-Wl,-rpath,${libdir}/tcltk/${PV}/lib" +inherit autotools features_check +# depends on virtual/libx11 +REQUIRED_DISTRO_FEATURES = "x11" + +EXTRA_OECONF = "\ + --enable-threads \ + --with-x \ + --with-tcl=${STAGING_BINDIR}/crossscripts \ + --libdir=${libdir} \ +" +export TK_LIBRARY='${libdir}/tk${VER}' +do_install_append() { + ln -sf libtk${VER}.so ${D}${libdir}/libtk${VER}.so.0 + oe_libinstall -so libtk${VER} ${D}${libdir} + ln -sf wish${VER} ${D}${bindir}/wish + + sed -i "s;-L${B};-L${STAGING_LIBDIR};g" tkConfig.sh + sed -i "s;'${WORKDIR};'${STAGING_INCDIR};g" tkConfig.sh + install -d ${D}${bindir_crossscripts} + install -m 0755 tkConfig.sh ${D}${bindir_crossscripts} +} + +PACKAGECONFIG ??= "xft" +PACKAGECONFIG[xft] = "--enable-xft,--disable-xft,xft" +PACKAGECONFIG[xss] = "--enable-xss,--disable-xss,libxscrnsaver libxext" + +PACKAGES =+ "${PN}-lib" + +FILES_${PN}-lib = "${libdir}/libtk${VER}.so*" +FILES_${PN} += "${libdir}/tk*" + +# isn't getting picked up by shlibs code +RDEPENDS_${PN} += "tk-lib" +RDEPENDS_${PN}_class-native = "" + +BBCLASSEXTEND = "native nativesdk" + +# Fix the path in sstate +SSTATE_SCAN_FILES += "*Config.sh" + +inherit binconfig + +SYSROOT_DIRS += "${bindir_crossscripts}" + +# Fix some paths that might be used by Tcl extensions +BINCONFIG_GLOB = "*Config.sh" + +# Cleanup host path from ${libdir}/tclConfig.sh and remove the +# ${bindir_crossscripts}/tclConfig.sh from target +PACKAGE_PREPROCESS_FUNCS += "tcl_package_preprocess" +tcl_package_preprocess() { + sed -i -e "s;${DEBUG_PREFIX_MAP};;g" \ + -e "s;-L${STAGING_LIBDIR};-L${libdir};g" \ + -e "s;${STAGING_INCDIR};${includedir};g" \ + -e "s;--sysroot=${RECIPE_SYSROOT};;g" \ + ${PKGD}${libdir}/tkConfig.sh + + rm -f ${PKGD}${bindir_crossscripts}/tkConfig.sh +} diff --git a/meta-oe/recipes-devtools/tcltk/tk_8.6.9.bb b/meta-oe/recipes-devtools/tcltk/tk_8.6.9.bb deleted file mode 100644 index 3d77670749..0000000000 --- a/meta-oe/recipes-devtools/tcltk/tk_8.6.9.bb +++ /dev/null @@ -1,96 +0,0 @@ -SUMMARY = "Tool Command Language ToolKit Extension" -HOMEPAGE = "http://tcl.sourceforge.net" -SECTION = "devel/tcltk" - -# http://www.tcl.tk/software/tcltk/license.html -LICENSE = "tcl" -LIC_FILES_CHKSUM = "file://${S}/../license.terms;md5=c88f99decec11afa967ad33d314f87fe \ - file://${S}/../compat/license.terms;md5=c88f99decec11afa967ad33d314f87fe \ - file://${S}/../doc/license.terms;md5=c88f99decec11afa967ad33d314f87fe \ - file://${S}/../library/license.terms;md5=c88f99decec11afa967ad33d314f87fe \ - file://${S}/../macosx/license.terms;md5=c88f99decec11afa967ad33d314f87fe \ - file://${S}/../tests/license.terms;md5=c88f99decec11afa967ad33d314f87fe \ - file://${S}/../unix/license.terms;md5=c88f99decec11afa967ad33d314f87fe \ - file://${S}/../win/license.terms;md5=c88f99decec11afa967ad33d314f87fe \ - file://${S}/../xlib/license.terms;md5=c88f99decec11afa967ad33d314f87fe \ -" - -DEPENDS = "tcl virtual/libx11 libxt" - -SRC_URI = "\ - ${SOURCEFORGE_MIRROR}/tcl/${BPN}${PV}-src.tar.gz \ - file://confsearch.diff;striplevel=2 \ - file://non-linux.diff;striplevel=2 \ - file://tklibrary.diff;striplevel=2 \ - file://tkprivate.diff;striplevel=2 \ - file://fix-xft.diff \ - file://configure.use.fontconfig.with.xft.patch \ -" -SRC_URI[md5sum] = "e3cf6290999ee30651d75864eccfec63" -SRC_URI[sha256sum] = "d3f9161e8ba0f107fe8d4df1f6d3a14c30cc3512dfc12a795daa367a27660dac" - -S = "${WORKDIR}/${BPN}${PV}/unix" - -# Short version format: "8.6" -VER = "${@os.path.splitext(d.getVar('PV'))[0]}" - -LDFLAGS += "-Wl,-rpath,${libdir}/tcltk/${PV}/lib" -inherit autotools features_check -# depends on virtual/libx11 -REQUIRED_DISTRO_FEATURES = "x11" - -EXTRA_OECONF = "\ - --enable-threads \ - --with-x \ - --with-tcl=${STAGING_BINDIR}/crossscripts \ - --libdir=${libdir} \ -" -export TK_LIBRARY='${libdir}/tk${VER}' -do_install_append() { - ln -sf libtk${VER}.so ${D}${libdir}/libtk${VER}.so.0 - oe_libinstall -so libtk${VER} ${D}${libdir} - ln -sf wish${VER} ${D}${bindir}/wish - - sed -i "s;-L${B};-L${STAGING_LIBDIR};g" tkConfig.sh - sed -i "s;'${WORKDIR};'${STAGING_INCDIR};g" tkConfig.sh - install -d ${D}${bindir_crossscripts} - install -m 0755 tkConfig.sh ${D}${bindir_crossscripts} -} - -PACKAGECONFIG ??= "xft" -PACKAGECONFIG[xft] = "--enable-xft,--disable-xft,xft" -PACKAGECONFIG[xss] = "--enable-xss,--disable-xss,libxscrnsaver libxext" - -PACKAGES =+ "${PN}-lib" - -FILES_${PN}-lib = "${libdir}/libtk${VER}.so*" -FILES_${PN} += "${libdir}/tk*" - -# isn't getting picked up by shlibs code -RDEPENDS_${PN} += "tk-lib" -RDEPENDS_${PN}_class-native = "" - -BBCLASSEXTEND = "native nativesdk" - -# Fix the path in sstate -SSTATE_SCAN_FILES += "*Config.sh" - -inherit binconfig - -SYSROOT_DIRS += "${bindir_crossscripts}" - -# Fix some paths that might be used by Tcl extensions -BINCONFIG_GLOB = "*Config.sh" - -# Cleanup host path from ${libdir}/tclConfig.sh and remove the -# ${bindir_crossscripts}/tclConfig.sh from target -PACKAGE_PREPROCESS_FUNCS += "tcl_package_preprocess" -tcl_package_preprocess() { - sed -i -e "s;${DEBUG_PREFIX_MAP};;g" \ - -e "s;-L${STAGING_LIBDIR};-L${libdir};g" \ - -e "s;${STAGING_INCDIR};${includedir};g" \ - -e "s;--sysroot=${RECIPE_SYSROOT};;g" \ - ${PKGD}${libdir}/tkConfig.sh - - rm -f ${PKGD}${bindir_crossscripts}/tkConfig.sh -} -- cgit v1.2.3-54-g00ecf