Request 5858 (accepted)

Overview

Request 5858 (accepted)

Version 6.2

Created by wkazubski 7 months ago
In state accepted

Submit qt-dab

Submit package home:wkazubski:test / qt-dab to package home:wkazubski / qt-dab

qt-dab.changes Changed

@@ -1,14 +1,29 @@
 -------------------------------------------------------------------
-Sat Sep 30 21:46:13 UTC 2023 - Wojciech Kazubski <wk@ire.pw.edu.pl>
+Wed Oct 18 18:38:29 UTC 2023 - Wojciech Kazubski <wk@ire.pw.edu.pl>
 
-- update to release 4.7
+- update to release 6.2
+  * new GUI
+  * quite some rewriting of code parts
+  * the offsets (errors) in the decoded data are made visible by
+    computing - per carrier/bin - the development of the average offset.
+
+-------------------------------------------------------------------
+Sat Sep 30 21:47:02 UTC 2023 - Wojciech Kazubski <wk@ire.pw.edu.pl>
+
+- update to release 5.4
 - added a patch qt-dab-fix-build-with-gcc13.patch to fix build for
   Tumbleweed
 
 -------------------------------------------------------------------
 Wed Apr 26 21:46:23 UTC 2023 - Wojciech Kazubski <wk@ire.pw.edu.pl>
 
-- update to release 4.6
+- update to release 5.3
+
+-------------------------------------------------------------------
+Sun Aug 14 13:18:36 UTC 2022 - Wojciech Kazubski <wk@ire.pw.edu.pl>
+
+- update to release 5.0 (qt-dab-45)
+  * new front end design
 
 -------------------------------------------------------------------
 Tue Jun 28 21:16:53 UTC 2022 - Wojciech Kazubski <wk@ire.pw.edu.pl>

qt-dab4.changes Changed

qt-dab5.changes Changed

qt-dab.spec Changed

@@ -16,20 +16,20 @@
 #
 
 %define bname qt-dab
-%define branch qt-dab-s4
+%define branch qt-dab-s6
 %define version4 4.7
 %define version5 5.4
+%define version6 6.2
 
 Name:           %{bname}
-Version:        %{version4}
+Version:        %{version6}
 Release:        0
 License:        GPL-2.0-or-later
 Summary:        Simple DAB/DAB+ receiver
 Url:            http://www.sdr-j.tk/index.html
 Group:          Productivity/Multimedia/Other
-Source0:        https://github.com/JvanKatwijk/%{name}/archive/refs/tags/%{name}-%{version4}-%{version5}.tar.gz#/%{name}-%{name}-%{version4}-%{version5}.tar.gz
-Patch1:         %{bname}-45-use-qwt6-qt5.patch
-Patch2:         %{bname}-fix-build-with-gcc13.patch
+Source0:        https://github.com/JvanKatwijk/%{name}/archive/refs/tags/%{name}-%{version6}.tar.gz#/%{name}-Qt-DAB-%{version6}.tar.gz
+Patch1:         %{bname}-6.1-use-qwt6-qt5.patch
 BuildRequires:  cmake
 BuildRequires:  gcc-c++
 BuildRequires:  libqt5-qtbase-devel
@@ -56,11 +56,8 @@
 
 
 %prep
-%setup -q -n %{name}-%{name}-%{version4}-%{version5}
+%setup -q -n %{name}-Qt-DAB-%{version6}
 %patch1 -p 1
-%if 0%{?suse_version} > 1500
-%patch2 -p 1
-%endif
 
 
 %build
@@ -78,15 +75,29 @@
 cd %{branch}
 %cmake_install
 mkdir -p %{buildroot}%{_bindir}
-mv %{buildroot}/usr/%{name}-%{version} %{buildroot}%{_bindir}/%{name}-4
+mv %{buildroot}/usr/%{name}-%{version} %{buildroot}%{_bindir}/%{name}-6
 
 #install desktop file
