update PKGBUILD

2 files changed, 80 insertions, 26 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 15f86f72979d..41c07c079d34 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,40 @@
 pkgbase = discreet
 	pkgdesc = Discreet Cryptocurrency Wallet. discreet.net
-	pkgver = 0.0.1
-	pkgrel = 1
-	url = https://github.com/DiscreetNetwork/discreet
+	pkgver = 0.2.23
+	pkgrel = 2
+	url = https://
+	arch = i686
 	arch = x86_64
-	depends = dotnet-sdk
-	source = https://github.com/DiscreetNetwork/discreet/archive/refs/heads/master.zip
-	sha256sums = 1cec76252c3e7944d0c4b6e0009fc01ec6e3b8e01675172a41bde98354e0239c
+	arch = aarch64
+	arch = armv8
+	arch = armv7
+	arch = armv7l
+	arch = armv7h
+	arch = armv6h
+	arch = armhf
+	arch = armel
+	arch = arm
+	makedepends = dotnet-sdk
+	source = git+https://github.com/DiscreetNetwork/DiscreetCore
+	source = git+https://github.com/DiscreetNetwork/discreet-gui
+	source = git+https://github.com/DiscreetNetwork/discreet
+	sha256sums = SKIP
+	sha256sums = SKIP
+	sha256sums = SKIP
 
-pkgname = discreet
+pkgname = discreet-gui
+	depends = discreet-daemon
+
+pkgname = discreet-daemon
+	depends = bzip2
+	depends = snappy
+	depends = lz4
+	depends = zlib
+	depends = zstd
+	depends = glibc
+	depends = lib32-glibc
+	depends = tbb
+	depends = liburing
+	depends = jemalloc
+	depends = libxcrypt
+	depends = boost
diff --git a/PKGBUILD b/PKGBUILD
index 023f73c77f6c..9bb1b4b8559e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,29 +1,54 @@
 # Maintainer: Moses Narrow <moe_narrow@use.startmail.com>
-pkgname=discreet
-_pkgname=${pkgname}
+pkgbase=discreet
+pkgname=("discreet-gui" "discreet-daemon")
+_pkgname0=${pkgname[0]}
+_pkgname1=${pkgname[1]}
 _githuborg="DiscreetNetwork"
 pkgdesc="Discreet Cryptocurrency Wallet. discreet.net"
-pkgver=0.0.1
-pkgrel=1
-arch=('x86_64')
-depends=('dotnet-sdk')
-_pkgpath="github.com/${_githuborg}/${_pkgname}"
+pkgver=0.2.23
+_guiver="${pkgver}-3"
+_daemonver=0.0.28-2
+pkgrel=2
+arch=( 'i686' 'x86_64' 'aarch64' 'armv8' 'armv7' 'armv7l' 'armv7h' 'armv6h' 'armhf' 'armel' 'arm' )
+makedepends=('dotnet-sdk')
 url="https://${_pkgpath}"
-source=("${url}/archive/refs/heads/master.zip")
-sha256sums=('1cec76252c3e7944d0c4b6e0009fc01ec6e3b8e01675172a41bde98354e0239c')
-
+source=(
+"git+https://github.com/DiscreetNetwork/DiscreetCore"
+"git+https://github.com/DiscreetNetwork/discreet-gui"
+"git+https://github.com/DiscreetNetwork/discreet"
+)
+sha256sums=('SKIP'
+            'SKIP'
+            'SKIP')
 
 build() {
-	cd ${srcdir}/Discreet-master/Discreet
-dotnet publish --configuration Release --runtime linux-x64 --framework net6.0 --self-contained true
+	cd ${srcdir}/discreet-gui/Discreet-GUI/
+	dotnet restore
+   dotnet publish --configuration Release --runtime linux-x64 --self-contained true -p:Version=0.0.28
+#   cd ${srcdir}/DiscreetCore/DiscreetCore/
+ #  sed -i "12s/.*/BOOST=\/usr\/include\/boost/" $_i | awk 'NR==12{ print; exit }' Makefile  || exit 1
+  # sed -i "13s/.*/BOOST_LIB=\/usr\/lib/" $_i | awk 'NR==13{ print; exit }' Makefile  || exit 1
+  # make core
+   	cd ${srcdir}/discreet
+	dotnet restore
+	dotnet publish --configuration Release --runtime linux-x64 --self-contained true
 }
 
-package() {
+package_discreet-gui() {
+	depends=("discreet-daemon")
+	#create directory trees
+	cd ${pkgdir}
+	mkdir -p ${pkgdir}/usr/lib/discreet-gui/ ${pkgdir}/usr/bin
+	cp -a ${srcdir}/discreet-gui/Discreet-GUI/Discreet-GUI/bin/Release/net6.0/linux-x64/publish/* ${pkgdir}/usr/lib/discreet-gui/
+	ln -rTsf ${pkgdir}/usr/lib/discreet-gui/Discreet-GUI ${pkgdir}/usr/bin/discreet-gui
+}
+package_discreet-daemon() {
+	depends=( 'bzip2' 'snappy' 'lz4' 'zlib' 'zstd' 'glibc' 'lib32-glibc' 'tbb' 'liburing' 'jemalloc' 'libxcrypt' 'boost')
 	#create directory trees
-	_path=${pkgdir}/opt/${_pkgname}
-	install -dm755 ${pkgdir}/usr/bin
-	install -dm755 ${_path}
-	cp -a ${srcdir}/Discreet-master/Discreet/bin/Release/net6.0/linux-x64/* ${_path}/
-	ln -rTsf ${_path}/${_pkgname^} ${pkgdir}/usr/bin/${_pkgname}
-	chmod 755 ${pkgdir}/usr/bin/${i}
+	cd ${pkgdir}
+	mkdir -p ${pkgdir}/usr/lib/discreet/ ${pkgdir}/usr/bin
+	cp -a ${srcdir}/discreet/Discreet/bin/Release/net6.0/linux-x64/publish/* ${pkgdir}/usr/lib/discreet
+	install -Dm644 ${srcdir}/DiscreetCore/linux/DiscreetCore.so ${pkgdir}/usr/lib/discreet/Discreet
+	ln -rTsf ${pkgdir}/usr/lib/discreet/Discreet ${pkgdir}/usr/bin/discreetd
+	ln -rTsf ${pkgdir}/usr/lib/libdl.so.2 ${pkgdir}/usr/lib/discreet/libdl.so
 }