This also fixes the build since tcl is moved to 8.6.0 in OE-Core
The licence has been updated a little
license.terms 2009-11-13 10:38:48.
000000000 -0800
license.terms 2012-12-19 07:39:12.
000000000 -0800
@@ -1,7 +1,8 @@
This software is copyrighted by the Regents of the University of
-California, Sun Microsystems, Inc., and other parties. The following
-terms apply to all files associated with the software unless explicitly
-disclaimed in individual files.
+California, Sun Microsystems, Inc., Scriptics Corporation, ActiveState
+Corporation, Apple Inc. and other parties. The following terms apply
to
+all files associated with the software unless explicitly disclaimed in
+individual files.
The authors hereby grant permission to use, copy, modify, distribute,
and license this software and its documentation for any purpose,
provided
@@ -28,12 +29,12 @@
GOVERNMENT USE: If you are acquiring this software on behalf of the
U.S. government, the Government shall have only "Restricted Rights"
-in the software and related documentation as defined in the Federal
+in the software and related documentation as defined in the Federal
Acquisition Regulations (FARs) in Clause 52.227.19 (c) (2). If you
are acquiring the software on behalf of the Department of Defense, the
software shall be classified as "Commercial Computer Software" and the
Government shall have only "Restricted Rights" as defined in Clause
-252.227-7013 (c) (1) of DFARs. Notwithstanding the foregoing, the
+252.227-7013 (b) (3) of DFARs. Notwithstanding the foregoing, the
authors grant the U.S. Government and others acting in its behalf
permission to use and distribute the software in accordance with the
terms specified in this license.
(From meta-openembedded rev:
a695d15ea384001a7e68c20972e9b21785d57275)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
+++ /dev/null
-Patch by Chris Waters fixes installing of several manual pages which
-aren't installed by upstream script but are referenced inside other
-manual pages.
-
---- tk8.5-8.5.8.orig/unix/installManPage
-+++ tk8.5-8.5.8/unix/installManPage
-@@ -51,7 +51,16 @@
- }' $MANPAGE`
-
- SECTION=`echo $MANPAGE | sed 's/.*\(.\)$/\1/'`
-+NAME=`basename $MANPAGE .$SECTION`
- SRCDIR=`dirname $MANPAGE`
-+
-+SPECIALS="FindPhoto"
-+for n in $SPECIALS; do
-+ if [ "$NAME" = "$n" ] ; then
-+ NAMES="$n $NAMES"
-+ fi
-+done
-+
- FIRST=""
- for f in $NAMES; do
- f=$f.$SECTION$SUFFIX
+++ /dev/null
-Patch by Chris Waters removes -rpath from search flags and adds -soname
-to library build options.
-
-Also, it fixes Makefile.in to put correct Tk library filename to pkgIndex.tcl
-
---- tk8.5-8.5.8.orig/unix/configure
-+++ tk8.5-8.5.8/unix/configure
-@@ -5557,6 +5557,9 @@
- # get rid of the warnings.
- #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
-
-+ # following line added by CW for Debian GNU/Linux
-+ TK_SHLIB_LD_EXTRAS="-Wl,-soname,\${TK_LIB_FILE}.0"
-+
- SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS}'
- DL_OBJS="tclLoadDl.o"
- DL_LIBS="-ldl"
---- tk8.5-8.5.8.orig/unix/Makefile.in
-+++ tk8.5-8.5.8/unix/Makefile.in
-@@ -713,7 +713,7 @@
- echo "if {[catch {package present Tcl 8.5.0}]} { return }";\
- relative=`echo | awk '{ORS=" "; split("$(TK_PKG_DIR)",a,"/"); for (f in a) {print ".."}}'`;\
- echo "package ifneeded Tk $(MAJOR_VERSION).$(MINOR_VERSION)$(PATCH_LEVEL)\
-- [list load [file join \$$dir $${relative}$(TK_LIB_FILE)] Tk]";\
-+ [list load [file join $(LIB_RUNTIME_DIR) $(TK_LIB_FILE).0] Tk]";\
- ) > "$(PKG_INDEX)"; \
- fi
- @echo "Installing $(LIB_FILE) to $(LIB_INSTALL_DIR)/"
---- tk8.5-8.5.8.orig/unix/tcl.m4
-+++ tk8.5-8.5.8/unix/tcl.m4
-@@ -1433,6 +1433,9 @@
- # get rid of the warnings.
- #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
-
-+ # following line added by CW for Debian GNU/Linux
-+ TK_SHLIB_LD_EXTRAS="-Wl,-soname,\${TK_LIB_FILE}.0"
-+
- SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS}'
- DL_OBJS="tclLoadDl.o"
- DL_LIBS="-ldl"
HOMEPAGE = "http://tcl.sourceforge.net"
SECTION = "devel/tcltk"
LICENSE = "tcl"
-LIC_FILES_CHKSUM = "file://license.terms;md5=24954e7e6b54c1b4e16de861b9d392fc"
+LIC_FILES_CHKSUM = "file://license.terms;md5=c88f99decec11afa967ad33d314f87fe"
DEPENDS = "tcl virtual/libx11 libxt"
SRC_URI = "\
${SOURCEFORGE_MIRROR}/tcl/tk${PV}-src.tar.gz \
file://confsearch.diff;striplevel=2 \
- file://manpages.diff;striplevel=2 \
file://non-linux.diff;striplevel=2 \
- file://rpath.diff;striplevel=2 \
file://tklibrary.diff;striplevel=2 \
file://tkprivate.diff;striplevel=2 \
file://fix-xft.diff \
"
-SRC_URI[md5sum] = "13bf90602e16fc530e05196431021dc6"
-SRC_URI[sha256sum] = "9737da5c30e631281062b6acbb4753840f9e95657c78e37657d9c520589ab2d4"
+SRC_URI[md5sum] = "b883a1a3c489c17413fb602a94bf54e8"
+SRC_URI[sha256sum] = "5c708b2b6f658916df59190b27750fa1ea2bc10992108e10f961c0700f058de6"
S = "${WORKDIR}/tk${PV}/unix"
-
+LDFLAGS += "-Wl,-rpath,${libdir}/tcltk/8.6.0/lib"
inherit autotools
EXTRA_OECONF = "\
--enable-threads \
+ --with-x \
--with-tcl=${STAGING_BINDIR_CROSS} \
- --x-includes=${STAGING_INCDIR} \
- --x-libraries=${STAGING_LIBDIR} \
"
do_install_append() {
- mv libtk8.5.so libtk8.5.so.0
- oe_libinstall -so libtk8.5 ${D}${libdir}
- ln -sf wish8.5 ${D}${bindir}/wish
+ mv libtk8.6.so libtk8.6.so.0
+ oe_libinstall -so libtk8.6 ${D}${libdir}
+ ln -sf wish8.6 ${D}${bindir}/wish
}
PACKAGES =+ "${PN}-lib"
-FILES_${PN}-lib = "${libdir}/libtk8.5.so.*"
+FILES_${PN}-lib = "${libdir}/libtk8.6.so.*"
FILES_${PN} += "${libdir}/tk*"
BINCONFIG_GLOB = "*Config.sh"
projects / scm / bb / tizen-distro.git / commitdiff