From af6f9fe5185c1425bac6394073c94be723489198 Mon Sep 17 00:00:00 2001
From: "ALLEN-PC\\acj30" <acj3017@gmail.com>
Date: Fri, 2 Dec 2022 19:03:29 -0600
Subject: [PATCH 1/2] Added a more concrete Linux exception for Discord RPC

---
 sp/src/game/client/client_base.vpc    | 2 +-
 sp/src/game/client/client_mapbase.vpc | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sp/src/game/client/client_base.vpc b/sp/src/game/client/client_base.vpc
index dcdb9ad3..9eae51f1 100644
--- a/sp/src/game/client/client_base.vpc
+++ b/sp/src/game/client/client_base.vpc
@@ -1261,7 +1261,7 @@ $Project
 		$ImpLib		steam_api
 		
 		// Discord integration
-		$Lib	"$LIBPUBLIC\discord-rpc" [$MAPBASE_RPC]
+		$Lib	"$LIBPUBLIC\discord-rpc" [$MAPBASE_RPC&&!$LINUXALL]
 		
 		$Lib $LIBCOMMON/libcrypto [$POSIX]
 
diff --git a/sp/src/game/client/client_mapbase.vpc b/sp/src/game/client/client_mapbase.vpc
index f8860e24..4e604314 100644
--- a/sp/src/game/client/client_mapbase.vpc
+++ b/sp/src/game/client/client_mapbase.vpc
@@ -10,7 +10,7 @@ $Configuration
 	{
 		$PreprocessorDefinitions		"$BASE;ASW_PROJECTED_TEXTURES;DYNAMIC_RTT_SHADOWS;GLOWS_ENABLE"
 		
-		$PreprocessorDefinitions		"$BASE;MAPBASE_RPC;DISCORD_RPC;STEAM_RPC"	[$MAPBASE_RPC]
+		$PreprocessorDefinitions		"$BASE;MAPBASE_RPC;DISCORD_RPC;STEAM_RPC"	[$MAPBASE_RPC&&!$LINUXALL]
 		$PreprocessorDefinitions		"$BASE;MAPBASE_VSCRIPT"		[$MAPBASE_VSCRIPT]
 		$PreprocessorDefinitions		"$BASE;NEW_RESPONSE_SYSTEM"		[$NEW_RESPONSE_SYSTEM]
 	}

From 82bc30cc2674448f4224cfafcf7f19d396c863a6 Mon Sep 17 00:00:00 2001
From: "ALLEN-PC\\acj30" <acj3017@gmail.com>
Date: Thu, 11 Jan 2024 15:55:38 -0600
Subject: [PATCH 2/2] Fix GitHub workflow not installing packages properly

---
 .github/workflows/mapbase_build-base.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/mapbase_build-base.yml b/.github/workflows/mapbase_build-base.yml
index e5619bfc..5b791c2f 100644
--- a/.github/workflows/mapbase_build-base.yml
+++ b/.github/workflows/mapbase_build-base.yml
@@ -194,7 +194,9 @@ jobs:
     - uses: actions/checkout@v3
 
     - name: Install GCC/G++ multilib
-      run: sudo apt-get install gcc-multilib g++-multilib
+      run: |
+        sudo apt-get update
+        sudo apt-get install gcc-multilib g++-multilib
 
     - name: Pick game
       if: inputs.project-group == 'game' || inputs.project-group == 'shaders'