Add dep, add desktop entry and icons, check for bad commit

3 files changed, 35 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c398b5ab2058..d645025b1e6a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = ghidra-git
 	pkgdesc = Software reverse engineering framework (git)
-	pkgver = 9.0.4+818+g6da0d934
+	pkgver = 9.0.4+822+g3a12b5bb
 	pkgrel = 1
 	url = https://www.nsa.gov/ghidra
 	arch = x86_64
@@ -11,6 +11,7 @@ pkgbase = ghidra-git
 	makedepends = fop
 	depends = java-environment>=11
 	depends = bash
+	depends = hicolor-icon-theme
 	provides = ghidra
 	conflicts = ghidra
 	conflicts = ghidra-bin
@@ -23,12 +24,14 @@ pkgbase = ghidra-git
 	source = https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/android4me/AXMLPrinter2.jar
 	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
 	sha512sums = SKIP
 	sha512sums = SKIP
 	sha512sums = c4a6c72ea09b58a44fcb8918cfada600467f10f99a02b53d2436ac68295e73c8daf9ba0a8bc7160ba1e28e87f032ee034435ebe40af35b6e2fe9fa4607581358
 	sha512sums = c1168ec913f1fbb0675915d4fd865ec9a8e8573f6c8aedcb6e68166f61f11aeaececc7548d54d78134843c0102c57d6350973f6d3027d0ffdae52a5c57a7f601
 	sha512sums = 0ff5a228ae1c5251c8ba59f9bcd9b4a199b0caaf688f6eccba42c3d227784d8f56f9164b2fad73fc173ec314340c036144123ce152fe911013df5598bd708944
 	sha512sums = b85b4316115695acc78cc7c675c673058c05a238451562be0c6a48b2d11a28e5645a42cb62cdf063be015369df26201dfab6cf2e60f39e6468d1d53b23f94415
+	sha512sums = a85b8b3276e2ff4ed8bda6470c15d02711ebaa48463c775cd2a36549fad738e9fe073dab80f8c57646490ffc959cdc27e9d25b1dc2a5810b0ddb249b5dc99a9b
 
 pkgname = ghidra-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 09f8af63a792..dc9316b5b338 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: Danny Bautista <pyrolagus@gmail.com>
 
 pkgname=ghidra-git
-pkgver=9.0.4+818+g6da0d934
+pkgver=9.0.4+822+g3a12b5bb
 _d2j=2.0
 _yajsw=12.12
 _hfsx=0.21
@@ -14,14 +14,15 @@ _git=https://github.com/NationalSecurityAgency/ghidra
 license=(Apache)
 provides=(ghidra)
 conflicts=(ghidra ghidra-bin)
-depends=('java-environment>=11' bash)
+depends=('java-environment>=11' bash hicolor-icon-theme)
 makedepends=(git gradle unzip fop)
 source=(git+$_git
         git+$_git-data
         https://github.com/pxb1988/dex2jar/releases/download/$_d2j/dex-tools-$_d2j.zip
         https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/android4me/AXMLPrinter2.jar
         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)
+        https://sourceforge.net/projects/catacombae/files/HFSExplorer/$_hfsx/hfsexplorer-${_hfsx/./_}-bin.zip
+        ghidra.desktop)
 noextract=(AXMLPrinter2.jar
            yajsw-stable-$_yajsw.zip
            hfsexplorer-${_hfsx/./_}-bin.zip)
@@ -30,11 +31,12 @@ sha512sums=('SKIP'
             'c4a6c72ea09b58a44fcb8918cfada600467f10f99a02b53d2436ac68295e73c8daf9ba0a8bc7160ba1e28e87f032ee034435ebe40af35b6e2fe9fa4607581358'
             'c1168ec913f1fbb0675915d4fd865ec9a8e8573f6c8aedcb6e68166f61f11aeaececc7548d54d78134843c0102c57d6350973f6d3027d0ffdae52a5c57a7f601'
             '0ff5a228ae1c5251c8ba59f9bcd9b4a199b0caaf688f6eccba42c3d227784d8f56f9164b2fad73fc173ec314340c036144123ce152fe911013df5598bd708944'
-            'b85b4316115695acc78cc7c675c673058c05a238451562be0c6a48b2d11a28e5645a42cb62cdf063be015369df26201dfab6cf2e60f39e6468d1d53b23f94415')
+            'b85b4316115695acc78cc7c675c673058c05a238451562be0c6a48b2d11a28e5645a42cb62cdf063be015369df26201dfab6cf2e60f39e6468d1d53b23f94415'
+            'a85b8b3276e2ff4ed8bda6470c15d02711ebaa48463c775cd2a36549fad738e9fe073dab80f8c57646490ffc959cdc27e9d25b1dc2a5810b0ddb249b5dc99a9b')
 
 pkgver() {
   cd ghidra
-  git describe --tags | sed 's#Ghidra_##;s#_build##;s#-#+#g' #;s#+#+r#' # Add when pkgver goes to 9.0.5
+  git describe --tags | sed 's#Ghidra_##;s#_build##;s#-#+#g' # ;s#+#+r#' # Add when pkgver goes to 9.0.5
 }
 
 prepare() {
@@ -44,7 +46,13 @@ prepare() {
 
   cd ghidra
 
-  # Copy needed libraries into flat repo folder
+  # This commit breaks the build
+  if [ "$(git describe --tags)" = 'Ghidra_9.0.4_build-828-g8f3f5c18' ]; then
+    git checkout HEAD^
+    cd .. && pkgver
+  fi
+
+  # Copy needed libraries into a flat repo
   mkdir flatRepo
   cp ../dex2jar-$_d2j/lib/dex-*.jar \
     ../AXMLPrinter2.jar \
@@ -52,7 +60,8 @@ prepare() {
     flatRepo
 
   # YAJSW expects this symlink
-  ln -sf ghidra ../ghidra.bin
+  ln -s ghidra ../ghidra.bin
+  # and it's archive is used by GhidraServer
   cp ../yajsw-stable-$_yajsw.zip Ghidra/Features/GhidraServer
 
   # Add FID datasets
@@ -90,5 +99,11 @@ package() {
   ln -s /opt/ghidra/ghidraRun "$pkgdir"/usr/bin/ghidra
   ln -s /opt/ghidra/support/analyzeHeadless "$pkgdir"/usr/bin/ghidra-analyzeHeadless
 
+  install -Dm 644 ../ghidra.desktop -t "$pkgdir"/usr/share/applications
+  for i in 16 24 32 40 48 64 128 256; do
+    install -Dm 644 Ghidra/Framework/Generic/src/main/resources/images/GhidraIcon$i.png \
+      "$pkgdir"/usr/share/icons/hicolor/${i}x${i}/apps/ghidra.png
+  done
+
   install -Dm 644 LICENSE -t "$pkgdir"/usr/share/licenses/ghidra
 }
diff --git a/ghidra.desktop b/ghidra.desktop
new file mode 100644
index 000000000000..f5d46dc9f4a4
--- /dev/null
+++ b/ghidra.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+Name=Ghidra
+Comment=Software reverse engineering framework
+Exec=ghidra
+Icon=ghidra
+Categories=Utility;
+Terminal=false