-%suse_update_desktop_file -G Qt-DAB -i %{name}-4 AudioVideo Tuner 
+%suse_update_desktop_file -G Qt-DAB -i %{name}-6 AudioVideo Tuner 
 
 #create and install icons
-convert %{bname}-4.ico %{name}.png
-install -Dpm 0644 %{name}.png \
-	%{buildroot}%{_datadir}/pixmaps/%{name}.png
+convert %{bname}-6.ico %{name}.png
+install -Dpm 0644 %{name}-7.png \
+    %{buildroot}%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
+install -Dpm 0644 %{name}-6.png \
+    %{buildroot}%{_datadir}/icons/hicolor/24x24/apps/%{name}.png
+install -Dpm 0644 %{name}-5.png \
+    %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
+install -Dpm 0644 %{name}-4.png \
+    %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
+install -Dpm 0644 %{name}-3.png \
+    %{buildroot}%{_datadir}/icons/hicolor/64x64/apps/%{name}.png
+install -Dpm 0644 %{name}-2.png \
+    %{buildroot}%{_datadir}/icons/hicolor/72x72/apps/%{name}.png
+install -Dpm 0644 %{name}-1.png \
+    %{buildroot}%{_datadir}/icons/hicolor/96x96/apps/%{name}.png
+install -Dpm 0644 %{name}-0.png \
+    %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/%{name}.png
 
 #fix docs permissions
 chmod a-x ../README.md
@@ -96,8 +107,8 @@
 %doc AUTHORS README.md
 %license COPYING
 %{_bindir}/*
-%{_datadir}/applications/%{name}-4.desktop
-%{_datadir}/pixmaps/%{name}*.png
+%{_datadir}/applications/%{name}-6.desktop
+%{_datadir}/icons/hicolor/*x*/apps/%{name}.png
 
 
 %changelog

qt-dab4.spec Changed

@@ -19,17 +19,17 @@
 %define branch qt-dab-s4
 %define version4 4.7
 %define version5 5.4
+%define version6 6.2
 
-Name:           %{bname}
+Name:           %{bname}4
 Version:        %{version4}
 Release:        0
 License:        GPL-2.0-or-later
 Summary:        Simple DAB/DAB+ receiver
 Url:            http://www.sdr-j.tk/index.html
 Group:          Productivity/Multimedia/Other
-Source0:        https://github.com/JvanKatwijk/%{name}/archive/refs/tags/%{name}-%{version4}-%{version5}.tar.gz#/%{name}-%{name}-%{version4}-%{version5}.tar.gz
-Patch1:         %{bname}-45-use-qwt6-qt5.patch
-Patch2:         %{bname}-fix-build-with-gcc13.patch
+Source0:        https://github.com/JvanKatwijk/%{bname}/archive/refs/tags/%{bname}-%{version6}.tar.gz#/%{bname}-Qt-DAB-%{version6}.tar.gz
+Patch1:         %{bname}-6.1-use-qwt6-qt5.patch
 BuildRequires:  cmake
 BuildRequires:  gcc-c++
 BuildRequires:  libqt5-qtbase-devel
@@ -56,11 +56,12 @@
 
 
 %prep
-%setup -q -n %{name}-%{name}-%{version4}-%{version5}
+%setup -q -n %{bname}-Qt-DAB-%{version6}
 %patch1 -p 1
-%if 0%{?suse_version} > 1500
-%patch2 -p 1
-%endif
+
+#rename files
+mv src/scopes-qwt6/iqdisplay.cpp-xxx src/scopes-qwt6/iqdisplay.cpp
+mv includes/scopes-qwt6/iqdisplay.h-xxx includes/scopes-qwt6/iqdisplay.h
 
 
 %build
@@ -78,15 +79,29 @@
 cd %{branch}
 %cmake_install
 mkdir -p %{buildroot}%{_bindir}
-mv %{buildroot}/usr/%{name}-%{version} %{buildroot}%{_bindir}/%{name}-4
+mv %{buildroot}/usr/%{bname}-%{version} %{buildroot}%{_bindir}/%{name}-4
 
 #install desktop file
