From dfebfbc4ab6461111a33a51a865b4b6561ac9564 Mon Sep 17 00:00:00 2001
From: Enbeon <85409980+ActuallyEnbeon@users.noreply.github.com>
Date: Mon, 14 Apr 2025 00:06:08 +0100
Subject: [PATCH] Update to upstream version 2.0.90

---
 .SRCINFO            |  10 ++--
 .gitignore          |   1 +
 PKGBUILD            |  16 ++---
 assembler_pom.patch | 138 ++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 154 insertions(+), 11 deletions(-)
 create mode 100644 assembler_pom.patch

diff --git a/.SRCINFO b/.SRCINFO
index ac9ed6edd16a..8aed69737661 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,20 @@
 pkgbase = jd-gui-duo
 	pkgdesc = A 2-in-1 JAVA decompiler based on JD-CORE v0 and v1
-	pkgver = 2.0.89
-	pkgrel = 2
+	pkgver = 2.0.90
+	pkgrel = 1
 	url = https://github.com/nbauma109/jd-gui-duo
 	arch = any
 	license = GPL3
 	makedepends = maven
 	makedepends = jdk21-openjdk
 	depends = java-runtime>=21
-	source = jd-gui-duo-2.0.89.tar.gz::https://github.com/nbauma109/jd-gui-duo/archive/refs/tags/2.0.89.tar.gz
+	source = jd-gui-duo-2.0.90.tar.gz::https://github.com/nbauma109/jd-gui-duo/archive/refs/tags/2.0.90.tar.gz
 	source = jd-gui-duo
 	source = jd-gui-duo.desktop
-	sha256sums = 5fefc06d3b6a48366b0bf35d875e4d3ca854b8def0307fb9b4635051211f6586
+	source = assembler_pom.patch
+	sha256sums = d284488492baf57a8146a1a36e580c8141629a2e8276aacfc77be6e8ccc4e7fb
 	sha256sums = 9d175e28662dd1ad701f76d5aa7f7752543453f156615b96787e641252ce60e4
 	sha256sums = d40a09c9c228b55dcb54823b878cd180521386a11abffed478ce89439fd4e184
+	sha256sums = 755b30376b61883e8c4ba854cdb17d8c1a6bdd5120c5bba339f9f56e7d47c15e
 
 pkgname = jd-gui-duo
diff --git a/.gitignore b/.gitignore
index ddc83f0a45dc..9088b6883ddf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,7 @@
 # Force-add specific files
 !.gitignore
 !.SRCINFO
+!assembler_pom.patch
 !jd-gui-duo
 !jd-gui-duo.desktop
 !LICENSE
diff --git a/PKGBUILD b/PKGBUILD
index d2255e562266..380a44c1d659 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,24 +1,26 @@
 # Maintainer: Enbeon <actuallyenbeon at gmail dot com>
 pkgname=jd-gui-duo
-pkgver=2.0.89
-pkgrel=2
+pkgver=2.0.90
+pkgrel=1
 pkgdesc="A 2-in-1 JAVA decompiler based on JD-CORE v0 and v1"
 arch=('any')
-url="https://github.com/nbauma109/jd-gui-duo"
+url="https://github.com/nbauma109/$pkgname"
 license=('GPL3')
 depends=('java-runtime>=21')
 makedepends=('maven' 'jdk21-openjdk')
 source=(
-	"$pkgname-$pkgver.tar.gz::https://github.com/nbauma109/jd-gui-duo/archive/refs/tags/$pkgver.tar.gz"
+	"$pkgname-$pkgver.tar.gz::https://github.com/nbauma109/$pkgname/archive/refs/tags/$pkgver.tar.gz"
 	"jd-gui-duo"
 	"jd-gui-duo.desktop"
+	"assembler_pom.patch"
 )
-sha256sums=('5fefc06d3b6a48366b0bf35d875e4d3ca854b8def0307fb9b4635051211f6586'
+sha256sums=('d284488492baf57a8146a1a36e580c8141629a2e8276aacfc77be6e8ccc4e7fb'
             '9d175e28662dd1ad701f76d5aa7f7752543453f156615b96787e641252ce60e4'
-            'd40a09c9c228b55dcb54823b878cd180521386a11abffed478ce89439fd4e184')
-
+            'd40a09c9c228b55dcb54823b878cd180521386a11abffed478ce89439fd4e184'
+            '755b30376b61883e8c4ba854cdb17d8c1a6bdd5120c5bba339f9f56e7d47c15e')
 
 build() {
+	patch "$pkgname-$pkgver/assembler/pom.xml" < "assembler_pom.patch"
 	cd "$pkgname-$pkgver"
 	JAVA_HOME="/usr/lib/jvm/java-21-openjdk" mvn clean package --no-transfer-progress
 }
