xdman: fix versioning, remove bundled deps, build from source

Signed-off-by: éclairevoyant <848000+eclairevoyant@users.noreply.github.com>

5 files changed, 57 insertions, 57 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b803a3857c85..e07056bb3ad1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,22 @@
 pkgbase = xdman
-	pkgdesc = Xtreme Download Manager is a powerful tool to increase download speed up-to 500%, save videos from video sharing sites and integration with ANY browser.
-	pkgver = 2020.7.2.11
-	pkgrel = 2
-	url = https://subhra74.github.io/xdm/
+	pkgdesc = Xtreme Download Manager: download manager with multiple browser integrations
+	pkgver = 7.2.11
+	pkgrel = 3
+	epoch = 1
+	url = https://xtremedownloadmanager.com/
 	arch = i686
 	arch = x86_64
-	license = GPL
+	license = GPL2
+	makedepends = java-environment>=11
+	makedepends = maven
+	depends = ffmpeg
 	depends = java-runtime>=11
-	source = xdman.bin
-	source = https://github.com/subhra74/xdm/releases/download/7.2.11/xdm-setup-7.2.11.tar.xz
-	sha256sums = f50e60e27a8b70c03b564853a3c11a59105915891782c581cc803356e0008739
-	sha256sums = 140413651797d97b13c5f1a2f0c528da6e46d3652bd36abd743b1a69dc610438
+	depends = python
+	depends = sh
+	depends = youtube-dl
+	source = xdman-7.2.11.tar.gz::https://github.com/subhra74/xdm/archive/refs/tags/7.2.11.tar.gz
+	source = xdman.sh
+	b2sums = 8987f8f68823b1224cb6c01becaf40be57440d4c0dba80c65b583b02964f8f5e77cd27c072a63ff4b47f6f1931f13b3d5fa63196841ecf7e28f96f5227da9b52
+	b2sums = 788ae28b70bc510b0c865bebd5f53d857820908421d40b2ecc76b390e6f5de55c2f76a93c2cc4017cbcd7df7cf4855a0243217abfccc9843dde88188fe6c3fc0
 
 pkgname = xdman
