Update to Ghidra 10.2

3 files changed, 40 insertions, 26 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 08f3d4a5594b..1592a4b43a21 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = ghidra-darcula
 	pkgdesc = Software reverse engineering framework (with dark theme)
-	pkgver = 10.1.4
+	pkgver = 10.2
 	pkgrel = 1
 	url = https://ghidra-sre.org
 	arch = x86_64
@@ -11,14 +11,14 @@ pkgbase = ghidra-darcula
 	makedepends = gradle
 	makedepends = unzip
 	depends = bash
-	depends = java-environment=11
+	depends = java-environment=17
 	depends = polkit
 	provides = ghidra
 	conflicts = ghidra
 	conflicts = ghidra-dev
 	conflicts = ghidra-desktop
 	options = !strip
-	source = git+https://github.com/NationalSecurityAgency/ghidra#tag=Ghidra_10.1.4_build
+	source = git+https://github.com/NationalSecurityAgency/ghidra#tag=Ghidra_10.2_build
 	source = git+https://github.com/encounter/darcula-laf.git#commit=5f401c27dc0710575d45e13c2c255d78dbe0a4ab
 	source = ghidra.desktop
 	source = ghidra-root.desktop
@@ -29,6 +29,6 @@ pkgbase = ghidra-darcula
 	sha512sums = 4cf019d5bfde5265d667400111fb0c2473caa2457756c9c73e33d6128da3b116bf8d1b8cbb4092bbe27ea65ea5ab46f922e05a1e53ff36b90f76d8fcc4bfc1e7
 	sha512sums = c717029cf31860e27b5563c3ff4b2740d4b1997bc50481214e24c38f12d9acbfa9ca2cbfe594d43071fbf8420ac8f022119c2c23ddef0c717d96860e22eb35c3
 	sha512sums = 0a35f58b1820ac65ce37d09b0a6904ab7018c773c73ecd29bcfda37cbd27f34af868585084b5cd408b1066b7956df043cb1573a1e3d890e173be737d2de51401
-	sha512sums = 833fc176889f7682028f167b3093d1828b79805aa58d7f8ed8387b4baeeec1da2f30e5d607aebdb460580b939ea9dceb35e4aabf03b0a0f29f328efaa58e2f82
+	sha512sums = b28edc15f99e6f6aacd844b6983ea23946c8479599a34c1254c1457235ae983951f4b4a2081fc7b937e83946dac948955136e06f7cc62dd5ddc9713e4463ab9a
 
 pkgname = ghidra-darcula
diff --git a/PKGBUILD b/PKGBUILD
index 7a7081a08c2a..f8b1f02b983e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 pkgname=ghidra-darcula
 _darcula=5f401c27dc0710575d45e13c2c255d78dbe0a4ab
 _darcula_version=2019.09
-pkgver=10.1.4
+pkgver=10.2
 pkgrel=1
 pkgdesc='Software reverse engineering framework (with dark theme)'
 arch=('x86_64' 'aarch64')