-%suse_update_desktop_file -G Qt-DAB -i %{name}-4 AudioVideo Tuner 
+%suse_update_desktop_file -G Qt-DAB -i %{bname}-4 AudioVideo Tuner 
 
 #create and install icons
 convert %{bname}-4.ico %{name}.png
-install -Dpm 0644 %{name}.png \
-	%{buildroot}%{_datadir}/pixmaps/%{name}.png
+install -Dpm 0644 %{name}-7.png \
+    %{buildroot}%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
+install -Dpm 0644 %{name}-6.png \
+    %{buildroot}%{_datadir}/icons/hicolor/24x24/apps/%{name}.png
+install -Dpm 0644 %{name}-5.png \
+    %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
+install -Dpm 0644 %{name}-4.png \
+    %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
+install -Dpm 0644 %{name}-3.png \
+    %{buildroot}%{_datadir}/icons/hicolor/64x64/apps/%{name}.png
+install -Dpm 0644 %{name}-2.png \
+    %{buildroot}%{_datadir}/icons/hicolor/72x72/apps/%{name}.png
+install -Dpm 0644 %{name}-1.png \
+    %{buildroot}%{_datadir}/icons/hicolor/96x96/apps/%{name}.png
+install -Dpm 0644 %{name}-0.png \
+    %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/%{name}.png
 
 #fix docs permissions
 chmod a-x ../README.md
@@ -96,8 +111,8 @@
 %doc AUTHORS README.md
 %license COPYING
 %{_bindir}/*
-%{_datadir}/applications/%{name}-4.desktop
-%{_datadir}/pixmaps/%{name}*.png
+%{_datadir}/applications/%{bname}-4.desktop
+%{_datadir}/icons/hicolor/*x*/apps/%{name}.png
 
 
 %changelog

qt-dab5.spec Changed

@@ -19,6 +19,7 @@
 %define branch qt-dab-s5
 %define version4 4.7
 %define version5 5.4
+%define version6 6.2
 
 Name:           %{bname}5
 Version:        %{version5}
@@ -27,9 +28,8 @@
 Summary:        Simple DAB/DAB+ receiver
 Url:            http://www.sdr-j.tk/index.html
 Group:          Productivity/Multimedia/Other
-Source0:        https://github.com/JvanKatwijk/%{bname}/archive/refs/tags/%{bname}-%{version4}-%{version5}.tar.gz#/%{bname}-%{bname}-%{version4}-%{version5}.tar.gz
-Patch1:         %{bname}-45-use-qwt6-qt5.patch
-Patch2:         %{bname}-fix-build-with-gcc13.patch
+Source0:        https://github.com/JvanKatwijk/%{bname}/archive/refs/tags/%{bname}-%{version6}.tar.gz#/%{bname}-Qt-DAB-%{version6}.tar.gz
+Patch1:         %{bname}-6.1-use-qwt6-qt5.patch
 BuildRequires:  cmake
 BuildRequires:  gcc-c++
 BuildRequires:  libqt5-qtbase-devel
@@ -56,11 +56,12 @@
 
 
 %prep
-%setup -q -n %{bname}-%{bname}-%{version4}-%{version5}
+%setup -q -n %{bname}-Qt-DAB-%{version6}
 %patch1 -p 1
-%if 0%{?suse_version} > 1500
-%patch2 -p 1
-%endif
+
+#rename files
+mv src/scopes-qwt6/iqdisplay.cpp-xxx src/scopes-qwt6/iqdisplay.cpp
+mv includes/scopes-qwt6/iqdisplay.h-xxx includes/scopes-qwt6/iqdisplay.h
 
 
 %build

qt-dab-45-use-qwt6-qt5.patch -> qt-dab-6.1-use-qwt6-qt5.patch Changed

