Compare commits

...
Sign in to create a new pull request.

29 commits

Author SHA1 Message Date
Fedora Release Engineering
5642f2f14a Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild 2026-07-17 08:56:48 +00:00
Jaroslav Škarvada
6b7d92a212 Fixed build
Signed-off-by: Jaroslav Škarvada <jskarvad@redhat.com>
2026-05-04 16:59:00 +02:00
Jaroslav Škarvada
252764a18d New version
Resolves: rhbz#2464806
2026-05-04 16:18:49 +02:00
Jaroslav Škarvada
3107511312 Minor spec cleanup
Signed-off-by: Jaroslav Škarvada <jskarvad@redhat.com>
2026-04-15 00:08:53 +02:00
Jaroslav Škarvada
00686dbf86 Fixed building and some minor changes
Signed-off-by: Jaroslav Škarvada <jskarvad@redhat.com>
2026-04-14 18:11:12 +02:00
Jaroslav Škarvada
46480ecc51 New version 2026-04-14 15:59:03 +02:00
Fedora Release Engineering
6af8bb114e Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild 2026-01-17 20:23:09 +00:00
Jaroslav Škarvada
f9d89bdab8 Rebuilt for boost
Resolves: rhbz#2429735
2026-01-15 10:07:43 +01:00
Jaroslav Škarvada
eaf731bd39 Added patch
Signed-off-by: Jaroslav Škarvada <jskarvad@redhat.com>
2026-01-10 02:27:12 +01:00
Jaroslav Škarvada
b22913d80b New version 2026-01-10 02:26:36 +01:00
AsciiWolf
8217eb9acc Update AppStream metadata 2025-10-10 16:00:55 +02:00
Fedora Release Engineering
8882a691fa Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild 2025-07-25 20:33:38 +00:00
Richard Shaw
a506bea2c1 Update to 2.8.0 final release. 2025-03-30 20:30:17 -05:00
Richard Shaw
66a019d783 Rebuild for hamlib 4.6. 2025-02-05 20:56:18 -06:00
Fedora Release Engineering
764ee60941 Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild 2025-01-19 15:17:34 +00:00
Richard Shaw
cf20511687 Update to 2.7.0 RC8. 2025-01-07 20:52:43 -06:00
Richard Shaw
dcb21187da Hamlib no longer builds for i686. 2024-12-31 10:50:46 -06:00
Richard Shaw
1057968ef7 Rebuild for Hamlib 4.6. 2024-12-31 10:27:06 -06:00
Richard Shaw
1f300b23eb Update to 2.7.0 RC7. 2024-10-01 06:32:38 -05:00
Richard Shaw
8a6c20d03b Remove superfox binaries and patch build system. 2024-09-13 20:08:04 -05:00
Richard Shaw
837073e3d7 Update to 2.7.0 RC6. 2024-08-01 17:03:18 -05:00
Miroslav Suchý
3984584b35 convert GPLv3+ license to SPDX
This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4
2024-07-25 13:32:39 +02:00
Fedora Release Engineering
5e8ec731f9 Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild 2024-07-20 09:35:01 +00:00
Richard Shaw
733f9caaed Upload sources. 2024-01-23 21:19:15 -06:00
Richard Shaw
94b87de4c6 Update to 2.7.0 RC3. 2024-01-22 20:53:47 -06:00
Jonathan Wakely
eacccfb17e Rebuilt for Boost 1.83 2024-01-18 00:06:17 +00:00
Richard Shaw
ff1d82283b Include changes needed for 2.7.0. 2023-05-23 13:30:51 -05:00
Richard Shaw
9753a0edcc Rebuilt for Boost 1.81 2023-05-23 13:29:08 -05:00
Jonathan Wakely
3f438e2ef4 Rebuilt for Boost 1.81 2023-02-20 22:20:07 +00:00
5 changed files with 233 additions and 46 deletions

2
.gitignore vendored
View file

@ -1 +1,3 @@
/wsjtx-*.tgz
/wsjtx-3.0.0.tar.gz
/wsjtx-3.0.1.tar.gz

