public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: media-radio/unixcw/, media-radio/unixcw/files/
@ 2018-08-01  9:14 Thomas Beierlein
  0 siblings, 0 replies; 5+ messages in thread
From: Thomas Beierlein @ 2018-08-01  9:14 UTC (permalink / raw
  To: gentoo-commits

commit:     6bd56369bade77916f1984fc35bff33b4bc90413
Author:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
AuthorDate: Wed Aug  1 08:38:05 2018 +0000
Commit:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
CommitDate: Wed Aug  1 08:38:05 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6bd56369

media-radio/unixcw: Fix tests

Make test independent of installed audio system.

Reported-by: Toralf Förster <toralf <AT> gentoo.org>
Closes: https://bugs.gentoo.org/630276
Package-Manager: Portage-2.3.44, Repoman-2.3.10

 media-radio/unixcw/files/unixcw-tests.patch | 12 ++++++++++++
 media-radio/unixcw/unixcw-3.5.1.ebuild      |  7 +++----
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/media-radio/unixcw/files/unixcw-tests.patch b/media-radio/unixcw/files/unixcw-tests.patch
new file mode 100644
index 00000000000..9d2c3d9685c
--- /dev/null
+++ b/media-radio/unixcw/files/unixcw-tests.patch
@@ -0,0 +1,12 @@
+# works now without any installed audio system
+--- src/libcw/tests/libcw_test_tq_short_space.c.orig	2018-08-01 07:53:33.972577616 +0000
++++ src/libcw/tests/libcw_test_tq_short_space.c	2018-08-01 07:53:42.877456677 +0000
+@@ -94,7 +94,7 @@
+ 	bool success = true;
+ 
+         /* Library initialization. */
+-        cw_generator_new(CW_AUDIO_SOUNDCARD, NULL);
++        cw_generator_new(CW_AUDIO_NULL, NULL);
+         cw_generator_start();
+ 
+ 	cw_register_tone_queue_low_callback(cwdaemon_tone_queue_low_callback, NULL, tq_low_watermark);

diff --git a/media-radio/unixcw/unixcw-3.5.1.ebuild b/media-radio/unixcw/unixcw-3.5.1.ebuild
index 1eb06a2ba00..b50fdf97de9 100644
--- a/media-radio/unixcw/unixcw-3.5.1.ebuild
+++ b/media-radio/unixcw/unixcw-3.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,8 +14,6 @@ SLOT="0"
 KEYWORDS="alpha amd64 ppc x86"
 IUSE="alsa ncurses pulseaudio suid test qt5"
 
-REQUIRED_USE="test? ( || ( alsa pulseaudio ) )"
-
 RDEPEND="ncurses? ( sys-libs/ncurses:= )
 	qt5? ( dev-qt/qtcore:5
 		dev-qt/qtgui:5
@@ -30,7 +28,8 @@ DEPEND="${RDEPEND}
 src_prepare() {
 	append-cflags -std=gnu11
 	append-cxxflags -std=gnu++11
-	epatch "${FILESDIR}"/$PN-3.5-tinfo.patch
+	epatch "${FILESDIR}"/$PN-3.5-tinfo.patch \
+	    "${FILESDIR}"/$PN-tests.patch
 	eautoreconf
 }
 


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-radio/unixcw/, media-radio/unixcw/files/
@ 2025-02-04  7:45 Thomas Beierlein
  0 siblings, 0 replies; 5+ messages in thread
From: Thomas Beierlein @ 2025-02-04  7:45 UTC (permalink / raw
  To: gentoo-commits

commit:     40c688f285b4d9f07067da6e2566369fa92a5628
Author:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
AuthorDate: Tue Feb  4 07:39:14 2025 +0000
Commit:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
CommitDate: Tue Feb  4 07:44:55 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40c688f2

media-radio/unixcw: Move to Qt6

Signed-off-by: Thomas Beierlein <tomjbe <AT> gentoo.org>

 .../unixcw/files/unixcw-3.6.1-qt6-build.patch      | 116 +++++++++++++++++++++
 .../unixcw/files/unixcw-3.6.1-qt6-src.patch        |  44 ++++++++
 media-radio/unixcw/unixcw-3.6.1-r1.ebuild          |  78 ++++++++++++++
 3 files changed, 238 insertions(+)

diff --git a/media-radio/unixcw/files/unixcw-3.6.1-qt6-build.patch b/media-radio/unixcw/files/unixcw-3.6.1-qt6-build.patch
new file mode 100644
index 000000000000..53cda260267e
--- /dev/null
+++ b/media-radio/unixcw/files/unixcw-3.6.1-qt6-build.patch
@@ -0,0 +1,116 @@
+diff --git a/configure.ac b/configure.ac
+index aecd270..d66151e 100755
+--- a/configure.ac
++++ b/configure.ac
+@@ -512,28 +512,28 @@ if test "$enable_xcwcp" = "no" ; then
+     WITH_XCWCP='no'
+ else
+     # http://stackoverflow.com/questions/5178511/integrate-qt-project-with-autotool
+-    PKG_CHECK_MODULES(QT5, [Qt5Widgets Qt5Gui Qt5Core >= 5.0.0], [
+-			   AC_PATH_PROGS(MOC, [moc-qt5 moc], moc,`eval $PKG_CONFIG --variable=host_bins Qt5Core`)
++    PKG_CHECK_MODULES(QT6, [Qt6Widgets Qt6Gui Qt6Core >= 6.0.0], [
++			   AC_PATH_PROGS(MOC, [moc-qt6 moc], moc,`eval $PKG_CONFIG --variable=libexecdir Qt6Core`)
+ 
+ 			   # https://stackoverflow.com/questions/11663702/how-to-suppress-warnings-for-file-included-from-header
+-			   QT_INCLUDE_DIR=`$PKG_CONFIG --variable=includedir Qt5Core`
+-			   QT5_CFLAGS="-isystem $QT_INCLUDE_DIR"
+-			   QT5_CFLAGS+=" -isystem $QT_INCLUDE_DIR/QtWidgets"
+-			   QT5_CFLAGS+=" -isystem $QT_INCLUDE_DIR/QtGui"
+-			   QT5_CFLAGS+=" -isystem $QT_INCLUDE_DIR/QtCore"
++			   QT_INCLUDE_DIR=`$PKG_CONFIG --variable=includedir Qt6Core`
++			   QT6_CFLAGS="-isystem $QT_INCLUDE_DIR"
++			   QT6_CFLAGS+=" -isystem $QT_INCLUDE_DIR/QtWidgets"
++			   QT6_CFLAGS+=" -isystem $QT_INCLUDE_DIR/QtGui"
++			   QT6_CFLAGS+=" -isystem $QT_INCLUDE_DIR/QtCore"
+ 
+-			   AC_MSG_RESULT([QT5 CLFAGS is $QT5_CFLAGS])
+-			   AC_MSG_RESULT([QT5 LIBS is $QT5_LIBS])
++			   AC_MSG_RESULT([QT6 CFLAGS is $QT6_CFLAGS])
++			   AC_MSG_RESULT([QT6 LIBS is $QT6_LIBS])
+ 
+-			   AC_SUBST(QT5_CFLAGS)
+-			   AC_SUBST(QT5_LIBS)
++			   AC_SUBST(QT6_CFLAGS)
++			   AC_SUBST(QT6_LIBS)
+ 			   AC_SUBST(MOC)
+ 
+ 			   WITH_XCWCP='yes'
+ 
+ 			   ], [
+ 
+-			   AC_MSG_WARN([Cannot find Qt5 files - unable to build xcwcp])
++			   AC_MSG_WARN([Cannot find Qt6 files - unable to build xcwcp])
+ 
+ 			   WITH_XCWCP='no'
+ 
+@@ -797,9 +797,9 @@ AC_MSG_NOTICE([  build cwgen:  ..........................................  $WITH
+ AC_MSG_NOTICE([  build cwcp:  ...........................................  $WITH_CWCP])
+ AC_MSG_NOTICE([  build xcwcp:  ..........................................  $WITH_XCWCP])
+ if test "$WITH_XCWCP" = 'yes' ; then
+-    AC_MSG_NOTICE([      Qt5 LIBS:  .........................................  $QT5_LIBS])
+-    AC_MSG_NOTICE([      Qt5 MOC:  ..........................................  $MOC])
+-    AC_MSG_NOTICE([      Qt5 CFLAGS:  .......................................  $QT5_CFLAGS])
++    AC_MSG_NOTICE([      Qt6 LIBS:  .........................................  $QT6_LIBS])
++    AC_MSG_NOTICE([      Qt6 MOC:  ..........................................  $MOC])
++    AC_MSG_NOTICE([      Qt6 CFLAGS:  .......................................  $QT6_CFLAGS])
+ fi
+ AC_MSG_NOTICE([  CFLAGS:  ...............................................  $CFLAGS])
+ 
+diff --git a/Makefile.inc.in b/Makefile.inc.in
+index dd091db..6ad9361 100644
+--- a/Makefile.inc.in
++++ b/Makefile.inc.in
+@@ -27,9 +27,9 @@ AC_LDCONFIG	= @LDCONFIG@
+ AC_LIBS		= @LIBS@
+ AC_AWK		= @AWK@
+ 
+-AC_QT5_CFLAGS	= @QT5_CFLAGS@
+-AC_QT5_LIBS	= @QT5_LIBS@
+-AC_QT5_MOC	= @MOC@
++AC_QT6_CFLAGS	= @QT6_CFLAGS@
++AC_QT6_LIBS	= @QT6_LIBS@
++AC_QT6_MOC	= @MOC@
+ AC_SRC_SUBDIRS	= @SRC_SUBDIRS@
+ 
+ AC_CFLAG_PIC	= @CFLAG_PIC@
+diff --git a/src/xcwcp/Makefile.am b/src/xcwcp/Makefile.am
+index 6d4a02d..492b321 100644
+--- a/src/xcwcp/Makefile.am
++++ b/src/xcwcp/Makefile.am
+@@ -18,7 +18,7 @@
+ 
+ # use $(top_builddir) instead of $(top_srcdir) because Makefile.inc is
+ # (re)created at build time; if you use $(top_srcdir), you may (will?)
+-# get empty $(AC_QT5_CFLAGS), $(AC_QT5_LIBS) and $(AC_QT5_MOC);
++# get empty $(AC_QT6_CFLAGS), $(AC_QT6_LIBS) and $(AC_QT6_MOC);
+ -include $(top_builddir)/Makefile.inc
+ 
+ # program(s) to be built in current dir
+@@ -36,12 +36,12 @@ xcwcp_SOURCES = \
+ nodist_xcwcp_SOURCES = moc_application.cc
+ 
+ # target-specific preprocessor flags (#defs and include dirs)
+-xcwcp_CPPFLAGS = -I$(top_srcdir)/src/ -I$(top_srcdir)/src/libcw/ $(AC_QT5_CFLAGS) $(AC_CFLAG_PIC)
++xcwcp_CPPFLAGS = -I$(top_srcdir)/src/ -I$(top_srcdir)/src/libcw/ $(AC_QT6_CFLAGS) $(AC_CFLAG_PIC)
+ 
+ # Target-specific linker flags (objects to link). Order is important:
+ # first static library then dynamic. Otherwise linker may not find
+ # symbols from the dynamic library.
+-xcwcp_LDADD = $(top_builddir)/src/cwutils/lib_xcwcp.a -L$(top_builddir)/src/libcw/.libs -lcw $(AC_QT5_LIBS) -lpthread $(INTL_LIB)
++xcwcp_LDADD = $(top_builddir)/src/cwutils/lib_xcwcp.a -L$(top_builddir)/src/libcw/.libs -lcw $(AC_QT6_LIBS) -lpthread $(INTL_LIB)
+ 
+ 
+ 
+@@ -73,10 +73,10 @@ CLEANFILES = moc_application.cc
+ # Qt5 magic
+ if HOST_IS_FREEBSD
+ moc_application.cc: application.h
+-	$(AC_QT5_MOC) application.h -o application.cc
++	$(AC_QT6_MOC) application.h -o application.cc
+ else
+ moc_application.cc: application.h
+-	$(AC_QT5_MOC) $< -o $@
++	$(AC_QT6_MOC) $< -o $@
+ endif
+ 
+ 

diff --git a/media-radio/unixcw/files/unixcw-3.6.1-qt6-src.patch b/media-radio/unixcw/files/unixcw-3.6.1-qt6-src.patch
new file mode 100644
index 000000000000..d904ee9020b5
--- /dev/null
+++ b/media-radio/unixcw/files/unixcw-3.6.1-qt6-src.patch
@@ -0,0 +1,44 @@
+diff --git a/src/xcwcp/application.cc b/src/xcwcp/application.cc
+index 12f9311..f1dd707 100644
+--- a/src/xcwcp/application.cc
++++ b/src/xcwcp/application.cc
+@@ -821,7 +821,7 @@ void Application::make_toolbar(void)
+ 	toolbar->addSeparator();
+ 
+ 
+-	QLabel *speed_label_ = new QLabel(_("Speed:"), 0, 0);
++	QLabel *speed_label_ = new QLabel(_("Speed:"), 0, Qt::Widget);
+ 	toolbar->addWidget(speed_label_);
+ 
+ 	speed_spin = new QSpinBox(toolbar);
+@@ -857,7 +857,7 @@ void Application::make_toolbar(void)
+ 	toolbar->addSeparator();
+ 
+ 
+-	QLabel *volume_label = new QLabel(_("Volume:"), 0, 0);
++	QLabel *volume_label = new QLabel(_("Volume:"), 0, Qt::Widget);
+ 	toolbar->addWidget(volume_label);
+ 
+ 	volume_spin = new QSpinBox(toolbar);
+@@ -875,7 +875,7 @@ void Application::make_toolbar(void)
+ 	toolbar->addSeparator();
+ 
+ 
+-	QLabel *gap_label = new QLabel(_("Gap:"), 0, 0);
++	QLabel *gap_label = new QLabel(_("Gap:"), 0, Qt::Widget);
+ 	toolbar->addWidget(gap_label);
+ 
+ 	gap_spin = new QSpinBox(toolbar);
+diff --git a/src/xcwcp/receiver.cc b/src/xcwcp/receiver.cc
+index 904ad22..7c785c0 100644
+--- a/src/xcwcp/receiver.cc
++++ b/src/xcwcp/receiver.cc
+@@ -165,7 +165,7 @@ void Receiver::handle_mouse_event(QMouseEvent *event, bool is_reverse_paddles)
+ 		const int is_down = event->type() == QEvent::MouseButtonPress
+ 			|| event->type() == QEvent::MouseButtonDblClick;
+ 
+-		if (event->button() == Qt::MidButton) {
++		if (event->button() == Qt::MiddleButton) {
+ 			//fprintf(stderr, "---------- handle mouse event: sk: %d\n", is_down);
+ 			sk_event(is_down);
+ 			event->accept();

diff --git a/media-radio/unixcw/unixcw-3.6.1-r1.ebuild b/media-radio/unixcw/unixcw-3.6.1-r1.ebuild
new file mode 100644
index 000000000000..22f41c23d9a4
--- /dev/null
+++ b/media-radio/unixcw/unixcw-3.6.1-r1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Collection of programs that fit together to form a morse code tutor program"
+HOMEPAGE="https://unixcw.sourceforge.net"
+SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~x86"
+IUSE="alsa ncurses pulseaudio suid test qt6"
+RESTRICT="!test? ( test )"
+
+RDEPEND="ncurses? ( sys-libs/ncurses:= )
+	qt6? ( dev-qt/qtbase:6[gui,widgets] )
+	alsa? ( media-libs/alsa-lib )
+	pulseaudio? ( media-libs/libpulse )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+	dev-build/libtool"
+
+PATCHES=( "${FILESDIR}/${PN}-3.6.1-qt6-src.patch"
+	"${FILESDIR}/${PN}-3.6.1-qt6-build.patch" )
+
+src_prepare() {
+	eapply "${PATCHES[@]}"
+	eapply -p0 "${FILESDIR}"/${PN}-3.6-tinfo.patch
+	# Bug# 837617 and 858278
+	sed -i -e "s/curses, initscr/ncurses, initscr/" \
+		-e "s/_curses_initscr/_ncurses_initscr/" configure.ac || die
+	eapply_user
+	eautoreconf
+}
+
+src_configure() {
+	econf --libdir="${EPREFIX}/usr/$(get_libdir)" \
+		$(use_enable pulseaudio ) \
+		$(use_enable alsa ) \
+		$(use_enable ncurses cwcp ) \
+		$(use_enable qt6 xcwcp ) \
+		--disable-static
+}
+
+src_install() {
+	default
+
+	if ! use suid ; then
+		fperms 711 /usr/bin/cw
+		if use ncurses ; then
+			fperms 711 /usr/bin/cwcp
+		fi
+		if use qt6 ; then
+			fperms 711 /usr/bin/xcwcp
+		fi
+	fi
+
+	find "${D}" -name '*.la' -type f -delete || die
+}
+
+pkg_postinst() {
+	if use suid ; then
+		ewarn "You have choosen to install 'cw', 'cwcp' and 'xcwcp' setuid"
+		ewarn "by setting USE=suid."
+		ewarn "Be aware that this is a security risk and not recommended."
+		ewarn ""
+		ewarn "These files do only need root access if you want to use the"
+		ewarn "PC speaker for morse sidetone output. You can alternativly"
+		ewarn "drop USE=suid and use sudo."
+	else
+		elog "Be aware that 'cw', 'cwcp' and 'xcwcp' needs root access if"
+		elog "you want to use the PC speaker for morse sidetone output."
+		elog "You can call the programs via sudo for that (see 'man sudo')."
+	fi
+}


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-radio/unixcw/, media-radio/unixcw/files/
@ 2023-06-18 13:03 Thomas Beierlein
  0 siblings, 0 replies; 5+ messages in thread
From: Thomas Beierlein @ 2023-06-18 13:03 UTC (permalink / raw
  To: gentoo-commits

commit:     3eb19262128df220a4761f9cbc207db12786dd65
Author:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 18 12:46:21 2023 +0000
Commit:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
CommitDate: Sun Jun 18 13:03:22 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3eb19262

media-radio/unixcw: drop 3.5.1-r1

Signed-off-by: Thomas Beierlein <tomjbe <AT> gentoo.org>

 media-radio/unixcw/Manifest                     |  1 -
 media-radio/unixcw/files/unixcw-3.5-tinfo.patch | 30 ----------
 media-radio/unixcw/files/unixcw-tests.patch     | 12 ----
 media-radio/unixcw/unixcw-3.5.1-r1.ebuild       | 78 -------------------------
 4 files changed, 121 deletions(-)

diff --git a/media-radio/unixcw/Manifest b/media-radio/unixcw/Manifest
index a2d5606bf515..5369052e9a29 100644
--- a/media-radio/unixcw/Manifest
+++ b/media-radio/unixcw/Manifest
@@ -1,2 +1 @@
-DIST unixcw-3.5.1.tar.gz 740331 BLAKE2B 9b5b4b819cf75ca0b10d773ebdf9869bf835c49f10c54b5bd34441b417d48d9a92abc9390a41870bf1c09fbbfe932554307abba181cad3b8631947adcf9890b1 SHA512 b59499723d810a537a2f5ab2b4b34c83a1c8c815af82a60ba29f4d9cee445525e530136f4e202db6b87305ac7a818fa6e59214a45c6bffce299eb50b58c866e1
 DIST unixcw-3.6.0.tar.gz 870148 BLAKE2B 4eca3fe63ce7aec43e16ecca8120018e1bda6541f707ac9857db1f9dc6181a53ee24c7328f0a1f97a6aa1993600d68d9313e0567c12dfcf7a061837885aaefcb SHA512 17abdfaeb2b4e7459e1efd93f5f85a8ed89fde06e5b8d23d83c9f1c76888bc9048af1a8adc9c030f560e94e0dd0576b3a30bf040fece4d13e001d01734d6338b

diff --git a/media-radio/unixcw/files/unixcw-3.5-tinfo.patch b/media-radio/unixcw/files/unixcw-3.5-tinfo.patch
deleted file mode 100644
index af85350e7ae3..000000000000
--- a/media-radio/unixcw/files/unixcw-3.5-tinfo.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- configure.ac.old	2017-03-07 13:31:46.074580930 +0100
-+++ configure.ac	2017-03-07 13:33:25.640924331 +0100
-@@ -347,7 +347,7 @@
-     AC_DEFINE([LIBCW_WITH_PULSEAUDIO], [1], [Define as 1 if your build machine can support PulseAudio.])
- fi
- 
--
-+PKG_PROG_PKG_CONFIG
- 
- if test "$enable_cwcp" = "no" ; then
-    WITH_CWCP='no'
-@@ -355,6 +355,7 @@
-     AC_CHECK_LIB(curses, initscr)
-     if test $ac_cv_lib_curses_initscr = 'yes' ; then
- 	WITH_CWCP='yes'
-+	PKG_CHECK_MODULES(ncurses, ncurses, [NCURSES_LIB="$ncurses_LIBS"], )
-     else
- 	WITH_CWCP='no'
- 	AC_MSG_WARN([Cannot find libcurses - unable to build cwcp])
---- src/cwcp/Makefile.am.old	2017-03-07 13:30:10.813167002 +0100
-+++ src/cwcp/Makefile.am	2017-03-07 13:30:28.950864931 +0100
-@@ -26,7 +26,7 @@
- # target-specific preprocessor flags (#defs and include dirs)
- #cwcp_CPPFLAGS = -I$(top_srcdir)/src/cwutils/ -I$(top_srcdir)/src/libcw/
- # target-specific linker flags (objects to link)
--cwcp_LDADD = -lcurses -L$(top_builddir)/src/libcw/.libs -lcw $(top_builddir)/src/cwutils/lib_cwcp.a
-+cwcp_LDADD = $(ncurses_LIBS) -L$(top_builddir)/src/libcw/.libs -lcw $(top_builddir)/src/cwutils/lib_cwcp.a
- 
- 
- # copy man page to proper directory during installation

diff --git a/media-radio/unixcw/files/unixcw-tests.patch b/media-radio/unixcw/files/unixcw-tests.patch
deleted file mode 100644
index 9d2c3d9685c2..000000000000
--- a/media-radio/unixcw/files/unixcw-tests.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-# works now without any installed audio system
---- src/libcw/tests/libcw_test_tq_short_space.c.orig	2018-08-01 07:53:33.972577616 +0000
-+++ src/libcw/tests/libcw_test_tq_short_space.c	2018-08-01 07:53:42.877456677 +0000
-@@ -94,7 +94,7 @@
- 	bool success = true;
- 
-         /* Library initialization. */
--        cw_generator_new(CW_AUDIO_SOUNDCARD, NULL);
-+        cw_generator_new(CW_AUDIO_NULL, NULL);
-         cw_generator_start();
- 
- 	cw_register_tone_queue_low_callback(cwdaemon_tone_queue_low_callback, NULL, tq_low_watermark);

diff --git a/media-radio/unixcw/unixcw-3.5.1-r1.ebuild b/media-radio/unixcw/unixcw-3.5.1-r1.ebuild
deleted file mode 100644
index 3124530b8bd4..000000000000
--- a/media-radio/unixcw/unixcw-3.5.1-r1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic
-
-DESCRIPTION="A package of programs that fit together to form a morse code tutor program"
-HOMEPAGE="http://unixcw.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ppc x86"
-IUSE="alsa ncurses pulseaudio suid test qt5"
-RESTRICT="!test? ( test )"
-
-RDEPEND="ncurses? ( sys-libs/ncurses:= )
-	qt5? ( dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5 )
-	alsa? ( media-libs/alsa-lib )
-	pulseaudio? ( media-sound/pulseaudio )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	sys-devel/libtool"
-
-src_prepare() {
-	append-cflags -std=gnu11
-	append-cxxflags -std=gnu++11
-	eapply -p0 "${FILESDIR}"/${PN}-3.5-tinfo.patch \
-		"${FILESDIR}"/${PN}-tests.patch
-	# Bug# 837617
-	sed -i -e "s/curses, initscr/ncurses, initscr/" \
-		-e "s/_curses_initscr/_ncurses_initscr/" configure.ac || die
-	eapply_user
-	eautoreconf
-}
-
-src_configure() {
-	econf --libdir=/usr/$(get_libdir) \
-		$(use_enable pulseaudio ) \
-		$(use_enable alsa ) \
-		$(use_enable ncurses cwcp ) \
-		$(use_enable qt5 xcwcp ) \
-		--disable-static
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	find "${D}" -name '*.la' -type f -delete || die
-	dodoc ChangeLog NEWS README
-	if ! use suid ; then
-		fperms 711 /usr/bin/cw
-		if use ncurses ; then
-			fperms 711 /usr/bin/cwcp
-		fi
-		if use qt5 ; then
-			fperms 711 /usr/bin/xcwcp
-		fi
-	fi
-}
-
-pkg_postinst() {
-	if use suid ; then
-		ewarn "You have choosen to install 'cw', 'cwcp' and 'xcwcp' setuid"
-		ewarn "by setting USE=suid."
-		ewarn "Be aware that this is a security risk and not recommended."
-		ewarn ""
-		ewarn "These files do only need root access if you want to use the"
-		ewarn "PC speaker for morse sidetone output. You can alternativly"
-		ewarn "drop USE=suid and use sudo."
-	else
-		elog "Be aware that 'cw', 'cwcp' and 'xcwcp' needs root access if"
-		elog "you want to use the PC speaker for morse sidetone output."
-		elog "You can call the programs via sudo for that (see 'man sudo')."
-	fi
-}


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-radio/unixcw/, media-radio/unixcw/files/
@ 2022-07-15 15:50 Thomas Beierlein
  0 siblings, 0 replies; 5+ messages in thread
From: Thomas Beierlein @ 2022-07-15 15:50 UTC (permalink / raw
  To: gentoo-commits

commit:     51197e7f5c51eb29624651741baaa474a03a101d
Author:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 15 15:43:21 2022 +0000
Commit:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
CommitDate: Fri Jul 15 15:50:18 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51197e7f

media-radio/unixcw: add 3.6.0

Signed-off-by: Thomas Beierlein <tomjbe <AT> gentoo.org>

 media-radio/unixcw/Manifest                     |  1 +
 media-radio/unixcw/files/unixcw-3.6-tinfo.patch | 30 ++++++++++
 media-radio/unixcw/unixcw-3.6.0.ebuild          | 74 +++++++++++++++++++++++++
 3 files changed, 105 insertions(+)

diff --git a/media-radio/unixcw/Manifest b/media-radio/unixcw/Manifest
index 1bc0ae730a26..a2d5606bf515 100644
--- a/media-radio/unixcw/Manifest
+++ b/media-radio/unixcw/Manifest
@@ -1 +1,2 @@
 DIST unixcw-3.5.1.tar.gz 740331 BLAKE2B 9b5b4b819cf75ca0b10d773ebdf9869bf835c49f10c54b5bd34441b417d48d9a92abc9390a41870bf1c09fbbfe932554307abba181cad3b8631947adcf9890b1 SHA512 b59499723d810a537a2f5ab2b4b34c83a1c8c815af82a60ba29f4d9cee445525e530136f4e202db6b87305ac7a818fa6e59214a45c6bffce299eb50b58c866e1
+DIST unixcw-3.6.0.tar.gz 870148 BLAKE2B 4eca3fe63ce7aec43e16ecca8120018e1bda6541f707ac9857db1f9dc6181a53ee24c7328f0a1f97a6aa1993600d68d9313e0567c12dfcf7a061837885aaefcb SHA512 17abdfaeb2b4e7459e1efd93f5f85a8ed89fde06e5b8d23d83c9f1c76888bc9048af1a8adc9c030f560e94e0dd0576b3a30bf040fece4d13e001d01734d6338b

diff --git a/media-radio/unixcw/files/unixcw-3.6-tinfo.patch b/media-radio/unixcw/files/unixcw-3.6-tinfo.patch
new file mode 100644
index 000000000000..855eccc045eb
--- /dev/null
+++ b/media-radio/unixcw/files/unixcw-3.6-tinfo.patch
@@ -0,0 +1,30 @@
+--- configure.ac.old	2017-03-07 13:31:46.074580930 +0100
++++ configure.ac	2017-03-07 13:33:25.640924331 +0100
+@@ -347,7 +347,7 @@
+     AC_DEFINE([LIBCW_WITH_PULSEAUDIO], [1], [Define as 1 if your build machine can support PulseAudio.])
+ fi
+ 
+-
++PKG_PROG_PKG_CONFIG
+ 
+ if test "$enable_cwcp" = "no" ; then
+    WITH_CWCP='no'
+@@ -355,6 +355,7 @@
+     AC_CHECK_LIB(curses, initscr)
+     if test $ac_cv_lib_curses_initscr = 'yes' ; then
+ 	WITH_CWCP='yes'
++	PKG_CHECK_MODULES(ncurses, ncurses, [NCURSES_LIB="$ncurses_LIBS"], )
+     else
+ 	WITH_CWCP='no'
+ 	AC_MSG_WARN([Cannot find libcurses - unable to build cwcp])
+--- src/cwcp/Makefile.am.old	2022-07-15 17:36:58.554778217 +0200
++++ src/cwcp/Makefile.am	2022-07-15 17:37:49.169570822 +0200
+@@ -28,7 +28,7 @@
+ # Target-specific linker flags (objects to link). Order is important:
+ # first static library then dynamic. Otherwise linker may not find
+ # symbols from the dynamic library.
+-cwcp_LDADD = $(top_builddir)/src/cwutils/lib_cwcp.a -lcurses $(INTL_LIB) -L$(top_builddir)/src/libcw/.libs -lcw
++cwcp_LDADD = $(top_builddir)/src/cwutils/lib_cwcp.a ${ncurses_LIBS} $(INTL_LIB) -L$(top_builddir)/src/libcw/.libs -lcw
+ 
+ 
+ # copy man page to proper directory during installation	

diff --git a/media-radio/unixcw/unixcw-3.6.0.ebuild b/media-radio/unixcw/unixcw-3.6.0.ebuild
new file mode 100644
index 000000000000..fa0f69b925ac
--- /dev/null
+++ b/media-radio/unixcw/unixcw-3.6.0.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic
+
+DESCRIPTION="A package of programs that fit together to form a morse code tutor program"
+HOMEPAGE="http://unixcw.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~x86"
+IUSE="alsa ncurses pulseaudio suid test qt5"
+RESTRICT="!test? ( test )"
+
+RDEPEND="ncurses? ( sys-libs/ncurses:= )
+	qt5? ( dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5 )
+	alsa? ( media-libs/alsa-lib )
+	pulseaudio? ( media-sound/pulseaudio )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	sys-devel/libtool"
+
+src_prepare() {
+	append-cflags -std=gnu11
+	append-cxxflags -std=gnu++11
+	eapply -p0 "${FILESDIR}"/$PN-3.6-tinfo.patch
+	eapply_user
+	eautoreconf
+}
+
+src_configure() {
+	econf --libdir=/usr/$(get_libdir) \
+		$(use_enable pulseaudio ) \
+		$(use_enable alsa ) \
+		$(use_enable ncurses cwcp ) \
+		$(use_enable qt5 xcwcp ) \
+		--disable-static
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	find "${D}" -name '*.la' -type f -delete || die
+	dodoc ChangeLog NEWS README
+	if ! use suid ; then
+		fperms 711 /usr/bin/cw
+		if use ncurses ; then
+			fperms 711 /usr/bin/cwcp
+		fi
+		if use qt5 ; then
+			fperms 711 /usr/bin/xcwcp
+		fi
+	fi
+}
+
+pkg_postinst() {
+	if use suid ; then
+		ewarn "You have choosen to install 'cw', 'cwcp' and 'xcwcp' setuid"
+		ewarn "by setting USE=suid."
+		ewarn "Be aware that this is a security risk and not recommended."
+		ewarn ""
+		ewarn "These files do only need root access if you want to use the"
+		ewarn "PC speaker for morse sidetone output. You can alternativly"
+		ewarn "drop USE=suid and use sudo."
+	else
+		elog "Be aware that 'cw', 'cwcp' and 'xcwcp' needs root access if"
+		elog "you want to use the PC speaker for morse sidetone output."
+		elog "You can call the programs via sudo for that (see 'man sudo')."
+	fi
+}


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-radio/unixcw/, media-radio/unixcw/files/
@ 2017-03-07 12:47 Thomas Beierlein
  0 siblings, 0 replies; 5+ messages in thread
From: Thomas Beierlein @ 2017-03-07 12:47 UTC (permalink / raw
  To: gentoo-commits

commit:     77439de6529aa525779ce6e6921521b7ee847b31
Author:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
AuthorDate: Tue Mar  7 12:47:12 2017 +0000
Commit:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
CommitDate: Tue Mar  7 12:47:12 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77439de6

media-radio/unixcw: Version bump. Fix tinfo problem.

Package-Manager: Portage-2.3.4, Repoman-2.3.2

 media-radio/unixcw/Manifest                     |  1 +
 media-radio/unixcw/files/unixcw-3.5-tinfo.patch | 21 ++++++++
 media-radio/unixcw/unixcw-3.5.1.ebuild          | 72 +++++++++++++++++++++++++
 3 files changed, 94 insertions(+)

diff --git a/media-radio/unixcw/Manifest b/media-radio/unixcw/Manifest
index b614d7b7e5b..dcc85630ca4 100644
--- a/media-radio/unixcw/Manifest
+++ b/media-radio/unixcw/Manifest
@@ -1,2 +1,3 @@
 DIST unixcw-3.4.2.tar.gz 730461 SHA256 ace7d16cfc8f84ffe041de6774baa0727ed0230657cf8a93cb4addf1cb4e8b2a SHA512 118e4f7fcca78713e5be5aa2faccec4e26979e95dcc300bf259534bb417eee7b21591ecb778467591b1a3b61c9ede18f229f88cd1bba2d6bc54f4d410096e0c9 WHIRLPOOL e8959ccb6eca32f4d468dbdb1add61dad6be30b453369385a1c857309ea89d052e4ef5577c4e17f101a79ee762f10ead3ec1fae72a394455ac473c4758fe0e3c
 DIST unixcw-3.5.0.tar.gz 739258 SHA256 82c455b67c6444165ec59f75bc29ad0665b79d70489bd09e3166fd1ccde718e6 SHA512 82128656dce56558f4a41be394afd1579f9de43f170c695e09e25e231b8416993b1cb94215325b39645391b2a43ede8119291efad284fecc35eb8a753669e8ec WHIRLPOOL 3c6dd3bcfa4d43f114938a1048e04f21a63199bb7c291e415e5b035dfe6c59031c60760ad65721cea84ee942ef6263f1938fa9093e6ab6c620875433b415c878
+DIST unixcw-3.5.1.tar.gz 740331 SHA256 63b6253e29083e1e27c65150f580792aab912c989ae2d47c6df16e80cc79e07e SHA512 b59499723d810a537a2f5ab2b4b34c83a1c8c815af82a60ba29f4d9cee445525e530136f4e202db6b87305ac7a818fa6e59214a45c6bffce299eb50b58c866e1 WHIRLPOOL d9ff9ea9548852c68f6948e4aa630cb58ae8487161723361644c4f7b93708123ca2e82e6860be33156ae15db482a6fc7eb6ae81792783f6f47c7e2ff08d05be6

diff --git a/media-radio/unixcw/files/unixcw-3.5-tinfo.patch b/media-radio/unixcw/files/unixcw-3.5-tinfo.patch
new file mode 100644
index 00000000000..3473f752deb
--- /dev/null
+++ b/media-radio/unixcw/files/unixcw-3.5-tinfo.patch
@@ -0,0 +1,21 @@
+--- configure.ac.old	2017-03-07 13:31:46.074580930 +0100
++++ configure.ac	2017-03-07 13:33:25.640924331 +0100
+@@ -355,6 +355,7 @@
+     AC_CHECK_LIB(curses, initscr)
+     if test $ac_cv_lib_curses_initscr = 'yes' ; then
+ 	WITH_CWCP='yes'
++	PKG_CHECK_MODULES(ncurses, ncurses, [NCURSES_LIB="$ncurses_LIBS"], )
+     else
+ 	WITH_CWCP='no'
+ 	AC_MSG_WARN([Cannot find libcurses - unable to build cwcp])
+--- src/cwcp/Makefile.am.old	2017-03-07 13:30:10.813167002 +0100
++++ src/cwcp/Makefile.am	2017-03-07 13:30:28.950864931 +0100
+@@ -26,7 +26,7 @@
+ # target-specific preprocessor flags (#defs and include dirs)
+ #cwcp_CPPFLAGS = -I$(top_srcdir)/src/cwutils/ -I$(top_srcdir)/src/libcw/
+ # target-specific linker flags (objects to link)
+-cwcp_LDADD = -lcurses -L$(top_builddir)/src/libcw/.libs -lcw $(top_builddir)/src/cwutils/lib_cwcp.a
++cwcp_LDADD = $(ncurses_LIBS) -L$(top_builddir)/src/libcw/.libs -lcw $(top_builddir)/src/cwutils/lib_cwcp.a
+ 
+ 
+ # copy man page to proper directory during installation

diff --git a/media-radio/unixcw/unixcw-3.5.1.ebuild b/media-radio/unixcw/unixcw-3.5.1.ebuild
new file mode 100644
index 00000000000..6d7cf506822
--- /dev/null
+++ b/media-radio/unixcw/unixcw-3.5.1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools eutils flag-o-matic multilib
+
+DESCRIPTION="A package of programs that fit together to form a morse code tutor program"
+HOMEPAGE="http://unixcw.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~x86"
+IUSE="alsa ncurses pulseaudio suid qt5"
+
+RDEPEND="ncurses? ( sys-libs/ncurses:= )
+	qt5? ( dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5 )
+	alsa? ( media-libs/alsa-lib )
+	pulseaudio? ( media-sound/pulseaudio )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	sys-devel/libtool
+	!<=app-misc/cw-1.0.16-r1"
+
+src_prepare() {
+	append-cflags -std=gnu11
+	append-cxxflags -std=gnu++11
+	epatch "${FILESDIR}"/$PN-3.5-tinfo.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf --libdir=/usr/$(get_libdir) \
+		$(use_enable pulseaudio ) \
+		$(use_enable alsa ) \
+		$(use_enable ncurses cwcp ) \
+		$(use_enable qt5 xcwcp )
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	prune_libtool_files
+	dodoc ChangeLog NEWS README
+	if ! use suid ; then
+		fperms 711 /usr/bin/cw
+		if use ncurses ; then
+			fperms 711 /usr/bin/cwcp
+		fi
+		if use qt5 ; then
+			fperms 711 /usr/bin/xcwcp
+		fi
+	fi
+}
+
+pkg_postinst() {
+	if use suid ; then
+		ewarn "You have choosen to install 'cw', 'cwcp' and 'xcwcp' setuid"
+		ewarn "by setting USE=suid."
+		ewarn "Be aware that this is a security risk and not recommended."
+		ewarn ""
+		ewarn "These files do only need root access if you want to use the"
+		ewarn "PC speaker for morse sidetone output. You can alternativly"
+		ewarn "drop USE=suid and use sudo."
+	else
+		elog "Be aware that 'cw', 'cwcp' and 'xcwcp' needs root access if"
+		elog "you want to use the PC speaker for morse sidetone output."
+		elog "You can call the programs via sudo for that (see 'man sudo')."
+	fi
+}


^ permalink raw reply related	[flat|nested] 5+ messages in thread
end of thread, other threads:[~2025-02-04  7:45 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-08-01  9:14 [gentoo-commits] repo/gentoo:master commit in: media-radio/unixcw/, media-radio/unixcw/files/ Thomas Beierlein
  -- strict thread matches above, loose matches on Subject: below --
2025-02-04  7:45 Thomas Beierlein
2023-06-18 13:03 Thomas Beierlein
2022-07-15 15:50 Thomas Beierlein
2017-03-07 12:47 Thomas Beierlein

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox