From 2110bdf88a98f6008ce47097654e1102d31365a8 Mon Sep 17 00:00:00 2001
From: Martin Rotter <rotter.martinos@gmail.com>
Date: Mon, 24 Oct 2022 10:12:37 +0200
Subject: [PATCH] Revert "prepare for lite rssguard for flatpak"

This reverts commit 0029d45cbb52c3b3dc93db6071bf3edb1d0eae08.
---
 .../com.github.rssguardlite.appdata.xml       | 57 -------------------
 .../miscellaneous/systemfactory.cpp           |  4 --
 src/rssguard/CMakeLists.txt                   | 15 +----
 3 files changed, 3 insertions(+), 73 deletions(-)
 delete mode 100644 resources/desktop/com.github.rssguardlite.appdata.xml

diff --git a/resources/desktop/com.github.rssguardlite.appdata.xml b/resources/desktop/com.github.rssguardlite.appdata.xml
deleted file mode 100644
index 3d8745f12..000000000
--- a/resources/desktop/com.github.rssguardlite.appdata.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2017-2022 Martin Rotter <rotter.martinos@gmail.com> -->
-<component type="desktop-application">
-  <id>com.github.rssguardlite.desktop</id>
-  <metadata_license>CC0-1.0</metadata_license>
-  <project_license>GPL-3.0</project_license>
-  <name>RSS Guard (lite)</name>
-  <update_contact>rotter.martinos_AT_gmail.com</update_contact>
-  <summary>Simple (yet powerful) feed reader</summary>
-  ​<translation type="qt">rssguard</translation>
-  <description>
-    <p>
-      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.
-    </p>
-    <p>
-      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. 
-    </p>
-  </description>
-  <launchable type="desktop-id">com.github.rssguard.desktop</launchable>
-  <screenshots>
-  <screenshot type="default">
-      <image>https://raw.githubusercontent.com/martinrotter/rssguard/master/resources/docs/images/rssguard-window.png</image>
-    </screenshot>
-  </screenshots>
-  <url type="homepage">https://github.com/martinrotter/rssguard</url>
-  <url type="bugtracker">https://github.com/martinrotter/rssguard/issues</url>
-  <url type="donation">https://github.com/sponsors/martinrotter</url>
-  <content_rating type="oars-1.1" />
-  <releases>
-    <release version="4.2.5" date="2022-10-24"/>
-  </releases>
-  <content_rating type="oars-1.0">
-    <content_attribute id="violence-cartoon">none</content_attribute>
-    <content_attribute id="violence-fantasy">none</content_attribute>
-    <content_attribute id="violence-realistic">none</content_attribute>
-    <content_attribute id="violence-bloodshed">none</content_attribute>
-    <content_attribute id="violence-sexual">none</content_attribute>
-    <content_attribute id="drugs-alcohol">none</content_attribute>
-    <content_attribute id="drugs-narcotics">none</content_attribute>
-    <content_attribute id="drugs-tobacco">none</content_attribute>
-    <content_attribute id="sex-nudity">none</content_attribute>
-    <content_attribute id="sex-themes">none</content_attribute>
-    <content_attribute id="language-profanity">none</content_attribute>
-    <content_attribute id="language-humor">none</content_attribute>
-    <content_attribute id="language-discrimination">none</content_attribute>
-    <content_attribute id="social-chat">none</content_attribute>
-    <content_attribute id="social-info">none</content_attribute>
-    <content_attribute id="social-audio">none</content_attribute>
-    <content_attribute id="social-location">none</content_attribute>
-    <content_attribute id="social-contacts">none</content_attribute>
-    <content_attribute id="money-purchasing">none</content_attribute>
-    <content_attribute id="money-gambling">none</content_attribute>
-  </content_rating>
-  <provides>
-    <binary>rssguard</binary>
-  </provides>
-</component>
diff --git a/src/librssguard/miscellaneous/systemfactory.cpp b/src/librssguard/miscellaneous/systemfactory.cpp
index 38d6c40d9..5e807f6a6 100644
--- a/src/librssguard/miscellaneous/systemfactory.cpp
+++ b/src/librssguard/miscellaneous/systemfactory.cpp
@@ -189,11 +189,7 @@ 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 3c434a8ac..ce274ae3f 100644
--- a/src/rssguard/CMakeLists.txt
+++ b/src/rssguard/CMakeLists.txt
@@ -66,18 +66,9 @@ elseif(UNIX AND NOT APPLE AND NOT ANDROID)
   install(FILES ${CMAKE_SOURCE_DIR}/resources/desktop/${APP_REVERSE_NAME}.desktop
     DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications
   )
-
-  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/desktop/${APP_REVERSE_NAME}.appdata.xml
+    DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/metainfo
+  )
   install(FILES ${CMAKE_SOURCE_DIR}/resources/graphics/${CMAKE_PROJECT_NAME}.png
     DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/256x256/apps
   )