redstrate/astra
1
Fork 0
mirror of https://github.com/redstrate/Astra.git synced 2025-04-23 21:07:45 +00:00
Code Activity

Use steamwrap and more flatpak fixes

Browse source
This commit is contained in:
Joshua Goins 2023-12-20 19:29:04 -05:00
parent a10649781e
commit 52a0f700b5
3 changed files with 59 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
flatpak/kf6.json
View file

@ -610,6 +610,38 @@
"url" : "https://invent.kde.org/plasma/plasma-integration.git"
}
]
},
{
"builddir" : true,
"buildsystem" : "cmake-ninja",
"config-opts" : [
"-DBUILD_TESTING=OFF",
"-DBUILD_QT5=OFF"
],
"name" : "kquickcharts",
"sources" : [
{
"branch" : "master",
"type" : "git",
"url" : "https://invent.kde.org/frameworks/kquickcharts.git"
}
]
},
{
"builddir" : true,
"buildsystem" : "cmake-ninja",
"config-opts" : [
"-DBUILD_TESTING=OFF",
"-DBUILD_QT5=OFF"
],
"name" : "qqc2-breeze-style",
"sources" : [
{
"branch" : "master",
"type" : "git",
"url" : "https://invent.kde.org/plasma/qqc2-breeze-style.git"
}
]
}
]
}

12
launcher/src/compatibilitytoolinstaller.cpp
View file

@ -35,14 +35,12 @@ void CompatibilityToolInstaller::installCompatibilityTool()
QString command;
if (KSandbox::isFlatpak()) {
QFile wrapperFile(astraToolDir.absoluteFilePath(QStringLiteral("launch.sh")));
wrapperFile.open(QIODevice::WriteOnly);
wrapperFile.write(
QByteArrayLiteral("#!/bin/bash\n"
"LD_LIBRARY_PATH= exec \"${@:1}\""));
QProcess::execute(QStringLiteral("chmod"), {QStringLiteral("+x"), astraToolDir.absoluteFilePath(QStringLiteral("launch.sh"))});
QFile().copy(QStringLiteral("/app/bin/steamwrap"), astraToolDir.absoluteFilePath(QStringLiteral("steamwrap")));
QFile().copy(QStringLiteral("/app/bin/libsteam_api.so"), astraToolDir.absoluteFilePath(QStringLiteral("libsteam_api.so")));
command = QStringLiteral("/launch.sh /usr/bin/flatpak run zone.xiv.astra");
QProcess::execute(QStringLiteral("chmod"), {QStringLiteral("+x"), astraToolDir.absoluteFilePath(QStringLiteral("steamwrap"))});
command = QStringLiteral("/steamwrap /usr/bin/flatpak run zone.xiv.astra");
} else {
const QString appPath = QCoreApplication::applicationFilePath();
QFile appFile(appPath);

32
zone.xiv.astra.yml
View file

@ -11,12 +11,14 @@ build-options:
- --share=network
finish-args:
- --share=ipc
- --socket=x11
- --socket=wayland
- --filesystem=host
- --device=dri
- --socket=fallback-x11
- --share=network
- --filesystem=home
- --socket=pulseaudio
- --talk-name=org.freedesktop.secrets
- --system-talk-name=org.freedesktop.UDisks2
- --device=all
- --allow=devel
modules:
- flatpak/kf6.json
- flatpak/kirigami-addons.json
@ -58,11 +60,22 @@ modules:
sources:
- type: git
url: https://github.com/stachenov/quazip.git
#- name: icon
# buildsystem: simple
# build-commands:
# - mkdir -p /app/share/icons/hicolor/32x32/apps/
# - install -D /usr/share/icons/breeze/mimetypes/64/none.svg /app/share/icons/hicolor/32x32/apps/zone.xiv.astra.svg
- name: steamwrap
buildsystem: simple
build-commands:
- install -D steamwrap /app/bin/steamwrap
sources:
- type: file
url: https://xiv.zone/distrib/steamwrap/steamwrap
sha256: b6c8a398fdf88787000df5de133c748b896b1ba3a2a9892f2e10e0f8e02627af
- name: steamapi
buildsystem: simple
build-commands:
- install -D libsteam_api.so /app/bin/libsteam_api.so
sources:
- type: file
url: https://xiv.zone/distrib/steamwrap/libsteam_api.so
sha256: b50b9d313eb554792216762f5cc0b972cfae14149f720440e0f0d6c4563c951f
- name: qcoro
buildsystem: cmake-ninja
config-optios:
@ -109,7 +122,6 @@ modules:
- -DCMAKE_BUILD_TYPE=RelWithDebInfo
- -DRust_COMPILER=/usr/lib/sdk/rust-stable/bin/rustc
- -DENABLE_GAMEMODE=OFF
- -DENABLE_CLI=OFF
- -DBUILD_FLATPAK=ON
build-options:
build-args: