Build from source

3 files changed, 54 insertions, 13 deletions

diff --git a/.gitignore b/.gitignore
index 99eae0d3c8ba..a3dc6cf57e52 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 *.zip
 *.pkg.tar*
 *.src.tar*
+version*.tar.gz
 pkg/
 src/
diff --git a/PKGBUILD b/PKGBUILD
index 4edf49c06890..1124144a9f88 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,29 +9,51 @@ arch=('any')
 url="https://github.com/jindrapetrik/jpexs-decompiler/releases"
 license=('GPL3')
 depends=('java-runtime>=8')
-source=(https://github.com/jindrapetrik/jpexs-decompiler/releases/download/version${pkgver}/${pkgname}_${pkgver}.zip
+makedepends=('ant')
+source=(https://github.com/jindrapetrik/jpexs-decompiler/archive/refs/tags/version${pkgver}.tar.gz
         $pkgname
         $pkgname.desktop
-        $pkgname.png)
-md5sums=('e1efb304c511ebd29c075f3f6b1f07de'
-         'bbf0428af149a21ea8d837506f91c6e8'
-         '1630ed36db9aadb2325b8ad9eb00f2de'
-         'decfc4be2e1ce355c267049ae332419c')
+	version.patch)
+b2sums=('1b78cd9cd9c9ddb95ecb1bc965619c7be2b24a8a2ea54e0bf376d27b1212ecfd01bbaeadc3e6720008b522f55f022f4a50243f532f994f61c0fd04c179b57bf0'
+         '9fb18759764df78715295e3e110edde21fde377117a0166cb94677f9824e43624933e2fb49d2a9787531aa0f3ddcb22d9b6702f13d05d5667136b6cea674b546'
+         '4ab0b43f051893bbc5ea8b5c4822474b139622f5023b157e7763ca8802494fd53af4eaf1471ea03c0130f339e838604daf84c2766935e4bc00c75d1d9a566fef'
+         'd874316146f395ddde442cf73610aa0213d51df9b7b6e5de7fe06254119d7937cdfb07ce6aeb0aedbf37635356069331011e64e47aec06db10dd5c46abca4b7c')
+
+prepare() {
+    cd "jpexs-decompiler-version${pkgver}"
+    
+    cp ../version.patch version.patch
+
+    IFS='.' read -r major minor patch <<< ${pkgver}
+    sed -i "s/MAJOR/${major}/g" version.patch
+    sed -i "s/MINOR/${minor}/g" version.patch
+    sed -i "s/PATCH/${patch}/g" version.patch
+
+    patch -p1 -i version.patch
+}
+
+build() {
+    cd "jpexs-decompiler-version${pkgver}"
+    ant build
+}
 
 package() {
-    cd "$srcdir"
+    cd "jpexs-decompiler-version${pkgver}"
     install -Ddm755 "${pkgdir}/usr/share/java/${pkgname}/lib"
     install -Ddm755 "${pkgdir}/usr/share/licenses/${pkgname}"
-    install -Dm755 "${pkgname}" "${pkgdir}/usr/bin/${pkgname}"
-    install -Dm644 "${pkgname}.jar" "${pkgdir}/usr/share/java/${pkgname}/${pkgname}.jar"
-    install -Dm644 "license.txt" "${pkgdir}/usr/share/licenses/${pkgname}/license.txt"
-    install -Dm644 "${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
-    install -Dm644 "${pkgname}.png" "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
-    cd "$srcdir/lib"
+    install -Dm644 "dist/${pkgname}.jar" "${pkgdir}/usr/share/java/${pkgname}/${pkgname}.jar"
+    install -Dm644 "resources/license.txt" "${pkgdir}/usr/share/licenses/${pkgname}/license.txt"
+    install -Dm644 "resources/icon.png" "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
+
+    cd "lib"
     for f in *.license.txt; do
         cp -d --no-preserve=ownership "$f" "${pkgdir}/usr/share/licenses/${pkgname}/$f"
     done
     for f in *.jar; do
         cp -d --no-preserve=ownership "$f" "${pkgdir}/usr/share/java/${pkgname}/lib/$f"
     done
+
+    cd "$srcdir"
+    install -Dm644 "${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
+    install -Dm755 "${pkgname}" "${pkgdir}/usr/bin/${pkgname}"
 }
diff --git a/version.patch b/version.patch
new file mode 100644
index 000000000000..50e37f3d4212
--- /dev/null
+++ b/version.patch
@@ -0,0 +1,18 @@
+diff -ru a/build.xml b/build.xml
+--- a/build.xml	2023-10-21 21:10:40.828907880 +0100
++++ b/build.xml	2023-10-21 22:46:31.135436489 +0100
+@@ -51,10 +51,10 @@
+         
+     </target>
+     <target name="-loadversion-private" unless="new.version">
+-        <property name="version.major" value="0" />
+-        <property name="version.minor" value="0" />
+-        <property name="version.release" value="0" />
+-        <property name="version.major" value="0" />
++        <property name="version.major" value="MAJOR" />
++        <property name="version.minor" value="MINOR" />
++        <property name="version.release" value="PATCH" />
++        <property name="version.major" value="MAJOR" />
+         <property name="version.build" value="0" />
+         <!-- <property name="version.revision" value="" /> -->
+         <property name="version.debug" value="true" />