pool/qsstv
SHA256
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update to 7.1.7 and some improvements

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/hamradio/qsstv?expand=0&rev=11
This commit is contained in:
Walter Fey 2012-12-16 20:53:10 +00:00 committed by Git OBS Bridge
parent 3b48f71d2e
commit 3c4befda10
16 changed files with 189 additions and 3279 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Fix-mix-ui-form.patch Normal file
View File

@ -0,0 +1,12 @@
--- a/src/src.pro 2012-01-04 22:11:46.000000000 +0100
+++ b/src/src.pro 2012-11-04 18:38:43.245069169 +0100
@@ -74,7 +74,8 @@
gallerywidget.ui \
rxwidget.ui \
txwidget.ui \
- sweepform.ui
+ sweepform.ui \
+ plotform.ui
HEADERS += imageviewer.h \

10
fix-no-return-in-nonvoid-function-logging.cpp.patch Normal file
View File

@ -0,0 +1,10 @@
--- a/src/logging.cpp 2011-12-27 16:58:39.000000000 +0100
+++ b/src/logging.cpp 2012-12-16 18:52:48.823278586 +0100
@@ -91,6 +91,7 @@
auxFile->setFileName(QDir::homePath()+"/aux_"+logname);
return reopen();
#endif
+return TRUE;
}

3
qsstv-5.3c.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:da435c51216c8c68de9593ef747287cae04cfa95d3f615b15a7cb08722a85d54
size 1010568

24
qsstv-fix-html-doc-path.patch Normal file
View File

