diff --git a/resources/desktop/com.github.rssguard.appdata.xml b/resources/desktop/com.github.rssguard.appdata.xml index 519039b45..56e661c4f 100644 --- a/resources/desktop/com.github.rssguard.appdata.xml +++ b/resources/desktop/com.github.rssguard.appdata.xml @@ -1,5 +1,5 @@ - + com.github.rssguard.desktop CC0-1.0 diff --git a/resources/desktop/com.github.rssguardlite.appdata.xml b/resources/desktop/com.github.rssguardlite.appdata.xml new file mode 100644 index 000000000..e4495f943 --- /dev/null +++ b/resources/desktop/com.github.rssguardlite.appdata.xml @@ -0,0 +1,57 @@ + + + + com.github.rssguardlite.desktop + CC0-1.0 + GPL-3.0 + RSS Guard (lite) + rotter.martinos_AT_gmail.com + Simple (yet powerful) feed reader + ​rssguard + +

+ RSS Guard is simple (yet powerful) feed reader. It is able to fetch the most known feed formats, including RSS/RDF and ATOM. RSS Guard is developed on top of the Qt library. +

+

+ This build of RSS Guard does not contain QtWebEngine module and some other things and is meant for users who prefer more secure and lightweight app. +

+
+ com.github.rssguard.desktop + + + https://raw.githubusercontent.com/martinrotter/rssguard/master/resources/docs/images/rssguard-window.png + + + https://github.com/martinrotter/rssguard + https://github.com/martinrotter/rssguard/issues + https://github.com/sponsors/martinrotter + + + + + + none + none + none + none + none + none + none + none + none + none + none + none + none + none + none + none + none + none + none + none + + + rssguard + +
diff --git a/resources/scripts/hooks/pre-commit b/resources/scripts/hooks/pre-commit index 6e3d1cd53..2dc4a82ab 100755 --- a/resources/scripts/hooks/pre-commit +++ b/resources/scripts/hooks/pre-commit @@ -1,16 +1,17 @@ #!/bin/sh -set -- resources/desktop/*.appdata.xml -appdata_file="$1" -appdata_file_n="${1}.n" changelog_file="resources/text/CHANGELOG" - -# Set version and date. datestring="$(date +%F)" versionstring="$(head -n 1 "$changelog_file")" -cat "$appdata_file" | sed -e "s@release version\=\"[A-Za-z0-9.]*\"@release version\=\"$versionstring\"@g" | sed -e "s@ date\=\"[0-9\-]*\"@ date\=\"$datestring\"@g" > "$appdata_file_n" -mv "$appdata_file_n" "$appdata_file" +for appdata_file in resources/desktop/*.appdata.xml; do + appdata_file_n="${appdata_file}.n" + + # Set version and date. + cat "$appdata_file" | sed -e "s@release version\=\"[A-Za-z0-9.]*\"@release version\=\"$versionstring\"@g" | sed -e "s@ date\=\"[0-9\-]*\"@ date\=\"$datestring\"@g" > "$appdata_file_n" + mv "$appdata_file_n" "$appdata_file" + + git add "$appdata_file" +done -git add "$appdata_file" exit 0 \ No newline at end of file diff --git a/src/librssguard/miscellaneous/systemfactory.cpp b/src/librssguard/miscellaneous/systemfactory.cpp index 5e807f6a6..38d6c40d9 100644 --- a/src/librssguard/miscellaneous/systemfactory.cpp +++ b/src/librssguard/miscellaneous/systemfactory.cpp @@ -189,7 +189,11 @@ bool SystemFactory::setAutoStartStatus(AutoStartStatus new_status) { args = FROM_STD_LIST(QStringList, std_args); #if defined(IS_FLATPAK_BUILD) +#if defined(USE_WEBENGINE) const QString flatpak_run = QSL("flatpak run %1").arg(QSL(APP_REVERSE_NAME)); +#else + const QString flatpak_run = QSL("flatpak run %1lite").arg(QSL(APP_REVERSE_NAME)); +#endif args = args.mid(1); args.prepend(flatpak_run); diff --git a/src/rssguard/CMakeLists.txt b/src/rssguard/CMakeLists.txt index ce274ae3f..3c434a8ac 100644 --- a/src/rssguard/CMakeLists.txt +++ b/src/rssguard/CMakeLists.txt @@ -66,9 +66,18 @@ elseif(UNIX AND NOT APPLE AND NOT ANDROID) install(FILES ${CMAKE_SOURCE_DIR}/resources/desktop/${APP_REVERSE_NAME}.desktop DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications ) - install(FILES ${CMAKE_SOURCE_DIR}/resources/desktop/${APP_REVERSE_NAME}.appdata.xml - DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/metainfo - ) + + if(USE_WEBENGINE) + install(FILES ${CMAKE_SOURCE_DIR}/resources/desktop/${APP_REVERSE_NAME}.appdata.xml + DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/metainfo + ) + else() + install(FILES ${CMAKE_SOURCE_DIR}/resources/desktop/${APP_REVERSE_NAME}lite.appdata.xml + DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/metainfo + RENAME ${APP_REVERSE_NAME}.appdata.xml + ) + endif() + install(FILES ${CMAKE_SOURCE_DIR}/resources/graphics/${CMAKE_PROJECT_NAME}.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/256x256/apps )