Merge pull request #17 from dada513/develop

Fix metainfo parsing

.gitignore

@@ -45,8 +45,6 @@ run/
 flatbuild
 builddir
 # Deb
-packages/debian/polymc/usr/bin
-packages/debian/polymc/usr/lib
-packages/debian/polymc/usr/share/polymc/jars
+packages/debian/polymc/usr/
 packages/debian/polymc.deb
 packages/debian/polymc/DEBIAN/control

CMakeLists.txt

@@ -57,9 +57,9 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DQT_NO_DEPRECATED_WARNINGS=Y")
 set(Launcher_NEWS_RSS_URL "https://multimc.org/rss.xml" CACHE STRING "URL to fetch Launcher's news RSS feed from.")
 
 ######## Set version numbers ########
-set(Launcher_VERSION_MAJOR    0)
-set(Launcher_VERSION_MINOR    6)
-set(Launcher_VERSION_HOTFIX   14)
+set(Launcher_VERSION_MAJOR    1)
+set(Launcher_VERSION_MINOR    0)
+set(Launcher_VERSION_HOTFIX   3)
 
 # Build number
 set(Launcher_VERSION_BUILD -1 CACHE STRING "Build number. -1 for no build number.")
@@ -210,6 +210,8 @@ elseif(Launcher_LAYOUT_REAL STREQUAL "lin-system")
     set(Launcher_SHARE_DEST_DIR "share/polymc" CACHE STRING "Path to the shared data directory")
     set(JARS_DEST_DIR "${Launcher_SHARE_DEST_DIR}/jars")
     set(Launcher_DESKTOP_DEST_DIR "share/applications" CACHE STRING "Path to the desktop file directory")
+    set(Launcher_METAINFO_DEST_DIR "share/metainfo" CACHE STRING "Path to the metainfo directory")
+    set(Launcher_ICON_DEST_DIR "share/icons/hicolor/scalable/apps" CACHE STRING "Path to the scalable icon directory")
 
     set(BINARY_DEST_DIR ${Launcher_BINARY_DEST_DIR})
     set(LIBRARY_DEST_DIR ${Launcher_LIBRARY_DEST_DIR})
@@ -218,6 +220,8 @@ elseif(Launcher_LAYOUT_REAL STREQUAL "lin-system")
     SET(Launcher_APP_BINARY_DEFS "-DMULTIMC_JARS_LOCATION=${CMAKE_INSTALL_PREFIX}/${JARS_DEST_DIR}" "-DLAUNCHER_LINUX_DATADIR")
 
     install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${Launcher_Desktop} DESTINATION ${Launcher_DESKTOP_DEST_DIR})
+    install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${Launcher_MetaInfo} DESTINATION ${Launcher_METAINFO_DEST_DIR})
+    install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${Launcher_SVG} DESTINATION ${Launcher_ICON_DEST_DIR})
 
     # install as bundle with no dependencies included
     set(INSTALL_BUNDLE "nodeps")

README.md

