Skip to content

Commit

Permalink
Merge pull request #517 from matterhorn103/xdg-spec
Browse files Browse the repository at this point in the history
Use name according to the XDG standard, harmonize metadata with flatpak
  • Loading branch information
ghutchis authored Oct 31, 2024
2 parents 13e2a9f + 9ea2169 commit 40d89ee
Show file tree
Hide file tree
Showing 5 changed files with 86 additions and 63 deletions.
6 changes: 3 additions & 3 deletions avogadro/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -173,10 +173,10 @@ if(APPLE)
MACOSX_PACKAGE_LOCATION Resources)

elseif(UNIX)
install(FILES "icons/avogadro2.desktop" DESTINATION "${INSTALL_XDG_APPS_DIR}")
install(FILES "icons/avogadro2.appdata.xml" DESTINATION "${CMAKE_INSTALL_PREFIX}/share/metainfo")
install(FILES "icons/org.openchemistry.Avogadro2.desktop" DESTINATION "${INSTALL_XDG_APPS_DIR}")
install(FILES "icons/org.openchemistry.Avogadro2.metainfo.xml" DESTINATION "${CMAKE_INSTALL_PREFIX}/share/metainfo")
install(FILES "icons/avogadro.png" DESTINATION "${INSTALL_XDG_ICON_DIR}"
RENAME "avogadro2.png")
RENAME "org.openchemistry.Avogadro2.png")
elseif(WIN32)
list(APPEND avogadro_srcs icons/avogadro.rc)
endif()
Expand Down
57 changes: 0 additions & 57 deletions avogadro/icons/avogadro2.appdata.xml

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
[Desktop Entry]
Version=1.0
Name=Avogadro2
Name=Avogadro
Comment=Advanced molecular editor
Comment[hu]=Fejlett molekuláris szerkesztő
Exec=avogadro2 %f
Icon=avogadro2
Icon=org.openchemistry.Avogadro2
Terminal=false
Type=Application
Categories=Qt;Science;Chemistry;Physics;Education;
Expand Down
80 changes: 80 additions & 0 deletions avogadro/icons/org.openchemistry.Avogadro2.metainfo.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
<?xml version="1.0" encoding="UTF-8"?>
<component type="desktop">
<id>org.openchemistry.Avogadro2</id>
<launchable type="desktop-id">org.openchemistry.Avogadro2.desktop</launchable>
<name>Avogadro</name>
<summary>Free and open source molecular editor</summary>
<metadata_license>CC0-1.0</metadata_license>
<project_license>BSD-3-Clause</project_license>
<categories>
<category>Education</category>
<category>Chemistry</category>
</categories>
<description>
<p>
Avogadro is an advanced molecular editor designed for cross-platform use in computational chemistry,
molecular modeling, bioinformatics, materials science, and related areas. It offers flexible
rendering and a powerful plugin architecture. The code in this repository is a rewrite of Avogadro
with source code split across a libraries repository and an application repository. Core features
and goals of the Avogadro project:
</p>
<ul>
<li>Open source distributed under the liberal 3-clause BSD license</li>
<li>Cross platform with nightly builds on Linux, Mac OS X and Windows</li>
<li>Intuitive interface designed to be useful to whole community</li>
<li>Fast and efficient embracing the latest technologies</li>
<li>Extensible, making extensive use of a plugin architecture</li>
<li>Flexible supporting a range of chemical data formats and packages</li>
</ul>
</description>
<url type="homepage">https://two.avogadro.cc/</url>
<url type="help">https://two.avogadro.cc/docs</url>
<url type="faq">https://discuss.avogadro.cc/</url>
<url type="bugtracker">https://github.com/OpenChemistry/avogadrolibs/issues</url>
<url type="translate">https://hosted.weblate.org/engage/avogadro/</url>
<url type="donation">https://opencollective.com/open-chemistry</url>
<developer_name>Open Chemistry team</developer_name>
<screenshots>
<screenshot type="default">
<image>https://two.avogadro.cc/_images/home_screenshot_1.png</image>
</screenshot>
<screenshot>
<image>https://two.avogadro.cc/_images/home_splash_1.png</image>
</screenshot>
<screenshot>
<image>https://two.avogadro.cc/_images/bondcentric.png</image>
</screenshot>
<screenshot>
<image>https://two.avogadro.cc/_images/ferrocene.png</image>
</screenshot>
<screenshot>
<image>https://two.avogadro.cc/_images/covid-spike.png</image>
</screenshot>
<screenshot>
<image>https://two.avogadro.cc/_images/benzene-mo.png</image>
</screenshot>
<screenshot>
<image>https://two.avogadro.cc/_images/zeolite.png</image>
</screenshot>
<screenshot>
<image>https://two.avogadro.cc/_images/AuNP.png</image>
</screenshot>
<screenshot>
<image>https://two.avogadro.cc/_images/C180.png</image>
</screenshot>
<screenshot>
<image>https://two.avogadro.cc/_images/phenol-qtaim.png</image>
</screenshot>
</screenshots>
<content_rating type="oars-1.1"/>
<releases>
<release version="1.99.0" date="2024-02-10"/>
<release version="1.98.1" date="2023-11-02"/>
<release version="1.98.0" date="2023-10-27"/>
<release version="1.97.0" date="2022-07-21"/>
<release version="1.96.0" date="2022-06-02"/>
<release version="1.95.1" date="2021-08-27"/>
<release version="1.95.0" date="2021-08-20"/>
<release version="1.94.0" date="2021-06-03"/>
</releases>
</component>
2 changes: 1 addition & 1 deletion flatpak/shared-modules
Submodule shared-modules updated 71 files
+40 −0 .github/workflows/ci.yml
+31 −0 .github/workflows/update.yaml
+1 −0 .gitignore
+8 −3 CODEOWNERS
+28 −3 README.md
+3 −0 SDL/README.md
+4 −0 SDL/SDL-1.2.15.json
+6 −0 SDL/SDL_image-1.2.12.json
+5 −0 SDL/SDL_mixer-1.2.12.json
+6 −0 SDL/SDL_ttf-2.0.11.json
+27 −0 SDL/sdl-sysloadso-buffer-length.patch
+5 −2 SDL/sdl12-compat.json
+3 −3 glu/glu-9.json
+59 −22 gtk2/gtk2-common-themes.json
+30 −0 gtk2/gtk2-fix-crash-in-show-uri.patch
+281 −0 gtk2/gtk2-gcc14.patch
+7 −0 gtk2/gtk2.json
+10 −0 gtk2/readme.md
+2 −2 gudev/gudev.json
+20 −0 gzdoom/game-music-emu.json
+24 −20 gzdoom/gzdoom.json
+20 −0 gzdoom/zmusic.json
+51 −0 libayatana-appindicator/0001-Fix-HAVE_VALGRIND-AM_CONDITIONAL.patch
+44 −0 libayatana-appindicator/0001-Make-introspection-configurable.patch
+116 −0 libayatana-appindicator/libayatana-appindicator-gtk3.json
+10 −5 libcanberra/libcanberra.json
+0 −34 libmad/Provide-Thumb-2-alternative-code-for-MAD_F_MLN.diff
+0 −12 libmad/libmad-0.15.1b-cflags-O2.patch
+0 −146 libmad/libmad-0.15.1b-cflags.patch
+0 −37 libmad/libmad-0.15.1b-multiarch.patch
+0 −13 libmad/libmad-0.15.1b-ppc.patch
+9 −42 libmad/libmad.json
+0 −12 libmad/libmad.thumb.diff
+0 −11 libmad/mad.pc
+2 −2 libsecret/libsecret.json
+14 −0 libsoup/libsoup-2.4.json
+4 −4 libusb/libusb.json
+1 −0 linux-audio/fftw3f.json
+6 −4 linux-audio/fluidsynth2-static.json
+3 −5 linux-audio/fluidsynth2.json
+0 −23 linux-audio/jack2.json
+3 −0 linux-audio/ladspa.json
+5 −0 linux-audio/lash.json
+3 −1 linux-audio/libinstpatch.json
+1 −1 linux-audio/liblo-static.json
+3 −0 linux-audio/liblo.json
+94 −0 linux-audio/lilv-static.json
+18 −36 linux-audio/lilv.json
+12 −5 linux-audio/lrdf.json
+4 −9 linux-audio/lv2.json
+31 −0 linux-audio/patches/raptor-libxml.patch
+3 −8 lua5.3/lua-5.3.5.json
+45 −0 lua5.3/luaconf.patch
+8 −11 lua5.4/lua-5.4.json
+32 −0 lua5.4/luaconf.patch
+30 −0 luajit/luajit.json
+27 −0 lzo/lzo.json
+3 −7 mac/mac.json
+34 −0 pygame/cython-fixes.patch
+25 −0 pygame/glib.patch
+0 −105 pygame/portmidi-no-java.patch
+49 −7 pygame/pygame-1.9.6.json
+0 −54 qt4/disable-sslv3.patch
+0 −11 qt4/fixgcc11.patch
+0 −31 qt4/fixgcc9.patch
+0 −118 qt4/qt4-4.8.7-minimal.json
+0 −514 qt4/qt4-aarch64.patch
+0 −409 qt4/qt4-openssl-1.1.patch
+6 −1 smpeg/smpeg-0.4.5.json
+22 −0 squashfs-tools/squashfs-tools.json
+54 −0 update-checker.sh

0 comments on commit 40d89ee

Please sign in to comment.