-
diff --git a/.gitignore b/.gitignore
index c1e96ad06cf8..7b4faf736e4f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
-/*
-!/.gitignore
-!/PKGBUILD
-!/.SRCINFO
-!/xdman.bin
+*
+!.gitignore
+!.SRCINFO
+!PKGBUILD
+!xdman.sh
diff --git a/PKGBUILD b/PKGBUILD
index 788c1583bb23..424a76b8a22f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,38 +1,32 @@
-# Maintainer: Chang Feng<chang_196700@hotmail.com>
-# Contributor: Ivan Fonseca <ivanfon@riseup.net>
-# Contributor: boosterdev@linuxmail.org
+# Maintainer: éclairevoyant
+# Contributor: Chang Feng <chang_196700 at hotmail dot com>
+# Contributor: Ivan Fonseca <ivanfon at riseup dot net>
+# Contributor: boosterdev at linuxmail at org
 
+_gitname=xdm
 pkgname=xdman
-_pkgver=7.2.11
-pkgver=2020.${_pkgver}
-pkgrel=2
-pkgdesc="Xtreme Download Manager is a powerful tool to increase download speed up-to 500%, save videos from video sharing sites and integration with ANY browser."
+pkgver=7.2.11
+pkgrel=3
+epoch=1
+pkgdesc="Xtreme Download Manager: download manager with multiple browser integrations"
 arch=('i686' 'x86_64')
-url="https://subhra74.github.io/xdm/"
-depends=('java-runtime>=11')
-license=('GPL')
-source=(
-  'xdman.bin'
-  "https://github.com/subhra74/xdm/releases/download/${_pkgver}/xdm-setup-${_pkgver}.tar.xz"
-)
-sha256sums=(
-  'f50e60e27a8b70c03b564853a3c11a59105915891782c581cc803356e0008739'
-  '140413651797d97b13c5f1a2f0c528da6e46d3652bd36abd743b1a69dc610438'
-)
+url="https://xtremedownloadmanager.com/"
+depends=('ffmpeg' 'java-runtime>=11' 'python' 'sh' 'youtube-dl')
+makedepends=('java-environment>=11' 'maven')
+license=('GPL2')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/subhra74/$_gitname/archive/refs/tags/$pkgver.tar.gz"
+        "$pkgname.sh")
+b2sums=('8987f8f68823b1224cb6c01becaf40be57440d4c0dba80c65b583b02964f8f5e77cd27c072a63ff4b47f6f1931f13b3d5fa63196841ecf7e28f96f5227da9b52'
+        '788ae28b70bc510b0c865bebd5f53d857820908421d40b2ecc76b390e6f5de55c2f76a93c2cc4017cbcd7df7cf4855a0243217abfccc9843dde88188fe6c3fc0')
 
-prepare () {
-  cd $srcdir
-  dd if="install.sh" bs=8K skip=1 | tar -xvJf -
-  rm -rf opt/xdman/jre
-  rm -rf opt/xdman/uninstall.sh
+build() {
+	cd $_gitname-$pkgver/app
+	mvn package
 }
 
 package() {
-  install -d -m755 "$pkgdir"/opt/xdman
-  install -D -m644 "$srcdir"/usr/share/applications/xdman.desktop "$pkgdir"/usr/share/applications/xdman.desktop
-  cp -dr --no-preserve='ownership' "$srcdir"/opt/xdman "$pkgdir"/opt/
-  install -D -m755 "$srcdir"/xdman.bin "$pkgdir"/opt/xdman/xdman
-
-  mkdir -p "$pkgdir/usr/bin"
-  ln -s "/opt/xdman/xdman" "$pkgdir/usr/bin/xdman"
+	install -Dm644 $_gitname-$pkgver/app/target/$pkgname.jar "$pkgdir/usr/share/java/$pkgname/$pkgname.jar"
+	ln -s /usr/bin/ffmpeg "$pkgdir/usr/share/java/$pkgname/"
+	ln -s /usr/bin/youtube-dl "$pkgdir/usr/share/java/$pkgname/"
+	install -Dm755 $pkgname.sh "$pkgdir/usr/bin/$pkgname"
 }
diff --git a/xdman.bin b/xdman.bin
deleted file mode 100755
index d06297aba4b2..000000000000
--- a/xdman.bin
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-if [ $EUID -eq 0 ];then
-	echo "It's not recomended to run XDM  as root, as it can cause problems"
-fi
-if [ -f "$HOME/.xdmanrc" ]; then
-    source "$HOME/.xdmanrc"
-fi
-if [ "x$XDMAN_JAVA_HOME" != "x" ]; then
-    "$XDMAN_JAVA_HOME/bin/java" -Dsun.java2d.xrender=false -jar /opt/xdman/xdman.jar $@
-else
-    java -Dsun.java2d.xrender=false -jar /opt/xdman/xdman.jar $@
-fi
diff --git a/xdman.sh b/xdman.sh
new file mode 100755
index 000000000000..e656478008f3
--- /dev/null
+++ b/xdman.sh
@@ -0,0 +1,12 @@
+#!/usr/bin/env sh
+if [ $EUID -eq 0 ];then
+	echo "It's not recomended to run XDM as root, as it can cause problems"
+fi
+if [ -f "$HOME/.xdmanrc" ]; then
+	source "$HOME/.xdmanrc"
+fi
+if [ "x$XDMAN_JAVA_HOME" != "x" ]; then
+	"$XDMAN_JAVA_HOME/bin/java" -Dsun.java2d.xrender=false -jar /usr/share/java/xdman/xdman.jar $@
+else
+	java -Dsun.java2d.xrender=false -jar /usr/share/java/xdman/xdman.jar $@
+fi