simon/nixos-config
simon/nixos-config
1
1
Fork 0
Code Issues 8 Pull requests Actions Projects Activity

pkgs/osu-lazer: Rebase patches

Browse source
This commit is contained in:
Simon Bruder 2023-01-10 17:22:58 +01:00
parent 3a5236fb76
commit c2c8e70f1e
Signed by: simon
GPG key ID: 8D3C82F9F309F8EC
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkgs/osu-lazer/0001-Disable-deployed-build.patch
View file

@ -1,4 +1,4 @@
From ba1b9a0549968992b34093f587fde5570dd4dfe2 Mon Sep 17 00:00:00 2001 From fcf66151219e26ac5ab50aecc37af84a52d949a1 Mon Sep 17 00:00:00 2001
From: Simon Bruder <simon@sbruder.de> From: Simon Bruder <simon@sbruder.de>
Date: Fri, 9 Apr 2021 12:01:42 +0200 Date: Fri, 9 Apr 2021 12:01:42 +0200
Subject: [PATCH 1/2] Disable deployed build Subject: [PATCH 1/2] Disable deployed build
@ -9,10 +9,10 @@ It shows warnings at startup which prolong the time it takes to start.
1 file changed, 1 insertion(+), 4 deletions(-) 1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 3b81b5c8cd..856b7a0039 100644 index 36e248c1f2..f6ba27bed5 100644
--- a/osu.Game/OsuGameBase.cs --- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs +++ b/osu.Game/OsuGameBase.cs
@@ -98,7 +98,7 @@ public partial class OsuGameBase : Framework.Game, ICanAcceptFiles, IBeatSyncPro @@ -108,7 +108,7 @@ public partial class OsuGameBase : Framework.Game, ICanAcceptFiles, IBeatSyncPro
/// </summary> /// </summary>
public string VersionHash { get; private set; } public string VersionHash { get; private set; }
@ -21,7 +21,7 @@ index 3b81b5c8cd..856b7a0039 100644
internal const string BUILD_SUFFIX = "lazer"; internal const string BUILD_SUFFIX = "lazer";
@@ -106,9 +106,6 @@ public virtual string Version @@ -116,9 +116,6 @@ public virtual string Version
{ {
get get
{ {
@ -32,5 +32,5 @@ index 3b81b5c8cd..856b7a0039 100644
return $@"{version.Major}.{version.Minor}.{version.Build}-{BUILD_SUFFIX}"; return $@"{version.Major}.{version.Minor}.{version.Build}-{BUILD_SUFFIX}";
} }
-- --
2.36.0 2.38.1

10
pkgs/osu-lazer/0002-Remove-random-song-button-from-footer.patch
View file

@ -1,4 +1,4 @@
From 9e2055a56686cfb0231915289bf977a590d5b10d Mon Sep 17 00:00:00 2001 From 5281678cb08ed3e665966f9558167697989dca64 Mon Sep 17 00:00:00 2001
From: Simon Bruder <simon@sbruder.de> From: Simon Bruder <simon@sbruder.de>
Date: Fri, 9 Apr 2021 12:02:44 +0200 Date: Fri, 9 Apr 2021 12:02:44 +0200
Subject: [PATCH 2/2] Remove random song button from footer Subject: [PATCH 2/2] Remove random song button from footer
@ -9,10 +9,10 @@ I often click it accidentally.
1 file changed, 5 deletions(-) 1 file changed, 5 deletions(-)
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index 7abcbfca42..7bbfac6a85 100644 index f4804c6a6c..dafc0e53f7 100644
--- a/osu.Game/Screens/Select/SongSelect.cs --- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs +++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -305,11 +305,6 @@ protected override void LoadComplete() @@ -321,11 +321,6 @@ protected override bool OnScroll(ScrollEvent e)
protected virtual IEnumerable<(FooterButton, OverlayContainer)> CreateFooterButtons() => new (FooterButton, OverlayContainer)[] protected virtual IEnumerable<(FooterButton, OverlayContainer)> CreateFooterButtons() => new (FooterButton, OverlayContainer)[]
{ {
(new FooterButtonMods { Current = Mods }, ModSelect), (new FooterButtonMods { Current = Mods }, ModSelect),
@ -21,9 +21,9 @@ index 7abcbfca42..7bbfac6a85 100644
- NextRandom = () => Carousel.SelectNextRandom(), - NextRandom = () => Carousel.SelectNextRandom(),
- PreviousRandom = Carousel.SelectPreviousRandom - PreviousRandom = Carousel.SelectPreviousRandom
- }, null), - }, null),
(new FooterButtonOptions(), BeatmapOptions) (beatmapOptionsButton = new FooterButtonOptions(), BeatmapOptions)
}; };
-- --
2.36.0 2.38.1