@ -0,0 +1,24 @@
diff -Naur qsstv_7.1.7.orig/src/configdialog.cpp qsstv_7.1.7/src/configdialog.cpp
--- qsstv_7.1.7.orig/src/configdialog.cpp 2011-12-29 05:06:12.000000000 -0600
+++ qsstv_7.1.7/src/configdialog.cpp 2012-08-06 13:40:42.420234818 -0500
@@ -100,7 +100,7 @@
txImagesPath=qSettings.value("txImagesPath",QString(getenv("HOME"))+"/").toString();
templatesPath=qSettings.value("templatesPath",QString(getenv("HOME"))+"/").toString();
audioPath=qSettings.value("audioPath",QString(getenv("HOME"))+"/").toString();
- docPath =qSettings.value("docPath",QString("/usr/share/doc/qsstv/")).toString();
+ docPath =qSettings.value("docPath",QString("/usr/share/doc/packages/qsstv/html/")).toString();
defaultImageFormat=qSettings.value("defaultImageFormat","png").toString();
samplingrate=qSettings.value("samplingrate",11025).toInt();
rxClock=qSettings.value("rxclock",11025.).toDouble();
diff -Naur qsstv_7.1.7.orig/src/src.pro qsstv_7.1.7/src/src.pro
--- qsstv_7.1.7.orig/src/src.pro 2012-01-04 15:11:46.000000000 -0600
+++ qsstv_7.1.7/src/src.pro 2012-08-06 13:38:58.357540295 -0500
@@ -180,7 +180,7 @@
QMAKE_EXTRA_TARGETS += dox
message(dox will be generated)
}
-dox.path=/usr/share/doc/$$TARGET
+dox.path=/usr/share/doc/packages/$$TARGET/html
dox.files= $$PWD/documentation/html/*
LIBS += -L/usr/lib64 \

14
qsstv-fix-target-path.patch Normal file
View File

@ -0,0 +1,14 @@
Change target.path from /usr/local/bin to /usr/bin so that it complies with
our file system standard.
--- a/src/src.pro
+++ b/src/src.pro
@@ -190,7 +190,7 @@
-lasound \
-lhamlib
-target.path=/usr/local/bin
+target.path=/usr/bin
target.extra = strip $(TARGET); cp -f $(TARGET) $${PREFIX}/bin/$(TARGET)
INSTALLS +=target
INSTALLS +=dox

20
qsstv-gcc47_unistd.patch Normal file
View File

@ -0,0 +1,20 @@
Description: Fix FTBFS with GCC 4.7
This patch fixes wavio.cpp:285:33: error: 'lseek' was not declared in this
scope which resulted from the upgrade to GCC 4.7. This erro was detected
during a QA rebuild of all packages in sid.
.
Author: Martijn van Brummelen <martijn@brumit.nl>
Bug-Debian: http://bugs.debian.org/672079
Forwarded: no
Last-Update: 2012-05-08
--- qsstv-7.1.7.orig/src/wavio.cpp
+++ qsstv-7.1.7/src/wavio.cpp
@@ -34,6 +34,7 @@
#include <qfiledialog.h>
#include "configparams.h"
#include "supportfunctions.h"
+#include <unistd.h>
//#include "qfilterdesignglobal.h"

21
qsstv.1 Normal file
View File

@ -0,0 +1,21 @@
.TH QSSTV 1
.SH NAME
qsstv \- Qt based slow scan television and fax
.SH SYNOPSIS
.B qsstv
.SH DESCRIPTION
.B qsstv
is a program for sending and receiving slow-scan TV and fax.
These are modes used by hamradio operators.
Qsstv uses a soundcard to send and receive images.
.SH SEE ALSO
The qsstv documentation in html format in
/usr/share/doc/qsstv/html.
.SH FILES
Settings for qsstv are saved in
.I $HOME/qsstv.conf

21
qsstv.changes Normal file
View File

@ -0,0 +1,21 @@
-------------------------------------------------------------------
Sun Dec 16 18:08:58 UTC 2012 - p.drouand@gmail.com
- Update to 7.1.7 version:
* Complete rewrite of 5.3.x versions
- Remove patchs (fixed on upstream release):
* qsstv_config_guess.diff
* qsstv_config_sub.diff
* qsstv_qsstv_repeater_cpp.diff
* qsstv_repeater_2.diff
- Added patchs:
* Fix-mix-ui-form.patch
* fix-no-return-in-nonvoid-function-logging.cpp.patch
* qsstv-fix-html-doc-path.patch
* qsstv-fix-target-path.patch
* qsstv-gcc47_unistd.patch
- Add a man documentation file for qsstv binary
- Add a desktop file
- Add a changes file to get more opensuse compliant
- Clean the specfile

10
qsstv.desktop Normal file
View File

@ -0,0 +1,10 @@
[Desktop Entry]
Name=qsstv
GenericName=qsstv
Comment=Qt-based slow-scan TV and fax
Exec=qsstv
Icon=qsstv
Terminal=false
Type=Application
Categories=Network;HamRadio;
Version=1.0

3
qsstv.png
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d4211ddd5ca15fb14b6158d05dab8af6f0d1b4b203d03ffcc4f522cc571e1b55
size 591

255
qsstv.spec
View File

@ -1,219 +1,72 @@
# norootforbuild
Name: qsstv
Summary: QSSTV is an sstv app
Version: 5.3c
Release: 1
License: GPL
Group: Productivity/Hamradio/Digital
Source: %{name}-%{version}.tar.bz2
Source1: qsstv.png
Patch: qsstv_config_guess.diff
Patch1: qsstv_config_sub.diff
Patch2: qsstv_qsstv_repeater_cpp.diff
%if 0%{?suse_version} > 1030
Patch3: qsstv_repeater_2.diff
%endif
BuildRoot: %{_tmppath}/build-root-%{name}
#Packager: DL9PF <dl9pf@gmx.de>
Distribution: %distribution
Prefix: /usr
Url: http://
#Vendor: Yourvendor <if needed>
# Installation dependency requirements
##########################
## SUSE, SLES, openSUSE ##
##########################
#%if 0%{?suse_version}
#Requires: gtk2
#%endif
#%if 0%{?suse_version} == 1020
#Requires:
#%endif
#%if 0%{?suse_version} == 1010
#Requires:
#%endif
#%if 0%{?suse_version} == 1000
#Requires:
#%endif
#%if 0%{?suse_version} == 930
#Requires:
#%endif
#%if 0%{?sles_version} == 10
#Requires:
#%endif
#%if 0%{?sles_version} == 9
#Requires:
#%endif
##########################
## Fedora Core ##
##########################
%if 0%{?fedora_version} == 4
Requires:
%endif
%if 0%{?fedora_version} == 5
Requires:
%endif
%if 0%{?fedora_version} == 6
Requires:
%endif
##########################
## Mandriva ##
##########################
%if 0%{?mandriva_version} == 2006
Requires:
%endif
%if 0%{?mandriva_version} == 2007
Requires:
%endif
# Build dependency requirements
##########################
## SUSE, SLES, openSUSE ##
##########################
%if 0%{?suse_version}
BuildRequires: qt3 qt3-devel libjpeg-devel update-desktop-files
%endif
#%if 0%{?suse_version} == 1020
#BuildRequires:
#%endif
#%if 0%{?suse_version} == 1010
#BuildRequires:
#%endif
#%if 0%{?suse_version} == 1000
#BuildRequires:
#%endif
#%if 0%{?suse_version} == 930
#BuildRequires:
#%endif
#%if 0%{?sles_version} == 10
#BuildRequires:
#%endif
#%if 0%{?sles_version} == 9
#BuildRequires:
#%endif
##########################
## Fedora Core ##
##########################
%if 0%{?fedora_version} == 4
BuildRequires:
%endif
%if 0%{?fedora_version} == 5
BuildRequires:
%endif
%if 0%{?fedora_version} == 6
BuildRequires:
%endif
##########################
## Mandriva ##
##########################
%if 0%{?mandriva_version} == 2006
BuildRequires:
%endif
%if 0%{?mandriva_version} == 2007
BuildRequires:
%endif
Name: qsstv
Summary: Qt-based slow-scan TV and fax
Version: 7.1.7
Release: 0
License: GPL-3.0
Group: Productivity/Hamradio/Other
Url: http://users.telenet.be/on4qz/qsstv/
Source: %{name}_%{version}.tar.bz2
Source1: qsstv.desktop
Source2: qsstv.1
Patch0: qsstv-fix-html-doc-path.patch
Patch1: qsstv-fix-target-path.patch
Patch2: qsstv-gcc47_unistd.patch
Patch3: Fix-mix-ui-form.patch
Patch4: fix-no-return-in-nonvoid-function-logging.cpp.patch
BuildRequires: fftw3-devel
BuildRequires: libqt4-devel
BuildRequires: update-desktop-files
BuildRequires: alsa-devel
BuildRequires: hamlib-devel
BuildRequires: libqwt5-devel
BuildRequires: gcc-c++
BuildRequires: fdupes
BuildRoot: %{_tmppath}/build-root-%{name}
%description
qsstv is an sstv app You can send and receive images sent over radio using your soundcard.
#%package -n %{name}-data
#Summary: Data files used by the bongo system
#Group: Servers/Messaging
#Requires: %{name} = %{version}
#Provides: %{name}-data = %{version}
#
#%description -n %{name}-data
#Data files used by the bongo system
Qsstv is a program for receiving slow-scan television and fax. These are
modes used by hamradio operators. Qsstv uses a soundcard to send and
receive images.
%prep
rm -rf $RPM_BUILD_ROOT
mkdir $RPM_BUILD_ROOT
%setup -q
%patch -p1
%patch1 -p1
%patch2 -p1
%if 0%{?suse_version} > 1030
%setup -q -n %{name}_%{version}
%patch0 -p1 -b .docpath
%patch1 -p1 -b .targetpath
%patch2 -p1 -b .gcc47
%patch3 -p1
%endif
%patch4 -p1
# Don't strip the executable so debuginfo package can be built.
sed -i 's| strip $(TARGET);||g' src/src.pro
%build
#mv configure configure2
#aclocal
#autoheader
#autoconf
#automake
#mv configure configure2
#cat configure2 | sed -e 's!/usr/share/qt3!/usr/lib64/qt3!' > configure
#chmod u+x configure
#cat configure | grep /usr/lib/qt3
%configure --prefix=%{prefix} --libdir=%{_libdir} --mandir=%{_mandir} --infodir=%{_infodir} --sysconfdir=%{_sysconfdir} --with-qt-libraries=/usr/%_lib/qt3/%_lib \
%ifarch x86_64 ppc64 s390x
--enable-libsuffix=64
%endif
tail -n51 config.log
# ./configure --prefix=%{prefix} --libdir=%_libdir
make
qmake -makefile %{name}_%{version}.pro PREFIX=%{_prefix} QMAKE_CFLAGS="%optflags" QMAKE_CXXFLAGS="%optflags"
%__make %{?_smp_mflags}
%install
mkdir -p $RPM_BUILD_ROOT/etc/init.d
make DESTDIR=$RPM_BUILD_ROOT install
#mkdir -p $RPM_BUILD_ROOT/usr/share/icons
#install -D /usr/src/packages/SOURCES/qsstv.png $RPM_BUILD_ROOT/usr/share/icons/qsstv.png
mkdir -p %{buildroot}/%{_bindir}
cp -f src/%{name} %{buildroot}/%{_bindir}/%{name}
# Remove redundant documentation files
%fdupes -s src/documentation/html/*
cd $RPM_BUILD_ROOT
# Make suse_update_desktop_file be able to find the qsstv icon
cp src/icons/%{name}.png %_sourcedir
%suse_update_desktop_file -c qsstv Qsstv "SSTV Application" qsstv qsstv "Network;HamRadio"
# Install man page borrowed from Debian
mkdir -p %{buildroot}%{_mandir}/man1
install -pm 0644 %{SOURCE2} %{buildroot}%{_mandir}/man1/
%post
#Copy the default apache config to the correct directory
%suse_update_desktop_file -i %{name}
##########################
## SUSE, SLES, openSUSE ##
##########################
%if 0%{?suse_version}
%endif
##########################
## Fedora Core ##
##########################
%if 0%{?fedora_version}
%endif
##########################
## Mandriva ##
##########################
%if 0%{?mandriva_version}
%endif
%clean
rm -rf $RPM_BUILD_ROOT
%files -n %{name}
%defattr(-,root,root,0755)
%{prefix}/bin/*
%dir %{prefix}/share/%{name}
%{prefix}/share/%{name}/
#%{prefix}/man/man1/
%doc AUTHORS ChangeLog COPYING Doxyfile INSTALL README TODO
/usr/share/applications/qsstv.desktop
/usr/share/pixmaps/qsstv.png
#/usr/share/icons/qsstv.png
%files
%defattr(-,root,root,-)
%doc COPYING src/documentation/html/*
%{_bindir}/*
%{_datadir}/pixmaps/%{name}.png
%{_datadir}/applications/%{name}.desktop
%{_mandir}/man1/%{name}.1*
%changelog
* Thu May 13 2010 - dl8fcl@darc.de
- Fixed BuildRequires for openSUSE_Factory
* Tue Oct 21 2008 - dl8fcl@darc.de
- Desktop file added
* Sat Oct 04 2008 - dl9pf@gmx.de
- Fixed for Factory

3
qsstv_7.1.7.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:935e86da9aceea73ef81d95d1cfcf5faffbc4ce6d28adc2eb1155ecdb7e9ad62
size 2114404

1469
qsstv_config_guess.diff
View File

File diff suppressed because it is too large Load Diff

1582
qsstv_config_sub.diff
View File

File diff suppressed because it is too large Load Diff

10
qsstv_qsstv_repeater_cpp.diff
View File

@ -1,10 +0,0 @@
--- qsstv-5.3c/qsstv/repeater.cpp 2002-07-06 17:37:37.000000000 +0200
+++ qsstv-5.3c_new/qsstv/repeater.cpp 2007-06-22 07:45:05.034390932 +0200
@@ -51,6 +51,7 @@
void repeater::restartImageTimer()
{
+ irepImInterval = atoi(configFile.readOption("RepeaterImageInterval"));
imageTimer->stop();
if(irepImInterval>0)
{

11
qsstv_repeater_2.diff
View File

@ -1,11 +0,0 @@
diff -Nur qsstv-5.3c.orig/qsstv/repeater.h qsstv-5.3c/qsstv/repeater.h
--- qsstv-5.3c.orig/qsstv/repeater.h 2002-07-06 17:37:37.000000000 +0200
+++ qsstv-5.3c/qsstv/repeater.h 2008-06-04 22:27:23.000000000 +0200
@@ -2,6 +2,7 @@
#define REPEATER_H
#include "qobject.h"
#include <qtimer.h>
+#include <cstdlib>
class repeater: public QObject
{