mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2025-12-21 09:07:26 -08:00
media-radio/wsjtx_improved: drop 2.8.0-r2, 3.0.0
Signed-off-by: Thomas Beierlein <tomjbe@gentoo.org>
This commit is contained in:
parent
880d5779b2
commit
7334e1d35f
@ -1,2 +1 @@
|
||||
DIST wsjtx-2.8.0_improved_PLUS_250501_qt6.tgz 32956533 BLAKE2B d74f7daa52b1e950f12ee45c46d4e0f92b9e177a8e67156adb5961c44f1e7cf78fb25d5b1615cb446b5855f0c2af6fe17320b16a85e2e9f6cc0860f66bb853cd SHA512 ec9c9415c070da39251862dc4bf07d75c42d1c1e0ad76075a045b34966148aa423a596886ca6ae7d6a8c5621ab9f8dbeae0478b692b4a361d6aaf10b2f8ebafa
|
||||
DIST wsjtx-3.0.0_improved_PLUS_250924_qt6.tgz 35003895 BLAKE2B 6649bdac6cc390e966398a37d5854009d8b540ce951557c186803cbd81c90a0d5428f816593b22b44e73ea82f8dab6c2b91ff6581ddac87f6f90d43ec852e5db SHA512 70d34e9d6b03549d7445689709766fb2e1be50a56b3a54c405e3d489a93a72fd8038ad2d7e02ddfbca6a9794fbd3a8c3e3c914fd0bb4a5de02a12cc1311fe309
|
||||
|
||||
@ -1,40 +0,0 @@
|
||||
diff --git a/widgets/logqso.cpp b/widgets/logqso.cpp
|
||||
index 3f81b4d..eed2835 100755
|
||||
--- a/widgets/logqso.cpp
|
||||
+++ b/widgets/logqso.cpp
|
||||
@@ -176,7 +176,7 @@ void LogQSO::loadSettings ()
|
||||
QString comments_location; // load the content of comments.txt file to the comments combo box
|
||||
QDir dataPath {QStandardPaths::writableLocation (QStandardPaths::AppDataLocation)};
|
||||
comments_location = dataPath.exists("comments.txt") ? dataPath.absoluteFilePath("comments.txt") : m_config->data_dir ().absoluteFilePath ("comments.txt");
|
||||
- QFile file2 = {comments_location};
|
||||
+ QFile file2 {comments_location};
|
||||
QTextStream stream2(&file2);
|
||||
if(file2.open (QIODevice::ReadOnly | QIODevice::Text)) {
|
||||
while (!stream2.atEnd()) {
|
||||
@@ -538,7 +538,7 @@ void LogQSO::on_addButton_clicked()
|
||||
if (m_comments_temp != "") {
|
||||
QString comments_location = m_config->writeable_data_dir().absoluteFilePath("comments.txt");
|
||||
if(QFileInfo::exists(m_config->writeable_data_dir().absoluteFilePath("comments.txt"))) {
|
||||
- QFile file2 = {comments_location};
|
||||
+ QFile file2 {comments_location};
|
||||
if (file2.open(QIODevice::WriteOnly | QIODevice::Text | QIODevice::Append)) {
|
||||
QTextStream out(&file2);
|
||||
out << m_comments_temp // append new line to comments.txt
|
||||
@@ -555,7 +555,7 @@ void LogQSO::on_addButton_clicked()
|
||||
"\"comments.txt\" from your log directory");
|
||||
}
|
||||
} else {
|
||||
- QFile file2 = {comments_location};
|
||||
+ QFile file2 {comments_location};
|
||||
if (file2.open(QIODevice::WriteOnly | QIODevice::Text | QIODevice::Append)) {
|
||||
QTextStream out(&file2);
|
||||
out << ("\n" + m_comments_temp) // create file "comments.txt" and add a blank line
|
||||
@@ -573,7 +573,7 @@ void LogQSO::on_addButton_clicked()
|
||||
}
|
||||
}
|
||||
ui->comments->clear(); // clear the comments combo box and reload updated content
|
||||
- QFile file2 = {comments_location};
|
||||
+ QFile file2 {comments_location};
|
||||
QTextStream stream2(&file2);
|
||||
if(file2.open (QIODevice::ReadOnly | QIODevice::Text)) {
|
||||
while (!stream2.atEnd()) {
|
||||
@ -1,66 +0,0 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index a4d37ad..aaf771e 100755
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -1733,7 +1733,7 @@ install (DIRECTORY
|
||||
|
||||
install (DIRECTORY
|
||||
${PROJECT_SOURCE_DIR}/sounds
|
||||
- DESTINATION ${CMAKE_INSTALL_BINDIR}
|
||||
+ DESTINATION ${CMAKE_INSTALL_DATADIR}/${CMAKE_PROJECT_NAME}
|
||||
#COMPONENT runtime
|
||||
)
|
||||
|
||||
diff --git a/widgets/displaytext.cpp b/widgets/displaytext.cpp
|
||||
index 371e7b6..66d6b23 100755
|
||||
--- a/widgets/displaytext.cpp
|
||||
+++ b/widgets/displaytext.cpp
|
||||
@@ -917,7 +917,7 @@ void DisplayText::AudioAlerts()
|
||||
{
|
||||
if(m_config->alert_Enabled()) {
|
||||
QAudioDevice info(QMediaDevices::defaultAudioOutput());
|
||||
- QString binPath = QCoreApplication::applicationDirPath();
|
||||
+ QString binPath = "/usr/share/wsjtx";
|
||||
QAudioFormat format;
|
||||
format.setSampleRate(48000);
|
||||
format.setChannelCount(1);
|
||||
diff --git a/widgets/mainwindow.cpp b/widgets/mainwindow.cpp
|
||||
index 04aadde..8ba7b4c 100755
|
||||
--- a/widgets/mainwindow.cpp
|
||||
+++ b/widgets/mainwindow.cpp
|
||||
@@ -2963,7 +2963,7 @@ void MainWindow::fastSink(qint64 frames)
|
||||
QTimer::singleShot (100, [=] { // UR delete for versions without alerts
|
||||
if ((m_config.alert_Enabled()) && (m_config.alert_DXcall()) && (play_DXcall) && (m_hisCall!="")) {
|
||||
QAudioDevice info(QMediaDevices::defaultAudioOutput());
|
||||
- QString binPath = QCoreApplication::applicationDirPath();
|
||||
+ QString binPath = "/usr/share/wsjtx";
|
||||
QAudioFormat format;
|
||||
format.setSampleRate(48000);
|
||||
format.setChannelCount(1);
|
||||
@@ -6475,7 +6475,7 @@ void MainWindow::readFromStdout() //readFromStdout
|
||||
QTimer::singleShot (100, [=] { // UR delete for versions without alerts
|
||||
if (m_config.alert_Enabled() && m_config.alert_DXcall() && play_DXcall && m_hisCall!="") {
|
||||
QAudioDevice info(QMediaDevices::defaultAudioOutput());
|
||||
- QString binPath = QCoreApplication::applicationDirPath();
|
||||
+ QString binPath = "/usr/share/wsjtx";
|
||||
QAudioFormat format;
|
||||
format.setSampleRate(48000);
|
||||
format.setChannelCount(1);
|
||||
@@ -9549,7 +9549,7 @@ void MainWindow::mousePressEvent(QMouseEvent *event) // mouse press events
|
||||
// Testing the default audio device
|
||||
if (ui->pbBandHopping->hasFocus() && event->button() & Qt::RightButton) {
|
||||
QAudioDevice info(QMediaDevices::defaultAudioOutput());
|
||||
- QString binPath = QCoreApplication::applicationDirPath();
|
||||
+ QString binPath = "/usr/share/wsjtx";
|
||||
QAudioFormat format;
|
||||
format.setSampleRate(48000);
|
||||
format.setChannelCount(1);
|
||||
@@ -15768,7 +15768,7 @@ void MainWindow::remove_old_files(const QString &directoryPath, int daysOld)
|
||||
void MainWindow::alertQSYmessage ()
|
||||
{
|
||||
QAudioDevice info(QMediaDevices::defaultAudioOutput());
|
||||
- QString binPath = QCoreApplication::applicationDirPath();
|
||||
+ QString binPath = "/usr/share/wsjtx";
|
||||
QAudioFormat format;
|
||||
format.setSampleRate(48000);
|
||||
format.setChannelCount(1);
|
||||
@ -1,76 +0,0 @@
|
||||
# Copyright 1999-2025 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
inherit cmake edos2unix flag-o-matic
|
||||
|
||||
DESCRIPTION="Weak signal ham radio communication with improvements"
|
||||
HOMEPAGE="https://wsjt-x-improved.sourceforge.io/"
|
||||
SRC_URI="https://downloads.sourceforge.net/wsjt-x-improved/wsjtx-${PV}_improved_PLUS_250501_qt6.tgz"
|
||||
|
||||
S=${WORKDIR}/wsjtx
|
||||
|
||||
LICENSE="GPL-3"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 ~x86"
|
||||
IUSE="doc"
|
||||
|
||||
RDEPEND="
|
||||
!media-radio/wsjtx
|
||||
dev-libs/boost:=[nls,python]
|
||||
dev-qt/qtbase:6[concurrent,gui,network,sql,sqlite,widgets]
|
||||
dev-qt/qtmultimedia:6
|
||||
dev-qt/qtserialport:6
|
||||
dev-qt/qtwebsockets:6
|
||||
virtual/libusb:1
|
||||
>=media-libs/hamlib-4.0:=
|
||||
sci-libs/fftw:3.0=[threads,fortran]
|
||||
virtual/fortran
|
||||
app-text/asciidoc
|
||||
doc? ( dev-ruby/asciidoctor )"
|
||||
DEPEND="${RDEPEND}"
|
||||
BDEPEND="dev-qt/qttools[linguist]"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/wsjtx-2.2.0-werror.patch"
|
||||
"${FILESDIR}/wsjtx-2.3.0-drop-docs.patch"
|
||||
"${FILESDIR}/wsjtx-clang.patch"
|
||||
"${FILESDIR}/wsjtx-fix-sound-dir.patch"
|
||||
"${FILESDIR}/wsjtx-2.8.0-qt691.patch"
|
||||
"${FILESDIR}/wsjtx-2.8.0-qt692-audio.patch"
|
||||
)
|
||||
|
||||
DOCS=( AUTHORS BUGS NEWS README THANKS )
|
||||
|
||||
src_unpack() {
|
||||
unpack ${A}
|
||||
unpack "${WORKDIR}/wsjtx-2.8.0/src/wsjtx.tgz"
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
edos2unix "${S}/message_aggregator.desktop"
|
||||
edos2unix "${S}/wsjtx.desktop"
|
||||
edos2unix "${S}/CMakeLists.txt"
|
||||
sed -i -e "s/COMMAND \${GZIP_EXECUTABLE}/# COMMAND/" \
|
||||
manpages/CMakeLists.txt || die
|
||||
cmake_src_prepare
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
# fails to compile with -flto (bug #860417)
|
||||
filter-lto
|
||||
|
||||
local mycmakeargs=(
|
||||
-DWSJT_GENERATE_DOCS="$(usex doc)"
|
||||
-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
|
||||
)
|
||||
append-ldflags -no-pie
|
||||
cmake_src_configure
|
||||
}
|
||||
|
||||
src_install() {
|
||||
cmake_src_install
|
||||
rm "${D}"/usr/bin/rigctl{,d,com}-wsjtx || die
|
||||
rm "${D}"/usr/share/man/man1/rigctl{,d,com}-wsjtx.1 || die
|
||||
}
|
||||
@ -1,75 +0,0 @@
|
||||
# Copyright 1999-2025 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
inherit cmake edos2unix flag-o-matic
|
||||
|
||||
DESCRIPTION="Weak signal ham radio communication with improvements"
|
||||
HOMEPAGE="https://wsjt-x-improved.sourceforge.io/"
|
||||
SRC_URI="https://downloads.sourceforge.net/wsjt-x-improved/wsjtx-${PV}_improved_PLUS_250924_qt6.tgz"
|
||||
|
||||
S=${WORKDIR}/wsjtx
|
||||
|
||||
LICENSE="GPL-3"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="doc"
|
||||
|
||||
RDEPEND="
|
||||
!media-radio/wsjtx
|
||||
dev-libs/boost:=[nls,python]
|
||||
dev-qt/qtbase:6[concurrent,gui,network,sql,sqlite,widgets]
|
||||
dev-qt/qtmultimedia:6
|
||||
dev-qt/qtserialport:6
|
||||
dev-qt/qtwebsockets:6
|
||||
virtual/libusb:1
|
||||
>=media-libs/hamlib-4.0:=
|
||||
sci-libs/fftw:3.0=[threads,fortran]
|
||||
virtual/fortran
|
||||
app-text/asciidoc
|
||||
doc? ( dev-ruby/asciidoctor )"
|
||||
DEPEND="${RDEPEND}"
|
||||
BDEPEND="dev-qt/qttools[linguist]"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/wsjtx-2.2.0-werror.patch"
|
||||
"${FILESDIR}/wsjtx-2.3.0-drop-docs.patch"
|
||||
"${FILESDIR}/wsjtx-clang.patch"
|
||||
"${FILESDIR}/wsjtx-3.0.0-fix-sound-dir.patch"
|
||||
"${FILESDIR}/wsjtx-2.8.0-qt692-audio.patch"
|
||||
)
|
||||
|
||||
DOCS=( AUTHORS BUGS NEWS README THANKS )
|
||||
|
||||
src_unpack() {
|
||||
unpack ${A}
|
||||
unpack "${WORKDIR}/wsjtx-3.0.0/src/wsjtx.tgz"
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
edos2unix "${S}/message_aggregator.desktop"
|
||||
edos2unix "${S}/wsjtx.desktop"
|
||||
edos2unix "${S}/CMakeLists.txt"
|
||||
sed -i -e "s/COMMAND \${GZIP_EXECUTABLE}/# COMMAND/" \
|
||||
manpages/CMakeLists.txt || die
|
||||
cmake_src_prepare
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
# fails to compile with -flto (bug #860417)
|
||||
filter-lto
|
||||
|
||||
local mycmakeargs=(
|
||||
-DWSJT_GENERATE_DOCS="$(usex doc)"
|
||||
-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
|
||||
)
|
||||
append-ldflags -no-pie
|
||||
cmake_src_configure
|
||||
}
|
||||
|
||||
src_install() {
|
||||
cmake_src_install
|
||||
rm "${D}"/usr/bin/rigctl{,d,com}-wsjtx || die
|
||||
rm "${D}"/usr/share/man/man1/rigctl{,d,com}-wsjtx.1 || die
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user