@@ -1,6 +1,6 @@
-diff -up qt-dab-qt-dab-45/qt-dab-s4/cmake/Modules/FindQwt.cmake.aaaa qt-dab-qt-dab-45/qt-dab-s4/cmake/Modules/FindQwt.cmake
---- qt-dab-qt-dab-45/qt-dab-s4/cmake/Modules/FindQwt.cmake.aaaa	2022-08-14 14:20:10.923390213 +0200
-+++ qt-dab-qt-dab-45/qt-dab-s4/cmake/Modules/FindQwt.cmake	2022-08-14 14:20:30.117886134 +0200
+diff -up qt-dab-qt-dab-6.1/qt-dab-s4/cmake/Modules/FindQwt.cmake.aaaa qt-dab-qt-dab-6.1/qt-dab-s4/cmake/Modules/FindQwt.cmake
+--- qt-dab-qt-dab-6.1/qt-dab-s4/cmake/Modules/FindQwt.cmake.aaaa	2023-09-29 18:55:55.000000000 +0200
++++ qt-dab-qt-dab-6.1/qt-dab-s4/cmake/Modules/FindQwt.cmake	2023-10-01 08:53:37.775447549 +0200
 @@ -19,6 +19,7 @@ find_path(QWT_INCLUDE_DIRS
    /usr/include/qwt5
    /usr/include/qwt6-qt5
@@ -9,9 +9,20 @@
    /opt/local/include/qwt
    /sw/include/qwt
    /usr/local/lib/qwt.framework/Headers
-diff -up qt-dab-qt-dab-45/qt-dab-s5/cmake/Modules/FindQwt.cmake.aaaa qt-dab-qt-dab-45/qt-dab-s5/cmake/Modules/FindQwt.cmake
---- qt-dab-qt-dab-45/qt-dab-s5/cmake/Modules/FindQwt.cmake.aaaa	2022-08-14 14:21:12.606556727 +0200
-+++ qt-dab-qt-dab-45/qt-dab-s5/cmake/Modules/FindQwt.cmake	2022-08-14 14:21:34.440845794 +0200
+diff -up qt-dab-qt-dab-6.1/qt-dab-s5/cmake/Modules/FindQwt.cmake.aaaa qt-dab-qt-dab-6.1/qt-dab-s5/cmake/Modules/FindQwt.cmake
+--- qt-dab-qt-dab-6.1/qt-dab-s5/cmake/Modules/FindQwt.cmake.aaaa	2023-09-29 18:55:55.000000000 +0200
++++ qt-dab-qt-dab-6.1/qt-dab-s5/cmake/Modules/FindQwt.cmake	2023-10-01 08:53:37.775447549 +0200
+@@ -19,6 +19,7 @@ find_path(QWT_INCLUDE_DIRS
+   /usr/include/qwt5
+   /usr/include/qwt6-qt5
+   /usr/include/qt5/qwt
++  /usr/include/qt5/qwt6
+   /opt/local/include/qwt
+   /sw/include/qwt
+   /usr/local/lib/qwt.framework/Headers
+diff -up qt-dab-qt-dab-6.1/qt-dab-s6/cmake/Modules/FindQwt.cmake.aaaa qt-dab-qt-dab-6.1/qt-dab-s6/cmake/Modules/FindQwt.cmake
+--- qt-dab-qt-dab-6.1/qt-dab-s6/cmake/Modules/FindQwt.cmake.aaaa	2023-10-01 08:58:42.871036468 +0200
++++ qt-dab-qt-dab-6.1/qt-dab-s6/cmake/Modules/FindQwt.cmake	2023-10-01 08:59:12.255355648 +0200
 @@ -19,6 +19,7 @@ find_path(QWT_INCLUDE_DIRS
    /usr/include/qwt5
    /usr/include/qwt6-qt5

qt-dab-Qt-DAB-6.2.tar.gz Added

qt-dab-qt-dab-4.7-5.4.tar.gz Deleted

Build Results
RPM Lint

Refresh

Comments for request 5858 0

Request History

wkazubski created request 7 months ago

Version 6.2

wkazubski accepted request 7 months ago