Skip to content

Commit 40d89ee

Browse files
authored
Merge pull request #517 from matterhorn103/xdg-spec
Use name according to the XDG standard, harmonize metadata with flatpak
2 parents 13e2a9f + 9ea2169 commit 40d89ee

5 files changed

+86
-63
lines changed

avogadro/CMakeLists.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -173,10 +173,10 @@ if(APPLE)
173173
MACOSX_PACKAGE_LOCATION Resources)
174174

175175
elseif(UNIX)
176-
install(FILES "icons/avogadro2.desktop" DESTINATION "${INSTALL_XDG_APPS_DIR}")
177-
install(FILES "icons/avogadro2.appdata.xml" DESTINATION "${CMAKE_INSTALL_PREFIX}/share/metainfo")
176+
install(FILES "icons/org.openchemistry.Avogadro2.desktop" DESTINATION "${INSTALL_XDG_APPS_DIR}")
177+
install(FILES "icons/org.openchemistry.Avogadro2.metainfo.xml" DESTINATION "${CMAKE_INSTALL_PREFIX}/share/metainfo")
178178
install(FILES "icons/avogadro.png" DESTINATION "${INSTALL_XDG_ICON_DIR}"
179-
RENAME "avogadro2.png")
179+
RENAME "org.openchemistry.Avogadro2.png")
180180
elseif(WIN32)
181181
list(APPEND avogadro_srcs icons/avogadro.rc)
182182
endif()

avogadro/icons/avogadro2.appdata.xml

-57
This file was deleted.

avogadro/icons/avogadro2.desktop avogadro/icons/org.openchemistry.Avogadro2.desktop

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
[Desktop Entry]
22
Version=1.0
3-
Name=Avogadro2
3+
Name=Avogadro
44
Comment=Advanced molecular editor
55
Comment[hu]=Fejlett molekuláris szerkesztő
66
Exec=avogadro2 %f
7-
Icon=avogadro2
7+
Icon=org.openchemistry.Avogadro2
88
Terminal=false
99
Type=Application
1010
Categories=Qt;Science;Chemistry;Physics;Education;
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<component type="desktop">
3+
<id>org.openchemistry.Avogadro2</id>
4+
<launchable type="desktop-id">org.openchemistry.Avogadro2.desktop</launchable>
5+
<name>Avogadro</name>
6+
<summary>Free and open source molecular editor</summary>
7+
<metadata_license>CC0-1.0</metadata_license>
8+
<project_license>BSD-3-Clause</project_license>
9+
<categories>
10+
<category>Education</category>
11+
<category>Chemistry</category>
12+
</categories>
13+
<description>
14+
<p>
15+
Avogadro is an advanced molecular editor designed for cross-platform use in computational chemistry,
16+
molecular modeling, bioinformatics, materials science, and related areas. It offers flexible
17+
rendering and a powerful plugin architecture. The code in this repository is a rewrite of Avogadro
18+
with source code split across a libraries repository and an application repository. Core features
19+
and goals of the Avogadro project:
20+
</p>
21+
<ul>
22+
<li>Open source distributed under the liberal 3-clause BSD license</li>
23+
<li>Cross platform with nightly builds on Linux, Mac OS X and Windows</li>
24+
<li>Intuitive interface designed to be useful to whole community</li>
25+
<li>Fast and efficient embracing the latest technologies</li>
26+
<li>Extensible, making extensive use of a plugin architecture</li>
27+
<li>Flexible supporting a range of chemical data formats and packages</li>
28+
</ul>
29+
</description>
30+
<url type="homepage">https://two.avogadro.cc/</url>
31+
<url type="help">https://two.avogadro.cc/docs</url>
32+
<url type="faq">https://discuss.avogadro.cc/</url>
33+
<url type="bugtracker">https://github.com/OpenChemistry/avogadrolibs/issues</url>
34+
<url type="translate">https://hosted.weblate.org/engage/avogadro/</url>
35+
<url type="donation">https://opencollective.com/open-chemistry</url>
36+
<developer_name>Open Chemistry team</developer_name>
37+
<screenshots>
38+
<screenshot type="default">
39+
<image>https://two.avogadro.cc/_images/home_screenshot_1.png</image>
40+
</screenshot>
41+
<screenshot>
42+
<image>https://two.avogadro.cc/_images/home_splash_1.png</image>
43+
</screenshot>
44+
<screenshot>
45+
<image>https://two.avogadro.cc/_images/bondcentric.png</image>
46+
</screenshot>
47+
<screenshot>
48+
<image>https://two.avogadro.cc/_images/ferrocene.png</image>
49+
</screenshot>
50+
<screenshot>
51+
<image>https://two.avogadro.cc/_images/covid-spike.png</image>
52+
</screenshot>
53+
<screenshot>
54+
<image>https://two.avogadro.cc/_images/benzene-mo.png</image>
55+
</screenshot>
56+
<screenshot>
57+
<image>https://two.avogadro.cc/_images/zeolite.png</image>
58+
</screenshot>
59+
<screenshot>
60+
<image>https://two.avogadro.cc/_images/AuNP.png</image>
61+
</screenshot>
62+
<screenshot>
63+
<image>https://two.avogadro.cc/_images/C180.png</image>
64+
</screenshot>
65+
<screenshot>
66+
<image>https://two.avogadro.cc/_images/phenol-qtaim.png</image>
67+
</screenshot>
68+
</screenshots>
69+
<content_rating type="oars-1.1"/>
70+
<releases>
71+
<release version="1.99.0" date="2024-02-10"/>
72+
<release version="1.98.1" date="2023-11-02"/>
73+
<release version="1.98.0" date="2023-10-27"/>
74+
<release version="1.97.0" date="2022-07-21"/>
75+
<release version="1.96.0" date="2022-06-02"/>
76+
<release version="1.95.1" date="2021-08-27"/>
77+
<release version="1.95.0" date="2021-08-20"/>
78+
<release version="1.94.0" date="2021-06-03"/>
79+
</releases>
80+
</component>

flatpak/shared-modules

Submodule shared-modules updated 71 files

0 commit comments

Comments
 (0)