Remove patch for #2443

2 files changed, 3 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d91b6c60b7ad..a404b1fafd5b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = ghidra-git
 	pkgdesc = Software reverse engineering framework (git)
-	pkgver = 9.2+r57+g8f1be0932
+	pkgver = 9.2.2+r211+g41c453c54
 	pkgrel = 1
 	url = https://www.nsa.gov/ghidra
 	arch = x86_64
@@ -25,7 +25,6 @@ pkgbase = ghidra-git
 	source = https://sourceforge.net/projects/yajsw/files/yajsw/yajsw-stable-12.12/yajsw-stable-12.12.zip
 	source = https://sourceforge.net/projects/catacombae/files/HFSExplorer/0.21/hfsexplorer-0_21-bin.zip
 	source = ghidra.desktop
-	source = 2443.patch
 	sha512sums = SKIP
 	sha512sums = SKIP
 	sha512sums = c4a6c72ea09b58a44fcb8918cfada600467f10f99a02b53d2436ac68295e73c8daf9ba0a8bc7160ba1e28e87f032ee034435ebe40af35b6e2fe9fa4607581358
@@ -33,7 +32,6 @@ pkgbase = ghidra-git
 	sha512sums = 0ff5a228ae1c5251c8ba59f9bcd9b4a199b0caaf688f6eccba42c3d227784d8f56f9164b2fad73fc173ec314340c036144123ce152fe911013df5598bd708944
 	sha512sums = b85b4316115695acc78cc7c675c673058c05a238451562be0c6a48b2d11a28e5645a42cb62cdf063be015369df26201dfab6cf2e60f39e6468d1d53b23f94415
 	sha512sums = a85b8b3276e2ff4ed8bda6470c15d02711ebaa48463c775cd2a36549fad738e9fe073dab80f8c57646490ffc959cdc27e9d25b1dc2a5810b0ddb249b5dc99a9b
-	sha512sums = f659c42f50213fcd08770952292de23344a7e13e8412f538ffce8beea89bae0b260e0d0e88119f95218be56557db31ceb7365308657dc2bbb3d6af4a05321ec7
 
 pkgname = ghidra-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 4938f0da0aa4..7e30f542a5bd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: Danny Bautista <pyrolagus@gmail.com>
 
 pkgname=ghidra-git
-pkgver=9.2+r57+g8f1be0932
+pkgver=9.2.2+r211+g41c453c54
 _d2j=2.0
 _yajsw=12.12
 _hfsx=0.21
@@ -24,7 +24,6 @@ source=(
   https://sourceforge.net/projects/yajsw/files/yajsw/yajsw-stable-$_yajsw/yajsw-stable-$_yajsw.zip
   https://sourceforge.net/projects/catacombae/files/HFSExplorer/$_hfsx/hfsexplorer-${_hfsx/./_}-bin.zip
   ghidra.desktop
-  2443.patch
 )
 noextract=(
   AXMLPrinter2.jar
@@ -37,8 +36,7 @@ sha512sums=('SKIP'
             'c1168ec913f1fbb0675915d4fd865ec9a8e8573f6c8aedcb6e68166f61f11aeaececc7548d54d78134843c0102c57d6350973f6d3027d0ffdae52a5c57a7f601'
             '0ff5a228ae1c5251c8ba59f9bcd9b4a199b0caaf688f6eccba42c3d227784d8f56f9164b2fad73fc173ec314340c036144123ce152fe911013df5598bd708944'
             'b85b4316115695acc78cc7c675c673058c05a238451562be0c6a48b2d11a28e5645a42cb62cdf063be015369df26201dfab6cf2e60f39e6468d1d53b23f94415'
-            'a85b8b3276e2ff4ed8bda6470c15d02711ebaa48463c775cd2a36549fad738e9fe073dab80f8c57646490ffc959cdc27e9d25b1dc2a5810b0ddb249b5dc99a9b'
-            'f659c42f50213fcd08770952292de23344a7e13e8412f538ffce8beea89bae0b260e0d0e88119f95218be56557db31ceb7365308657dc2bbb3d6af4a05321ec7')
+            'a85b8b3276e2ff4ed8bda6470c15d02711ebaa48463c775cd2a36549fad738e9fe073dab80f8c57646490ffc959cdc27e9d25b1dc2a5810b0ddb249b5dc99a9b')
 
 pkgver() {
   cd ghidra
@@ -68,9 +66,6 @@ prepare() {
 
   # Ignore lack of licensing for YAJSW zip, packed FID datasets, and the native binaries
   sed -i '/FileTree tree/a\\t\texclude "yajsw-stable-**.zip"\n\t\texclude "src/main/fidb/**.fidb"\n\t\texclude "os/linux64/**"' gradle/support/ip.gradle
-
-  # Patch for https://github.com/NationalSecurityAgency/ghidra/issues/2443
-  patch -Np1 -i "$srcdir"/2443.patch
 }
 
 build() {