@@ -14,13 +14,13 @@ Several source build packages are available, along with experimental pre-built g
 
 - An [AUR package](https://aur.archlinux.org/packages/polymc-git/) is available.
 - A Gentoo ebuild is available in the [swirl](https://git.swurl.xyz/swirl/ebuilds) overlay, named `games-action/polymc`. Check the README for instructions on how to add the overlay.
-- A Flatpak is available. Instructions on building it can be found in [packages/flatpak/BUILDING.md](packages/flatpak/BUILDING.md).
-- Generic, prebuilt packages (archived by version) can be found [here](https://packages.polymc.org/) ([latest](https://packages.polymc.org/latest))
+- A Flatpak is available in [Flathub](https://flathub.org/apps/details/org.polymc.PolyMC). You can install it from there or build it yourself using [this source](https://github.com/flathub/org.polymc.PolyMC).
+- Generic, prebuilt packages (archived by version) can be found [here](https://packages.polymc.org/) ([latest](https://packages.polymc.org/latest)).
 - Last build status: https://jenkins.polymc.org/job/PolyMC/lastBuild/
 - [Linux (AMD64) System](https://packages.polymc.org/latest/lin64-system/lin64-system.tar.zst) ([SHA256](https://packages.polymc.org/latest/lin64-system/lin64-system.tar.zst.sha256)) - this is a generic system package intended to be used as a base for making distro-specific packages.
 - [Windows (32-bit)](https://packages.polymc.org/latest/win32/win32.zip) ([SHA256](https://packages.polymc.org/latest/win32/win32.zip.sha256)) - this is a portable package, you can extract it anywhere and run it. This package needs testing.
 - [Debian (AMD64)](https://packages.polymc.org/latest/deb/polymc-amd64.deb) ([SHA256](https://packages.polymc.org/latest/deb/polymc-amd64.deb.sha256)) - this is intended to be installed with `dpkg -i`. Alternatively, you may build the `.deb` yourself, by going to `packages/debian` and running `./makedeb.sh`.
-- [AppImage (AMD64)](https://packages.polymc.org/latest/appimage/PolyMC-latest-x86_64.AppImage) ([SHA256](https://packages.polymc.org/latest/appimage/PolyMC-latest-x86_64.AppImage.sha256)) - `chmod +x` must be run on this file before usage. This should work on any distribution
+- [AppImage (AMD64)](https://packages.polymc.org/latest/appimage/PolyMC-latest-x86_64.AppImage) ([SHA256](https://packages.polymc.org/latest/appimage/PolyMC-latest-x86_64.AppImage.sha256)) - `chmod +x` must be run on this file before usage. This should work on any distribution.
 - MacOS currently does not have any packages. We are still working on setting up MacOS packaging.
 
 ## Development
@@ -50,7 +50,7 @@ Feel free to create an issue if you need help. However, you might find it easier
 
 [![PolyMC Discord](https://img.shields.io/discord/923671181020766230?label=PolyMC%20Discord)](https://discord.gg/xq7fxrgtMP)
 
-For people who don't want to use Discord, we have a Matrix Space which is bridged to the discord server. Be sure to enable spaces first (Settings -> Labs -> Spaces), and then you may join the space:
+For people who don't want to use Discord, we have a Matrix Space which is bridged to the Discord server. Be sure to enable spaces first (Settings -> Labs -> Spaces), and then you may join the space:
 
 [![PolyMC Space](https://img.shields.io/matrix/polymc:polymc.org?label=PolyMC%20Space&server_fqdn=matrix.polymc.org)](https://matrix.to/#/#polymc:polymc.org)
 

launcher/Application.cpp

@@ -1148,7 +1148,7 @@ void Application::setIconTheme(const QString& name)
 QIcon Application::getThemedIcon(const QString& name)
 {
     if(name == "logo") {
-        return QIcon(":/polymc.svg");
+        return QIcon(":/org.polymc.PolyMC.svg");
     }
     return XdgIcon::fromTheme(name);
 }

packages/debian/polymc/usr/share/applications/polymc.desktop

@@ -1,11 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=PolyMC
-Comment=A custom launcher for Minecraft that allows you to easily manage multiple installations of Minecraft at once.
-Type=Application
-Terminal=false
-Exec=polymc
-StartupNotify=true
-Icon=null
-Categories=Game;
-Keywords=game;minecraft;launcher;

packages/flatpak/BUILDING.md

@@ -1,28 +0,0 @@
-# Building the flatpak
-
-### 1. Install tools
-
-Install `flatpak` and `flatpak-builder` from your distribution repositories.
-
-### 2. Install SDK
-
-`flatpak install org.kde.Sdk org.kde.Platform`  
-Pick version `5.15`
-
-### 3. Get the yml flatpak file
-
-You can download it directly from github, or clone the repo.
-
-### 4. Build it
-
-```
-flatpak-builder --ccache --force-clean flatbuild packages/flatpak/org.polymc.PolyMC.yml
-```
-
-If you didn't clone the repo, the path might be different.
-
-### 5. Install the custom build
-
-```
-flatpak-builder --user --install --ccache --force-clean flatbuild packages/org.polymc.PolyMC.yml
-```

packages/flatpak/org.polymc.PolyMC.desktop

@@ -1,11 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=PolyMC
-Comment=A custom launcher for Minecraft that allows you to easily manage multiple installations of Minecraft at once.
-Type=Application
-Terminal=false
-Exec=polymc
-StartupNotify=true
-Icon=null
-Categories=Game;
-Keywords=game;minecraft;launcher;

packages/flatpak/org.polymc.PolyMC.yml

@@ -1,74 +0,0 @@
-app-id: org.polymc.PolyMC
-runtime: org.kde.Platform
-runtime-version: "5.15"
-sdk: org.kde.Sdk
-command: polymc
-finish-args:
-  - --share=ipc
-  - --socket=x11
-  - --socket=wayland
-  - --device=dri
-  - --share=network
-    # for Discord RPC mods
-  - --filesystem=xdg-run/app/com.discordapp.Discord:create
-
-modules:
-  - name: compile
-    buildsystem: simple
-    build-commands:
-      - mkdir build
-      - mkdir -p /app/bin
-      - cd build && JAVA_HOME=/run/build/compile/jdk PATH=$JAVA_HOME:$PATH JAVA_COMPILER=../jdk/bin/javac cmake -DLauncher_LAYOUT=lin-system -DCMAKE_INSTALL_PREFIX=/app/ .. && make -j$(nproc) install
-    sources:
-      - type: git
-        url: https://github.com/PolyMC/PolyMC.git
-        tag: 1.0.0
-      - type: archive
-        url: https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17%2B35/OpenJDK17-jdk_x64_linux_hotspot_17_35.tar.gz
-        sha256: 6f1335d9a7855159f982dac557420397be9aa85f3f7bc84e111d25871c02c0c7
-        archive-type: tar-gzip
-        dest: jdk
-  # old MC versions depend on Xrandr
-  - name: xrandr
-    buildsystem: simple
-    build-commands:
-      - ./configure --prefix=/app
-      - make
-      - make install
-    sources:
-      - type: archive
-        url: https://xorg.freedesktop.org/archive/individual/app/xrandr-1.5.1.tar.xz
-        sha256: 7bc76daf9d72f8aff885efad04ce06b90488a1a169d118dea8a2b661832e8762
-  - name: java
-    buildsystem: simple
-    build-commands:
-      - mkdir -p /app/jdk
-      - mv ./* /app/jdk
-    sources:
-      # JDK 17 for MC 1.18
-      - type: archive
-        url: https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.1%2B12/OpenJDK17U-jre_x64_linux_hotspot_17.0.1_12.tar.gz
-        sha256: 9d58cb741509a88e0ae33eb022334fb900b409b198eca6fe76246f0677b392ad
-        strip-components: 0
-      # JDK for Minecraft 1.17 - 1.18
-      - type: archive
-        url: https://github.com/adoptium/temurin16-binaries/releases/download/jdk-16.0.2%2B7/OpenJDK16U-jdk_x64_linux_hotspot_16.0.2_7.tar.gz
-        sha256: 323d6d7474a359a28eff7ddd0df8e65bd61554a8ed12ef42fd9365349e573c2c
-        strip-components: 0
-      # JDK 11 for 1.9 - 1.15.2
-      - type: archive
-        url: https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.13%2B8/OpenJDK11U-jre_x64_linux_hotspot_11.0.13_8.tar.gz
-        sha256: fb0a27e6e1f26a1ee79daa92e4cfe3ec0d676acfe114d99dd84b3414f056e8a0
-        strip-components: 0
-      # JDK 8 for pre1.9
-      - type: archive
-        url: https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u312-b07/OpenJDK8U-jre_x64_linux_hotspot_8u312b07.tar.gz
-        sha256: 18fd13e77621f712326bfcf79c3e3cc08c880e3e4b8f63a1e5da619f3054b063
-        strip-components: 0
-  - name: desktopfiles
-    buildsystem: simple
-    build-commands:
-      - install -Dm644 org.polymc.PolyMC.desktop /app/share/applications/org.polymc.PolyMC.desktop
-    sources:
-      - type: file
-        path: org.polymc.PolyMC.desktop

program_info/CMakeLists.txt

@@ -8,9 +8,11 @@ set(Launcher_UserAgent "${Launcher_CommonName}/5.0" PARENT_SCOPE)
 set(Launcher_ConfigFile "polymc.cfg" PARENT_SCOPE)
 set(Launcher_Git "https://github.com/PolyMC/PolyMC" PARENT_SCOPE)
 
-set(Launcher_Desktop "program_info/polymc.desktop" PARENT_SCOPE)
+set(Launcher_Desktop "program_info/org.polymc.PolyMC.desktop" PARENT_SCOPE)
+set(Launcher_MetaInfo "program_info/org.polymc.PolyMC.metainfo.xml" PARENT_SCOPE)
+set(Launcher_SVG "program_info/org.polymc.PolyMC.svg" PARENT_SCOPE)
 set(Launcher_Branding_ICNS "program_info/polymc.icns" PARENT_SCOPE)
 set(Launcher_Branding_WindowsRC "program_info/polymc.rc" PARENT_SCOPE)
 set(Launcher_Branding_LogoQRC "program_info/polymc.qrc" PARENT_SCOPE)
 
-configure_file(polymc.desktop.in polymc.desktop)
+configure_file(org.polymc.PolyMC.desktop.in org.polymc.PolyMC.desktop)

program_info/genicons.sh

@@ -1,17 +1,17 @@
 #/bin/bash
 
-inkscape -w 16 -h 16 -o polymc_16.png polymc.svg
-inkscape -w 24 -h 24 -o polymc_24.png polymc.svg
-inkscape -w 32 -h 32 -o polymc_32.png polymc.svg
-inkscape -w 48 -h 48 -o polymc_48.png polymc.svg
-inkscape -w 64 -h 64 -o polymc_64.png polymc.svg
-inkscape -w 128 -h 128 -o polymc_128.png polymc.svg
+inkscape -w 16 -h 16 -o polymc_16.png org.polymc.PolyMC.svg
+inkscape -w 24 -h 24 -o polymc_24.png org.polymc.PolyMC.svg
+inkscape -w 32 -h 32 -o polymc_32.png org.polymc.PolyMC.svg
+inkscape -w 48 -h 48 -o polymc_48.png org.polymc.PolyMC.svg
+inkscape -w 64 -h 64 -o polymc_64.png org.polymc.PolyMC.svg
+inkscape -w 128 -h 128 -o polymc_128.png org.polymc.PolyMC.svg
 
 convert polymc_128.png polymc_64.png polymc_48.png polymc_32.png polymc_24.png polymc_16.png polymc.ico
 
-inkscape -w 256 -h 256 -o polymc_256.png polymc.svg
-inkscape -w 512 -h 512 -o polymc_512.png polymc.svg
-inkscape -w 1024 -h 1024 -o polymc_1024.png polymc.svg
+inkscape -w 256 -h 256 -o polymc_256.png org.polymc.PolyMC.svg
+inkscape -w 512 -h 512 -o polymc_512.png org.polymc.PolyMC.svg
+inkscape -w 1024 -h 1024 -o polymc_1024.png org.polymc.PolyMC.svg
 
 png2icns polymc.icns polymc_1024.png polymc_512.png polymc_256.png polymc_128.png polymc_32.png polymc_16.png
 

program_info/org.polymc.PolyMC.desktop.in

@@ -6,6 +6,6 @@ Type=Application
 Terminal=false
 Exec=@Launcher_APP_BINARY_NAME@
 StartupNotify=true
-Icon=polymc
+Icon=org.polymc.PolyMC
 Categories=Game;
 Keywords=game;minecraft;launcher;

program_info/org.polymc.PolyMC.metainfo.xml

@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="desktop">
+  <id>org.polymc.PolyMC</id>
+  <provides>
+    <id>org.polymc.PolyMC</id>
+  </provides>
+  <launchable type="desktop-id">org.polymc.PolyMC.desktop</launchable>
+  <name>PolyMC</name>
+  <developer_name>PolyMC Team</developer_name>
+  <summary>A custom launcher for Minecraft that allows you to easily manage multiple installations of Minecraft at once</summary>
+  <metadata_license>CC0-1.0</metadata_license>
+  <project_license>GPL-3.0-only</project_license>
+  <url type="homepage">https://polymc.org/</url>
+  <url type="help">https://github.com/PolyMC/PolyMC#help--support</url>
+  <description>
+    <p>PolyMC is a custom launcher for Minecraft that focuses on predictability, long term stability and simplicity.</p>
+    <p>Features:</p>
+    <ul>
+      <li>Easily install game modifications, such as Fabric or Forge</li>
+      <li>Control your java settings</li>
+      <li>Manage worlds and resource packs from the launcher</li>
+      <li>See logs and other details easily</li>
+      <li>Kill Minecraft in case of a crash/freeze</li>
+      <li>Isolate minecraft instances to keep everything clean</li>
+    </ul>
+    <p>For flatpak users:</p>
+    <p>In flatpak, all java versions that are required by Minecraft are included.</p>
+    <p>
+      If using a Hybrid-Graphics device, you can use the
+      prime-run
+      script as a wrapper command to run Minecraft using the dedicated graphics card.
+    </p>
+  </description>
+  <screenshots>
+    <screenshot type="default">
+      <caption>The main PolyMC window</caption>
+      <image type="source" width="802" height="639">https://i.imgur.com/q2GcDo4.png</image>
+    </screenshot>
+  </screenshots>
+  <releases>
+    <release version="1.0.2" date="2022-01-01" />
+  </releases>
+  <content_rating type="oars-1.0">
+    <content_attribute id="violence-cartoon">moderate</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">intense</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>
+</component>

program_info/polymc.qrc

@@ -1,6 +1,6 @@
 <!DOCTYPE RCC>
 <RCC version="1.0">
     <qresource prefix="/">
-        <file>polymc.svg</file>
+        <file>org.polymc.PolyMC.svg</file>
     </qresource>
 </RCC>