Compare commits
22 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e129e589c5 | ||
|
|
40e17129cb | ||
|
|
dd1a4d394e | ||
|
|
530d13e147 | ||
|
|
02edd485b0 | ||
|
|
54d76ce918 | ||
|
|
eb0ee5155b | ||
|
|
83921f6648 | ||
|
|
9fc42fa97b | ||
|
|
5aabdcfacf | ||
|
|
3d4b546e5c | ||
|
|
51fd54e4f6 | ||
|
|
87454f5e48 | ||
|
|
75fb571ccf | ||
|
|
fc11d2963c | ||
|
|
6ba62d3827 | ||
|
|
961daff039 | ||
|
|
c3c42ffdd8 | ||
|
|
40cd357d1d | ||
|
|
6e7de74270 | ||
|
|
8901954212 | ||
|
|
37e1b6f15d |
2 changed files with 96 additions and 5 deletions
35
linpsk-comparison.patch
Normal file
35
linpsk-comparison.patch
Normal file
|
|
@ -0,0 +1,35 @@
|
|||
diff --git a/gui/crxdisplay.cpp b/gui/crxdisplay.cpp
|
||||
index 704207d..792876d 100644
|
||||
--- a/gui/crxdisplay.cpp
|
||||
+++ b/gui/crxdisplay.cpp
|
||||
@@ -78,7 +78,7 @@ bool CRxDisplay::start_process_loop()
|
||||
Sound = new WaveInput ( -1 );
|
||||
else
|
||||
Sound = new CSound ( settings.serial );
|
||||
- if ( Sound <= NULL )
|
||||
+ if ( Sound == NULL )
|
||||
return false;
|
||||
|
||||
connect ( Sound, SIGNAL ( samplesAvailable() ), this, SLOT ( process_rxdata() ) );
|
||||
diff --git a/gui/linpsk.cpp b/gui/linpsk.cpp
|
||||
index 5c8ff80..d6c6c0a 100644
|
||||
--- a/gui/linpsk.cpp
|
||||
+++ b/gui/linpsk.cpp
|
||||
@@ -410,7 +410,7 @@ void LinPSK::startTx()
|
||||
Modulator = new BpskModulator ( 11025, Frequency, TxBuffer );
|
||||
break; */
|
||||
}
|
||||
- if ( Sound <= NULL ) // Only create Sound Device once for output
|
||||
+ if ( Sound == NULL ) // Only create Sound Device once for output
|
||||
{
|
||||
if ( settings.DemoMode )
|
||||
{
|
||||
@@ -421,7 +421,7 @@ void LinPSK::startTx()
|
||||
Sound = new CSound ( settings.serial );
|
||||
connect ( Sound, SIGNAL ( samplesAvailable() ), this, SLOT ( process_txdata() ) );
|
||||
}
|
||||
- if ( Sound <= NULL )
|
||||
+ if ( Sound == NULL )
|
||||
{
|
||||
QMessageBox::critical ( 0, " Programm Error! LinPsk", "Could not create Sound Device for Output" );
|
||||
TxDisplay->TxFunctions->setStatus ( ON );
|
||||
66
linpsk.spec
66
linpsk.spec
|
|
@ -1,10 +1,10 @@
|
|||
Name: linpsk
|
||||
Version: 1.3.5
|
||||
Release: 2%{?dist}
|
||||
Release: 20%{?dist}
|
||||
Summary: Psk31 and RTTY program for Linux
|
||||
|
||||
Group: Applications/Communications
|
||||
License: GPLv2+
|
||||
# Automatically converted from old format: GPLv2+ - review is highly recommended.
|
||||
License: GPL-2.0-or-later
|
||||
URL: http://linpsk.sourceforge.net/
|
||||
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
|
||||
# Add .desktop file
|
||||
|
|
@ -16,12 +16,14 @@ Source3: %{name}_64x64.png
|
|||
|
||||
# Patch asoundrc file for default sound card (device 0)
|
||||
Patch0: linpsk-1.1-3.sound.conf.patch
|
||||
Patch1: linpsk-comparison.patch
|
||||
|
||||
|
||||
BuildRequires: fftw-devel
|
||||
BuildRequires: qt-devel
|
||||
BuildRequires: alsa-lib-devel
|
||||
BuildRequires: desktop-file-utils
|
||||
BuildRequires: make
|
||||
|
||||
#Requires:
|
||||
|
||||
|
|
@ -47,7 +49,8 @@ At the Moment RTTY only supports 45 baud and 1.5 stop-bits.
|
|||
#fix permissions for debuginfo files
|
||||
chmod 0644 src/{rttydemodulator.cpp,rttydemodulator.h}
|
||||
|
||||
%patch0 -p1 -b 3.sound.conf
|
||||
%patch -P0 -p1 -b 3.sound.conf
|
||||
%patch -P1 -p1 -b comparison
|
||||
|
||||
%build
|
||||
%{qmake_qt4} -unix -o Makefile %{name}.pro
|
||||
|
|
@ -81,7 +84,6 @@ desktop-file-install \
|
|||
find %{buildroot} -type f -name "*.a" -exec rm -f {} ';'
|
||||
|
||||
%files
|
||||
%defattr(-,root,root,-)
|
||||
%doc COPYING ChangeLog README
|
||||
%{_bindir}/%{name}
|
||||
%{_datadir}/pixmaps/%{name}.png
|
||||
|
|
@ -90,6 +92,60 @@ find %{buildroot} -type f -name "*.a" -exec rm -f {} ';'
|
|||
%{_libexecdir}/%{name}-bin
|
||||
|
||||
%changelog
|
||||
* Thu Jul 24 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.5-20
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
|
||||
|
||||
* Fri Jan 17 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.5-19
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
|
||||
|
||||
* Fri Jul 26 2024 Miroslav Suchý <msuchy@redhat.com> - 1.3.5-18
|
||||
- convert license to SPDX
|
||||
|
||||
* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.5-17
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
|
||||
|
||||
* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.5-16
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.5-15
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.5-14
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
||||
|
||||
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.5-13
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||
|
||||
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.5-12
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||
|
||||
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.5-11
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||
|
||||
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.5-10
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||
|
||||
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.5-9
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.5-8
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Mon Jul 27 2020 Jeff Law <law@redhat.com> - 1.3.5-7
|
||||
- Avoid ordered pointer comparison against 0 which is an error in C++17
|
||||
|
||||
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.5-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.5-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.5-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.5-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.5-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue