diff --git a/srcpkgs/ghidra/patches/protobuf-3.23.4.patch b/srcpkgs/ghidra/patches/protobuf-3.23.4.patch
deleted file mode 100644
index e4fb6333779..00000000000
--- a/srcpkgs/ghidra/patches/protobuf-3.23.4.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-diff '--color=auto' -ur ghidra-10.3.2.orig/ghidra_build/Ghidra/Debug/Debugger-gadp/build.gradle ghidra-10.3.2/ghidra_build/Ghidra/Debug/Debugger-gadp/build.gradle
---- ghidra-10.3.2.orig/ghidra_build/Ghidra/Debug/Debugger-gadp/build.gradle	2023-07-11 22:09:00.000000000 +0200
-+++ ghidra-10.3.2/ghidra_build/Ghidra/Debug/Debugger-gadp/build.gradle	2023-07-16 19:53:06.304326118 +0200
-@@ -33,29 +33,29 @@
- def platform = getCurrentPlatformName()
- 
- dependencies {
--	allProtocArtifacts 'com.google.protobuf:protoc:3.21.8:windows-x86_64@exe'
--	allProtocArtifacts 'com.google.protobuf:protoc:3.21.8:linux-x86_64@exe'
--	allProtocArtifacts 'com.google.protobuf:protoc:3.21.8:linux-aarch_64@exe'
--	allProtocArtifacts 'com.google.protobuf:protoc:3.21.8:osx-x86_64@exe'
--	allProtocArtifacts 'com.google.protobuf:protoc:3.21.8:osx-aarch_64@exe'
-+	allProtocArtifacts 'com.google.protobuf:protoc:3.23.4:windows-x86_64@exe'
-+	allProtocArtifacts 'com.google.protobuf:protoc:3.23.4:linux-x86_64@exe'
-+	allProtocArtifacts 'com.google.protobuf:protoc:3.23.4:linux-aarch_64@exe'
-+	allProtocArtifacts 'com.google.protobuf:protoc:3.23.4:osx-x86_64@exe'
-+	allProtocArtifacts 'com.google.protobuf:protoc:3.23.4:osx-aarch_64@exe'
- 
- 	if (isCurrentWindows()) {
--		protocArtifact 'com.google.protobuf:protoc:3.21.8:windows-x86_64@exe'
-+		protocArtifact 'com.google.protobuf:protoc:3.23.4:windows-x86_64@exe'
- 	}
- 	if (isCurrentLinux()) {
- 		if (platform.endsWith("x86_64")) {
--			protocArtifact 'com.google.protobuf:protoc:3.21.8:linux-x86_64@exe'
-+			protocArtifact 'com.google.protobuf:protoc:3.23.4:linux-x86_64@exe'
- 		}
- 		else {
--			protocArtifact 'com.google.protobuf:protoc:3.21.8:linux-aarch_64@exe'
-+			protocArtifact 'com.google.protobuf:protoc:3.23.4:linux-aarch_64@exe'
- 		}
- 	}
- 	if (isCurrentMac()) {
- 		if (platform.endsWith("x86_64")) {
--			protocArtifact 'com.google.protobuf:protoc:3.21.8:osx-x86_64@exe'
-+			protocArtifact 'com.google.protobuf:protoc:3.23.4:osx-x86_64@exe'
- 		}
- 		else {
--			protocArtifact 'com.google.protobuf:protoc:3.21.8:osx-aarch_64@exe'
-+			protocArtifact 'com.google.protobuf:protoc:3.23.4:osx-aarch_64@exe'
- 		}
- 	}
- 
-@@ -69,7 +69,7 @@
- 
- /*protobuf {
- 	protoc {
--		artifact = 'com.google.protobuf:protoc:3.21.8'
-+		artifact = 'com.google.protobuf:protoc:3.23.4'
- 	}
- }*/
- 
-diff '--color=auto' -ur ghidra-10.3.2.orig/ghidra_build/Ghidra/Debug/Debugger-isf/build.gradle ghidra-10.3.2/ghidra_build/Ghidra/Debug/Debugger-isf/build.gradle
---- ghidra-10.3.2.orig/ghidra_build/Ghidra/Debug/Debugger-isf/build.gradle	2023-07-11 22:09:00.000000000 +0200
-+++ ghidra-10.3.2/ghidra_build/Ghidra/Debug/Debugger-isf/build.gradle	2023-07-16 19:53:06.304326118 +0200
-@@ -30,29 +30,29 @@
- def platform = getCurrentPlatformName()
- 
- dependencies {
--	allProtocArtifacts 'com.google.protobuf:protoc:3.21.8:windows-x86_64@exe'
--	allProtocArtifacts 'com.google.protobuf:protoc:3.21.8:linux-x86_64@exe'
--	allProtocArtifacts 'com.google.protobuf:protoc:3.21.8:linux-aarch_64@exe'
--	allProtocArtifacts 'com.google.protobuf:protoc:3.21.8:osx-x86_64@exe'
--	allProtocArtifacts 'com.google.protobuf:protoc:3.21.8:osx-aarch_64@exe'
-+	allProtocArtifacts 'com.google.protobuf:protoc:3.23.4:windows-x86_64@exe'
-+	allProtocArtifacts 'com.google.protobuf:protoc:3.23.4:linux-x86_64@exe'
-+	allProtocArtifacts 'com.google.protobuf:protoc:3.23.4:linux-aarch_64@exe'
-+	allProtocArtifacts 'com.google.protobuf:protoc:3.23.4:osx-x86_64@exe'
-+	allProtocArtifacts 'com.google.protobuf:protoc:3.23.4:osx-aarch_64@exe'
- 
- 	if (isCurrentWindows()) {
--		protocArtifact 'com.google.protobuf:protoc:3.21.8:windows-x86_64@exe'
-+		protocArtifact 'com.google.protobuf:protoc:3.23.4:windows-x86_64@exe'
- 	}
- 	if (isCurrentLinux()) {
- 		if (platform.endsWith("x86_64")) {
--			protocArtifact 'com.google.protobuf:protoc:3.21.8:linux-x86_64@exe'
-+			protocArtifact 'com.google.protobuf:protoc:3.23.4:linux-x86_64@exe'
- 		}
- 		else {
--			protocArtifact 'com.google.protobuf:protoc:3.21.8:linux-aarch_64@exe'
-+			protocArtifact 'com.google.protobuf:protoc:3.23.4:linux-aarch_64@exe'
- 		}
- 	}
- 	if (isCurrentMac()) {
- 		if (platform.endsWith("x86_64")) {
--			protocArtifact 'com.google.protobuf:protoc:3.21.8:osx-x86_64@exe'
-+			protocArtifact 'com.google.protobuf:protoc:3.23.4:osx-x86_64@exe'
- 		}
- 		else {
--			protocArtifact 'com.google.protobuf:protoc:3.21.8:osx-aarch_64@exe'
-+			protocArtifact 'com.google.protobuf:protoc:3.23.4:osx-aarch_64@exe'
- 		}
- 	}
- 
-diff '--color=auto' -ur ghidra-10.3.2.orig/ghidra_build/Ghidra/Debug/Framework-AsyncComm/Module.manifest ghidra-10.3.2/ghidra_build/Ghidra/Debug/Framework-AsyncComm/Module.manifest
---- ghidra-10.3.2.orig/ghidra_build/Ghidra/Debug/Framework-AsyncComm/Module.manifest	2023-07-11 22:09:00.000000000 +0200
-+++ ghidra-10.3.2/ghidra_build/Ghidra/Debug/Framework-AsyncComm/Module.manifest	2023-07-16 19:53:06.304326118 +0200
-@@ -1 +1 @@
--MODULE FILE LICENSE: lib/protobuf-java-3.21.8.jar BSD-3-GOOGLE
-+MODULE FILE LICENSE: lib/protobuf-java-3.23.4.jar BSD-3-GOOGLE
-diff '--color=auto' -ur ghidra-10.3.2.orig/ghidra_build/Ghidra/Debug/Framework-AsyncComm/build.gradle ghidra-10.3.2/ghidra_build/Ghidra/Debug/Framework-AsyncComm/build.gradle
---- ghidra-10.3.2.orig/ghidra_build/Ghidra/Debug/Framework-AsyncComm/build.gradle	2023-07-11 22:09:00.000000000 +0200
-+++ ghidra-10.3.2/ghidra_build/Ghidra/Debug/Framework-AsyncComm/build.gradle	2023-07-16 19:53:06.305326125 +0200
-@@ -22,7 +22,7 @@
- eclipse.project.name = 'Debug Framework-AsyncComm'
- 
- dependencies {
--	api 'com.google.protobuf:protobuf-java:3.21.8'
-+	api 'com.google.protobuf:protobuf-java:3.23.4'
- 	api project(':Generic')
- 	api project(':Graph')
- 	api project(':ProposedUtils')
diff --git a/srcpkgs/ghidra/patches/protoc.patch b/srcpkgs/ghidra/patches/protoc.patch
index 9423bc17c20..f028d1d3ddb 100644
--- a/srcpkgs/ghidra/patches/protoc.patch
+++ b/srcpkgs/ghidra/patches/protoc.patch
@@ -1,33 +1,72 @@
---- ghidra-10.3/ghidra_build/Ghidra/Debug/Debugger-gadp/build.gradle.orig
-+++ ghidra-10.3/ghidra_build/Ghidra/Debug/Debugger-gadp/build.gradle
-@@ -81,14 +81,9 @@
- 	ext.outdir = file("build/generated/source/proto/main/java")
- 	outputs.dir(outdir)
- 	inputs.files(src)
--	dependsOn(configurations.protocArtifact)
- 	doLast {
--		def exe = configurations.protocArtifact.first()
--		if (!isCurrentWindows()) {
--			exe.setExecutable(true)
--		}
- 		exec {
--			commandLine exe, "--java_out=$outdir", "-I$srcdir"
-+			commandLine '/usr/bin/protoc', "--java_out=$outdir", "-I$srcdir"
- 			args src
- 		}
- 	}
---- ghidra-10.3/ghidra_build/Ghidra/Debug/Debugger-isf/build.gradle.orig
-+++ ghidra-10.3/ghidra_build/Ghidra/Debug/Debugger-isf/build.gradle
-@@ -72,14 +72,9 @@
- 	ext.outdir = file("build/generated/source/proto/main/java")
- 	outputs.dir(outdir)
- 	inputs.files(src)
--	dependsOn(configurations.protocArtifact)
- 	doLast {
--		def exe = configurations.protocArtifact.first()
--		if (!isCurrentWindows()) {
--			exe.setExecutable(true)
--		}
+--- ghidra-10.4/ghidra_build/Ghidra/Debug/Framework-AsyncComm/Module.manifest
++++ ghidra-10.4/ghidra_build/Ghidra/Debug/Framework-AsyncComm/Module.manifest
+@@ -1 +1 @@
+-MODULE FILE LICENSE: lib/protobuf-java-3.21.8.jar BSD-3-GOOGLE
++MODULE FILE LICENSE: lib/protobuf-java-3.24.3.jar BSD-3-GOOGLE
+--- ghidra-10.4/ghidra_build/Ghidra/Debug/Framework-AsyncComm/build.gradle
++++ ghidra-10.4/ghidra_build/Ghidra/Debug/Framework-AsyncComm/build.gradle
+@@ -22,7 +22,7 @@
+ eclipse.project.name = 'Debug Framework-AsyncComm'
+ 
+ dependencies {
+-	api 'com.google.protobuf:protobuf-java:3.21.8'
++	api 'com.google.protobuf:protobuf-java:3.24.3'
+ 	api project(':Generic')
+ 	api project(':Graph')
+ 	api project(':ProposedUtils')
+--- ghidra-10.4/ghidra_build/gradle/debugger/hasProtobuf.gradle
++++ ghidra-10.4/ghidra_build/gradle/debugger/hasProtobuf.gradle
+@@ -26,36 +26,36 @@
+ 
+ 
+ dependencies {
+-	allProtocArtifacts 'com.google.protobuf:protoc:3.21.8:windows-x86_64@exe'
+-	allProtocArtifacts 'com.google.protobuf:protoc:3.21.8:linux-x86_64@exe'
+-	allProtocArtifacts 'com.google.protobuf:protoc:3.21.8:linux-aarch_64@exe'
+-	allProtocArtifacts 'com.google.protobuf:protoc:3.21.8:osx-x86_64@exe'
+-	allProtocArtifacts 'com.google.protobuf:protoc:3.21.8:osx-aarch_64@exe'
++	allProtocArtifacts 'com.google.protobuf:protoc:3.24.3:windows-x86_64@exe'
++	allProtocArtifacts 'com.google.protobuf:protoc:3.24.3:linux-x86_64@exe'
++	allProtocArtifacts 'com.google.protobuf:protoc:3.24.3:linux-aarch_64@exe'
++	allProtocArtifacts 'com.google.protobuf:protoc:3.24.3:osx-x86_64@exe'
++	allProtocArtifacts 'com.google.protobuf:protoc:3.24.3:osx-aarch_64@exe'
+ 
+ 	if (isCurrentWindows()) {
+-		protocArtifact 'com.google.protobuf:protoc:3.21.8:windows-x86_64@exe'
++		protocArtifact 'com.google.protobuf:protoc:3.24.3:windows-x86_64@exe'
+ 	}
+ 	if (isCurrentLinux()) {
+ 		if (platform.endsWith("x86_64")) {
+-			protocArtifact 'com.google.protobuf:protoc:3.21.8:linux-x86_64@exe'
++			protocArtifact 'com.google.protobuf:protoc:3.24.3:linux-x86_64@exe'
+ 		}
+ 		else {
+-			protocArtifact 'com.google.protobuf:protoc:3.21.8:linux-aarch_64@exe'
++			protocArtifact 'com.google.protobuf:protoc:3.24.3:linux-aarch_64@exe'
+ 		}
+ 	}
+ 	if (isCurrentMac()) {
+ 		if (platform.endsWith("x86_64")) {
+-			protocArtifact 'com.google.protobuf:protoc:3.21.8:osx-x86_64@exe'
++			protocArtifact 'com.google.protobuf:protoc:3.24.3:osx-x86_64@exe'
+ 		}
+ 		else {
+-			protocArtifact 'com.google.protobuf:protoc:3.21.8:osx-aarch_64@exe'
++			protocArtifact 'com.google.protobuf:protoc:3.24.3:osx-aarch_64@exe'
+ 		}
+ 	}
+ }
+ 
+ /*protobuf {
+ 	protoc {
+-		artifact = 'com.google.protobuf:protoc:3.21.8'
++		artifact = 'com.google.protobuf:protoc:3.24.3'
+ 	}
+ }*/
+ 
+@@ -74,7 +74,7 @@
+ 			exe.setExecutable(true)
+ 		}
  		exec {
 -			commandLine exe, "--java_out=$outdir", "-I$srcdir"
 +			commandLine '/usr/bin/protoc', "--java_out=$outdir", "-I$srcdir"
diff --git a/srcpkgs/ghidra/template b/srcpkgs/ghidra/template
index 3390832648d..5292aeb02bc 100644
--- a/srcpkgs/ghidra/template
+++ b/srcpkgs/ghidra/template
@@ -1,6 +1,6 @@
 # Template file for 'ghidra'
 pkgname=ghidra
-version=10.3.3
+version=10.4
 revision=1
 _dex_ver=2.1
 _yajsw_ver=13.09
@@ -29,7 +29,7 @@ distfiles="https://github.com/NationalSecurityAgency/ghidra/archive/Ghidra_${ver
  https://github.com/NationalSecurityAgency/ghidra-data/raw/Ghidra_${version}/FunctionID/vs2019_x86.fidb
  https://github.com/NationalSecurityAgency/ghidra-data/raw/Ghidra_${version}/FunctionID/vsOlder_x64.fidb
  https://github.com/NationalSecurityAgency/ghidra-data/raw/Ghidra_${version}/FunctionID/vsOlder_x86.fidb"
-checksum="7600fd346a8a5f2072c660d88dd48e4bd14c5db84cbaaffd05320954702d2892
+checksum="8267576d169e6db9d8c3560181d31cea457e019df890b15b5ac0c67034c0b336
  7a9bdf843d43de4d1e94ec2e7b6f55825017b0c4a7ee39ff82660e2493a46f08
  4dae732a535846ae5dfab753e82a4d5f93ad9a05a065e2172bb9774a1b15453a
  00ed038eb6abaf6ddec8d202a3ed7a81b521458f4cd459948115cfd02ff59d6d