From 5610414aa45519dfa179a5faa882c61381801f3a Mon Sep 17 00:00:00 2001
From: Jared Cervantes <jared@jaredcervantes.com>
Date: Sun, 14 Jun 2026 17:22:47 -0400
Subject: [PATCH] z3: Switch to OpenJDK-25

Signed-off-by: Jared Cervantes <jared@jaredcervantes.com>
---
 packages/z/z3/package.yml      | 24 +++++++++++++++---------
 packages/z/z3/pspec_x86_64.xml | 17 +++++++++--------
 2 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/packages/z/z3/package.yml b/packages/z/z3/package.yml
index a0744941cea..03d8ff5510c 100644
--- a/packages/z/z3/package.yml
+++ b/packages/z/z3/package.yml
@@ -1,7 +1,7 @@
 # yaml-language-server: $schema=/usr/share/ypkg/schema/schema.json
 name       : z3
 version    : 4.15.4
-release    : 14
+release    : 15
 source     :
     - https://github.com/Z3Prover/z3/archive/refs/tags/z3-4.15.4.tar.gz : dae526252cb0585c8c863292ebec84cace4901a014b190a73f14087dd08d252b
 homepage   : https://z3prover.github.io/
@@ -18,26 +18,32 @@ description: |
     Z3 is a theorem prover from Microsoft Research.
 builddeps  :
     - pkgconfig(gmp)
-    - openjdk-21-devel
-patterns   :
-    - ^python-z3 :
-        - /usr/lib*/python*
-    - java :
-        - /usr/share/java
-        - /usr/lib*/*java*
+    - openjdk-25-devel
 environment: |
-    export JAVA_HOME=/usr/lib64/openjdk-21
+    export JAVA_HOME=/usr/lib64/openjdk-25
     export PATH=$JAVA_HOME/bin:$PATH
 setup      : |
     %cmake_ninja -DZ3_USE_LIB_GMP=ON \
                  -DZ3_BUILD_JAVA_BINDINGS=ON \
                  -DZ3_BUILD_PYTHON_BINDINGS=ON \
+                 -DJAVA_INCLUDE_PATH=/usr/include/openjdk-25 \
+                 -DJAVA_INCLUDE_PATH2=/usr/include/openjdk-25/linux \
+                 -DJAVA_AWT_INCLUDE_PATH=/usr/include/openjdk-25 \
+                 -DJAVA_AWT_LIBRARY=$JAVA_HOME/lib/libjawt.so \
+                 -DJAVA_JVM_LIBRARY=$JAVA_HOME/lib/server/libjvm.so \
                  -DPYTHON_EXECUTABLE=/usr/bin/python3 \
                  -DCMAKE_INSTALL_PYTHON_PKG_DIR=%libdir%/python%python3_version%/site-packages \
 build      : |
     %ninja_build
 install    : |
+    %install_license LICENSE.txt
     %ninja_install
 check      : |
     %ninja_build test-z3
     ./solusBuildDir/test-z3 -a
+patterns   :
+    - ^python-z3 :
+        - /usr/lib*/python*
+    - java :
+        - /usr/share/java
+        - /usr/lib*/*java*
diff --git a/packages/z/z3/pspec_x86_64.xml b/packages/z/z3/pspec_x86_64.xml
index e73408b8f03..4e9995fe5c9 100644
--- a/packages/z/z3/pspec_x86_64.xml
+++ b/packages/z/z3/pspec_x86_64.xml
@@ -3,8 +3,8 @@
         <Name>z3</Name>
         <Homepage>https://z3prover.github.io/</Homepage>
         <Packager>
-            <Name>Joey Riches</Name>
-            <Email>josephriches@gmail.com</Email>
+            <Name>Jared Cervantes</Name>
+            <Email>jared@jaredcervantes.com</Email>
         </Packager>
         <License>MIT</License>
         <PartOf>programming.library</PartOf>
@@ -23,6 +23,7 @@
             <Path fileType="executable">/usr/bin/z3</Path>
             <Path fileType="library">/usr/lib64/libz3.so.4.15</Path>
             <Path fileType="library">/usr/lib64/libz3.so.4.15.4.0</Path>
+            <Path fileType="data">/usr/share/licenses/z3/LICENSE.txt</Path>
         </Files>
     </Package>
     <Package>
@@ -52,7 +53,7 @@
 </Description>
         <PartOf>programming.devel</PartOf>
         <RuntimeDependencies>
-            <Dependency release="14">z3</Dependency>
+            <Dependency release="15">z3</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="header">/usr/include/z3++.h</Path>
@@ -84,7 +85,7 @@
 </Description>
         <PartOf>programming.java</PartOf>
         <RuntimeDependencies>
-            <Dependency release="14">z3</Dependency>
+            <Dependency release="15">z3</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="library">/usr/lib64/libz3java.so</Path>
@@ -92,12 +93,12 @@
         </Files>
     </Package>
     <History>
-        <Update release="14">
-            <Date>2026-06-08</Date>
+        <Update release="15">
+            <Date>2026-06-14</Date>
             <Version>4.15.4</Version>
             <Comment>Packaging update</Comment>
-            <Name>Joey Riches</Name>
-            <Email>josephriches@gmail.com</Email>
+            <Name>Jared Cervantes</Name>
+            <Email>jared@jaredcervantes.com</Email>
         </Update>
     </History>
 </PISI>
\ No newline at end of file