commit: b439ffdd2be1e48d7667d86ec59de46ef1d86ce5 Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org> AuthorDate: Mon Jan 4 09:15:06 2021 +0000 Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org> CommitDate: Mon Jan 4 09:15:06 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b439ffdd
dev-tcltk/blt: version bump to 2.5.3 Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org> dev-tcltk/blt/Manifest | 2 + dev-tcltk/blt/blt-2.5.3.ebuild | 132 +++++++++++++++++++++++++++++ dev-tcltk/blt/files/blt-2.5.3-darwin.patch | 36 ++++++++ dev-tcltk/blt/files/blt-2.5.3-gbsd.patch | 24 ++++++ dev-tcltk/blt/files/blt-2.5.3-gentoo.patch | 45 ++++++++++ 5 files changed, 239 insertions(+) diff --git a/dev-tcltk/blt/Manifest b/dev-tcltk/blt/Manifest index d11722e53ba..accc3e52a74 100644 --- a/dev-tcltk/blt/Manifest +++ b/dev-tcltk/blt/Manifest @@ -1 +1,3 @@ +DIST blt-2.5.3-debian-patches.tar.gz 52252 BLAKE2B 700a2df32117ea84f9e211e18bda0d64163d24b633b0c5735808da6f3c5f32b73a69e9f1af548cca7eea4538c2aae57a87d82b2f61673e49709ac30dc036e38a SHA512 3da7831c3c8a7847e004cfb81e911883eb29f565e63f3b7ed47719ccba0a0cb593c0dbb77ff22262d5f8c4a3cb94cc074fd9c02f37729fe7763533be6677a852 +DIST blt-src-2.5.3.zip 2724036 BLAKE2B c669bc033e691d1717b6b6dccf42901fed26f58bb4d2e9fffdd4e7f83eae788e1cbdb8fd1bcdc860845a569232ec26d06773146a420984d8abf5d25ee7f73dd9 SHA512 f589564cc5f790ab11ac1356b2e27659ef0e6132ffde42d4325f0aa8d8aa4269fdb9e81dd1c196017518704e4c1c78c0d4116f32afd1e6a1c60878961b8cdb26 DIST blt2.4z-8.5.2.tar.gz 2326234 BLAKE2B 83ea57989ee1e7bbbc243058b1a734942c4b6d796d06aa3a702012ea8d01eb059e76b6b8ff0efc9b43b000f1cfe7545419e2d892f1794b2add3d8c2c602e22ba SHA512 afc465ba47ae43a0c6be17400d0a572dccd8c2a8adfd8fc3ed50f9ec28d02129f069d88096c1428c4b242550131092b4141035d7ce90c9e7181ccf712502f09a diff --git a/dev-tcltk/blt/blt-2.5.3.ebuild b/dev-tcltk/blt/blt-2.5.3.ebuild new file mode 100644 index 00000000000..99bcce3d736 --- /dev/null +++ b/dev-tcltk/blt/blt-2.5.3.ebuild @@ -0,0 +1,132 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools eutils flag-o-matic multilib toolchain-funcs + +DESCRIPTION="Extension to Tk, adding new widgets, geometry managers, and misc commands" +HOMEPAGE="https://sourceforge.net/projects/wize/"; +SRC_URI="mirror://sourceforge/wize/${PN}-src-${PV}.zip + https://dev.gentoo.org/~tupone/distfiles/${P}-debian-patches.tar.gz"; + +IUSE="jpeg static-libs X" +SLOT="0" +LICENSE="BSD" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + +DEPEND=" + dev-lang/tk:0= + jpeg? ( virtual/jpeg:0= ) + X? ( x11-libs/libX11 )" +RDEPEND="${DEPEND}" + +S="${WORKDIR}"/${PN}2.5 + +MAKEOPTS+=" -j1" + +PATCHES=( + "${WORKDIR}"/patches/02-debian-all.patch + "${WORKDIR}"/patches/03-fedora-patch-2.patch + "${WORKDIR}"/patches/04-fedora-tk8.5.6.patch + "${WORKDIR}"/patches/05-tk8.5-zoomstack.patch + "${WORKDIR}"/patches/doc-typos.patch + "${WORKDIR}"/patches/tcl8.6.patch + "${WORKDIR}"/patches/tk8.6.patch + "${WORKDIR}"/patches/install.patch + "${WORKDIR}"/patches/usetclint.patch + "${WORKDIR}"/patches/usetkint.patch + "${WORKDIR}"/patches/table.patch + "${WORKDIR}"/patches/ldflags.patch + "${WORKDIR}"/patches/pkgindex.patch + "${WORKDIR}"/patches/decls.patch + "${WORKDIR}"/patches/bltnsutil.patch + "${WORKDIR}"/patches/blthash.patch + "${WORKDIR}"/patches/const.patch + "${WORKDIR}"/patches/uninitialized.patch + "${WORKDIR}"/patches/unused.patch + "${WORKDIR}"/patches/pointertoint.patch + "${WORKDIR}"/patches/autoreconf.patch + "${WORKDIR}"/patches/switch.patch + "${FILESDIR}"/${P}-gentoo.patch + "${FILESDIR}"/${P}-darwin.patch + "${FILESDIR}"/${P}-gbsd.patch +) + +src_prepare() { + default + rm acconfig.h || die + # Set the correct libdir and drop RPATH + sed \ + -e "s:\(^libdir=\${exec_prefix}/\)lib:\1$(get_libdir):" \ + -e 's:LD_RUN_PATH=.*$:LD_RUN_PATH="":g' \ + -i configure.in || die "sed configure* failed" + sed \ + -e "/^scriptdir =/s:lib:$(get_libdir):" \ + -i Makefile.in demos/Makefile.in || die "sed Makefile.in failed" + + sed \ + -e "/AR/s:ar:$(tc-getAR):g" \ + -e 's:0444:0644:g' \ + -i generic/Makefile.in || die + + append-cflags -fPIC + + mv configure.{in,ac} || die + eautoreconf +} + +src_configure() { + LC_ALL=C \ + econf \ + --x-includes="${EPREFIX}/usr/include" \ + --x-libraries="${EPREFIX}/usr/$(get_libdir)" \ + --with-blt="${EPREFIX}/usr/$(get_libdir)" \ + --with-tcl="${EPREFIX}/usr/$(get_libdir)" \ + --with-tk="${EPREFIX}/usr/$(get_libdir)" \ + --with-tclincls="${EPREFIX}/usr/include" \ + --with-tkincls="${EPREFIX}/usr/include" \ + --with-tcllibs="${EPREFIX}/usr/$(get_libdir)" \ + --with-tklibs="${EPREFIX}/usr/$(get_libdir)" \ + --with-cflags="${CFLAGS}" \ + --with-gnu-ld \ + $(use_enable jpeg) \ + $(use_with X x) \ + CC="$(tc-getCC)" +} + +src_compile() { + emake LDFLAGS="${LDFLAGS}" +} + +src_install() { + sed \ + -e "s:\.\./src/bltwish:${EPREFIX}/usr/bin/bltwish:g" \ + -e "s:\.\./bltwish:${EPREFIX}/usr/bin/bltwish:g" \ + -e "s:/usr/local/bin/bltwish:${EPREFIX}/usr/bin/bltwish:g" \ + -e "s:/usr/local/bin/tclsh:${EPREFIX}/usr/bin/tclsh:g" \ + -i demos/{,scripts/}*.tcl || die + + dodir \ + /usr/bin \ + /usr/$(get_libdir)/blt2.4/demos/bitmaps \ + /usr/share/man/mann \ + /usr/include + + emake INSTALL_ROOT="${D}" install + + dodoc NEWS PROBLEMS README + docinto html + dodoc html/*.html + for f in `ls "${ED}"/usr/share/man/mann` ; do + mv "${ED}"/usr/share/man/mann/${f} "${ED}"/usr/share/man/mann/${f/.n/.nblt} || die + done + + # fix for linking against shared lib with -lBLT or -lBLTlite + dosym libBLT24$(get_libname) /usr/$(get_libdir)/libBLT$(get_libname) + dosym libBLTlite24$(get_libname) /usr/$(get_libdir)/libBLTlite$(get_libname) + + use static-libs || \ + find "${ED}"/usr/$(get_libdir) -name "*.a" -print0 | \ + xargs -r -0 rm -fv +} diff --git a/dev-tcltk/blt/files/blt-2.5.3-darwin.patch b/dev-tcltk/blt/files/blt-2.5.3-darwin.patch new file mode 100644 index 00000000000..11524c2e74d --- /dev/null +++ b/dev-tcltk/blt/files/blt-2.5.3-darwin.patch @@ -0,0 +1,36 @@ +--- a/configure.in ++++ b/configure.in +@@ -183,9 +183,6 @@ + blt_lib_prefix="" + fi + ;; +- *-*-macosx) +- blt_platform="macosx" +- ;; + *) + blt_platform="unix" + ;; +@@ -728,6 +725,9 @@ + *-hpux*) + SHLIB_SUFFIX="sl" + ;; ++ *-darwin*) ++ SHLIB_SUFFIX="dylib" ++ ;; + *) + SHLIB_SUFFIX="so" + ;; +@@ -1145,6 +1145,13 @@ + LDFLAGS="" + ;; + ++ *-darwin*) ++ SHLIB_CFLAGS="" ++ SHLIB_LD="${CC}" ++ SHLIB_LD_FLAGS='-dynamiclib -install_name $(libdir)/$@' ++ SHLIB_SUFFIX=".dylib" ++ ;; ++ + *-dgux*) + SHLIB_CFLAGS="-K PIC" + SHLIB_LD="cc" diff --git a/dev-tcltk/blt/files/blt-2.5.3-gbsd.patch b/dev-tcltk/blt/files/blt-2.5.3-gbsd.patch new file mode 100644 index 00000000000..4449ad37446 --- /dev/null +++ b/dev-tcltk/blt/files/blt-2.5.3-gbsd.patch @@ -0,0 +1,24 @@ +--- a/configure.in 2012-05-06 18:11:47.000000000 -0400 ++++ b/configure.in 2012-05-06 18:15:08.000000000 -0400 +@@ -708,7 +708,7 @@ + fi + + case $target in +- *-sunos4*|*-*-netbsd|NetBSD-*|FreeBSD-*|OpenBSD-*|*-*-cygwin*|*-*-mingw*) ++ *-sunos4*|*-*-netbsd|NetBSD-*|FreeBSD-*|*-*-freebsd*|OpenBSD-*|*-*-cygwin*|*-*-mingw*) + TCL_LIB_NAME="tcl${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}" + TK_LIB_NAME="tk${TK_MAJOR_VERSION}${TK_MINOR_VERSION}" + ;; +@@ -1241,6 +1241,12 @@ + EXTRA_LIB_SPECS="-ldl" + ;; + ++ *-gentoo-netbsd*|*-gentoo-freebsd*|*-gentoo-openbsd*) ++ SHLIB_CFLAGS="-fPIC" ++ SHLIB_LD="${CC}" ++ SHLIB_LD_FLAGS='-rdynamic -shared -Wl,-E -Wl,-soname,$@' ++ ;; ++ + *-netbsd*|*-freebsd*|*-openbsd*) + # Not available on all versions: check for include file. + AC_CHECK_HEADER(dlfcn.h, test_ok=yes, test_ok=no) diff --git a/dev-tcltk/blt/files/blt-2.5.3-gentoo.patch b/dev-tcltk/blt/files/blt-2.5.3-gentoo.patch new file mode 100644 index 00000000000..3372b83a733 --- /dev/null +++ b/dev-tcltk/blt/files/blt-2.5.3-gentoo.patch @@ -0,0 +1,45 @@ +--- a/configure.in 2021-01-03 20:59:43.337589407 +0100 ++++ b/configure.in 2021-01-03 21:00:48.936539537 +0100 +@@ -56,10 +56,6 @@ + blt_enable_jpeg=$enableval ]) + AC_ARG_ENABLE(cygwin, [ --enable-cygwin Use cygwin Tcl/Tk libraries. Requires cygwin1.dll], [ + blt_enable_cygwin=$enableval ]) +-AC_ARG_WITH(cc, [ --with-cc=CC Set C compiler to CC], [ +- blt_with_cc=$with_cc +- unset ac_cv_prog_CC +- unset ac_cv_prog_CPP ]) + AC_ARG_WITH(cflags, [ --with-cflags=FLAGS Set compiler flags to FLAGS], + blt_with_cflags="$with_cflags") + AC_ARG_WITH(gnu_ld, [ --with-gnu-ld Use GNU linker], +@@ -96,22 +92,7 @@ + # + + AC_MSG_CHECKING([which C compiler]) +-if test "x${blt_with_cc}" != "x" ; then +- CC=${blt_with_cc} +- unset ac_cv_prog_CPP +- unset ac_cv_prog_CC +-elif test "x${BLT_ENV_CC}" != "x" ; then +- unset ac_cv_prog_CPP +- unset ac_cv_prog_CC +-elif test "x${blt_cv_prog_cc}" != "x" ; then +- CC=${blt_cv_prog_cc} +- unset ac_cv_prog_CC +-else +- AC_PROG_CC +-fi +-if test "x${CC}" = "x" ; then +- CC=cc +-fi ++AC_PROG_CC + + case $target in + *-*-cygwin*|*-*-mingw*) +@@ -125,7 +106,6 @@ + + unset blt_cv_prog_cc + AC_CACHE_VAL(blt_cv_prog_cc, blt_cv_prog_cc=$CC) +-AC_SUBST(CC) + AC_PROG_CPP + AS_IF([test "x${GCC}" != "x"],[ + blt_have_gcc="yes"