@@ -21,7 +21,7 @@ conflicts=(
 )
 depends=(
   'bash'
-  'java-environment=11'
+  'java-environment=17'
   'polkit'
 )
 makedepends=(
@@ -44,7 +44,7 @@ sha512sums=(
   '4cf019d5bfde5265d667400111fb0c2473caa2457756c9c73e33d6128da3b116bf8d1b8cbb4092bbe27ea65ea5ab46f922e05a1e53ff36b90f76d8fcc4bfc1e7'
   'c717029cf31860e27b5563c3ff4b2740d4b1997bc50481214e24c38f12d9acbfa9ca2cbfe594d43071fbf8420ac8f022119c2c23ddef0c717d96860e22eb35c3'
   '0a35f58b1820ac65ce37d09b0a6904ab7018c773c73ecd29bcfda37cbd27f34af868585084b5cd408b1066b7956df043cb1573a1e3d890e173be737d2de51401'
-  '833fc176889f7682028f167b3093d1828b79805aa58d7f8ed8387b4baeeec1da2f30e5d607aebdb460580b939ea9dceb35e4aabf03b0a0f29f328efaa58e2f82'
+  'b28edc15f99e6f6aacd844b6983ea23946c8479599a34c1254c1457235ae983951f4b4a2081fc7b937e83946dac948955136e06f7cc62dd5ddc9713e4463ab9a'
 )
 _pkgname="${pkgname/-*/}"
 _stop='\e[m'
@@ -63,8 +63,8 @@ prepare() {
 
   # Check Java version (thanks @ignapk)
   JDK_VERSION=$(java -version 2>&1)
-  if [[ ! $JDK_VERSION =~ 11\.0 ]]; then
-    echo "FAILURE: You seem to have jdk11 installed correctly but your system defaults to another java version. To enable jdk11 please type: sudo archlinux-java set java-11-openjdk"
+  if [[ ! $JDK_VERSION =~ 17\.0 ]]; then
+    echo "FAILURE: You seem to have jdk17 installed correctly but your system defaults to another java version. To enable jdk17 please type: sudo archlinux-java set java-17-openjdk"
     exit 1
   fi
 
diff --git a/darcula.patch b/darcula.patch
index a9b084e38773..f306f1587dbf 100644
--- a/darcula.patch
+++ b/darcula.patch
@@ -1,19 +1,19 @@
+diff --git a/Ghidra/Framework/Docking/build.gradle b/Ghidra/Framework/Docking/build.gradle
+index 139ec36c1..740d82356 100644
+--- a/Ghidra/Framework/Docking/build.gradle
++++ b/Ghidra/Framework/Docking/build.gradle
+@@ -37,6 +37,7 @@ dependencies {
+ // We export them to all "unnamed" modules, which are modules that don't define themselves
+ // as a new Java 9 style module.  Ghidra is currently using unnamed modules everywhere.
+ ext.addExports([
++	'java.desktop/sun.swing=ALL-UNNAMED',
+ 	'java.desktop/sun.awt=ALL-UNNAMED',
+ 	'java.desktop/sun.awt.image=ALL-UNNAMED'
+ ])
 diff --git a/Ghidra/Framework/Docking/src/main/java/docking/widgets/AbstractGCellRenderer.java b/Ghidra/Framework/Docking/src/main/java/docking/widgets/AbstractGCellRenderer.java
-index 48c057437..253eb3b5d 100644
+index 48c057437..a7b4fc347 100644
 --- a/Ghidra/Framework/Docking/src/main/java/docking/widgets/AbstractGCellRenderer.java
 +++ b/Ghidra/Framework/Docking/src/main/java/docking/widgets/AbstractGCellRenderer.java
-@@ -4,9 +4,9 @@
-  * Licensed under the Apache License, Version 2.0 (the "License");
-  * you may not use this file except in compliance with the License.
-  * You may obtain a copy of the License at
-- * 
-+ *
-  *      http://www.apache.org/licenses/LICENSE-2.0
-- * 
-+ *
-  * Unless required by applicable law or agreed to in writing, software
-  * distributed under the License is distributed on an "AS IS" BASIS,
-  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 @@ -32,7 +32,8 @@ import docking.widgets.label.GDHtmlLabel;
   */
  public abstract class AbstractGCellRenderer extends GDHtmlLabel {
@@ -34,10 +34,10 @@ index 48c057437..253eb3b5d 100644
  
  	protected Color getBackgroundColorForRow(int row) {
 diff --git a/Ghidra/Framework/Docking/src/main/java/docking/widgets/filter/FilterTextField.java b/Ghidra/Framework/Docking/src/main/java/docking/widgets/filter/FilterTextField.java
-index 6ec44132e..7a878c64d 100644
+index e6ad4df80..57e5625f2 100644
 --- a/Ghidra/Framework/Docking/src/main/java/docking/widgets/filter/FilterTextField.java
 +++ b/Ghidra/Framework/Docking/src/main/java/docking/widgets/filter/FilterTextField.java
-@@ -42,7 +42,7 @@ public class FilterTextField extends JPanel {
+@@ -43,7 +43,7 @@ public class FilterTextField extends JPanel {
  	private static final int FLASH_FREQUENCY_MS = 250;
  
  	private static Color FLASH_BACKGROUND_COLOR = Color.WHITE;
@@ -66,7 +66,7 @@ index 778efa242..eea383b15 100644
  	private static final Icon UP_ICON =
  		ResourceManager.getScaledIcon(Icons.SORT_ASCENDING_ICON, 14, 14);
 diff --git a/Ghidra/Framework/Docking/src/main/java/ghidra/docking/util/DockingWindowsLookAndFeelUtils.java b/Ghidra/Framework/Docking/src/main/java/ghidra/docking/util/DockingWindowsLookAndFeelUtils.java
-index 1d9ef7bb9..3dcb3834b 100644
+index 9b1e6199e..642f00686 100644
 --- a/Ghidra/Framework/Docking/src/main/java/ghidra/docking/util/DockingWindowsLookAndFeelUtils.java
 +++ b/Ghidra/Framework/Docking/src/main/java/ghidra/docking/util/DockingWindowsLookAndFeelUtils.java
 @@ -30,6 +30,9 @@ import ghidra.framework.Platform;
@@ -79,7 +79,7 @@ index 1d9ef7bb9..3dcb3834b 100644
  /**
   * A utility class to manage LookAndFeel (LaF) settings.
   */
-@@ -157,9 +160,8 @@ public class DockingWindowsLookAndFeelUtils {
+@@ -162,9 +165,8 @@ public class DockingWindowsLookAndFeelUtils {
  			throws ClassNotFoundException, InstantiationException, IllegalAccessException,
  			UnsupportedLookAndFeelException {
  
@@ -91,3 +91,17 @@ index 1d9ef7bb9..3dcb3834b 100644
  	}
  
  	private static String findLookAndFeelClassName(String lookAndFeelName) {
+diff --git a/gradle/root/distribution.gradle b/gradle/root/distribution.gradle
+index f44c8267b..b5a6d1688 100644
+--- a/gradle/root/distribution.gradle
++++ b/gradle/root/distribution.gradle
+@@ -137,7 +137,8 @@ task createJavadocs(type: Javadoc, description: 'Generate javadocs for all proje
+ 	
+ 	// Some internal packages are not public and need to be exported.
+     options.addMultilineStringsOption("-add-exports").setValue(["java.desktop/sun.awt.image=ALL-UNNAMED", 
+-    															"java.desktop/sun.awt=ALL-UNNAMED"])
++    															"java.desktop/sun.awt=ALL-UNNAMED", 
++    															"java.desktop/sun.swing=ALL-UNNAMED"])
+ }
+ 
+