[gentoo-commits] repo/gentoo:master commit in: dev-tcltk/blt/files/
commit: f1923d69cd685dcb2ba19af2eebfb997af747e80 Author: Alfredo Tupone gentoo org> AuthorDate: Fri Apr 14 16:54:51 2023 + Commit: Alfredo Tupone gentoo org> CommitDate: Fri Apr 14 16:55:28 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1923d69 dev-tcltk/blt: another fix for parallel install Closes: https://bugs.gentoo.org/903895 Signed-off-by: Alfredo Tupone gentoo.org> dev-tcltk/blt/files/blt-2.5.3-parallelMake.patch | 11 +++ 1 file changed, 11 insertions(+) diff --git a/dev-tcltk/blt/files/blt-2.5.3-parallelMake.patch b/dev-tcltk/blt/files/blt-2.5.3-parallelMake.patch index 7bad79a75610..81221ed6b7f4 100644 --- a/dev-tcltk/blt/files/blt-2.5.3-parallelMake.patch +++ b/dev-tcltk/blt/files/blt-2.5.3-parallelMake.patch @@ -10,3 +10,14 @@ install-mann: $(MAN_N) for i in *.n ; do \ +--- a/demos/Makefile.in2023-04-14 18:50:47.196822925 +0200 b/demos/Makefile.in2023-04-14 18:50:54.448710445 +0200 +@@ -47,7 +47,7 @@ + + all: + +-install: mkdirs install-bitmaps install-images install-scripts ++install: install-bitmaps install-images install-scripts + + install-scripts: + for i in $(srcdir)/scripts/*.tcl ; do \
[gentoo-commits] repo/gentoo:master commit in: dev-tcltk/blt/files/, dev-tcltk/blt/
commit: d331dfa96e72e0362d40693b98de424d81d53d58
Author: Alfredo Tupone gentoo org>
AuthorDate: Sun Jan 15 16:06:27 2023 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Sun Jan 15 16:06:27 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d331dfa9
dev-tcltk/blt: adding patch
Closes: https://bugs.gentoo.org/880325
Signed-off-by: Alfredo Tupone gentoo.org>
dev-tcltk/blt/blt-2.5.3-r2.ebuild| 1 +
dev-tcltk/blt/files/blt-2.5.3-parallelMake.patch | 12
2 files changed, 13 insertions(+)
diff --git a/dev-tcltk/blt/blt-2.5.3-r2.ebuild
b/dev-tcltk/blt/blt-2.5.3-r2.ebuild
index 314e835ec9ad..ea52ade048d1 100644
--- a/dev-tcltk/blt/blt-2.5.3-r2.ebuild
+++ b/dev-tcltk/blt/blt-2.5.3-r2.ebuild
@@ -56,6 +56,7 @@ PATCHES=(
"${FILESDIR}"/${P}-darwin.patch
"${FILESDIR}"/${P}-gbsd.patch
"${FILESDIR}"/${P}-lto.patch
+ "${FILESDIR}"/${P}-parallelMake.patch
)
src_prepare() {
diff --git a/dev-tcltk/blt/files/blt-2.5.3-parallelMake.patch
b/dev-tcltk/blt/files/blt-2.5.3-parallelMake.patch
new file mode 100644
index ..7bad79a75610
--- /dev/null
+++ b/dev-tcltk/blt/files/blt-2.5.3-parallelMake.patch
@@ -0,0 +1,12 @@
+--- a/man/Makefile.in 2023-01-15 13:10:49.541445995 +0100
b/man/Makefile.in 2023-01-15 13:11:44.483619553 +0100
+@@ -34,7 +34,8 @@
+
+ all: man.macros $(MANPAGES)
+
+-install: mkdirs install-mann install-man3
++install: mkdirs
++ $(MAKE) install-mann install-man3
+
+ install-mann: $(MAN_N)
+ for i in *.n ; do \
[gentoo-commits] repo/gentoo:master commit in: dev-tcltk/blt/files/, dev-tcltk/blt/
commit: b439ffdd2be1e48d7667d86ec59de46ef1d86ce5
Author: Alfredo Tupone gentoo org>
AuthorDate: Mon Jan 4 09:15:06 2021 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Mon Jan 4 09:15:06 2021 +
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 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 000..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)" \
+
[gentoo-commits] repo/gentoo:master commit in: dev-tcltk/blt/files/
commit: 620276b5ee5b832194a5aac851eda59f0d31e979 Author: Tupone Alfredo gentoo org> AuthorDate: Tue Nov 12 19:56:50 2019 + Commit: Alfredo Tupone gentoo org> CommitDate: Tue Nov 12 19:56:50 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=620276b5 dev-tcltk/blt: Fix some segmentation fault Package-Manager: Portage-2.3.76, Repoman-2.3.16 Signed-off-by: Alfredo Tupone gentoo.org> dev-tcltk/blt/files/blt-2.4z-gentoo.patch | 72 +++ 1 file changed, 72 insertions(+) diff --git a/dev-tcltk/blt/files/blt-2.4z-gentoo.patch b/dev-tcltk/blt/files/blt-2.4z-gentoo.patch index c0d0d7f7bfe..b1dac41eea0 100644 --- a/dev-tcltk/blt/files/blt-2.4z-gentoo.patch +++ b/dev-tcltk/blt/files/blt-2.4z-gentoo.patch @@ -48,3 +48,75 @@ 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
[gentoo-commits] repo/gentoo:master commit in: dev-tcltk/blt/files/
commit: 22a4a999c93f7ef4acb01f7c90f28d66849970aa Author: Michael Mair-Keimberger (asterix) gmail com> AuthorDate: Thu Sep 29 16:45:21 2016 + Commit: Amy Winston gentoo org> CommitDate: Fri Oct 14 17:34:14 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22a4a999 dev-tcltk/blt: remove unused patch/file dev-tcltk/blt/files/blt2.4z-install.diff | 26 -- dev-tcltk/blt/files/pkgIndex.tcl | 2 -- 2 files changed, 28 deletions(-) diff --git a/dev-tcltk/blt/files/blt2.4z-install.diff b/dev-tcltk/blt/files/blt2.4z-install.diff deleted file mode 100644 index 184d7f7.. --- a/dev-tcltk/blt/files/blt2.4z-install.diff +++ /dev/null @@ -1,26 +0,0 @@ blt2.4z/library/Makefile.in.jj 2003-07-09 20:18:32.0 +0100 -+++ blt2.4z/library/Makefile.in2003-07-09 20:19:06.0 +0100 -@@ -58,7 +58,7 @@ - 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 \ blt2.4z/Makefile.in.jj 2003-07-09 20:19:24.0 +0100 -+++ blt2.4z/Makefile.in2003-07-09 20:19:46.0 +0100 -@@ -47,9 +47,9 @@ - (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/pkgIndex.tcl b/dev-tcltk/blt/files/pkgIndex.tcl deleted file mode 100644 index 7911d85.. --- a/dev-tcltk/blt/files/pkgIndex.tcl +++ /dev/null @@ -1,2 +0,0 @@ -package ifneeded BLT 2.4 [list load [file join $dir .. libBLT24.so]] -package ifneeded BLTlite 2.4 [list load [file join $dir .. libBLTlite24.so]]
[gentoo-commits] repo/gentoo:master commit in: dev-tcltk/blt/files/, dev-tcltk/blt/
commit: 564bfb6b36bad876736ba5b04333f4a262b22659
Author: Justin Lecher gentoo org>
AuthorDate: Mon Sep 21 12:09:01 2015 +
Commit: Justin Lecher gentoo org>
CommitDate: Mon Sep 21 12:10:46 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=564bfb6b
dev-tcltk/blt: Drop old
Package-Manager: portage-2.2.20.1
Signed-off-by: Justin Lecher gentoo.org>
dev-tcltk/blt/blt-2.4z-r10.ebuild | 120 ---
dev-tcltk/blt/blt-2.4z-r11.ebuild | 123
dev-tcltk/blt/blt-2.4z-r12.ebuild | 127 -
dev-tcltk/blt/files/blt-2.4z-r4-fix-makefile.patch | 23
4 files changed, 393 deletions(-)
diff --git a/dev-tcltk/blt/blt-2.4z-r10.ebuild
b/dev-tcltk/blt/blt-2.4z-r10.ebuild
deleted file mode 100644
index e50b865..000
--- a/dev-tcltk/blt/blt-2.4z-r10.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-
-inherit 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 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86
~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-DEPEND="
- dev-lang/tk
- jpeg? ( virtual/jpeg )
- X? ( x11-libs/libX11 )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}${PV}${MY_V_SUFFIX}"
-
-src_prepare() {
- epatch "${FILESDIR}/blt-2.4z-r4-fix-makefile.patch"
- epatch "${FILESDIR}/blt-2.4z-r4-fix-makefile2.patch"
- # From blt-2.4z-6mdk.src.rpm
- epatch "${FILESDIR}"/blt2.4z-64bit.patch
-
- #epatch "${FILESDIR}"/blt-2.4z-tcl8.5-fix.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" \
- -i src/Makefile.in || die
-
- epatch "${FILESDIR}"/${P}-linking.patch
- epatch "${FILESDIR}"/${P}-darwin.patch
- epatch "${FILESDIR}"/${P}-gbsd.patch
-}
-
-src_configure() {
- # bug 167934
- append-flags -fPIC
-
- 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() {
- # parallel borks
- emake -j1 LDFLAGS="${LDFLAGS}" || die "emake failed"
-}
-
-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 \
- || die "dodir failed"
- emake -j1 INSTALL_ROOT="${D}" install || die "make install failed"
-
- 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}
- done
-
- # bug 259338 - dev-tcltk/blt-2.4z-r4 provides empty pkgIndex.tcl
- cp "${FILESDIR}"/pkgIndex.tcl
