diff --git a/rssguard-3.8.0-fix_install_path.patch b/rssguard-3.8.0-fix_install_path.patch new file mode 100644 index 0000000..a8499e3 --- /dev/null +++ b/rssguard-3.8.0-fix_install_path.patch @@ -0,0 +1,18 @@ +diff -up rssguard-3.8.0/pri/install.pri.orig rssguard-3.8.0/pri/install.pri +--- rssguard-3.8.0/pri/install.pri.orig 2020-11-10 13:21:20.000000000 +0100 ++++ rssguard-3.8.0/pri/install.pri 2020-11-11 12:26:39.099255346 +0100 +@@ -230,7 +230,7 @@ unix:!mac:!android { + appdata.path = $$quote($$PREFIX/share/metainfo/) + + lib.files = $$OUT_PWD/../librssguard/librssguard.so +- lib.path = $$quote($$PREFIX/lib/) ++ lib.path = $$quote($$PREFIX/$$LIB_INSTALL_DIR/) + lib.CONFIG = no_check_exist + + desktop_icon.files = ../../resources/graphics/$${TARGET}.png +@@ -287,5 +287,4 @@ for(header, INSTALL_HEADERS) { + + eval(headers_$${dirname(header)}.files += $$header) + eval(headers_$${dirname(header)}.path = $$path) +- eval(INSTALLS *= headers_$${dirname(header)}) + } diff --git a/rssguard-3.8.0-unbundle_qtsinglecoreapplication.patch b/rssguard-3.8.0-unbundle_qtsinglecoreapplication.patch deleted file mode 100644 index 184e2ae..0000000 --- a/rssguard-3.8.0-unbundle_qtsinglecoreapplication.patch +++ /dev/null @@ -1,46 +0,0 @@ -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 -@@ -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 -@@ -123,10 +123,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 \ -@@ -274,10 +270,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.3/src/librssguard/miscellaneous/application.cpp.orig rssguard-3.8.3/src/librssguard/miscellaneous/application.cpp ---- rssguard-3.8.3/src/librssguard/miscellaneous/application.cpp.orig 2020-11-30 08:15:34.000000000 +0100 -+++ rssguard-3.8.3/src/librssguard/miscellaneous/application.cpp 2020-12-04 23:26:41.035609132 +0100 -@@ -521,8 +521,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.";