prepare for flatpak

Author: p0358

.github/workflows/cmake.yml

@@ -44,7 +44,7 @@ jobs:
 
     env:
       CI_COMPILER: ${{ matrix.c_compiler }}
-      QT_VERSION: '6.8.1'
+      QT_VERSION: '6.9.3'
       QT_HOST: ${{ matrix.os == 'windows-latest' && 'windows' || 'linux' }}
       QT_ARCH: ${{ matrix.os == 'windows-latest' && 'win64_msvc2022_64' || 'linux_gcc_64' }}
 

.github/workflows/flatpak.yml

@@ -0,0 +1,42 @@
+name: Flatpak build
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+jobs:
+  flatpak:
+    runs-on: ubuntu-latest
+    container:
+      image: ghcr.io/flathub-infra/flatpak-github-actions:kde-6.9
+      options: --privileged
+    strategy:
+      matrix:
+        arch: [x86_64, aarch64]
+      # Don't fail the whole workflow if one architecture fails
+      fail-fast: false
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        submodules: 'recursive'
+    - name: Install deps
+      if: ${{ matrix.arch != 'x86_64' }}
+      run: |
+        # Use the static binaries because it's unable to use a package manager 
+        curl https://download.docker.com/linux/static/stable/x86_64/docker-26.0.0.tgz --output ./docker.tgz
+        tar xzvf docker.tgz
+        mv docker/* /usr/bin
+    - name: Set up QEMU
+      if: ${{ matrix.arch != 'x86_64' }}
+      id: qemu
+      uses: docker/setup-qemu-action@v3
+      with:
+        platforms: arm64
+    - uses: flatpak/flatpak-github-actions/flatpak-builder@v6
+      with:
+        bundle: UnCSO2.flatpak
+        manifest-path: tf.harmony.UnCSO2.yml
+        cache-key: flatpak-builder-${{ matrix.arch }}-${{ github.sha }}
+        arch: ${{ matrix.arch }}

.gitignore

@@ -410,3 +410,7 @@ CMakeLists.txt.user*
 *.AppImage
 
 /CMakeUserPresets.json
+
+/.flatpak-builder
+/repo
+/builddir

README.md

@@ -18,11 +18,11 @@ You may download the latest build of UnCSO2 [here](https://github.com/harmonytf/
 
 Aside from extracting files from Counter-Strike: Online 2's and Titanfall Online's proprietary archive format, PKG, UnCSO2 can:
 
-- Explore and extract from individual PKG archives;
-- Explore and extract from entire game's filesystems (loads every PKG archive in their PKG index);
-- Preview and/or extract individual file entries;
-- Decrypt Counter-Strike: Online 2 files with an `.e*` prepended in their extension;
-- Decompress Counter-Strike: Online 2 texture files.
+- Explore and extract from individual PKG archives
+- Explore and extract from entire game's filesystem (loads every PKG archive in their PKG index)
+- Preview and/or extract individual file entries
+- Decrypt Counter-Strike: Online 2 files with an `.e*` prepended in their extension
+- Decompress Counter-Strike: Online 2 texture files
 
 ### Compatible CSO2 regions
 
@@ -35,7 +35,7 @@ Those regions are: South Korea, China, Taiwan and Japan.
 ### Requirements
 
 - [CMake](https://cmake.org/download/) (must be in PATH)
-- [Qt 6.8](https://www.qt.io/download)
+- [Qt 6.9](https://www.qt.io/download)
 - A C++20 compile.
 
 #### With Visual Studio (new way)

appimage/UnCSO2.png

@@ -17,7 +17,7 @@ $isGccBuild = $curCompiler -eq 'gcc'
 $isClangBuild = $curCompiler -eq 'clang'
 #$isMingwBuild = $curBuildCombo -eq 'windows-mingw'
 #$isMsvcBuild = $curBuildCombo -eq 'windows-msvc'
-$qtVersion = if ($env:QT_VERSION) { $env:QT_VERSION } else { "6.8.0" };
+$qtVersion = if ($env:QT_VERSION) { $env:QT_VERSION } else { "6.9.0" };
 
 Write-Host "Running packaging script..."
 Write-Host "Current setup build combo is: $curBuildCombo"
@@ -33,7 +33,7 @@ if ($isLinux) {
     #Copy-Item ./build/libuncso2/external/cryptopp/libcryptopp.so* -Destination ./build/package/
 
     # copy AppImage prebuilt files
-    Copy-Item ./appimage/* -Destination ./build/package/
+    Copy-Item ./tf.harmony.UnCSO2.* -Destination ./build/package/
 
     # copy uncso2 itself to the package dir
     Copy-Item ./build/uc2 -Destination ./build/package/
@@ -79,13 +79,13 @@ if ($isLinux) {
     chmod a+x linuxdeploy-plugin-qt-x86_64.AppImage
 
     $env:VERSION = $versionStr;
-    ./linuxdeploy-x86_64.AppImage --appdir=./package/ --library=./package/libuncso2.so --executable=./package/uc2 --desktop-file=./package/UnCSO2.desktop --icon-file=./package/UnCSO2.png --plugin qt --output appimage
+    ./linuxdeploy-x86_64.AppImage --appdir=./package/ --library=./package/libuncso2.so --executable=./package/uc2 --desktop-file=./package/tf.harmony.UnCSO2.desktop --icon-file=./package/tf.harmony.UnCSO2.svg --plugin qt --output appimage
 
     if ($isGccBuild) {
-        Move-Item UnCSO2*.AppImage -Destination "../UnCSO2-$versionStr-linux64_gcc.AppImage"
+        Move-Item UnCSO2*.AppImage -Destination "../UnCSO2-$versionStr-linux-x86_64-gcc.AppImage"
     }
     elseif ($isClangBuild) {
-        Move-Item UnCSO2*.AppImage -Destination "../UnCSO2-$versionStr-linux64_clang.AppImage"
+        Move-Item UnCSO2*.AppImage -Destination "../UnCSO2-$versionStr-linux-x86_64-clang.AppImage"
     }
 }
 elseif ($isWindows) {
@@ -115,10 +115,10 @@ elseif ($isWindows) {
     Pop-Location
 
     #if ($isMingwBuild) {       
-    #    7z a -t7z -m0=lzma2 -mx=9 -mfb=64 -md=64m -ms=on "../UnCSO2-$versionStr-win64_mingw.7z" ./package/*
+    #    7z a -t7z -m0=lzma2 -mx=9 -mfb=64 -md=64m -ms=on "../UnCSO2-$versionStr-windows-x86_64_mingw.7z" ./package/*
     #}
     #elseif ($isMsvcBuild) {       
-        7z a -t7z -m0=lzma2 -mx=9 -mfb=64 -md=64m -ms=on "../UnCSO2-$versionStr-win64_msvc.7z" ./package/*
+        7z a -t7z -m0=lzma2 -mx=9 -mfb=64 -md=64m -ms=on "../UnCSO2-$versionStr-windows-x86_64_msvc.7z" ./package/*
     #}
 }
 

appveyor.yml

@@ -1,5 +1,5 @@
 <RCC>
     <qresource prefix="/icons">
-        <file>uncso2.svg</file>
+        <file alias="uncso2.svg">../tf.harmony.UnCSO2.svg</file>
     </qresource>
 </RCC>