From 2f8ebb9128107a1e035110b86f2b286e26380982 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Thu, 22 Apr 2021 08:39:19 +0200 Subject: dev-tcltk/blt: Drop 2.4z, EAPI5-- Closes: https://bugs.gentoo.org/783714 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner --- dev-tcltk/blt/Manifest | 1 - dev-tcltk/blt/blt-2.4z-r13.ebuild | 125 -------------------- dev-tcltk/blt/blt-2.4z-r14.ebuild | 128 --------------------- dev-tcltk/blt/files/blt-2.4z-aclocal.patch | 79 ------------- dev-tcltk/blt/files/blt-2.4z-darwin.patch | 72 ------------ dev-tcltk/blt/files/blt-2.4z-gbsd.patch | 54 --------- dev-tcltk/blt/files/blt-2.4z-gentoo.patch | 122 -------------------- dev-tcltk/blt/files/blt-2.4z-ldflags.patch | 30 ----- dev-tcltk/blt/files/blt-2.4z-linking.patch | 21 ---- .../blt/files/blt-2.4z-r4-fix-makefile2.patch | 18 --- .../blt/files/blt-2.4z-r4-fix-makefile3.patch | 14 --- .../blt/files/blt-2.4z-tcl8.5-fixpkgruntime.patch | 66 ----------- dev-tcltk/blt/files/blt-2.4z-tcl8.6.patch | 86 -------------- dev-tcltk/blt/files/blt-2.4z-tk8.6.patch | 20 ---- dev-tcltk/blt/files/blt2.4z-64bit.patch | 24 ---- 15 files changed, 860 deletions(-) delete mode 100644 dev-tcltk/blt/blt-2.4z-r13.ebuild delete mode 100644 dev-tcltk/blt/blt-2.4z-r14.ebuild delete mode 100644 dev-tcltk/blt/files/blt-2.4z-aclocal.patch delete mode 100644 dev-tcltk/blt/files/blt-2.4z-darwin.patch delete mode 100644 dev-tcltk/blt/files/blt-2.4z-gbsd.patch delete mode 100644 dev-tcltk/blt/files/blt-2.4z-gentoo.patch delete mode 100644 dev-tcltk/blt/files/blt-2.4z-ldflags.patch delete mode 100644 dev-tcltk/blt/files/blt-2.4z-linking.patch delete mode 100644 dev-tcltk/blt/files/blt-2.4z-r4-fix-makefile2.patch delete mode 100644 dev-tcltk/blt/files/blt-2.4z-r4-fix-makefile3.patch delete mode 100644 dev-tcltk/blt/files/blt-2.4z-tcl8.5-fixpkgruntime.patch delete mode 100644 dev-tcltk/blt/files/blt-2.4z-tcl8.6.patch delete mode 100644 dev-tcltk/blt/files/blt-2.4z-tk8.6.patch delete mode 100644 dev-tcltk/blt/files/blt2.4z-64bit.patch (limited to 'dev-tcltk') diff --git a/dev-tcltk/blt/Manifest b/dev-tcltk/blt/Manifest index accc3e52a747..e2b8df26e322 100644 --- a/dev-tcltk/blt/Manifest +++ b/dev-tcltk/blt/Manifest @@ -1,3 +1,2 @@ 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.4z-r13.ebuild b/dev-tcltk/blt/blt-2.4z-r13.ebuild deleted file mode 100644 index 468ad2abbec6..000000000000 --- a/dev-tcltk/blt/blt-2.4z-r13.ebuild +++ /dev/null @@ -1,125 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit autotools epatch flag-o-matic multilib toolchain-funcs - -MY_V_SUFFIX="-8.5.2" - -DESCRIPTION="Extension to Tk, adding new widgets, geometry managers, and misc commands" -HOMEPAGE=" - http://blt.sourceforge.net/ - http://jos.decoster.googlepages.com/bltfortk8.5.2" -SRC_URI=" - https://dev.gentoo.org/~jlec/distfiles/${PN}${PV}${MY_V_SUFFIX}.tar.gz - http://jos.decoster.googlepages.com/${PN}${PV}${MY_V_SUFFIX}.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 ~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}${PV}${MY_V_SUFFIX}" - -MAKEOPTS+=" -j1" - -src_prepare() { - epatch "${FILESDIR}/blt-2.4z-r4-fix-makefile2.patch" - epatch "${FILESDIR}/blt-2.4z-r4-fix-makefile3.patch" - # From blt-2.4z-6mdk.src.rpm - epatch "${FILESDIR}"/blt2.4z-64bit.patch - - epatch "${FILESDIR}"/blt-2.4z-tcl8.5-fixpkgruntime.patch - - epatch "${FILESDIR}"/${P}-ldflags.patch - - # 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' \ - -e "/RANLIB/s:ranlib:$(tc-getRANLIB):g" \ - -i configure* || 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 src/Makefile.in || die - - epatch \ - "${FILESDIR}"/${P}-linking.patch \ - "${FILESDIR}"/${P}-darwin.patch \ - "${FILESDIR}"/${P}-gbsd.patch \ - "${FILESDIR}"/${P}-tk8.6.patch \ - "${FILESDIR}"/${P}-tcl8.6.patch \ - "${FILESDIR}"/${P}-aclocal.patch - - 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-cc="$(tc-getCC)" \ - --with-cflags="${CFLAGS}" \ - --with-gnu-ld \ - $(use_enable jpeg) \ - $(use_with X x) -} - -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 - dohtml 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/blt-2.4z-r14.ebuild b/dev-tcltk/blt/blt-2.4z-r14.ebuild deleted file mode 100644 index cd480851d5e8..000000000000 --- a/dev-tcltk/blt/blt-2.4z-r14.ebuild +++ /dev/null @@ -1,128 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools epatch flag-o-matic multilib toolchain-funcs - -MY_V_SUFFIX="-8.5.2" - -DESCRIPTION="Extension to Tk, adding new widgets, geometry managers, and misc commands" -HOMEPAGE=" - http://blt.sourceforge.net/ - http://jos.decoster.googlepages.com/bltfortk8.5.2" -SRC_URI=" - https://dev.gentoo.org/~jlec/distfiles/${PN}${PV}${MY_V_SUFFIX}.tar.gz - http://jos.decoster.googlepages.com/${PN}${PV}${MY_V_SUFFIX}.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 ~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}${PV}${MY_V_SUFFIX}" - -MAKEOPTS+=" -j1" - -src_prepare() { - epatch "${FILESDIR}/blt-2.4z-r4-fix-makefile2.patch" - epatch "${FILESDIR}/blt-2.4z-r4-fix-makefile3.patch" - # From blt-2.4z-6mdk.src.rpm - epatch "${FILESDIR}"/blt2.4z-64bit.patch - - epatch "${FILESDIR}"/blt-2.4z-tcl8.5-fixpkgruntime.patch - - epatch "${FILESDIR}"/${P}-ldflags.patch - - # 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' \ - -e "/RANLIB/s:ranlib:$(tc-getRANLIB):g" \ - -i configure* || 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 src/Makefile.in || die - - epatch \ - "${FILESDIR}"/${P}-linking.patch \ - "${FILESDIR}"/${P}-darwin.patch \ - "${FILESDIR}"/${P}-gbsd.patch \ - "${FILESDIR}"/${P}-tk8.6.patch \ - "${FILESDIR}"/${P}-tcl8.6.patch \ - "${FILESDIR}"/${P}-gentoo.patch \ - "${FILESDIR}"/${P}-aclocal.patch - - append-cflags -fPIC - - mv configure.{in,ac} || die - - default - - 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-cc="$(tc-getCC)" \ - --with-cflags="${CFLAGS}" \ - --with-gnu-ld \ - $(use_enable jpeg) \ - $(use_with X x) -} - -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 - dohtml 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.4z-aclocal.patch b/dev-tcltk/blt/files/blt-2.4z-aclocal.patch deleted file mode 100644 index e7c62b5de7f3..000000000000 --- a/dev-tcltk/blt/files/blt-2.4z-aclocal.patch +++ /dev/null @@ -1,79 +0,0 @@ - aclocal.m4 | 6 +++--- - configure.in | 38 +++----------------------------------- - 2 files changed, 6 insertions(+), 38 deletions(-) - -diff --git a/aclocal.m4 b/aclocal.m4 -index 7441d3d..b86a6b2 100644 ---- a/aclocal.m4 -+++ b/aclocal.m4 -@@ -11,11 +11,11 @@ if test "$cross_compiling" = yes; then - else - cat > conftest.$ac_ext <lineArr) { - if ((htPtr->first != oldFirst) || (htPtr->last != oldLast)) { - int offset; - int i; - int first, last; -@@ -3378,6 +3378,7 @@ - } - DrawPage(htPtr, deltaY); -+ } - SendBogusEvent(tkwin); - - /* Reset flags */ - htPtr->flags &= ~TEXT_DIRTY; ---- a/src/bltText.c 2019-11-12 08:33:39.905088060 +0100 -+++ b/src/bltText.c 2019-11-12 08:34:01.995349355 +0100 -@@ -48,7 +48,7 @@ - - fragPtr = textPtr->fragArr; - for (i = 0; i < textPtr->nFrags; i++, fragPtr++) { --#if HAVE_UTF -+#if 0 - Tk_DrawChars(display, drawable, gc, font, fragPtr->text, - fragPtr->count, x + fragPtr->x, y + fragPtr->y); - #else ---- a/src/bltWindow.c 2019-11-12 20:38:50.348383884 +0100 -+++ b/src/bltWindow.c 2019-11-12 20:48:05.553043414 +0100 -@@ -362,6 +362,9 @@ - Atom windowAtom; /* Atom for TK_WINDOW. */ - Atom clipboardAtom; /* Atom for CLIPBOARD. */ - Atom utf8Atom; /* Atom for UTF8_STRING. */ -+#if (TK_VERSION_NUMBER >= _VERSION(8,6,0)) -+ Atom atomPairAtom; /* Atom for ATOM_PAIR. */ -+#endif - - Tk_Window clipWindow; /* Window used for clipboard ownership and to - * retrieve selections between processes. NULL -@@ -391,6 +394,7 @@ - Atom appNameProperty; /* X's name for property used to hold the - * application name on each comm window. */ - -+#if (TK_VERSION_NUMBER < _VERSION(8,6,0)) - /* - * Information used by tkXId.c only: - */ -@@ -408,7 +412,7 @@ - /* If set, it means a call to WindowIdCleanup - * has already been scheduled, 0 means it - * hasn't. */ -- -+#endif - /* - * Information used by tkUnixWm.c and tkWinWm.c only: - */ -@@ -417,6 +421,7 @@ - struct TkWmInfo *foregroundWmPtr; - /* Points to the foreground window. */ - -+#if (TK_VERSION_NUMBER < _VERSION(8,6,0)) - /* - * Information maintained by tkWindow.c for use later on by tkXId.c: - */ -@@ -428,6 +433,7 @@ - * can re-use ids in windowStackPtr when - * server has seen this request and event - * queue is empty. */ -+#endif - - /* - * Information used by tkVisual.c only: -@@ -460,7 +466,13 @@ - * display. */ - Window mouseButtonWindow; /* Window the button state was set in, added - * in Tk 8.4. */ -+#if (TK_VERSION_NUMBER >= _VERSION(8,6,0)) -+ Tk_Window warpWindow; -+ Tk_Window warpMainwin; /* For finding the root window for warping -+ * purposes. */ -+#else - Window warpWindow; -+#endif - int warpX; - int warpY; - -@@ -475,7 +487,11 @@ - - int iconDataSize; /* Size of default iconphoto image data. */ - unsigned char *iconDataPtr; /* Default iconphoto image data, if set. */ -- -+#if (TK_VERSION_NUMBER >= _VERSION(8,6,0)) -+#ifdef TK_USE_INPUT_METHODS -+ int ximGeneration; /* Used to invalidate XIC */ -+#endif /* TK_USE_INPUT_METHODS */ -+#endif - } TkDisplay; - - #else diff --git a/dev-tcltk/blt/files/blt-2.4z-ldflags.patch b/dev-tcltk/blt/files/blt-2.4z-ldflags.patch deleted file mode 100644 index bc795d060de8..000000000000 --- a/dev-tcltk/blt/files/blt-2.4z-ldflags.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/src/shared/Makefile.in b/src/shared/Makefile.in -index 5d93e82..db14156 100644 ---- a/src/shared/Makefile.in -+++ b/src/shared/Makefile.in -@@ -18,7 +18,7 @@ SHLIB_LD_FLAGS = @SHLIB_LD_FLAGS@ @LD_RUN_PATH@ - SHLIB_TCL_ONLY_LIB_SPECS = @SHLIB_TCL_ONLY_LIB_SPECS@ - SHLIB_LIB_SPECS = @SHLIB_LIB_SPECS@ - SHLIB_LD = @SHLIB_LD@ --LDFLAGS = @LDFLAGS@ @LD_RUN_PATH@ -+LDFLAGS += @LDFLAGS@ - - prefix = @prefix@ - exec_prefix = @exec_prefix@ -@@ -144,14 +144,14 @@ $(lib_so): $(OBJS) - $(CC) -c $(CC_SWITCHES) -DBLT_LIBRARY=\"$(scriptdir)\" \ - $(srcdir)/bltInit.c - $(RM) $@ -- $(SHLIB_LD) $(SHLIB_LD_FLAGS) -o $@ bltInit.o $(OBJS) \ -+ $(SHLIB_LD) $(SHLIB_LD_FLAGS) $(LDFLAGS) -o $@ bltInit.o $(OBJS) \ - $(SHLIB_LIB_SPECS) - - $(tcl_only_lib_so): $(TCL_ONLY_OBJS) - $(CC) -c $(CC_SWITCHES) -DTCL_ONLY -DBLT_LIBRARY=\"$(scriptdir)\" \ - $(srcdir)/bltInit.c - $(RM) $@ -- $(SHLIB_LD) $(SHLIB_LD_FLAGS) -o $@ bltInit.o $(TCL_ONLY_OBJS) \ -+ $(SHLIB_LD) $(SHLIB_LD_FLAGS) $(LDFLAGS) -o $@ bltInit.o $(TCL_ONLY_OBJS) \ - $(SHLIB_TCL_ONLY_LIB_SPECS) - - install: mkdirs install-lib install-demo diff --git a/dev-tcltk/blt/files/blt-2.4z-linking.patch b/dev-tcltk/blt/files/blt-2.4z-linking.patch deleted file mode 100644 index b5a5359171d3..000000000000 --- a/dev-tcltk/blt/files/blt-2.4z-linking.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/src/shared/Makefile.in b/src/shared/Makefile.in -index db14156..a06111f 100644 ---- a/src/shared/Makefile.in -+++ b/src/shared/Makefile.in -@@ -145,14 +145,14 @@ $(lib_so): $(OBJS) - $(srcdir)/bltInit.c - $(RM) $@ - $(SHLIB_LD) $(SHLIB_LD_FLAGS) $(LDFLAGS) -o $@ bltInit.o $(OBJS) \ -- $(SHLIB_LIB_SPECS) -+ $(SHLIB_LIB_SPECS) $(LIBS) - - $(tcl_only_lib_so): $(TCL_ONLY_OBJS) - $(CC) -c $(CC_SWITCHES) -DTCL_ONLY -DBLT_LIBRARY=\"$(scriptdir)\" \ - $(srcdir)/bltInit.c - $(RM) $@ - $(SHLIB_LD) $(SHLIB_LD_FLAGS) $(LDFLAGS) -o $@ bltInit.o $(TCL_ONLY_OBJS) \ -- $(SHLIB_TCL_ONLY_LIB_SPECS) -+ $(SHLIB_TCL_ONLY_LIB_SPECS) $(LIBS) - - install: mkdirs install-lib install-demo - diff --git a/dev-tcltk/blt/files/blt-2.4z-r4-fix-makefile2.patch b/dev-tcltk/blt/files/blt-2.4z-r4-fix-makefile2.patch deleted file mode 100644 index 1ff4fed5f51b..000000000000 --- a/dev-tcltk/blt/files/blt-2.4z-r4-fix-makefile2.patch +++ /dev/null @@ -1,18 +0,0 @@ -Source: mescalinum -Upstream: N/A -Reason: fix broken $DESTDIR support in Makefile ---- Makefile.in.orig 2008-10-26 14:36:22.000000000 +0100 -+++ Makefile.in 2008-10-26 14:37:04.000000000 +0100 -@@ -47,9 +47,9 @@ install-all: - (cd library; $(MAKE) install) - (cd man; $(MAKE) install) - (cd demos; $(MAKE) install) -- $(INSTALL_DATA) $(srcdir)/README $(INSTALL_DIR)$(scriptdir) -- $(INSTALL_DATA) $(srcdir)/PROBLEMS $(INSTALL_DIR)$(scriptdir) -- $(INSTALL_DATA) $(srcdir)/NEWS $(INSTALL_DIR)$(scriptdir) -+ $(INSTALL_DATA) $(srcdir)/README $(INSTALL_ROOT)$(scriptdir) -+ $(INSTALL_DATA) $(srcdir)/PROBLEMS $(INSTALL_ROOT)$(scriptdir) -+ $(INSTALL_DATA) $(srcdir)/NEWS $(INSTALL_ROOT)$(scriptdir) - - mkdirs: - @for i in $(instdirs) ; do \ diff --git a/dev-tcltk/blt/files/blt-2.4z-r4-fix-makefile3.patch b/dev-tcltk/blt/files/blt-2.4z-r4-fix-makefile3.patch deleted file mode 100644 index c7065df39753..000000000000 --- a/dev-tcltk/blt/files/blt-2.4z-r4-fix-makefile3.patch +++ /dev/null @@ -1,14 +0,0 @@ -Source: mescalinum -Upstream: N/A -Reason: fix broken $DESTDIR support in library/Makefile ---- library/Makefile.in.orig 2008-10-26 14:30:28.000000000 +0100 -+++ library/Makefile.in 2008-10-26 14:31:40.000000000 +0100 -@@ -58,7 +58,7 @@ install: mkdirs pkgIndex - for i in $(miscFiles) ; do \ - $(INSTALL_DATA) $(srcdir)/$$i $(INSTALL_ROOT)$(scriptdir) ; \ - done -- $(INSTALL_DATA) pkgIndex.tcl $(scriptdir) -+ $(INSTALL_DATA) pkgIndex.tcl $(INSTALL_ROOT)$(scriptdir) - - mkdirs: - @for i in $(instdirs) ; do \ diff --git a/dev-tcltk/blt/files/blt-2.4z-tcl8.5-fixpkgruntime.patch b/dev-tcltk/blt/files/blt-2.4z-tcl8.5-fixpkgruntime.patch deleted file mode 100644 index c8637b9c7c45..000000000000 --- a/dev-tcltk/blt/files/blt-2.4z-tcl8.5-fixpkgruntime.patch +++ /dev/null @@ -1,66 +0,0 @@ ---- src/bltInit.c.orig 2008-05-29 00:05:10.000000000 +0200 -+++ src/bltInit.c 2008-05-29 00:26:40.000000000 +0200 -@@ -413,7 +413,7 @@ Blt_Init(interp) - * Check that the versions of Tcl that have been loaded are - * the same ones that BLT was compiled against. - */ -- if (Tcl_PkgRequire(interp, "Tcl", TCL_VERSION, EXACT) == NULL) { -+ if (Tcl_InitStubs(interp, TCL_VERSION, 1) == NULL) { - return TCL_ERROR; - } - /* Set the "blt_version", "blt_patchLevel", and "blt_libPath" Tcl -@@ -458,16 +458,23 @@ Blt_Init(interp) - register Tcl_AppInitProc **p; - Tcl_Namespace *nsPtr; - -+ if (Tk_InitStubs(interp, TK_VERSION, 1) == NULL) { -+ return TCL_OK; -+ } -+ -+#if 0 - #if (TCL_VERSION_NUMBER >= _VERSION(8,1,0)) - if (Tcl_PkgPresent(interp, "Tk", TK_VERSION, EXACT) == NULL) { - return TCL_OK; -- } -+ } - #else - if (Tcl_PkgRequire(interp, "Tk", TK_VERSION, EXACT) == NULL) { - Tcl_ResetResult(interp); - return TCL_OK; - } - #endif -+#endif -+ - nsPtr = Tcl_CreateNamespace(interp, "blt::tile", NULL, - (Tcl_NamespaceDeleteProc *) NULL); - if (nsPtr == NULL) { -@@ -507,7 +514,7 @@ Blt_Init(interp) - * Check that the versions of Tcl that have been loaded are - * the same ones that BLT was compiled against. - */ -- if (Tcl_PkgRequire(interp, "Tcl", TCL_VERSION, EXACT) == NULL) { -+ if (Tcl_InitStubs(interp, TCL_VERSION, EXACT) == NULL) { - return TCL_ERROR; - } - /* Set the "blt_version", "blt_patchLevel", and "blt_libPath" Tcl -@@ -543,6 +550,11 @@ Blt_Init(interp) - if (!tkLoaded) { - register Tcl_AppInitProc **p; - -+ if (Tk_InitStubs(interp, TK_VERSION, 1) == NULL) { -+ return TCL_OK; -+ } -+ -+#if 0 - #if (TCL_VERSION_NUMBER >= _VERSION(8,1,0)) - if (Tcl_PkgPresent(interp, "Tk", TK_VERSION, EXACT) == NULL) { - return TCL_OK; -@@ -553,6 +565,8 @@ Blt_Init(interp) - return TCL_OK; - } - #endif -+#endif -+ - /* Initialize the BLT commands that use Tk too. */ - for (p = tkCmds; *p != NULL; p++) { - if ((**p) (interp) != TCL_OK) { diff --git a/dev-tcltk/blt/files/blt-2.4z-tcl8.6.patch b/dev-tcltk/blt/files/blt-2.4z-tcl8.6.patch deleted file mode 100644 index 8721940af2c3..000000000000 --- a/dev-tcltk/blt/files/blt-2.4z-tcl8.6.patch +++ /dev/null @@ -1,86 +0,0 @@ - src/bltScrollbar.c | 2 +- - src/bltTed.c | 6 +++--- - src/bltVecMath.c | 8 ++++---- - 3 files changed, 8 insertions(+), 8 deletions(-) - -diff --git a/src/bltScrollbar.c b/src/bltScrollbar.c -index 69662de..731e37b 100644 ---- a/src/bltScrollbar.c -+++ b/src/bltScrollbar.c -@@ -534,7 +534,7 @@ ScrollbarWidgetCmd(clientData, interp, argc, argv) - } else { - fraction = ((double)pixels / (double)barWidth); - } -- sprintf(interp->result, "%g", fraction); -+ sprintf(Tcl_GetStringResult(interp), "%g", fraction); - } else if ((c == 'f') && (strncmp(argv[1], "fraction", length) == 0)) { - int x, y, pos, barWidth; - double fraction; -diff --git a/src/bltTed.c b/src/bltTed.c -index 64c43e8..832ef9c 100644 ---- a/src/bltTed.c -+++ b/src/bltTed.c -@@ -1504,7 +1504,7 @@ EditOp(dataPtr, interp, argc, argv) - tablePtr->flags |= ARRANGE_PENDING; - Tcl_DoWhenIdle(tablePtr->arrangeProc, tablePtr); - } -- interp->result = Tk_PathName(tedPtr->tkwin); -+ Tcl_SetResult(interp, (char*)Tk_PathName(tedPtr->tkwin), TCL_VOLATILE); - tedPtr->flags |= LAYOUT_PENDING; - EventuallyRedraw(tedPtr); - return TCL_OK; -@@ -1678,7 +1678,7 @@ SelectOp(dataPtr, interp, argc, argv) - tedPtr->activeRectArr[4].width = grip - 1; - tedPtr->activeRectArr[4].height = grip - 1; - -- interp->result = Tk_PathName(entryPtr->tkwin); -+ Tcl_SetResult(interp, (char*)Tk_PathName(entryPtr->tkwin), TCL_VOLATILE); - active = 1; - break; - } -@@ -1751,7 +1751,7 @@ RepOp(dataPtr, interp, argc, argv) - tablePtr->flags |= ARRANGE_PENDING; - Tcl_DoWhenIdle(tablePtr->arrangeProc, tablePtr); - } -- interp->result = Tk_PathName(tedPtr->tkwin); -+ Tcl_SetResult(interp, (char*)Tk_PathName(tedPtr->tkwin), TCL_VOLATILE); - tedPtr->flags |= LAYOUT_PENDING; - EventuallyRedraw(tedPtr); - return TCL_OK; -diff --git a/src/bltVecMath.c b/src/bltVecMath.c -index dc37af8..5117f63 100644 ---- a/src/bltVecMath.c -+++ b/src/bltVecMath.c -@@ -764,20 +764,20 @@ MathError(interp, value) - if ((errno == EDOM) || (value != value)) { - Tcl_AppendResult(interp, "domain error: argument not in valid range", - (char *)NULL); -- Tcl_SetErrorCode(interp, "ARITH", "DOMAIN", interp->result, -+ Tcl_SetErrorCode(interp, "ARITH", "DOMAIN", Tcl_GetStringResult(interp), - (char *)NULL); - } else if ((errno == ERANGE) || IS_INF(value)) { - if (value == 0.0) { - Tcl_AppendResult(interp, - "floating-point value too small to represent", - (char *)NULL); -- Tcl_SetErrorCode(interp, "ARITH", "UNDERFLOW", interp->result, -+ Tcl_SetErrorCode(interp, "ARITH", "UNDERFLOW", Tcl_GetStringResult(interp), - (char *)NULL); - } else { - Tcl_AppendResult(interp, - "floating-point value too large to represent", - (char *)NULL); -- Tcl_SetErrorCode(interp, "ARITH", "OVERFLOW", interp->result, -+ Tcl_SetErrorCode(interp, "ARITH", "OVERFLOW", Tcl_GetStringResult(interp), - (char *)NULL); - } - } else { -@@ -786,7 +786,7 @@ MathError(interp, value) - sprintf(buf, "%d", errno); - Tcl_AppendResult(interp, "unknown floating-point error, ", - "errno = ", buf, (char *)NULL); -- Tcl_SetErrorCode(interp, "ARITH", "UNKNOWN", interp->result, -+ Tcl_SetErrorCode(interp, "ARITH", "UNKNOWN", Tcl_GetStringResult(interp), - (char *)NULL); - } - } diff --git a/dev-tcltk/blt/files/blt-2.4z-tk8.6.patch b/dev-tcltk/blt/files/blt-2.4z-tk8.6.patch deleted file mode 100644 index f956c098138e..000000000000 --- a/dev-tcltk/blt/files/blt-2.4z-tk8.6.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- src/tkButton.c.orig 2013-01-04 23:24:45.000000000 -0500 -+++ src/tkButton.c 2013-01-04 23:28:29.000000000 -0500 -@@ -526,8 +526,6 @@ - static Blt_TileChangedProc TileChangedProc; - static Tcl_CmdProc ButtonCmd, LabelCmd, CheckbuttonCmd, RadiobuttonCmd; - --EXTERN int TkCopyAndGlobalEval _ANSI_ARGS_((Tcl_Interp *interp, char *script)); -- - #if (TK_MAJOR_VERSION > 4) - EXTERN void TkComputeAnchor _ANSI_ARGS_((Tk_Anchor anchor, Tk_Window tkwin, - int padX, int padY, int innerWidth, int innerHeight, int *xPtr, -@@ -1890,7 +1888,7 @@ - } - } - if ((butPtr->type != TYPE_LABEL) && (butPtr->command != NULL)) { -- return TkCopyAndGlobalEval(butPtr->interp, butPtr->command); -+ return Tcl_EvalObjEx(butPtr->interp, butPtr->command, TCL_EVAL_GLOBAL); - } - return TCL_OK; - } diff --git a/dev-tcltk/blt/files/blt2.4z-64bit.patch b/dev-tcltk/blt/files/blt2.4z-64bit.patch deleted file mode 100644 index 9f1c3c975eef..000000000000 --- a/dev-tcltk/blt/files/blt2.4z-64bit.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- blt2.4z/src/bltTree.c.64bit-fixes 2002-09-29 07:44:12.000000000 +0200 -+++ blt2.4z/src/bltTree.c 2003-07-31 12:22:53.000000000 +0200 -@@ -95,17 +95,16 @@ static Value *TreeNextValue _ANSI_ARGS_( - */ - - #define REBUILD_MULTIPLIER 3 -+#define START_LOGSIZE 5 /* Initial hash table size is 32. */ -+#define MAX_LIST_VALUES 20 /* Convert to hash table when node -+ * value list gets bigger than this -+ * many values. */ - - #if (SIZEOF_VOID_P == 8) - #define RANDOM_INDEX(i) HashOneWord(mask, downshift, i) - #define BITSPERWORD 64 - #else - --#define START_LOGSIZE 5 /* Initial hash table size is 32. */ --#define MAX_LIST_VALUES 20 /* Convert to hash table when node -- * value list gets bigger than this -- * many values. */ -- - /* - * The following macro takes a preliminary integer hash value and - * produces an index into a hash tables bucket list. The idea is -- cgit v1.2.3-65-gdbad