FreshRSS/rssguard
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore: rename app id to io.github.martinrotter.rssguard (#826)

Browse Source 
The previous app id was invalid, according to Flathub/Flatpak rules.

Additionally, install the AppData file as `*.metainfo.xml`, because
`appdata.xml` is the legacy name.

Co-authored-by: guihkx <guihkx@users.noreply.github.com>
This commit is contained in:
Guilherme Silva 2022-10-26 07:56:48 -03:00 committed by GitHub
parent 64a4c4e168
commit 9d2d7dc022
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -63,7 +63,7 @@ set(APP_NAME "RSS Guard")
set(APP_EMAIL "rotter.martinos@gmail.com") set(APP_EMAIL "rotter.martinos@gmail.com")
set(APP_AUTHOR "Martin Rotter") set(APP_AUTHOR "Martin Rotter")
set(APP_COPYRIGHT "\\251 2011-${YEAR} ${APP_AUTHOR}") set(APP_COPYRIGHT "\\251 2011-${YEAR} ${APP_AUTHOR}")
set(APP_REVERSE_NAME "com.github.rssguard") set(APP_REVERSE_NAME "io.github.martinrotter.rssguard")
set(APP_DONATE_URL "https://github.com/sponsors/martinrotter") set(APP_DONATE_URL "https://github.com/sponsors/martinrotter")
set(APP_VERSION "4.2.5") set(APP_VERSION "4.2.5")

0
resources/desktop/com.github.rssguard.desktop.autostart → resources/desktop/io.github.martinrotter.rssguard.autostart
View File

0
resources/desktop/com.github.rssguard.desktop → resources/desktop/io.github.martinrotter.rssguard.desktop
View File

4
resources/desktop/com.github.rssguard.appdata.xml → resources/desktop/io.github.martinrotter.rssguard.metainfo.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- Copyright 2017-2022 Martin Rotter <rotter.martinos@gmail.com> --> <!-- Copyright 2017-2022 Martin Rotter <rotter.martinos@gmail.com> -->
<component type="desktop-application"> <component type="desktop-application">
<id>com.github.rssguard.desktop</id> <id>io.github.martinrotter.rssguard</id>
<metadata_license>CC0-1.0</metadata_license> <metadata_license>CC0-1.0</metadata_license>
<project_license>GPL-3.0</project_license> <project_license>GPL-3.0</project_license>
<name>RSS Guard</name> <name>RSS Guard</name>
@ -13,7 +13,7 @@
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. 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>
</description> </description>
<launchable type="desktop-id">com.github.rssguard.desktop</launchable> <launchable type="desktop-id">io.github.martinrotter.rssguard.desktop</launchable>
<screenshots> <screenshots>
<screenshot type="default"> <screenshot type="default">
<image>https://raw.githubusercontent.com/martinrotter/rssguard/master/resources/docs/images/rssguard-window.png</image> <image>https://raw.githubusercontent.com/martinrotter/rssguard/master/resources/docs/images/rssguard-window.png</image>

4
resources/rssguard.qrc
View File

@ -87,8 +87,8 @@
<file>initial_feeds/feeds-en_US.opml</file> <file>initial_feeds/feeds-en_US.opml</file>
<file>desktop/com.github.rssguard.desktop</file> <file>desktop/io.github.martinrotter.rssguard.desktop</file>
<file>desktop/com.github.rssguard.desktop.autostart</file> <file>desktop/io.github.martinrotter.rssguard.autostart</file>
<file>../localization/rssguard_cs.qm</file> <file>../localization/rssguard_cs.qm</file>
<file>../localization/rssguard_da.qm</file> <file>../localization/rssguard_da.qm</file>

2
resources/scripts/hooks/pre-commit
View File

@ -4,7 +4,7 @@ changelog_file="resources/text/CHANGELOG"
datestring="$(date +%F)" datestring="$(date +%F)"
versionstring="$(head -n 1 "$changelog_file")" versionstring="$(head -n 1 "$changelog_file")"
for appdata_file in resources/desktop/*.appdata.xml; do for appdata_file in resources/desktop/*.metainfo.xml; do
appdata_file_n="${appdata_file}.n" appdata_file_n="${appdata_file}.n"
# Set version and date. # Set version and date.

4
src/librssguard/definitions/definitions.h
View File

@ -337,8 +337,8 @@
#define APP_LANG_PATH QSL(":/localization") #define APP_LANG_PATH QSL(":/localization")
#if defined(Q_OS_UNIX) && !defined(Q_OS_MACOS) #if defined(Q_OS_UNIX) && !defined(Q_OS_MACOS)
#define APP_DESKTOP_SOURCE_ENTRY_FILE "com.github.rssguard.desktop.autostart" #define APP_DESKTOP_SOURCE_ENTRY_FILE "io.github.martinrotter.rssguard.autostart"
#define APP_DESKTOP_ENTRY_FILE "com.github.rssguard.desktop" #define APP_DESKTOP_ENTRY_FILE "io.github.martinrotter.rssguard.desktop"
#define APP_DESKTOP_ENTRY_PATH QSL(":/desktop") #define APP_DESKTOP_ENTRY_PATH QSL(":/desktop")
#endif #endif

2
src/rssguard/CMakeLists.txt
View File

@ -66,7 +66,7 @@ elseif(UNIX AND NOT APPLE AND NOT ANDROID)
install(FILES ${CMAKE_SOURCE_DIR}/resources/desktop/${APP_REVERSE_NAME}.desktop install(FILES ${CMAKE_SOURCE_DIR}/resources/desktop/${APP_REVERSE_NAME}.desktop
DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications
) )
install(FILES ${CMAKE_SOURCE_DIR}/resources/desktop/${APP_REVERSE_NAME}.appdata.xml install(FILES ${CMAKE_SOURCE_DIR}/resources/desktop/${APP_REVERSE_NAME}.metainfo.xml
DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/metainfo DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/metainfo
) )
install(FILES ${CMAKE_SOURCE_DIR}/resources/graphics/${CMAKE_PROJECT_NAME}.png install(FILES ${CMAKE_SOURCE_DIR}/resources/graphics/${CMAKE_PROJECT_NAME}.png