View file

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<component type="desktop">
<id>wsjtx.desktop</id>
<component type="desktop-application">
<id>edu.princeton.physics.WSJTX</id>
<launchable type="desktop-id">wsjtx.desktop</launchable>
<name>wsjtx</name>
<summary>Amateur Radio Weak Signal Operating</summary>
<developer_name>Joe Taylor and others</developer_name>
@ -76,12 +77,11 @@ are available for all three platforms.
<metadata_license>CC0-1.0</metadata_license>
<project_license>GPL-3.0+</project_license>
<url type="bugtracker">https://sourceforge.net/projects/wsjt/lists/wsjt-devel</url>
<url type="homepage">https://physics.princeton.edu/pulsar/K1JT/index.html</url>
<project_group>none</project_group>
<url type="homepage">https://wsjt.sourceforge.io/wsjtx.html</url>
<screenshots>
<screenshot type="default">
<caption>Main WSJT-X window</caption>
<image height="743" width="774">https://sourceforge.net/p/wsjt/wsjtx/ci/master/tree/doc/user_guide/en/images/main-ui.png?format=raw</image>
<image>https://sourceforge.net/p/wsjt/wsjtx/ci/master/tree/doc/user_guide/en/images/main-ui.png?format=raw</image>
</screenshot>
</screenshots>
<content_rating type="oars-1.1" />

View file

@ -1 +1 @@
SHA512 (wsjtx-2.6.1.tgz) = 0f151c10b75798ab28a01604b08981f399d612135b7e9ddc3e66f9121fd49c97bb9508ce649e342791705ee5e1247f8e461a31afa871ddd46da1cf7fd5826c74
SHA512 (wsjtx-3.0.1.tar.gz) = b1ba505f31e35908eba9f73be2995e20ba17b81b1ca16cbe13bed3f6f458bb7e8bd7f176fef83097edef3ea0823a73560cf421a8ea4b9d9e8cd8b0d31e6dd8a9

124
wsjtx-3.0.0-path-fix.patch Normal file
View file

