From 37c496d9f2a3f2abcd9ee488129471289d3fa166 Mon Sep 17 00:00:00 2001 From: Robert-André Mauchin Date: Jan 08 2021 14:59:12 +0000 Subject: Update to 3.8.4 Close: rhbz#1913107 Signed-off-by: Robert-André Mauchin --- diff --git a/.gitignore b/.gitignore index e356050..b0bd4e4 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /rssguard-3.7.1.tar.gz /rssguard-3.8.0.tar.gz /rssguard-3.8.3.tar.gz +/rssguard-3.8.4.tar.gz diff --git a/rssguard-3.8.0-unbundle_qtsinglecoreapplication.patch b/rssguard-3.8.0-unbundle_qtsinglecoreapplication.patch index 8144f85..184e2ae 100644 --- a/rssguard-3.8.0-unbundle_qtsinglecoreapplication.patch +++ b/rssguard-3.8.0-unbundle_qtsinglecoreapplication.patch @@ -1,17 +1,3 @@ -diff -up rssguard-3.8.3/pri/install.pri.orig rssguard-3.8.3/pri/install.pri ---- rssguard-3.8.3/pri/install.pri.orig 2020-11-30 08:15:34.000000000 +0100 -+++ rssguard-3.8.3/pri/install.pri 2020-12-04 23:26:41.034609152 +0100 -@@ -140,10 +140,6 @@ INSTALL_HEADERS = \ - ../librssguard/network-web/urlinterceptor.h \ - ../librssguard/network-web/webfactory.h \ - ../librssguard/network-web/webpage.h \ --../librssguard/qtsingleapplication/qtlocalpeer.h \ --../librssguard/qtsingleapplication/qtlockedfile.h \ --../librssguard/qtsingleapplication/qtsingleapplication.h \ --../librssguard/qtsingleapplication/qtsinglecoreapplication.h \ - ../librssguard/services/abstract/accountcheckmodel.cpp \ - ../librssguard/services/abstract/accountcheckmodel.h \ - ../librssguard/services/abstract/cacheforserviceroot.cpp \ diff -up rssguard-3.8.3/src/librssguard/librssguard.pro.orig rssguard-3.8.3/src/librssguard/librssguard.pro --- rssguard-3.8.3/src/librssguard/librssguard.pro.orig 2020-11-30 08:15:34.000000000 +0100 +++ rssguard-3.8.3/src/librssguard/librssguard.pro 2020-12-04 23:26:41.034609152 +0100 diff --git a/rssguard-3.8.4-unbundle_qtsinglecoreapplication.patch b/rssguard-3.8.4-unbundle_qtsinglecoreapplication.patch new file mode 100644 index 0000000..c50b198 --- /dev/null +++ b/rssguard-3.8.4-unbundle_qtsinglecoreapplication.patch @@ -0,0 +1,46 @@ +diff -up rssguard-3.8.4/src/librssguard/librssguard.pro.orig rssguard-3.8.4/src/librssguard/librssguard.pro +--- rssguard-3.8.4/src/librssguard/librssguard.pro.orig 2021-01-05 14:19:02.000000000 +0100 ++++ rssguard-3.8.4/src/librssguard/librssguard.pro 2021-01-08 15:50:46.292334813 +0100 +@@ -23,7 +23,7 @@ message($$MSG_PREFIX: lrelease executabl + include(../../pri/build_opts.pri) + + DEFINES *= RSSGUARD_DLLSPEC=Q_DECL_EXPORT +-CONFIG += unversioned_libname unversioned_soname skip_target_version_ext ++CONFIG += unversioned_libname unversioned_soname skip_target_version_ext qtsingleapplication + + RESOURCES += ../../resources/sql.qrc \ + ../../resources/rssguard.qrc +@@ -124,10 +124,6 @@ HEADERS += core/feeddownloader.h \ + network-web/oauth2service.h \ + network-web/silentnetworkaccessmanager.h \ + network-web/webfactory.h \ +- qtsingleapplication/qtlocalpeer.h \ +- qtsingleapplication/qtlockedfile.h \ +- qtsingleapplication/qtsingleapplication.h \ +- qtsingleapplication/qtsinglecoreapplication.h \ + services/abstract/accountcheckmodel.h \ + services/abstract/cacheforserviceroot.h \ + services/abstract/category.h \ +@@ -279,10 +275,6 @@ SOURCES += core/feeddownloader.cpp \ + network-web/oauth2service.cpp \ + network-web/silentnetworkaccessmanager.cpp \ + network-web/webfactory.cpp \ +- qtsingleapplication/qtlocalpeer.cpp \ +- qtsingleapplication/qtlockedfile.cpp \ +- qtsingleapplication/qtsingleapplication.cpp \ +- qtsingleapplication/qtsinglecoreapplication.cpp \ + services/abstract/accountcheckmodel.cpp \ + services/abstract/cacheforserviceroot.cpp \ + services/abstract/category.cpp \ +diff -up rssguard-3.8.4/src/librssguard/miscellaneous/application.cpp.orig rssguard-3.8.4/src/librssguard/miscellaneous/application.cpp +--- rssguard-3.8.4/src/librssguard/miscellaneous/application.cpp.orig 2021-01-05 14:19:02.000000000 +0100 ++++ rssguard-3.8.4/src/librssguard/miscellaneous/application.cpp 2021-01-08 15:50:46.292334813 +0100 +@@ -532,8 +532,6 @@ void Application::onAboutToQuit() { + + // Now, we can check if application should just quit or restart itself. + if (m_shouldRestart) { +- finish(); +- qDebugNN << LOGSEC_CORE << "Killing local peer connection to allow another instance to start."; + + if (QProcess::startDetached(QDir::toNativeSeparators(applicationFilePath()), {})) { + qDebugNN << LOGSEC_CORE << "New application instance was started."; diff --git a/rssguard.spec b/rssguard.spec index a8cf5e5..ba52d49 100644 --- a/rssguard.spec +++ b/rssguard.spec @@ -1,5 +1,5 @@ Name: rssguard -Version: 3.8.3 +Version: 3.8.4 Release: 1%{?dist} Summary: Simple yet powerful feed reader @@ -14,7 +14,7 @@ Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz # Fix installation path Patch0: rssguard-3.8.0-fix_install_path.patch # Unbundle qtsinglecoreapplication -Patch1: rssguard-3.8.0-unbundle_qtsinglecoreapplication.patch +Patch1: rssguard-3.8.4-unbundle_qtsinglecoreapplication.patch # Qt5WebEngine is only available on those architectures ExclusiveArch: %{qt5_qtwebengine_arches} @@ -65,6 +65,10 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/com.gith %{_datadir}/metainfo/com.github.rssguard.appdata.xml %changelog +* Fri Jan 8 15:13:47 CET 2021 Robert-André Mauchin - 3.8.4-1 +- Update to 3.8.4 +- Close: rhbz#1913107 + * Fri Dec 04 23:23:28 CET 2020 Robert-André Mauchin - 3.8.3-1 - Update to 3.8.3 - Close rhbz#1899877 diff --git a/sources b/sources index 9c31ad8..d74c2df 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rssguard-3.8.3.tar.gz) = d7c1d18981177880d93bfaf4a87769638804058609f68b8c42db376c4a0e56230b57a29f70054deb30e02634cfa64355ecfe658b5f961a516b990af91c6f3ba8 +SHA512 (rssguard-3.8.4.tar.gz) = 56456169b71fb1982e159bdef68ec584151ab73dbaa70612b7aac006dbe08d5c6534997f3649d9dda3fda7b5b93fa4050e55123e43941b961850578f1b581f34