Merge branch 'PrismLauncher:develop' into skinfix

.github/workflows/build.yml

@@ -158,7 +158,7 @@ jobs:
 
       - name: Retrieve ccache cache (Windows MinGW-w64)
         if: runner.os == 'Windows' && matrix.msystem != '' && inputs.build_type == 'Debug'
-        uses: actions/cache@v3.3.0
+        uses: actions/cache@v3.3.1
         with:
           path: '${{ github.workspace }}\.ccache'
           key: ${{ matrix.os }}-mingw-w64-ccache-${{ github.run_id }}
@@ -550,31 +550,6 @@ jobs:
         run: |
           ccache -s
 
-  snap:
-    runs-on: ubuntu-20.04
-    steps:
-      - name: Checkout
-        if: inputs.build_type == 'Debug'
-        uses: actions/checkout@v3
-        with:
-          submodules: 'true'
-      - name: Set short version
-        shell: bash
-        if: inputs.build_type == 'Debug'
-        run: |
-          ver_short=`git rev-parse --short HEAD`
-          echo "VERSION=$ver_short" >> $GITHUB_ENV
-      - name: Package Snap (Linux)
-        id: snapcraft
-        if: inputs.build_type == 'Debug'
-        uses: snapcore/action-build@v1
-      - name: Upload Snap (Linux)
-        if: inputs.build_type == 'Debug'
-        uses: actions/upload-artifact@v3
-        with:
-          name: prismlauncher_${{ env.VERSION }}_amd64.snap
-          path: ${{ steps.snapcraft.outputs.snap }}
-
   flatpak:
     runs-on: ubuntu-latest
     container:

launcher/modplatform/helpers/HashUtils.cpp

@@ -79,7 +79,7 @@ void FlameHasher::executeTask()
     // CF-specific
     auto should_filter_out = [](char c) { return (c == 9 || c == 10 || c == 13 || c == 32); };
 
-    std::ifstream file_stream(StringUtils::toStdString(m_path), std::ifstream::binary);
+    std::ifstream file_stream(StringUtils::toStdString(m_path).c_str(), std::ifstream::binary);
     // TODO: This is very heavy work, but apparently QtConcurrent can't use move semantics, so we can't boop this to another thread.
     // How do we make this non-blocking then?
     m_hash = QString::number(MurmurHash2(std::move(file_stream), 4 * MiB, should_filter_out));

libraries/tomlplusplus

@@ -1 +1 @@
-Subproject commit 0a90913abf9390b9e08ab6d3b40ac11634553f38
+Subproject commit 7eb2ffcc09f8e9890dc0b77ff8ab00fc53b1f2b8

snap/snapcraft.yaml

@@ -1,56 +0,0 @@
-name: prismlauncher
-license: GPL-3.0-only
-base: core20
-website: https://prismlauncher.org/
-source-code: https://github.com/PrismLauncher/PrismLauncher
-issues: https://github.com/PrismLauncher/PrismLauncher/issues
-donation: https://opencollective.com/prismlauncher
-contact: https://discord.gg/prismlauncher
-summary: A custom Minecraft launcher with modpack support
-adopt-info: prismlauncher
-
-grade: devel
-confinement: strict
-
-architectures:
-  - build-on: amd64
-  - build-on: arm64
-
-parts:
-  prismlauncher:
-    parse-info:
-      - usr/share/metainfo/org.prismlauncher.PrismLauncher.metainfo.xml
-    plugin: cmake
-    build-packages:
-      - default-jdk-headless
-    stage-packages:
-      - openjdk-17-jre
-      - openjdk-8-jre
-    source: .
-    override-pull: |
-      snapcraftctl pull
-      # Fix the icon reference in the desktop file
-      sed -i.bak -e 's|Icon=org.prismlauncher.PrismLauncher|Icon=/usr/share/icons/hicolor/scalable/apps/org.prismlauncher.PrismLauncher.svg|g' program_info/org.prismlauncher.PrismLauncher.desktop.in
-      # Remove the build directory so that local development doesn't interfere with Snap compilation
-      rm -rf build
-    cmake-generator: Ninja
-    cmake-parameters:
-      - "-DCMAKE_INSTALL_PREFIX=/usr"
-      - "-DCMAKE_BUILD_TYPE=RelWithDebInfo"
-      - "-DENABLE_LTO=ON"
-      - "-DLauncher_BUILD_PLATFORM=snap"
-      - "-DLauncher_QT_VERSION_MAJOR=5"
-
-apps:
-  prismlauncher:
-    common-id: org.prismlauncher.PrismLauncher
-    desktop: usr/share/applications/org.prismlauncher.PrismLauncher.desktop
-    command: usr/bin/prismlauncher
-    extensions:
-      - kde-neon
-    plugs:
-      - home
-      - opengl
-      - network
-      - network-bind
-      - audio-playback