[gentoo-commits] repo/gentoo:master commit in: app-misc/cw/files/
commit: 9071f59809bb17011bacc1455891222161076474 Author: David Seifert gentoo org> AuthorDate: Sun Oct 30 11:26:15 2022 + Commit: David Seifert gentoo org> CommitDate: Sun Oct 30 11:26:15 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9071f598 app-misc/cw: [QA] use git-format-patch style patches Signed-off-by: David Seifert gentoo.org> app-misc/cw/files/cw-1.0.16-replace-isastream-with-fcntl.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app-misc/cw/files/cw-1.0.16-replace-isastream-with-fcntl.patch b/app-misc/cw/files/cw-1.0.16-replace-isastream-with-fcntl.patch index 18f2dba953d2..978c23bb9b71 100644 --- a/app-misc/cw/files/cw-1.0.16-replace-isastream-with-fcntl.patch +++ b/app-misc/cw/files/cw-1.0.16-replace-isastream-with-fcntl.patch @@ -1,5 +1,5 @@ /var/tmp/portage/app-misc/cw-1.0.16-r3/work/cw-1.0.16/src/cw.c -+++ cw-1.0.16/src/cw.c +--- a/src/cw.c b/src/cw.c @@ -1173,7 +1173,7 @@ close(master); return(0);
[gentoo-commits] repo/gentoo:master commit in: app-misc/cw/
commit: 2ef5c526d49ef6bf31c6ff4f6d1c3fbedbbee2f2 Author: Jakov Smolić gentoo org> AuthorDate: Thu Oct 20 10:56:09 2022 + Commit: Jakov Smolić gentoo org> CommitDate: Thu Oct 20 10:56:09 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ef5c526 app-misc/cw: Stabilize 1.0.16-r5 x86, #877693 Signed-off-by: Jakov Smolić gentoo.org> app-misc/cw/cw-1.0.16-r5.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-misc/cw/cw-1.0.16-r5.ebuild b/app-misc/cw/cw-1.0.16-r5.ebuild index 55a62eabec2f..9af89860a23a 100644 --- a/app-misc/cw/cw-1.0.16-r5.ebuild +++ b/app-misc/cw/cw-1.0.16-r5.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/cwrapper/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64 x86" PATCHES=( "${FILESDIR}"/${PV}-ldflags.patch
[gentoo-commits] repo/gentoo:master commit in: app-misc/cw/
commit: 4e048a1c4baef7f68e1a489377c69f0d4204460a Author: Jakov Smolić gentoo org> AuthorDate: Thu Oct 20 10:52:18 2022 + Commit: Jakov Smolić gentoo org> CommitDate: Thu Oct 20 10:52:18 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e048a1c app-misc/cw: Stabilize 1.0.16-r5 amd64, #877693 Signed-off-by: Jakov Smolić gentoo.org> app-misc/cw/cw-1.0.16-r5.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-misc/cw/cw-1.0.16-r5.ebuild b/app-misc/cw/cw-1.0.16-r5.ebuild index 055fddd637fe..55a62eabec2f 100644 --- a/app-misc/cw/cw-1.0.16-r5.ebuild +++ b/app-misc/cw/cw-1.0.16-r5.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/cwrapper/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~x86" PATCHES=( "${FILESDIR}"/${PV}-ldflags.patch
[gentoo-commits] repo/gentoo:master commit in: app-misc/cw/files/, app-misc/cw/
commit: 9c83c91ab52747439175091db2509e34c2a89122 Author: Sam James gentoo org> AuthorDate: Thu Oct 20 03:49:45 2022 + Commit: Sam James gentoo org> CommitDate: Thu Oct 20 03:50:11 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c83c91a app-misc/cw: respect CPPFLAGS Bug: https://bugs.gentoo.org/870751 Fixes: af397b3d6dec93a39eb752d80dd10695d654958a Signed-off-by: Sam James gentoo.org> app-misc/cw/cw-1.0.16-r5.ebuild| 8 +++- app-misc/cw/files/cw-1.0.16-Respect-CPPFLAGS.patch | 21 + 2 files changed, 24 insertions(+), 5 deletions(-) diff --git a/app-misc/cw/cw-1.0.16-r5.ebuild b/app-misc/cw/cw-1.0.16-r5.ebuild index c66048665427..055fddd637fe 100644 --- a/app-misc/cw/cw-1.0.16-r5.ebuild +++ b/app-misc/cw/cw-1.0.16-r5.ebuild @@ -21,23 +21,21 @@ PATCHES=( "${FILESDIR}"/${PV}-format-security.patch "${FILESDIR}"/${P}-replace-isastream-with-fcntl.patch "${FILESDIR}"/${P}-fix-configure-for-newer-autotools.patch + "${FILESDIR}"/${P}-Respect-CPPFLAGS.patch ) -src_unpack() { +src_prepare() { default gunzip "${S}"/man/*.gz || die -} -src_prepare() { - default eautoreconf } src_configure() { tc-export CC - append-flags -D_XOPEN_SOURCE=500 -D_GNU_SOURCE + append-cppflags -D_GNU_SOURCE econf } diff --git a/app-misc/cw/files/cw-1.0.16-Respect-CPPFLAGS.patch b/app-misc/cw/files/cw-1.0.16-Respect-CPPFLAGS.patch new file mode 100644 index ..b1ae96daf4a4 --- /dev/null +++ b/app-misc/cw/files/cw-1.0.16-Respect-CPPFLAGS.patch @@ -0,0 +1,21 @@ +From 64249a5b7e2aaa4b53e41deb767a164cf5b68421 Mon Sep 17 00:00:00 2001 +From: Sam James +Date: Thu, 20 Oct 2022 04:48:48 +0100 +Subject: [PATCH] Respect CPPFLAGS + +--- a/Makefile.in b/Makefile.in +@@ -19,11 +19,11 @@ all: + + cw: + @$(ECHO) "* Compiling cw(color wrapper)..." +- $(CC) $(CFLAGS) $(LDFLAGS) src/cw.c -o bin/cw @CFLAGS@ @LIBS@ @DEFS@ ++ $(CC) $(CPPFLAGS) @DEFS@ $(CFLAGS) @CFLAGS@ $(LDFLAGS) src/cw.c -o bin/cw @LIBS@ + + cwu: + @$(ECHO) "* Compiling cwu(color wrapper directive updater)..." +- $(CC) $(CFLAGS) $(LDFLAGS) src/cwu.c -o bin/cwu ++ $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) src/cwu.c -o bin/cwu + + local: cw cwu +
[gentoo-commits] repo/gentoo:master commit in: app-misc/cw/files/, app-misc/cw/
commit: 168b50a0f6e705286b28213f7c77f5421ec8b915 Author: Pascal Jäger leimstift de> AuthorDate: Wed Oct 19 19:56:07 2022 + Commit: Sam James gentoo org> CommitDate: Thu Oct 20 03:50:05 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=168b50a0 app-misc/cw: 1.0.16 revbump, fix build for clang16 Fixes: af397b3d6dec93a39eb752d80dd10695d654958a Closes: https://bugs.gentoo.org/870751 Signed-off-by: Pascal Jäger leimstift.de> Closes: https://github.com/gentoo/gentoo/pull/27857 Signed-off-by: Sam James gentoo.org> app-misc/cw/{cw-1.0.16-r4.ebuild => cw-1.0.16-r5.ebuild} | 9 - .../cw/files/cw-1.0.16-fix-configure-for-newer-autotools.patch | 10 ++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/app-misc/cw/cw-1.0.16-r4.ebuild b/app-misc/cw/cw-1.0.16-r5.ebuild similarity index 90% rename from app-misc/cw/cw-1.0.16-r4.ebuild rename to app-misc/cw/cw-1.0.16-r5.ebuild index b738753f2715..c66048665427 100644 --- a/app-misc/cw/cw-1.0.16-r4.ebuild +++ b/app-misc/cw/cw-1.0.16-r5.ebuild @@ -3,7 +3,8 @@ EAPI=8 -inherit flag-o-matic toolchain-funcs +WANT_AUTOMAKE="none" +inherit autotools flag-o-matic toolchain-funcs DESCRIPTION="A non-intrusive real-time ANSI color wrapper for common unix-based commands" HOMEPAGE="http://cwrapper.sourceforge.net; @@ -19,6 +20,7 @@ PATCHES=( "${FILESDIR}"/${PV}-collision.patch "${FILESDIR}"/${PV}-format-security.patch "${FILESDIR}"/${P}-replace-isastream-with-fcntl.patch + "${FILESDIR}"/${P}-fix-configure-for-newer-autotools.patch ) src_unpack() { @@ -27,6 +29,11 @@ src_unpack() { gunzip "${S}"/man/*.gz || die } +src_prepare() { + default + eautoreconf +} + src_configure() { tc-export CC diff --git a/app-misc/cw/files/cw-1.0.16-fix-configure-for-newer-autotools.patch b/app-misc/cw/files/cw-1.0.16-fix-configure-for-newer-autotools.patch new file mode 100644 index ..038e30074371 --- /dev/null +++ b/app-misc/cw/files/cw-1.0.16-fix-configure-for-newer-autotools.patch @@ -0,0 +1,10 @@ +--- a/configure.in b/configure.in +@@ -17,7 +17,6 @@ ORIG_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -Wall" + AC_TRY_COMPILE(,[return 0;],AC_MSG_RESULT(yes),AC_MSG_RESULT(no);CFLAGS="$ORIG_CFLAGS") + AC_CONFIG_HEADER(config.h) +-AC_REQUIRE([AC_HEADER_STDC]) + AC_CHECK_LIB(util, openpty) + AC_CHECK_FILE("/dev/ptmx", AC_DEFINE(HAVE_DEV_PTMX, 1, Have /dev/ptmx.)) + AC_CHECK_FUNCS(getpt isatty isxdigit openpty putenv regcomp setenv setproctitle setsid sigaction sscanf uname unsetenv vsnprintf waitpid)
[gentoo-commits] repo/gentoo:master commit in: app-misc/cw/files/, app-misc/cw/
commit: 43b339616b8cd4ab204fb89b882dfe3d8ca55f78 Author: Alessandro Barbieri gmail com> AuthorDate: Mon Nov 1 16:17:23 2021 + Commit: Sam James gentoo org> CommitDate: Thu Jun 16 00:34:43 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43b33961 app-misc/cw: EAPI 8, fix build Closes: https://bugs.gentoo.org/830507 Closes: https://bugs.gentoo.org/692426 Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Alessandro Barbieri gmail.com> Closes: https://github.com/gentoo/gentoo/pull/22782 Signed-off-by: Sam James gentoo.org> app-misc/cw/cw-1.0.16-r4.ebuild| 71 ++ .../cw-1.0.16-replace-isastream-with-fcntl.patch | 20 ++ 2 files changed, 91 insertions(+) diff --git a/app-misc/cw/cw-1.0.16-r4.ebuild b/app-misc/cw/cw-1.0.16-r4.ebuild new file mode 100644 index ..8a1bb807eb9a --- /dev/null +++ b/app-misc/cw/cw-1.0.16-r4.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="A non-intrusive real-time ANSI color wrapper for common unix-based commands" +HOMEPAGE="http://cwrapper.sourceforge.net; +SRC_URI="mirror://sourceforge/cwrapper/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +PATCHES=( + "${FILESDIR}"/${PV}-ldflags.patch + "${FILESDIR}"/${PV}-path.patch + "${FILESDIR}"/${PV}-collision.patch + "${FILESDIR}"/${PV}-format-security.patch + "${FILESDIR}"/${P}-replace-isastream-with-fcntl.patch +) + +src_unpack() { + default + gunzip "${S}"/man/*.gz || die +} + +src_configure() { + tc-export CC + econf +} + +src_compile() { + emake local +} + +src_install() { + insinto /usr/share/cw + doins etc/* + + exeinto /usr/libexec/cw + doexe def/* + + doman man/cwu.1 + doman man/cwe.1 + newman man/cw.1 color-wrapper + dodoc CHANGES CONTRIB INSTALL README PLATFORM doc/README* + + dobin bin/{cwu,colorcfg} + # app-misc/color currently conflicts; hopefully 'colors' is safe + newbin bin/color colors + # media-radio/unixcw currently conflicts; + newbin bin/cw color-wrapper +} + +pkg_postinst() { + ebegin "Updating definition files" + cwu /usr/libexec/cw /usr/bin/color-wrapper || die # >/dev/null + eend $? + + elog "To enable color-wrapper, as your user, run:" + elog " colorcfg [1|2|3]" + elog "to add relevant environment variables to your ~/.bash_profile" + elog "Run colorcfg without options to see what [1|2|3] means." + elog + elog "After sourcing your ~/.bash_profile, commands for which definitions" + elog "are provided should have colored output." + elog + elog "To enable/disable colored output, run: 'colors [on|off]'." +} diff --git a/app-misc/cw/files/cw-1.0.16-replace-isastream-with-fcntl.patch b/app-misc/cw/files/cw-1.0.16-replace-isastream-with-fcntl.patch new file mode 100644 index ..18f2dba953d2 --- /dev/null +++ b/app-misc/cw/files/cw-1.0.16-replace-isastream-with-fcntl.patch @@ -0,0 +1,20 @@ +--- /var/tmp/portage/app-misc/cw-1.0.16-r3/work/cw-1.0.16/src/cw.c cw-1.0.16/src/cw.c +@@ -1173,7 +1173,7 @@ + close(master); + return(0); + } +- if(isastream(slave)){ ++ if(fcntl(slave,F_GETFD) < 0){ + if(ioctl(slave,I_PUSH,"ptem")<0||ioctl(slave,I_PUSH,"ldterm")<0){ +close(master); +close(slave); +@@ -1211,7 +1211,7 @@ + close(master); + return(0); + } +- if(isastream(slave)){ ++ if(fcntl(slave,F_GETFD) < 0){ + if(ioctl(slave,I_PUSH,"ptem")<0||ioctl(slave,I_PUSH,"ldterm")<0){ +close(master); +close(slave);
[gentoo-commits] repo/gentoo:master commit in: app-misc/cw/
commit: af397b3d6dec93a39eb752d80dd10695d654958a Author: Sam James gentoo org> AuthorDate: Thu Jun 16 00:34:05 2022 + Commit: Sam James gentoo org> CommitDate: Thu Jun 16 00:34:49 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af397b3d app-misc/cw: avoid implicit func. decls Bug: https://bugs.gentoo.org/692426 Signed-off-by: Sam James gentoo.org> app-misc/cw/cw-1.0.16-r4.ebuild | 10 +++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/app-misc/cw/cw-1.0.16-r4.ebuild b/app-misc/cw/cw-1.0.16-r4.ebuild index 8a1bb807eb9a..b738753f2715 100644 --- a/app-misc/cw/cw-1.0.16-r4.ebuild +++ b/app-misc/cw/cw-1.0.16-r4.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit toolchain-funcs +inherit flag-o-matic toolchain-funcs DESCRIPTION="A non-intrusive real-time ANSI color wrapper for common unix-based commands" HOMEPAGE="http://cwrapper.sourceforge.net; @@ -23,11 +23,15 @@ PATCHES=( src_unpack() { default + gunzip "${S}"/man/*.gz || die } src_configure() { tc-export CC + + append-flags -D_XOPEN_SOURCE=500 -D_GNU_SOURCE + econf } @@ -56,7 +60,7 @@ src_install() { pkg_postinst() { ebegin "Updating definition files" - cwu /usr/libexec/cw /usr/bin/color-wrapper || die # >/dev/null + cwu /usr/libexec/cw /usr/bin/color-wrapper # >/dev/null eend $? elog "To enable color-wrapper, as your user, run:"
[gentoo-commits] repo/gentoo:master commit in: app-misc/cw/, app-misc/cw/files/
commit: b1fa39d563324775ecdd4dfb606750381cdfd954 Author: Sam James gentoo org> AuthorDate: Sat Apr 3 21:32:25 2021 + Commit: Sam James gentoo org> CommitDate: Sat Apr 3 21:32:25 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1fa39d5 app-misc/cw: port to EAPI 7 (for now) Signed-off-by: Sam James gentoo.org> app-misc/cw/cw-1.0.16-r3.ebuild| 24 +--- app-misc/cw/files/1.0.16-collision.patch | 4 app-misc/cw/files/1.0.16-format-security.patch | 5 - app-misc/cw/files/1.0.16-ldflags.patch | 2 -- app-misc/cw/files/1.0.16-path.patch| 2 -- 5 files changed, 13 insertions(+), 24 deletions(-) diff --git a/app-misc/cw/cw-1.0.16-r3.ebuild b/app-misc/cw/cw-1.0.16-r3.ebuild index 5a667b143f9..3a0b86621c4 100644 --- a/app-misc/cw/cw-1.0.16-r3.ebuild +++ b/app-misc/cw/cw-1.0.16-r3.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -inherit eutils toolchain-funcs +inherit toolchain-funcs DESCRIPTION="A non-intrusive real-time ANSI color wrapper for common unix-based commands" HOMEPAGE="http://cwrapper.sourceforge.net/; @@ -12,15 +12,17 @@ SRC_URI="mirror://sourceforge/cwrapper/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 x86" -IUSE="" - -src_prepare() { - epatch \ - "${FILESDIR}"/${PV}-ldflags.patch \ - "${FILESDIR}"/${PV}-path.patch \ - "${FILESDIR}"/${PV}-collision.patch \ - "${FILESDIR}"/${PV}-format-security.patch + +PATCHES=( + "${FILESDIR}"/${PV}-ldflags.patch + "${FILESDIR}"/${PV}-path.patch + "${FILESDIR}"/${PV}-collision.patch + "${FILESDIR}"/${PV}-format-security.patch +) + +src_configure() { tc-export CC + econf } src_compile() { diff --git a/app-misc/cw/files/1.0.16-collision.patch b/app-misc/cw/files/1.0.16-collision.patch index 52bb8cab8f3..78ca0f99e39 100644 --- a/app-misc/cw/files/1.0.16-collision.patch +++ b/app-misc/cw/files/1.0.16-collision.patch @@ -1,5 +1,3 @@ -diff --git a/src/cw.c b/src/cw.c -index d7b4875..a7811d8 100644 --- a/src/cw.c +++ b/src/cw.c @@ -1336,7 +1336,7 @@ unsigned char is_cwfile(char *file){ @@ -11,8 +9,6 @@ index d7b4875..a7811d8 100644 return(0); } /* sets left and right borders. */ -diff --git a/src/cwu.c b/src/cwu.c -index 823618d..63f566b 100644 --- a/src/cwu.c +++ b/src/cwu.c @@ -37,12 +37,12 @@ signed int main(signed int argc,char **argv){ diff --git a/app-misc/cw/files/1.0.16-format-security.patch b/app-misc/cw/files/1.0.16-format-security.patch index 20f0b1d06b1..ceb92c69a09 100644 --- a/app-misc/cw/files/1.0.16-format-security.patch +++ b/app-misc/cw/files/1.0.16-format-security.patch @@ -1,8 +1,3 @@ - src/cw.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/cw.c b/src/cw.c -index d7b4875..3ec1ac1 100644 --- a/src/cw.c +++ b/src/cw.c @@ -643,7 +643,7 @@ void sighandler(signed int sig){ diff --git a/app-misc/cw/files/1.0.16-ldflags.patch b/app-misc/cw/files/1.0.16-ldflags.patch index 46037312c6c..4063de48d7f 100644 --- a/app-misc/cw/files/1.0.16-ldflags.patch +++ b/app-misc/cw/files/1.0.16-ldflags.patch @@ -1,5 +1,3 @@ -diff --git a/Makefile.in b/Makefile.in -index 9a6e4ec..e510493 100644 --- a/Makefile.in +++ b/Makefile.in @@ -19,11 +19,11 @@ all: diff --git a/app-misc/cw/files/1.0.16-path.patch b/app-misc/cw/files/1.0.16-path.patch index f62b5bd994d..76c3fbf1d67 100644 --- a/app-misc/cw/files/1.0.16-path.patch +++ b/app-misc/cw/files/1.0.16-path.patch @@ -1,5 +1,3 @@ -diff --git a/bin/colorcfg b/bin/colorcfg -index cf73b50..3e78c73 100755 --- a/bin/colorcfg +++ b/bin/colorcfg @@ -10,13 +10,7 @@ echo "[ cw/color wrapper: user setup script. ]"