@ -0,0 +1,124 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index cb951fd..d27c7c7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1832,7 +1832,7 @@ install (FILES
install (FILES
ALLCALL7.TXT
- DESTINATION ${CMAKE_INSTALL_BINDIR}
+ DESTINATION ${CMAKE_INSTALL_DATADIR}/${CMAKE_PROJECT_NAME}
#COMPONENT runtime
)
@@ -1845,7 +1845,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/Configuration.cpp b/Configuration.cpp
index f56139c..e896653 100644
--- a/Configuration.cpp
+++ b/Configuration.cpp
@@ -4979,7 +4979,7 @@ void Configuration::impl::on_voices_combo_box_currentIndexChanged (int /* index
void Configuration::impl::read_voices ()
{
- QString audioPath = QCoreApplication::applicationDirPath() + "/sounds/";
+ QString audioPath = "/usr/share/wsjtx/sounds/";
QString voiceList = audioPath + "voices.dat"; // load the content of voices.dat file to the voices combo box
QFile file2 {voiceList};
QStringList wordList;
@@ -5023,7 +5023,7 @@ void Configuration::impl::on_pb_test_alerts_clicked (bool)
effect->open(QIODevice::ReadOnly);
audio->start(effect);
#else
- QString audioPath = QCoreApplication::applicationDirPath() + "/sounds" + voicesPath_ + "/";
+ QString audioPath = "/usr/share/wsjtx/sounds" + voicesPath_ + "/";
QSound::play(audioPath + "Testing123.wav"); // for Linux and macOS
#endif
}
diff --git a/lib/ft8var/cwfilter.f90 b/lib/ft8var/cwfilter.f90
index 913c7e3..087bc70 100644
--- a/lib/ft8var/cwfilter.f90
+++ b/lib/ft8var/cwfilter.f90
@@ -17,7 +17,7 @@ subroutine cwfilter(first)
!note that with new, larger ALLCALL7.TXT files, dimensions of various ncall arrays may need to be increased in jt65_mod9.f90
!on 20250709 callj dim was increased from 9000 to 10000 when updated ALLCALL7.TXT file was added
if(first) then
- open(24,file='ALLCALL7.TXT',status='unknown') ! accepting Australian 7-char callsigns
+ open(24,file='/usr/share/wsjtx/ALLCALL7.TXT',status='unknown') ! accepting Australian 7-char callsigns
do i=1,MAXC
read(24,1004,end=20) line
1004 format(a80)
diff --git a/widgets/displaytext.cpp b/widgets/displaytext.cpp
index 1e2f642..421e032 100644
--- a/widgets/displaytext.cpp
+++ b/widgets/displaytext.cpp
@@ -931,7 +931,7 @@ void DisplayText::AudioAlerts()
connect(audio, SIGNAL(stateChanged(QAudio::State)), this, SLOT(handleStateChanged(QAudio::State)));
#else
if(m_config->alert_Enabled()) {
- QString audioPath = QCoreApplication::applicationDirPath() + "/sounds" + m_config->voicesPath() + "/";
+ QString audioPath = "/usr/share/wsjtx/sounds" + m_config->voicesPath() + "/";
#endif
QFile *effect2 = new QFile(this);
QFile *effect3 = new QFile(this);
diff --git a/widgets/mainwindow.cpp b/widgets/mainwindow.cpp
index b2c399e..0cb4b55 100644
--- a/widgets/mainwindow.cpp
+++ b/widgets/mainwindow.cpp
@@ -3381,7 +3381,7 @@ void MainWindow::fastSink(qint64 frames)
effect1->open(QIODevice::ReadOnly);
audio->start(effect1);
#else
- QString audioPath = QCoreApplication::applicationDirPath() + "/sounds" + m_config.voicesPath() + "/";
+ QString audioPath = "/usr/share/wsjtx/sounds" + m_config.voicesPath() + "/";
if (m_config.alert_DXcall() && play_DXcall) QSound::play(audioPath + "DXcall.wav"); // for Linux and macOS
else if (m_config.alert_DXcall() && play_Wanted) QSound::play(audioPath + "Wanted.wav"); // for Linux and macOS
#endif
@@ -7208,7 +7208,7 @@ void MainWindow::readFromStdout() //readFromStdout
effect1->open(QIODevice::ReadOnly);
audio->start(effect1);
#else
- QString audioPath = QCoreApplication::applicationDirPath() + "/sounds" + m_config.voicesPath() + "/";
+ QString audioPath = "/usr/share/wsjtx/sounds" + m_config.voicesPath() + "/";
if (m_config.alert_DXcall() && play_DXcall) QSound::play(audioPath + "DXcall.wav"); // for Linux and macOS
else if (m_config.alert_DXcall() && play_Wanted) QSound::play(audioPath + "Wanted.wav"); // for Linux and macOS
#endif
@@ -10404,7 +10404,7 @@ void MainWindow::mousePressEvent(QMouseEvent *event) // mouse press events
effect->open(QIODevice::ReadOnly);
audio->start(effect);
#else
- QString audioPath = QCoreApplication::applicationDirPath() + "/sounds" + m_config.voicesPath() + "/";
+ QString audioPath = "/usr/share/wsjtx/sounds" + m_config.voicesPath() + "/";
QSound::play(audioPath + "Testing_long.wav"); // for Linux and macOS
#endif
}
@@ -17332,7 +17332,7 @@ void MainWindow::on_actionErase_Ignore_List_triggered()
void MainWindow::read_ALLCALL7()
{
- static QFile AllCall7File {"ALLCALL7.TXT"};
+ static QFile AllCall7File {"/usr/share/wsjtx/ALLCALL7.TXT"};
QTextStream AllCall7Stream(&AllCall7File);
if(AllCall7File.open(QIODevice::ReadOnly | QIODevice::Text)) {
while (!AllCall7Stream.atEnd()) {
@@ -17379,11 +17379,11 @@ void MainWindow::alertQSYmessage ()
audio = new QAudioOutput(format, this);
connect(audio, SIGNAL(stateChanged(QAudio::State)), this, SLOT(handleStateChanged(QAudio::State)));
QFile *effect1 = new QFile(this);
- effect1->setFileName(QString("%1/%2").arg(binPath, "/sounds/Message.wav"));
+ effect1->setFileName(QString("%1/%2").arg("/usr/share/wsjtx", "/sounds/Message.wav"));
effect1->open(QIODevice::ReadOnly);
audio->start(effect1);
#else
QString binPath = QCoreApplication::applicationDirPath();
- QSound::play(binPath + "/sounds/Message.wav"); // for Linux and macOS
+ QSound::play("/usr/share/wsjtx/sounds/Message.wav"); // for Linux and macOS
#endif
}

View file

@ -1,18 +1,21 @@
#global rctag rc4
# for fortran nested functions that (still in 2026) in gfortran implementation uses
# trampolines that require executable stack
%undefine _hardened_linker_errors
Name: wsjtx
Version: 2.6.1
Release: 1%{?dist}
Version: 3.0.1
Release: 2%{?dist}
Summary: Weak Signal communication by K1JT
License: GPLv3+
URL: http://physics.princeton.edu/pulsar/k1jt/wsjtx.html
Source0: https://sourceforge.net/projects/wsjt/files/%{name}-%{version}%{?rctag:-%{rctag}}/%{name}-%{version}%{?rctag:-%{rctag}}.tgz
Source100: wsjtx.appdata.xml
License: GPL-3.0-or-later
URL: https://github.com/WSJTX/wsjtx
Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
Source100: edu.princeton.physics.WSJTX.metainfo.xml
ExcludeArch: i686
BuildRequires: cmake
BuildRequires: dos2unix
BuildRequires: tar
BuildRequires: gcc-c++
BuildRequires: gcc-gfortran
@ -20,12 +23,13 @@ BuildRequires: qt5-qtbase-devel
BuildRequires: qt5-linguist
BuildRequires: qt5-qtserialport-devel
BuildRequires: qt5-qtmultimedia-devel
BuildRequires: qt5-qtwebsockets-devel
BuildRequires: desktop-file-utils
BuildRequires: hamlib-devel
BuildRequires: fftw-devel
BuildRequires: libusbx-devel
BuildRequires: systemd-devel
%if 0%{?rhel}
%if 0%{?rhel} && 0%{?rhel} < 9
BuildRequires: boost169-devel
%else
BuildRequires: boost-devel
@ -36,6 +40,11 @@ BuildRequires: asciidoc
BuildRequires: rubygem-asciidoctor
BuildRequires: libappstream-glib
%endif
# Temporal fix, problem reported upstream
# https://github.com/WSJTX/wsjtx/issues/5
# https://www.mail-archive.com/wsjt-devel@lists.sourceforge.net/msg28480.html
Patch: wsjtx-3.0.0-path-fix.patch
%description
WSJT-X is a computer program designed to facilitate basic amateur radio
@ -46,24 +55,7 @@ from the Moon.
%prep
%setup -n %{name}-%{version}%{?rctag:-%{rctag}}
# remove bundled hamlib
rm -f src/hamlib*.tgz* src/hamlib*.tar.gz*
tar -xzf src/%{name}.tgz
# remove archive
rm -f src/wsjtx.tgz*
cd %{name}
%if ! 0%{?rhel} < 8
# remove bundled boost. EL 7 is not required version.
rm -rf boost
%endif
# convert CR + LF to LF
dos2unix *.ui *.iss *.txt
%autosetup -p1
%build
@ -72,13 +64,14 @@ dos2unix *.ui *.iss *.txt
# need to be fixed for this package to work with LTO
%define _lto_cflags %{nil}
# Workaround for build with gcc-10, problem reported upstream
export CFLAGS="%{optflags} -fcommon"
export LDFLAGS="%{?__global_ldflags}"
# -fcommon is a workaround for build with gcc-10, reported upstream
export CFLAGS="%{build_cflags} -fcommon -Wno-error=maybe-uninitialized"
# reported upstream
export CXXFLAGS="%{build_cxxflags} -Wno-error=maybe-uninitialized"
export LDFLAGS="%{build_ldflags}"
# workaround for hamlib check, i.e. for hamlib_LIBRARY_DIRS not to be empty
export PKG_CONFIG_ALLOW_SYSTEM_LIBS=1
cd %{name}
%cmake -Dhamlib_STATIC=FALSE \
-DBoost_NO_SYSTEM_PATHS=FALSE \
%if 0%{?rhel}
@ -92,11 +85,8 @@ cd %{name}
%install
cd %{name}
%cmake_install
dos2unix %{buildroot}%{_datadir}/applications/message_aggregator.desktop
# Make sure the right style is used.
desktop-file-edit --set-key=Exec --set-value="wsjtx --style=fusion" \
%{buildroot}/%{_datadir}/applications/%{name}.desktop
@ -105,33 +95,35 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/wsjtx.desktop
desktop-file-validate %{buildroot}%{_datadir}/applications/message_aggregator.desktop
%if 0%{?fedora}
# appdata file
# metainfo file
mkdir -p %{buildroot}%{_metainfodir}
install -pm 0644 %{SOURCE100} %{buildroot}%{_metainfodir}/
%endif
# fix docs
install -p -m 0644 -t %{buildroot}%{_datadir}/doc/%{name} GUIcontrols.txt jt9.txt \
v1.7_Features.txt wsjtx_changelog.txt
v1.7_Features.txt wsjtx_changelog.txt NEWS README THANKS
# drop wsjtx hamlib bins
# drop copies of the hamlib bins
# https://github.com/WSJTX/wsjtx/issues/6
rm -f %{buildroot}%{_bindir}/rigctl*-wsjtx
%if 0%{?fedora}
%check
appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.appdata.xml
appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.metainfo.xml
%endif
%files
%license COPYING
%doc %{_datadir}/doc/%{name}
%{_bindir}/cablog
%{_bindir}/echosim
%{_bindir}/fcal
%{_bindir}/fmeasure
%{_bindir}/fmtave
%{_bindir}/fst4sim
%{_bindir}/hash22calc
%{_bindir}/jt4code
%{_bindir}/jt65code
%{_bindir}/jt9
@ -139,12 +131,16 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.appdata.xml
%{_bindir}/ft8code
%{_bindir}/message_aggregator
%{_bindir}/msk144code
%{_bindir}/qmap
%{_bindir}/q65sim
%{_bindir}/q65code
%{_bindir}/udp_daemon
%{_bindir}/wsjtx
%{_bindir}/wsjtx_app_version
%{_bindir}/wsprd
%{_bindir}/EchoCallSim
%{_bindir}/ft8sim
%{_bindir}/testEchoCall
%{?fedora:%{_mandir}/man1/*.1.gz}
%{?fedora:%{_metainfodir}/*.xml}
%{_datadir}/applications/wsjtx.desktop
@ -154,6 +150,71 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.appdata.xml
%changelog
* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
* Mon May 04 2026 Jaroslav Škarvada <jskarvad@redhat.com> - 3.0.1-1
- New version
Resolves: rhbz#2464806
* Tue Apr 14 2026 Jaroslav Škarvada <jskarvad@redhat.com> - 3.0.0-1
- New version
* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.0~rc1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
* Thu Jan 15 2026 Jaroslav Škarvada <jskarvad@redhat.com> - 3.0.0~rc1-2
- Rebuilt for boost
Resolves: rhbz#2429735
* Mon Jan 05 2026 Jaroslav Škarvada <jskarvad@redhat.com> - 3.0.0~rc1-1
- New version
* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.7.0-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
* Mon Mar 31 2025 Richard Shaw <hobbes1069@gmail.com> - 2.7.0-13
- Update to 2.8.0 final release.
* Thu Feb 06 2025 Richard Shaw <hobbes1069@gmail.com> - 2.7.0-12
- Rebuild for hamlib 4.6.
* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.7.0-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
* Tue Jan 07 2025 Richard Shaw <hobbes1069@gmail.com> - 2.7.0-10
- Update to 2.7.0 RC8.
* Tue Dec 31 2024 Richard Shaw <hobbes1069@gmail.com> - 2.7.0-9
- Rebuild for Hamlib 4.6.
* Tue Oct 01 2024 Richard Shaw <hobbes1069@gmail.com> - 2.7.0-8
- Update to 2.7.0 RC7.
* Sat Sep 14 2024 Richard Shaw <hobbes1069@gmail.com> - 2.7.0-7
- Remove superfox binaries and patch build system.
* Thu Aug 1 2024 Richard Shaw <hobbes1069@gmail.com> - 2.7.0-6
- Update to 2.7.0 RC6.
* Thu Jul 25 2024 Miroslav Suchý <msuchy@redhat.com> - 2.7.0-5
- convert license to SPDX
* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.7.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Mon Jul 01 2024 Richard Shaw <hobbes1069@gmail.com> - 2.7.0-5
- Update to 2.7.0 RC5.
* Mon Jan 22 2024 Richard Shaw <hobbes1069@gmail.com> - 2.7.0-3
- Update to 2.7.0 RC3.
* Thu Jan 18 2024 Jonathan Wakely <jwakely@redhat.com> - 2.7.0-2
- Rebuilt for Boost 1.83
* Mon Feb 20 2023 Jonathan Wakely <jwakely@redhat.com> - 2.6.1-2
- Rebuilt for Boost 1.81
* Thu Jan 19 2023 Richard Shaw <hobbes1069@gmail.com> - 2.6.1-1
- Update to 2.6.0.