Add patch for jdk21

+ Fix namcap warnings

3 files changed, 39 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 328100d10f92..ab98dd683e91 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,10 @@
 pkgbase = lightzone
 	pkgdesc = Open-source professional-level digital darkroom software
 	pkgver = 5.0.0beta2
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/ktgw0316/LightZone/
 	arch = x86_64
-	license = custom:BSD-3-Clause
+	license = BSD-3-Clause
 	makedepends = java-environment=17
 	makedepends = ant
 	makedepends = autoconf
@@ -14,11 +14,9 @@ pkgbase = lightzone
 	makedepends = libx11
 	makedepends = pkgconf
 	makedepends = rsync
-	makedepends = javahelp2
-	makedepends = lcms2
-	makedepends = libjpeg-turbo
-	makedepends = libtiff
-	makedepends = libraw
+	depends = gcc-libs
+	depends = glibc
+	depends = hicolor-icon-theme
 	depends = java-runtime>=17
 	depends = javahelp2
 	depends = lcms2
@@ -30,6 +28,6 @@ pkgbase = lightzone
 	provides = lightzone
 	conflicts = lightzone-git
 	source = https://github.com/ktgw0316/LightZone//archive/5.0.0beta2.zip
-	md5sums = a39a95294e622238f0e0d6eea92cb22d
+	md5sums = d3b9246311182e12fc6da5230dfcb173
 
 pkgname = lightzone
diff --git a/PKGBUILD b/PKGBUILD
index e1e13f7aab51..0193a5545fc3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,21 +6,26 @@
 
 pkgname=lightzone
 pkgver=5.0.0beta2
-pkgrel=1
+pkgrel=2
 pkgdesc="Open-source professional-level digital darkroom software"
 url="https://github.com/ktgw0316/LightZone/"
-license=("custom:BSD-3-Clause")
+license=("BSD-3-Clause")
 arch=("x86_64")
 conflicts=('lightzone-git')
 provides=('lightzone')
-depends=('java-runtime>=17'
+depends=(
+    'gcc-libs'
+    'glibc'
+    'hicolor-icon-theme'
+    'java-runtime>=17'
     'javahelp2'
     'lcms2'
     'lensfun'
     'libjpeg-turbo'
     'libtiff'
     'libraw'
-    'libxml2')
+    'libxml2'
+)
 makedepends=('java-environment=17'
     'ant'
     'autoconf'
@@ -30,18 +35,22 @@ makedepends=('java-environment=17'
     'libx11'
     'pkgconf'
     'rsync'
-    'javahelp2'
-    'lcms2'
-    'libjpeg-turbo'
-    'libtiff'
-    'libraw')
+)
 
-git_url=${url}
-source=("${git_url}/archive/${pkgver}.zip")
+_git_url=${url}
+_patch_name="lombok_jdk21.patch"
+source=("${_git_url}/archive/${pkgver}.zip")
 md5sums=('d3b9246311182e12fc6da5230dfcb173')
 
+prepare() {
+  cd "${srcdir}/LightZone-${pkgver}/"
+  patch -Np1 -i "${srcdir}/../${_patch_name}"
+}
+
 build() {
-  if [ -d /usr/lib/jvm/java-17-openjdk ]; then
+  if [ -d /usr/lib/jvm/java-21-openjdk ]; then
+    export JAVA_HOME=/usr/lib/jvm/java-21-openjdk
+  elif [ -d /usr/lib/jvm/java-17-openjdk ]; then
     export JAVA_HOME=/usr/lib/jvm/java-17-openjdk
   else
     export JAVA_HOME=/usr/lib/jvm/default
diff --git a/lombok_jdk21.patch b/lombok_jdk21.patch
new file mode 100644
index 000000000000..46c8a635eb4d
--- /dev/null
+++ b/lombok_jdk21.patch
@@ -0,0 +1,12 @@
+diff --unified --recursive --text LightZone-5.0.0beta2/lightcrafts/ivy.xml LightZone-5.0.0beta2.new/lightcrafts/ivy.xml
+--- LightZone-5.0.0beta2/lightcrafts/ivy.xml	2023-09-25 21:58:06.000000000 +0900
++++ LightZone-5.0.0beta2.new/lightcrafts/ivy.xml	2024-03-31 14:38:38.160510073 +0900
+@@ -17,7 +17,7 @@
+     <dependency name="jiconfont-font_awesome" rev="4.7.0.0" org="com.github.jiconfont" conf="compile->default"/>
+     <dependency name="jiconfont-google_material_design_icons" rev="2.2.0.2" org="com.github.jiconfont" conf="compile->default"/>
+     <dependency name="jiconfont-swing" rev="1.0.1" org="com.github.jiconfont" conf="compile->default"/>
+-    <dependency name="lombok" rev="1.18.26" org="org.projectlombok" conf="compile->default"/>
++    <dependency name="lombok" rev="1.18.32" org="org.projectlombok" conf="compile->default"/>
+     <!-- Test dependencies -->
+     <dependency name="junit-jupiter-api" rev="5.9.3" org="org.junit.jupiter" conf="test->default"/>
+     <dependency name="junit-jupiter-params" rev="5.9.3" org="org.junit.jupiter" conf="test->default"/>