summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAvery2023-01-24 22:44:39 +0800
committerAvery2023-01-24 22:44:39 +0800
commit9121be14ecdab2697f23ac2a0e74858a5b570c11 (patch)
tree631ca9b7f38d2187ec39eded081ac6fdcf08d5d0
parentff64136059d0007f743585344e7e053a941cc4f7 (diff)
downloadaur-9121be14ecdab2697f23ac2a0e74858a5b570c11.tar.gz
chore: revert patch due to merged fix
-rw-r--r--.SRCINFO4
-rw-r--r--0000_Fix-numeric-limits.patch12
-rw-r--r--PKGBUILD9
3 files changed, 3 insertions, 22 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 47637e0ae833..1d974ca3ba7b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = ghidra-git
pkgdesc = Software reverse engineering framework (git)
- pkgver = 10.2.2.r610.ba0b42dc8
+ pkgver = 10.2.2.r620.e5a8f2634
pkgrel = 1
url = https://www.nsa.gov/ghidra
arch = x86_64
@@ -22,11 +22,9 @@ pkgbase = ghidra-git
source = ghidra.desktop
source = ghidra-root.desktop
source = ghidra.policy
- source = 0000_Fix-numeric-limits.patch
sha512sums = SKIP
sha512sums = a85b8b3276e2ff4ed8bda6470c15d02711ebaa48463c775cd2a36549fad738e9fe073dab80f8c57646490ffc959cdc27e9d25b1dc2a5810b0ddb249b5dc99a9b
sha512sums = c717029cf31860e27b5563c3ff4b2740d4b1997bc50481214e24c38f12d9acbfa9ca2cbfe594d43071fbf8420ac8f022119c2c23ddef0c717d96860e22eb35c3
sha512sums = 0a35f58b1820ac65ce37d09b0a6904ab7018c773c73ecd29bcfda37cbd27f34af868585084b5cd408b1066b7956df043cb1573a1e3d890e173be737d2de51401
- sha512sums = 76562e69f900b77198168b433c43624bd412796b2b63ad32abb5dc079b143fe52562febfa3d881fc0f2d07335c4bf6f555f0097599d5c69bfd9054d47e1b84d6
pkgname = ghidra-git
diff --git a/0000_Fix-numeric-limits.patch b/0000_Fix-numeric-limits.patch
deleted file mode 100644
index f85efc01cdac..000000000000
--- a/0000_Fix-numeric-limits.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/float.cc b/Ghidra/Features/Decompiler/src/decompile/cpp/float.cc
-index 23bd6b385d..38c973ce85 100644
---- a/Ghidra/Features/Decompiler/src/decompile/cpp/float.cc
-+++ b/Ghidra/Features/Decompiler/src/decompile/cpp/float.cc
-@@ -18,6 +18,7 @@
- #include "address.hh"
-
- #include <cmath>
-+#include <limits>
- using std::ldexp;
- using std::frexp;
- using std::signbit;
diff --git a/PKGBUILD b/PKGBUILD
index cd543508e90e..50392309db14 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
# Contributor: nullableVoidPtr <nullableVoidPtr _ gmail _ com>
pkgname=ghidra-git
-pkgver=10.2.2.r610.ba0b42dc8
+pkgver=10.2.2.r620.e5a8f2634
pkgrel=1
pkgdesc='Software reverse engineering framework (git)'
arch=('x86_64' 'aarch64')
@@ -34,13 +34,11 @@ source=(
'ghidra.desktop'
'ghidra-root.desktop'
'ghidra.policy'
- '0000_Fix-numeric-limits.patch'
)
sha512sums=('SKIP'
'a85b8b3276e2ff4ed8bda6470c15d02711ebaa48463c775cd2a36549fad738e9fe073dab80f8c57646490ffc959cdc27e9d25b1dc2a5810b0ddb249b5dc99a9b'
'c717029cf31860e27b5563c3ff4b2740d4b1997bc50481214e24c38f12d9acbfa9ca2cbfe594d43071fbf8420ac8f022119c2c23ddef0c717d96860e22eb35c3'
- '0a35f58b1820ac65ce37d09b0a6904ab7018c773c73ecd29bcfda37cbd27f34af868585084b5cd408b1066b7956df043cb1573a1e3d890e173be737d2de51401'
- '76562e69f900b77198168b433c43624bd412796b2b63ad32abb5dc079b143fe52562febfa3d881fc0f2d07335c4bf6f555f0097599d5c69bfd9054d47e1b84d6')
+ '0a35f58b1820ac65ce37d09b0a6904ab7018c773c73ecd29bcfda37cbd27f34af868585084b5cd408b1066b7956df043cb1573a1e3d890e173be737d2de51401')
_pkgname="${pkgname/-git/}"
_stop='\e[m'
_color="\e[33m"
@@ -68,9 +66,6 @@ prepare() {
# echo -e "${_prefix}[PATCH] - GP-793 corrected missing IP info (https://github.com/NationalSecurityAgency/ghidra/commit/70675fce99a4c6e6e650729e5dda6ccbbbbbd40d)"
# patch --no-backup-if-mismatch --forward --strip=2 --input="${srcdir}/0000-GP-793-corrected-missing-IP-info.patch"
- echo -e "${_prefix}[PATCH] - Include limits.h in float decompiler source code"
- patch --no-backup-if-mismatch --forward --strip=1 --input="${srcdir}/0000_Fix-numeric-limits.patch"
-
echo -e "${_prefix}Setting up the build dependencies"
gradle --parallel --init-script gradle/support/fetchDependencies.gradle init