diff --git a/assembler_pom.patch b/assembler_pom.patch
new file mode 100644
index 000000000000..f5c44856c92a
--- /dev/null
+++ b/assembler_pom.patch
@@ -0,0 +1,138 @@
+--- pom.xml	2025-04-13 20:50:15.000000000 +0100
++++ pom2.xml	2025-04-13 22:25:50.815491147 +0100
+@@ -47,19 +47,6 @@
+         <artifactId>download-maven-plugin</artifactId>
+         <executions>
+           <execution>
+-            <id>download-jre-windows</id>
+-            <phase>package</phase>
+-            <goals>
+-              <goal>wget</goal>
+-            </goals>
+-            <configuration>
+-              <url>https://github.com/nbauma109/jre-builder/releases/download/${jre.builder.version}/jre-${jre.builder.version}-${jre.version}-windows.zip</url>
+-              <unpack>true</unpack>
+-              <outputDirectory>${project.build.directory}/windows/jre</outputDirectory>
+-              <sha512>1df09e495aa76e55928d93f17f6128b0b05d8de817404d71b71ffc3c70f1c7d044a74d38b046bc69e8d71b49fa066336f4f43bbc2d9cbd907e34a881b19e0a05</sha512>
+-            </configuration>
+-          </execution>
+-          <execution>
+             <id>download-jre-linux</id>
+             <phase>package</phase>
+             <goals>
+@@ -72,19 +59,6 @@
+               <sha512>07cf8d488c3ab7febe1f046a745cc6d5ecf62ddbe323ddac533278c2b5bc2abbb9407de330d4fa4380c1cdd0617d02a83b7935fbd19f18e11c8be3f31ac77598</sha512>
+             </configuration>
+           </execution>
+-          <execution>
+-            <id>download-jre-macos</id>
+-            <phase>package</phase>
+-            <goals>
+-              <goal>wget</goal>
+-            </goals>
+-            <configuration>
+-              <url>https://github.com/nbauma109/jre-builder/releases/download/${jre.builder.version}/jre-${jre.builder.version}-${jre.version}-macos.zip</url>
+-              <unpack>true</unpack>
+-              <outputDirectory>${project.build.directory}/macos/jre</outputDirectory>
+-              <sha512>8100c651e49263f8e4fed00f8823f962dcaadf93840671edec59539ee399526cf5bdc358cc6f34901d5f86d20ce40071d6707ee098a00e350d3ae5c828652bcc</sha512>
+-            </configuration>
+-          </execution>
+         </executions>
+       </plugin>
+ 
+@@ -111,20 +85,6 @@
+         <artifactId>maven-assembly-plugin</artifactId>
+         <executions>
+           <execution>
+-            <id>assemble-windows</id>
+-            <phase>package</phase>
+-            <goals>
+-              <goal>single</goal>
+-            </goals>
+-            <configuration>
+-              <appendAssemblyId>false</appendAssemblyId>
+-              <finalName>jd-gui-duo-windows</finalName>
+-              <descriptors>
+-                <descriptor>assembly-windows.xml</descriptor>
+-              </descriptors>
+-            </configuration>
+-          </execution>
+-          <execution>
+             <id>assemble-linux</id>
+             <phase>package</phase>
+             <goals>
+@@ -138,74 +98,11 @@
+               </descriptors>
+             </configuration>
+           </execution>
+-          <execution>
+-            <id>assemble-macos</id>
+-            <phase>package</phase>
+-            <goals>
+-              <goal>single</goal>
+-            </goals>
+-            <configuration>
+-              <appendAssemblyId>false</appendAssemblyId>
+-              <finalName>jd-gui-duo-macos</finalName>
+-              <descriptors>
+-                <descriptor>assembly-macos.xml</descriptor>
+-              </descriptors>
+-            </configuration>
+-          </execution>
+         </executions>
+       </plugin>
+     </plugins>
+   </build>
+ 
+-  <profiles>
+-    <profile>
+-      <id>windows</id>
+-      <activation>
+-        <os>
+-          <family>Windows</family>
+-        </os>
+-      </activation>
+-      <build>
+-        <plugins>
+-          <plugin>
+-            <groupId>com.akathist.maven.plugins.launch4j</groupId>
+-            <artifactId>launch4j-maven-plugin</artifactId>
+-            <executions>
+-              <execution>
+-                <id>l4j-clui</id>
+-                <phase>prepare-package</phase>
+-                <goals>
+-                  <goal>launch4j</goal>
+-                </goals>
+-                <configuration>
+-                  <headerType>gui</headerType>
+-                  <outfile>${project.build.directory}/windows/jd-gui-duo-${project.version}.exe</outfile>
+-                  <jar>${project.build.directory}/lib/jd-gui-duo-app-${project.version}.jar</jar>
+-                  <classPath>
+-                    <mainClass>${main.class}</mainClass>
+-                    <addDependencies>false</addDependencies>
+-                  </classPath>
+-                  <jre>
+-                    <path>jre</path>
+-                    <opts>
+-                      <opt>-ea</opt>
+-                      <opt>--add-opens java.base/java.net=ALL-UNNAMED</opt>
+-                      <opt>--add-opens java.desktop/javax.swing.text=ALL-UNNAMED</opt>
+-                      <opt>--add-opens java.desktop/javax.swing.plaf.basic=ALL-UNNAMED</opt>
+-                      <opt>--add-opens java.prefs/java.util.prefs=ALL-UNNAMED</opt>
+-                      <opt>--add-opens java.base/java.lang.ref=ALL-UNNAMED</opt>
+-                    </opts>
+-                  </jre>
+-                  <icon>${project.parent.basedir}/src/launch4j/resources/images/jd-gui.ico</icon>
+-                </configuration>
+-              </execution>
+-            </executions>
+-          </plugin>
+-        </plugins>
+-      </build>
+-    </profile>
+-  </profiles>
+-
+   <dependencies>
+     <dependency>
+       <groupId>com.github.nbauma109</groupId>