diff options
Diffstat (limited to 'dev-tcltk/blt')
-rw-r--r-- | dev-tcltk/blt/Manifest | 2 | ||||
-rw-r--r-- | dev-tcltk/blt/blt-2.4z-r14.ebuild | 128 | ||||
-rw-r--r-- | dev-tcltk/blt/files/blt-2.4z-gentoo.patch | 122 |
3 files changed, 252 insertions, 0 deletions
diff --git a/dev-tcltk/blt/Manifest b/dev-tcltk/blt/Manifest index fba74af609b5..973e21f8b315 100644 --- a/dev-tcltk/blt/Manifest +++ b/dev-tcltk/blt/Manifest @@ -1,6 +1,7 @@ AUX blt-2.4z-aclocal.patch 1705 BLAKE2B b6a60380857ad7a70fdf77587f726a7e55e159a9b7ccf9be743ff1594c35ed8d4a43b7c0b7206e245e6df999a3dbf8b6f80cf766c711333c2824c936d97d9891 SHA512 dfc4eb375b12d8ae87a65c039bae6445b70008ff1681cf1a40028a04685bbfcbb5dc841b25b475285679aac9303e0807f88c061f983a26a3de66fc1e1dc2ad12 AUX blt-2.4z-darwin.patch 1186 BLAKE2B f58e5105e0655d4548d919a5dd95f6e8ea49d3d37cc1e8f4553ead2edf1244eec8a532d49409757a21c766cfba397e90bb8ae7008675fedbe665fff8178de8a0 SHA512 31941da432004eec1837fda164365327e39f44345581c8f87d6c37e95ed609b61ee6420e832c67b91277418ff232cc1b6c7ee85cd5e9a8859bf8530e16d354c5 AUX blt-2.4z-gbsd.patch 1980 BLAKE2B 2b629aff5a63c8a42bcbf8f8b1922be01f3e5239ea7a0a55ecdb3f3cef67fd0b988ed063fd6fa110ad0d6a912f28f1c432f0d25610b2ec54add1158c694075a4 SHA512 9e3b833445f998af5c070d755c4c6904d78175640b771abc020289c857bb12ab82fdd504eebc16771c3b057b94643d20acf4eb5952184ca2d2f9233ecd55f92c +AUX blt-2.4z-gentoo.patch 3737 BLAKE2B c125071aabca71dd6401d2a1793cb812d0b9eb679a36bc2f0237b257e4e27dbab84be7a96d561d24c4b4817247d3d9ce27d87d30244d0cbf284873d95bfb7d5c SHA512 82ca35009ec902754432db06cdfbeca2a68803d3079b4dfa0add1745ad3dac67524bf951f86beff9d70026c24b8dda454688e8c639385ddf19ed4ace1c01e61d AUX blt-2.4z-ldflags.patch 1086 BLAKE2B 351e459f3ca67a49f77875ddfb1a36cccc859fd8c537bb6d14b5d85d5c3ea5766ba242974de007cba515c13c7550dc3a76318fabce3fc5404c7a900a5566a38b SHA512 d2e19fc9caab2ae013c01e66c9674906bda2f01190bf6e9da93c2d22cb4a36a167f7de34649e6d3efc84b0094b1710fc3380347367830dc012873c3845716445 AUX blt-2.4z-linking.patch 684 BLAKE2B 1125105c5d8891412f31b966673f876ae8b36fe4349e81e7349dbd7636a49ddbcdbebbc68b78966ad86ff67f75b7236d724ad920176e2991cb8e77a2c07bb0b4 SHA512 09ad0d4b43d51b33020a13ecbe31d04d5ddcdf2134d0c0e1275b4de3127adad624d222f492a6d9b0a4f198537afb30d9af70f8685668bf7eba966f020c34368e AUX blt-2.4z-r4-fix-makefile2.patch 728 BLAKE2B aa71cba7b9fae1f546838a722d44c3e276ed88f7417029d3c2b3c88c35c5e6071a73ee63e58bc66b03ca9a9a9fb144ecee1da1a671b75be69d423dd4a12c76c1 SHA512 5f9b5ab26101bf89bb7161bd4bfb4974144c61ae692f67b7598fe0c42929f84b14ac459fdfc29a1436b64924085b8047c90a84501c031f9d8575d4dc38c22681 @@ -11,4 +12,5 @@ AUX blt-2.4z-tk8.6.patch 781 BLAKE2B 46e29dc6390033981e9db351d8d00503c37c45a0f7c AUX blt2.4z-64bit.patch 891 BLAKE2B ddf77f3a5d47a5252271e57adff1afeb9a4bca868a89c4060a13b7c494355499cd14238a5087cd6da43e7f589be8894f7cbdedb2d04c7ea004a7193da63e2c8f SHA512 fee84b20e3cf8491567c11ed1cff3955963b68deda2d4d8a91b48691aa50d83db45a6aa4d86f80f8dd38b0b6bb1f68a1324e9f6805cc10fde2bcfb45f03f71e4 DIST blt2.4z-8.5.2.tar.gz 2326234 BLAKE2B 83ea57989ee1e7bbbc243058b1a734942c4b6d796d06aa3a702012ea8d01eb059e76b6b8ff0efc9b43b000f1cfe7545419e2d892f1794b2add3d8c2c602e22ba SHA512 afc465ba47ae43a0c6be17400d0a572dccd8c2a8adfd8fc3ed50f9ec28d02129f069d88096c1428c4b242550131092b4141035d7ce90c9e7181ccf712502f09a EBUILD blt-2.4z-r13.ebuild 3534 BLAKE2B 3d5d25030e2875f9268d8c89193fa61f9c2990f868ded3fbdbd39f581859b3d12598450507b64d64c750ae7f1e1b4684b6d7bb43c875f85aac410ef77e7bc2dc SHA512 fda536f17ed19192d100000bb58cb71cd4b47ed2d3d22e3150e46e8f6fad4e682813a8e3bf7f680b7b22851b14f35d6d214a0ae76bb59049ea1a07284b30a741 +EBUILD blt-2.4z-r14.ebuild 3587 BLAKE2B c8f20345d15ba18c12de35c6816991905452db776e019fa7abd5b99eff9f181a02529a9626f7cb9334cb26d9d052e38d1336dcec61d6bd68409b48b2ff445c25 SHA512 d9562b1189e3d8d4488427b5d5d84efe43ac75a97408c8b02a24863013dca1ab643da2aa6cf34cd33f954bd5e6a212cf65c852c383bca79f5f494a4d773da6db MISC metadata.xml 336 BLAKE2B 42e123497016c3cffffc99cd56d04cf37bc81ad11487a39a97f1200df91edfb8d2c359ef76a3be83d4682cc6e2ba2695fd460af1de06d8f15b0932dd1f3ad211 SHA512 32593908c71225b7869b03d96dde6b7ed0d3db25f921257cf5027c80830cca794d0ed30b73c3189edd34553d6766ae57daf8caceb106bc49398fb519fd95d28c diff --git a/dev-tcltk/blt/blt-2.4z-r14.ebuild b/dev-tcltk/blt/blt-2.4z-r14.ebuild new file mode 100644 index 000000000000..896f8c28b833 --- /dev/null +++ b/dev-tcltk/blt/blt-2.4z-r14.ebuild @@ -0,0 +1,128 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit autotools eutils 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 ~sh ~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}${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-gentoo.patch b/dev-tcltk/blt/files/blt-2.4z-gentoo.patch new file mode 100644 index 000000000000..b1dac41eea0b --- /dev/null +++ b/dev-tcltk/blt/files/blt-2.4z-gentoo.patch @@ -0,0 +1,122 @@ +--- a/src/bltInit.c 2019-11-09 22:03:25.863937619 +0100 ++++ b/src/bltInit.c 2019-11-09 22:03:37.052748213 +0100 +@@ -413,7 +413,7 @@ + * Check that the versions of Tcl that have been loaded are + * the same ones that BLT was compiled against. + */ +- if (Tcl_InitStubs(interp, TCL_VERSION, 1) == NULL) { ++ if (Tcl_InitStubs(interp, TCL_PATCH_LEVEL, 1) == NULL) { + return TCL_ERROR; + } + /* Set the "blt_version", "blt_patchLevel", and "blt_libPath" Tcl +@@ -458,7 +458,7 @@ + register Tcl_AppInitProc **p; + Tcl_Namespace *nsPtr; + +- if (Tk_InitStubs(interp, TK_VERSION, 1) == NULL) { ++ if (Tk_InitStubs(interp, TK_PATCH_LEVEL, 1) == NULL) { + return TCL_OK; + } + +--- a/src/bltHtext.c 2019-11-10 21:37:10.229076065 +0100 ++++ b/src/bltHtext.c 2019-11-10 21:38:24.835776868 +0100 +@@ -3347,7 +3347,8 @@ + * The page is always draw at full width and the viewport will clip + * the text. + */ ++ if (htPtr->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 |