Backport patch from upstream, use PEP 517 workflow

4 files changed, 48 insertions, 30 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 091bf87e91b2..f5c40d0b13f8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,13 @@
 pkgbase = etesync-dav
 	pkgdesc = A CalDAV and CardDAV adapter for EteSync
 	pkgver = 0.32.1
-	pkgrel = 1
-	url = https://pypi.python.org/pypi/etesync-dav/
+	pkgrel = 2
+	url = https://github.com/etesync/etesync-dav/
 	arch = any
 	license = GPL
+	makedepends = python-build
+	makedepends = python-installer
+	makedepends = python-wheel
 	makedepends = python-setuptools
 	depends = python-appdirs
 	depends = python-etesync
@@ -13,9 +16,9 @@ pkgbase = etesync-dav
 	depends = python-flask
 	depends = python-flask-wtf
 	replaces = python-radicale-storage-etesync
-	source = https://pypi.org/packages/source/e/etesync-dav/etesync-dav-0.32.1.tar.gz
-	source = etesync-dav.service
-	sha256sums = a4e2ee83932755d29ac39c1e74005ec289880fd2d4d2164f09fe2464a294d720
-	sha256sums = f1a76ba3038f89019c4d3f206824dc5e471d3707ab5b2fb27802215ea6d6bc8c
+	source = etesync-dav-0.32.1.tar.gz::https://github.com/etesync/etesync-dav//archive/v0.32.1.tar.gz
+	source = add-missing-comma-in-setup.py.patch
+	sha256sums = ba79f3cac8c1b73258bf18bf766530756783248572d4dce805e6cb4a17164c7f
+	sha256sums = 98d3d69d368eedd073245ac0943882455405e519304044e2b571f97bc8487954
 
 pkgname = etesync-dav
diff --git a/PKGBUILD b/PKGBUILD
index 71c9148d045e..de7a495f3d1e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,10 +3,10 @@
 
 pkgname=etesync-dav
 pkgver=0.32.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A CalDAV and CardDAV adapter for EteSync"
 arch=('any')
-url="https://pypi.python.org/pypi/${pkgname}/"
+url="https://github.com/etesync/etesync-dav/"
 license=('GPL')
 depends=('python-appdirs'
          'python-etesync'
@@ -16,28 +16,29 @@ depends=('python-appdirs'
          'python-flask-wtf'
 )
 replaces=('python-radicale-storage-etesync')
-makedepends=('python-setuptools')
-source=("https://pypi.org/packages/source/e/${pkgname}/${pkgname}-${pkgver}.tar.gz"
-        "etesync-dav.service")
-sha256sums=('a4e2ee83932755d29ac39c1e74005ec289880fd2d4d2164f09fe2464a294d720'
-            'f1a76ba3038f89019c4d3f206824dc5e471d3707ab5b2fb27802215ea6d6bc8c')
+makedepends=('python-build' 'python-installer' 'python-wheel' 'python-setuptools')
+source=("$pkgname-$pkgver.tar.gz::$url/archive/v$pkgver.tar.gz"
+        "add-missing-comma-in-setup.py.patch")
+sha256sums=('ba79f3cac8c1b73258bf18bf766530756783248572d4dce805e6cb4a17164c7f'
+            '98d3d69d368eedd073245ac0943882455405e519304044e2b571f97bc8487954')
+
+prepare() {
+  cd "${pkgname}-${pkgver}"
+  patch -p1 < "$srcdir/add-missing-comma-in-setup.py.patch"
+}
 
 build() {
   cd "${pkgname}-${pkgver}"
-  python setup.py build
+  python -m build --wheel --no-isolation
 }
 
 package() {
   cd "${pkgname}-${pkgver}"
-  python setup.py install --skip-build \
-    --optimize=1 \
-    --prefix=/usr \
-    --root="${pkgdir}"
+  python -m installer --destdir="$pkgdir" dist/*.whl
+
   install -t "${pkgdir}/usr/share/doc/${pkgname}" \
     -vDm644 {DESCRIPTION.rst,README.md}
 
-# FIXME: replace with the one in the etesync-dav repo once released
-  mkdir -p "${pkgdir}/usr/lib/systemd/user/"
-  install -Dm644 ../etesync-dav.service "${pkgdir}/usr/lib/systemd/user/"
+  install -Dm644 examples/systemd-user/etesync-dav.service "${pkgdir}/usr/lib/systemd/user/etesync-dav.service"
 }
 
diff --git a/add-missing-comma-in-setup.py.patch b/add-missing-comma-in-setup.py.patch
new file mode 100644
index 000000000000..5224937a33b0
--- /dev/null
+++ b/add-missing-comma-in-setup.py.patch
@@ -0,0 +1,23 @@
+From 040cb7b57205e70515019fb356e508a6414da11e Mon Sep 17 00:00:00 2001
+From: triallax <triallax@tutanota.com>
+Date: Tue, 18 Apr 2023 21:42:21 +0100
+Subject: [PATCH] Add missing comma in setup.py
+
+Fixes #292.
+---
+ setup.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index a69cd1a6..77c7fc5a 100644
+--- a/setup.py
++++ b/setup.py
+@@ -115,7 +115,7 @@ def get_version_string():
+     'Flask>=1.1.1',
+     'Flask-WTF>=0.14.2,<1.0.0',
+     'requests[socks]>=2.21',
+-    'types-setuptools>=50.0.0'
++    'types-setuptools>=50.0.0',
+     'pyobjc-framework-Cocoa>=7.0.0 ; sys_platform=="darwin"',
+ ]
+ 
diff --git a/etesync-dav.service b/etesync-dav.service
deleted file mode 100644
index 324ba5cc9828..000000000000
--- a/etesync-dav.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Cal/CardDAV frontend for Etesync
-
-[Service]
-Type=simple
-ExecStart=/usr/bin/etesync-dav
-
-[Install]
-WantedBy=default.target