From 25a70491a3f52fd1f3bd4e0e9cdcae893e99ce7a Mon Sep 17 00:00:00 2001 From: "Anna (navi) Figueiredo Gomes" Date: Sat, 12 Aug 2023 22:39:06 +0200 Subject: [PATCH 01/12] use NativeLibrary to try loading libgamemodeauto.so.0 this removes the reliance on path checking, instead moving it to the (appropriate) dlopen(3) call that dotnet does under the hood. that call loads libs based on different variables that are set by the user. thus allowing the user to have the lib in different paths scanned by /etc/ld.so.cache, or override it by setting LD_LIBRARY_PATH. Signed-off-by: Anna (navi) Figueiredo Gomes --- .../Components/SettingsPage/Tabs/SettingsTabWine.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/XIVLauncher.Core/Components/SettingsPage/Tabs/SettingsTabWine.cs b/src/XIVLauncher.Core/Components/SettingsPage/Tabs/SettingsTabWine.cs index 435006e3..8d542456 100644 --- a/src/XIVLauncher.Core/Components/SettingsPage/Tabs/SettingsTabWine.cs +++ b/src/XIVLauncher.Core/Components/SettingsPage/Tabs/SettingsTabWine.cs @@ -29,9 +29,10 @@ public SettingsTabWine() CheckVisibility = () => RuntimeInformation.IsOSPlatform(OSPlatform.Linux), CheckValidity = b => { - if (b == true && (!File.Exists("/usr/lib/libgamemodeauto.so.0") && !File.Exists("/app/lib/libgamemodeauto.so.0"))) + var handle = IntPtr.Zero; + if (b == true && !NativeLibrary.TryLoad("libgamemodeauto.so.0", out handle)) return "GameMode was not detected on your system."; - + NativeLibrary.Free(handle); return null; } }, From 0630d30a864209294016efd1f38613b3f9aa42a8 Mon Sep 17 00:00:00 2001 From: Blooym <19539165+Blooym@users.noreply.github.com> Date: Sat, 12 Aug 2023 23:04:26 +0100 Subject: [PATCH 02/12] ci: add quick way to generate nuget deps --- .../workflows/generate_flatpak_nuget_deps.yml | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 .github/workflows/generate_flatpak_nuget_deps.yml diff --git a/.github/workflows/generate_flatpak_nuget_deps.yml b/.github/workflows/generate_flatpak_nuget_deps.yml new file mode 100644 index 00000000..57f68240 --- /dev/null +++ b/.github/workflows/generate_flatpak_nuget_deps.yml @@ -0,0 +1,40 @@ +name: "Nuget Dependencies" + +on: + workflow_dispatch: + +jobs: + Generate: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v3 + with: + submodules: true + fetch-depth: 0 + + - name: Setup Python3 + uses: actions/setup-python@v4 + with: + python-version: 3.x + + - name: Setup Flatpak + run: | + sudo apt update -y + sudo apt install flatpak -y + flatpak remote-add --user --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo + flatpak install --user org.freedesktop.Sdk.Extension.dotnet6/x86_64/22.08 -y # Update this when needed. + flatpak install --user org.freedesktop.Sdk/x86_64/22.08 -y # As well as this, if dependency generation is failing. + + - name: Generate nuget-dependencies.json + working-directory: ./src/XIVLauncher.Core/ + run: | + curl -LO https://raw.githubusercontent.com/flatpak/flatpak-builder-tools/master/dotnet/flatpak-dotnet-generator.py + python3 flatpak-dotnet-generator.py nuget-dependencies.json XIVLauncher.Core.csproj + + - name: Upload nuget-dependencies.json + uses: actions/upload-artifact@v3 + with: + name: nuget-dependencies + path: | + ./src/XIVLauncher.Core/nuget-dependencies.json From 66e137ab0e3fae43eedac6945bbcc9d879938146 Mon Sep 17 00:00:00 2001 From: KazWolfe Date: Tue, 12 Sep 2023 09:41:52 -0700 Subject: [PATCH 03/12] Change Text to Custom Repo - Removes confusing "3rd Party" term --- src/XIVLauncher.Core/Components/MainPage/LoginFrame.cs | 2 +- .../Components/SettingsPage/Tabs/SettingsTabTroubleshooting.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/XIVLauncher.Core/Components/MainPage/LoginFrame.cs b/src/XIVLauncher.Core/Components/MainPage/LoginFrame.cs index aac7ae2e..7de7ff81 100644 --- a/src/XIVLauncher.Core/Components/MainPage/LoginFrame.cs +++ b/src/XIVLauncher.Core/Components/MainPage/LoginFrame.cs @@ -117,7 +117,7 @@ public override void Draw() ImGui.Separator(); - if (ImGui.MenuItem("Launch without 3rd-party plugins")) + if (ImGui.MenuItem("Launch without custom repo plugins")) { this.OnLogin?.Invoke(LoginAction.GameNoThirdparty); } diff --git a/src/XIVLauncher.Core/Components/SettingsPage/Tabs/SettingsTabTroubleshooting.cs b/src/XIVLauncher.Core/Components/SettingsPage/Tabs/SettingsTabTroubleshooting.cs index c3f4f153..91ca5428 100644 --- a/src/XIVLauncher.Core/Components/SettingsPage/Tabs/SettingsTabTroubleshooting.cs +++ b/src/XIVLauncher.Core/Components/SettingsPage/Tabs/SettingsTabTroubleshooting.cs @@ -43,7 +43,7 @@ public override void Draw() Program.ClearTools(true); } - ImGui.Text("\nClear all the files and folders related to Dalamud. Your settings will not be touched,\nbut all your plugins will be uninstalled, including 3rd-party repos."); + ImGui.Text("\nClear all the files and folders related to Dalamud. Your settings will not be touched,\nbut all your plugins will be uninstalled, including custom repos."); if (ImGui.Button("Clear Dalamud")) { Program.ClearPlugins(true); From 10be703df6afa7a93ad097b4ea524285cbe5e710 Mon Sep 17 00:00:00 2001 From: Rankyn Bass Date: Wed, 20 Sep 2023 15:39:37 -0700 Subject: [PATCH 04/12] Move Clear Settings button * Move it to the bottom, just above Clear All. * This makes it less likely someone will click this on accident. --- .../SettingsPage/Tabs/SettingsTabTroubleshooting.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/XIVLauncher.Core/Components/SettingsPage/Tabs/SettingsTabTroubleshooting.cs b/src/XIVLauncher.Core/Components/SettingsPage/Tabs/SettingsTabTroubleshooting.cs index 91ca5428..67569151 100644 --- a/src/XIVLauncher.Core/Components/SettingsPage/Tabs/SettingsTabTroubleshooting.cs +++ b/src/XIVLauncher.Core/Components/SettingsPage/Tabs/SettingsTabTroubleshooting.cs @@ -25,12 +25,6 @@ public override void Draw() ImGui.Separator(); - ImGui.Text("\nReset settings to default."); - if (ImGui.Button("Clear Settings")) - { - Program.ClearSettings(true); - } - ImGui.Text("\nClear the Wine Prefix - delete the ~/.xlcore/wineprefix folder"); if (ImGui.Button("Clear Prefix")) { @@ -55,6 +49,12 @@ public override void Draw() Program.ClearLogs(true); } + ImGui.Text("\nReset settings to default."); + if (ImGui.Button("Clear Settings")) + { + Program.ClearSettings(true); + } + ImGui.Text("\nDo all of the above."); if (ImGui.Button("Clear Everything")) { From 9fefb5477761bce4e89220163d4ce5d6501d12ba Mon Sep 17 00:00:00 2001 From: Blooym <19539165+Blooym@users.noreply.github.com> Date: Tue, 3 Oct 2023 10:03:06 +0100 Subject: [PATCH 05/12] Update submodules for patching fix --- lib/FFXIVQuickLauncher | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/FFXIVQuickLauncher b/lib/FFXIVQuickLauncher index 2844c3df..5e102289 160000 --- a/lib/FFXIVQuickLauncher +++ b/lib/FFXIVQuickLauncher @@ -1 +1 @@ -Subproject commit 2844c3df359080755bf4475aff30066c2e5cc29a +Subproject commit 5e1022893d0aa52da84680b7c0694bdd5d560b32 From e48cc19d51a6c881c9b54b1ce9c5dd36020e68ca Mon Sep 17 00:00:00 2001 From: Blooym <19539165+Blooym@users.noreply.github.com> Date: Tue, 3 Oct 2023 10:25:39 +0100 Subject: [PATCH 06/12] chore: actually bump assembly tag --- src/XIVLauncher.Core/XIVLauncher.Core.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/XIVLauncher.Core/XIVLauncher.Core.csproj b/src/XIVLauncher.Core/XIVLauncher.Core.csproj index 0cc2f9a9..cf0fa00a 100644 --- a/src/XIVLauncher.Core/XIVLauncher.Core.csproj +++ b/src/XIVLauncher.Core/XIVLauncher.Core.csproj @@ -9,7 +9,7 @@ latest Resources\dalamud_icon.ico - 1.0.4.0 + 1.0.5.0 $(Version) $(Version) From dbe7cc14eb6362827a94b91b33fe2a405103d11f Mon Sep 17 00:00:00 2001 From: Blooym <19539165+Blooym@users.noreply.github.com> Date: Tue, 3 Oct 2023 17:52:22 +0100 Subject: [PATCH 07/12] chore: update submodule to fix repair --- lib/FFXIVQuickLauncher | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/FFXIVQuickLauncher b/lib/FFXIVQuickLauncher index 5e102289..e6d2ff89 160000 --- a/lib/FFXIVQuickLauncher +++ b/lib/FFXIVQuickLauncher @@ -1 +1 @@ -Subproject commit 5e1022893d0aa52da84680b7c0694bdd5d560b32 +Subproject commit e6d2ff897dd0392ac3b18e0820734199db05c009 From 5202793ee0a534f2ea2939b3b4a0bcf17b0cb0d5 Mon Sep 17 00:00:00 2001 From: Blooym <19539165+Blooym@users.noreply.github.com> Date: Tue, 3 Oct 2023 17:53:47 +0100 Subject: [PATCH 08/12] ci: make release CI sync up its changes and delete branches that already exist --- .github/workflows/make-release.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/make-release.yml b/.github/workflows/make-release.yml index 24085ebb..16efca2f 100644 --- a/.github/workflows/make-release.yml +++ b/.github/workflows/make-release.yml @@ -89,7 +89,13 @@ jobs: # Clone the repository we want to make the PR to. gh repo fork ${{ env.BASE_REPO }} --clone=true --remote=true /tmp/xlcore-flatpak - # Create a new branch for the PR. + # Sync the main branch & create a new branch for the PR + git -C /tmp/xlcore-flatpak fetch upstream + git -C /tmp/xlcore-flatpak reset --hard && git -C /tmp/xlcore-flatpak clean -fdx + git -C /tmp/xlcore-flatpak pull upstream master + + # Delete (if exists) and create the branch we want to make the PR from. + git -C /tmp/xlcore-flatpak branch -D ${{ env.HEAD_BRANCH }} || true git -C /tmp/xlcore-flatpak checkout -b ${{ env.HEAD_BRANCH }} # Copy the files we need to the forked repository. @@ -113,7 +119,7 @@ jobs: # Push the changes to the fork. git remote -v - git push --set-upstream origin ${{ env.HEAD_BRANCH }} + git push --set-upstream origin ${{ env.HEAD_BRANCH }} --force # Make a PR from the fork to the upstream repository. gh pr create --repo ${{ env.BASE_REPO }} --title "Update to ${{ github.ref_name }}" --body "This PR was automatically generated by GitHub Actions." From 08fc6bf7932fdecf773cdba349c5b3016a53a293 Mon Sep 17 00:00:00 2001 From: Blooym <19539165+Blooym@users.noreply.github.com> Date: Tue, 3 Oct 2023 23:19:50 +0100 Subject: [PATCH 09/12] chore: include more fixes in submodule bump --- lib/FFXIVQuickLauncher | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/FFXIVQuickLauncher b/lib/FFXIVQuickLauncher index e6d2ff89..e8e22c32 160000 --- a/lib/FFXIVQuickLauncher +++ b/lib/FFXIVQuickLauncher @@ -1 +1 @@ -Subproject commit e6d2ff897dd0392ac3b18e0820734199db05c009 +Subproject commit e8e22c32969a858343b751dbbda4777606ba5717 From b3a41142377b5066bab639acddf4a6c6f20f2502 Mon Sep 17 00:00:00 2001 From: Blooym <19539165+Blooym@users.noreply.github.com> Date: Wed, 4 Oct 2023 18:20:48 +0100 Subject: [PATCH 10/12] chore: bump version to v1.0.6 --- src/XIVLauncher.Core/XIVLauncher.Core.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/XIVLauncher.Core/XIVLauncher.Core.csproj b/src/XIVLauncher.Core/XIVLauncher.Core.csproj index cf0fa00a..69fc52df 100644 --- a/src/XIVLauncher.Core/XIVLauncher.Core.csproj +++ b/src/XIVLauncher.Core/XIVLauncher.Core.csproj @@ -9,7 +9,7 @@ latest Resources\dalamud_icon.ico - 1.0.5.0 + 1.0.6.0 $(Version) $(Version) From c13ed3f2986b961f4db75fc03ecbaedd9b33db32 Mon Sep 17 00:00:00 2001 From: R Date: Thu, 5 Oct 2023 02:36:05 -0700 Subject: [PATCH 11/12] Update README.md Added MPR (git) and updated version text for PPA to reflect the current build it provides. --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index b460f25d..3183f0b4 100644 --- a/README.md +++ b/README.md @@ -24,6 +24,7 @@ XIVLauncher Core has community packages for various Linux distributions. Please | [Copr (Fedora+openSuse+EL9)](https://copr.fedorainfracloud.org/coprs/rankyn/xivlauncher/) | ![COPR version](https://img.shields.io/endpoint?url=https%3A%2F%2Fraw.githubusercontent.com%2Frankynbass%2FXIVLauncher4rpm%2Fmain%2Fbadge.json)| | [GURU (Gentoo)](https://gitweb.gentoo.org/repo/proj/guru.git/tree/games-util/xivlauncher) | ![GURU version](https://repology.org/badge/version-for-repo/gentoo_ovl_guru/xivlauncher.svg?header=guru) | | [MPR (Debian+Ubuntu)](https://mpr.makedeb.org/packages/xivlauncher) | ![MPR package](https://repology.org/badge/version-for-repo/mpr/xivlauncher.svg?header=MPR) | +| [MPR (git) (Debian+Ubuntu)](https://mpr.makedeb.org/packages/xivlauncher-git) | ![MPR package](https://repology.org/badge/version-for-repo/mpr/xivlauncher.svg?header=MPR) | | [nixpkgs stable](https://search.nixos.org/packages?channel=22.11&from=0&size=50&sort=relevance&type=packages&query=xivlauncher) | ![nixpkgs stable version](https://repology.org/badge/version-for-repo/nix_stable_22_11/xivlauncher.svg?header=nixpkgs%2022.11) | | [nixpkgs unstable](https://search.nixos.org/packages?channel=unstable&from=0&size=50&sort=relevance&type=packages&query=xivlauncher) | ![nixpkgs unstable version](https://repology.org/badge/version-for-repo/nix_unstable/xivlauncher.svg?header=nixpkgs%20unstable) | -| [PPA (Ubuntu)](https://launchpad.net/~linneris/+archive/ubuntu/xivlauncher-core-stable) | ![PPA version](https://img.shields.io/static/v1?label=PPA&message=1.0.3&color=brightgreen) | +| [PPA (Ubuntu)](https://launchpad.net/~linneris/+archive/ubuntu/xivlauncher-core-stable) | ![PPA version](https://img.shields.io/static/v1?label=PPA&message=1.0.5&color=brightgreen) | From c6be28e0471f9ee31af987ac3854c87761bdc718 Mon Sep 17 00:00:00 2001 From: ash Date: Sat, 21 Oct 2023 00:52:19 +0100 Subject: [PATCH 12/12] Bump nixpkgs stable link to 23.05 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3183f0b4..49e4b600 100644 --- a/README.md +++ b/README.md @@ -25,6 +25,6 @@ XIVLauncher Core has community packages for various Linux distributions. Please | [GURU (Gentoo)](https://gitweb.gentoo.org/repo/proj/guru.git/tree/games-util/xivlauncher) | ![GURU version](https://repology.org/badge/version-for-repo/gentoo_ovl_guru/xivlauncher.svg?header=guru) | | [MPR (Debian+Ubuntu)](https://mpr.makedeb.org/packages/xivlauncher) | ![MPR package](https://repology.org/badge/version-for-repo/mpr/xivlauncher.svg?header=MPR) | | [MPR (git) (Debian+Ubuntu)](https://mpr.makedeb.org/packages/xivlauncher-git) | ![MPR package](https://repology.org/badge/version-for-repo/mpr/xivlauncher.svg?header=MPR) | -| [nixpkgs stable](https://search.nixos.org/packages?channel=22.11&from=0&size=50&sort=relevance&type=packages&query=xivlauncher) | ![nixpkgs stable version](https://repology.org/badge/version-for-repo/nix_stable_22_11/xivlauncher.svg?header=nixpkgs%2022.11) | +| [nixpkgs stable](https://search.nixos.org/packages?channel=23.05&from=0&size=50&sort=relevance&type=packages&query=xivlauncher) | ![nixpkgs stable version](https://repology.org/badge/version-for-repo/nix_stable_23_05/xivlauncher.svg?header=nixpkgs%2023.05) | | [nixpkgs unstable](https://search.nixos.org/packages?channel=unstable&from=0&size=50&sort=relevance&type=packages&query=xivlauncher) | ![nixpkgs unstable version](https://repology.org/badge/version-for-repo/nix_unstable/xivlauncher.svg?header=nixpkgs%20unstable) | | [PPA (Ubuntu)](https://launchpad.net/~linneris/+archive/ubuntu/xivlauncher-core-stable) | ![PPA version](https://img.shields.io/static/v1?label=PPA&message=1.0.5&color=brightgreen) |