revision

2 files changed, 36 insertions, 52 deletions

diff --git a/.SRCINFO b/.SRCINFO
index dd1970e6c12f..fd228f1fceda 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,25 +1,22 @@
 pkgbase = zsync2-git
-	pkgdesc = A file transfer program that's able to connect to rsync servers
-	pkgver = 2.0.0pre
-	pkgrel = 2
-	url = https://github.com/AppImage/zsync2
+	pkgdesc = A rewrite of the advanced file download/sync tool zsync
+	pkgver = 2.0.0.alpha.1.20230304.r5.g87fb5a0
+	pkgrel = 1
+	url = https://github.com/AppImageCommunity/zsync2
 	arch = x86_64
-	license = custom:Artistic
-	makedepends = cmake
+	license = PerlArtistic
 	makedepends = git
-	makedepends = gnutls
-	makedepends = openssl
-	makedepends = zlib
+	makedepends = cmake
+	makedepends = args
+	makedepends = gtest
+	depends = glibc
+	depends = gcc-libs
+	depends = cpr
 	depends = curl
+	depends = libgcrypt
 	provides = zsync2
 	conflicts = zsync2
-	source = git+https://github.com/AppImage/zsync2.git
-	source = git+https://github.com/Taywee/args.git
-	source = git+https://github.com/libcpr/cpr.git
-	source = git+https://github.com/google/googletest.git
-	b2sums = SKIP
-	b2sums = SKIP
-	b2sums = SKIP
+	source = git+https://github.com/AppImageCommunity/zsync2.git
 	b2sums = SKIP
 
 pkgname = zsync2-git
diff --git a/PKGBUILD b/PKGBUILD
index 33b27b9d512e..8a5d734c1248 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,50 +1,37 @@
-# Maintainer: Jonathon Fernyhough <jonathon+m2x+dev>
+# Maintainer: Chris Severance aur.severach aATt spamgourmet dott com
+# Maintainer: Fabio 'Lolix' Loli <fabio.loli@disroot.org>
+# Contributor: Jonathon Fernyhough <jonathon+m2x+dev>
 
 pkgname=zsync2-git
-pkgver=2.0.0pre
-pkgrel=2
-pkgdesc="A file transfer program that's able to connect to rsync servers"
+pkgver=2.0.0.alpha.1.20230304.r5.g87fb5a0
+pkgrel=1
+pkgdesc="A rewrite of the advanced file download/sync tool zsync"
 arch=(x86_64)
-url="https://github.com/AppImage/zsync2"
-license=("custom:Artistic")
+url="https://github.com/AppImageCommunity/zsync2"
+license=(PerlArtistic)
+depends=(glibc gcc-libs cpr curl libgcrypt)
+makedepends=(git cmake args gtest)
 provides=(zsync2)
 conflicts=(zsync2)
-depends=(curl)
-makedepends=(cmake git gnutls openssl zlib)
-source=(git+$url.git
-        git+https://github.com/Taywee/args.git
-        git+https://github.com/libcpr/cpr.git
-        git+https://github.com/google/googletest.git)
-b2sums=('SKIP'
-        'SKIP'
-        'SKIP'
-        'SKIP')
+source=("git+https://github.com/AppImageCommunity/zsync2.git")
+b2sums=('SKIP')
 
 pkgver() {
-  cd ${pkgname/-git/}
-  ( set -o pipefail
-    git describe --long 2>/dev/null | sed 's/\([^-]*-g\)/r\1/;s/-/./g' ||
-    printf "2.0.0r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
-  )
-}
-
-prepare() {
-  cd ${pkgname/-git/}
-  git submodule init
-  git config submodule.lib/args.url   "$srcdir"/args
-  git config submodule.lib/cpr.url    "$srcdir"/cpr
-  git config submodule.lib/gtest.url  "$srcdir"/googletest
-  git submodule update
+  cd zsync2
+  git describe --long --tags --exclude continuous | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 build() {
-  cmake -B build ${pkgname/-git/} \
-    -DUSE_SYSTEM_CURL=1 -DBUILD_CPR_TESTS=0 \
-    -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=lib
-  make -C build
+  cmake -B build -S "zsync2" -Wno-dev \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DUSE_SYSTEM_CPR=ON \
+    -DUSE_SYSTEM_ARGS=ON
+
+  cmake --build build
 }
 
 package() {
-  make -C build DESTDIR="$pkgdir" install
-  install -Dm644 ${pkgname/-git/}/COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+  DESTDIR="${pkgdir}" cmake --install build
+  install -D zsync2/COPYING -t "${pkgdir}/usr/share/licenses/${pkgname}"
 }