2.2.0

2 files changed, 50 insertions, 37 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 01be748b7fc2..37518d0bf31c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = drawpile
 	pkgdesc = Collaborative drawing program specially made for use with pen tablets
-	pkgver = 2.1.20
-	pkgrel = 5
+	pkgver = 2.2.0
+	pkgrel = 1
 	url = https://drawpile.net/
 	arch = i686
 	arch = x86_64
@@ -13,15 +13,16 @@ pkgbase = drawpile
 	makedepends = qt5-svg
 	makedepends = qt5-tools
 	makedepends = qt5-x11extras
-	source = https://drawpile.net/files/src/drawpile-2.1.20.tar.gz
-	sha256sums = a2f45e8b7482854288eb7b7f9db0961c79f0129ab92216280fdb94457e0d0fa9
+	makedepends = cargo
+	source = https://github.com/drawpile/Drawpile/archive/refs/tags/2.2.0.tar.gz
+	sha256sums = 41122fef2d590f621226570aa62cc7bae8bd0b1cf758c3f001f37cc8c9199683
 
 pkgname = drawpile
 	pkgdesc = Collaborative drawing program specially made for use with pen tablets (meta package)
 	arch = any
 	depends = drawpile-client
 	depends = drawpile-server
-	conflicts = drawpile-common
+	depends = drawpile-tools
 
 pkgname = drawpile-client
 	pkgdesc = Collaborative drawing program specially made for use with pen tablets (client)
@@ -30,9 +31,6 @@ pkgname = drawpile-client
 	depends = karchive5
 	depends = qt5-multimedia
 	depends = qt5-x11extras
-	optdepends = kdnssd5: automatic service discovery (such as printers)
-	optdepends = giflib: GIF support
-	optdepends = miniupnpc: UPnP support
 	optdepends = qt5-color-widgets: alternative color wheel
 	optdepends = qtkeychain-qt5: Password storage
 
@@ -40,4 +38,8 @@ pkgname = drawpile-server
 	pkgdesc = Collaborative drawing program specially made for use with pen tablets (server)
 	depends = karchive5
 	optdepends = libmicrohttpd: web-admin feature
+	optdepends = libsodium: ext-auth support
 	optdepends = libsystemd: systemd and logging support
+
+pkgname = drawpile-tools
+	pkgdesc = Collaborative drawing program specially made for use with pen tablets (tools)
diff --git a/PKGBUILD b/PKGBUILD
index 0007d2f40a53..235ba83a7327 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,62 +4,73 @@
 # Contributor: Franco Iacomella <yaco@gnu.org>
 
 pkgbase='drawpile'
-pkgname=("${pkgbase}"{,'-client','-server'})
-pkgver=2.1.20
-pkgrel=5
+pkgname=("${pkgbase}"{,'-client','-server','-tools'})
+pkgver=2.2.0
+pkgrel=1
 pkgdesc='Collaborative drawing program specially made for use with pen tablets'
 arch=('i686' 'x86_64')
 url='https://drawpile.net/'
 license=('GPL3')
-makedepends=('cmake' 'extra-cmake-modules' 'karchive5' 'qt5-multimedia' 'qt5-svg' 'qt5-tools' 'qt5-x11extras')
+makedepends=('cmake' 'extra-cmake-modules' 'karchive5' 'qt5-multimedia' 'qt5-svg' 'qt5-tools' 'qt5-x11extras' 'cargo')
 source=(
-    "https://drawpile.net/files/src/${pkgbase}-${pkgver}.tar.gz")
+    "https://github.com/drawpile/Drawpile/archive/refs/tags/${pkgver}.tar.gz")
 sha256sums=(
-    'a2f45e8b7482854288eb7b7f9db0961c79f0129ab92216280fdb94457e0d0fa9')
+    '41122fef2d590f621226570aa62cc7bae8bd0b1cf758c3f001f37cc8c9199683')
 
-_cmakeargs+=('-Wno-dev' '-DKIS_TABLET=ON')
+_cmakeargs+=(
+		'--preset linux-release-qt5-all-make'
+		'-DCMAKE_EXPORT_COMPILE_COMMANDS=OFF'
+		'-DCMAKE_INSTALL_PREFIX=/usr'
+		'-DSOURCE_ASSETS=OFF')
 
 build() {
-	cd "${pkgbase}-${pkgver}"
-
-	# Ensure build is an empty directory
-	rm -rf 'build'
-	mkdir -p 'build'
-	cd 'build'
-
-	cmake .. -DCMAKE_BUILD_TYPE='Release' -DCMAKE_INSTALL_PREFIX='/usr' "${_cmakeargs[@]}"
-	make
+	cd "Drawpile-${pkgver}"
+	cmake "${_cmakeargs[@]}" -B build
+	cmake --build build
 }
 
 package_drawpile() {
 	pkgdesc+=' (meta package)'
 	arch=('any')
-	depends=("${pkgbase}-client" "${pkgbase}-server")
-	conflicts=("${pkgbase}-common")
+	depends=("${pkgbase}-client" "${pkgbase}-server" "${pkgbase}-tools")
+	
+	cd "Drawpile-${pkgver}"
+	
+	DESTDIR="${srcdir}/pkg" cmake --install build
 }
 
 package_drawpile-client() {
 	pkgdesc+=' (client)'
 	depends=('desktop-file-utils' 'karchive5' 'qt5-multimedia' 'qt5-x11extras')
-	optdepends=('kdnssd5: automatic service discovery (such as printers)'
-		'giflib: GIF support'
-		'miniupnpc: UPnP support'
-		'qt5-color-widgets: alternative color wheel'
+	optdepends=('qt5-color-widgets: alternative color wheel'
 		'qtkeychain-qt5: Password storage')
 	install="${pkgbase}.install"
-	cd "${pkgbase}-${pkgver}"
-
-	DESTDIR="${pkgdir}" make -C 'build' install
-	rm -rfv "${pkgdir}"/usr/bin/drawpile-srv
+	
+	cd "Drawpile-${pkgver}"
+	
+	mkdir -p "${pkgdir}"/usr/{bin,share}
+	cp -r "${srcdir}"/pkg/usr/share/* "${pkgdir}"/usr/share
+	cp "${srcdir}"/pkg/usr/bin/drawpile "${pkgdir}"/usr/bin
 }
 
 package_drawpile-server() {
 	pkgdesc+=' (server)'
 	depends=('karchive5')
 	optdepends=('libmicrohttpd: web-admin feature'
+		'libsodium: ext-auth support'
 		'libsystemd: systemd and logging support')
-	cd "${pkgbase}-${pkgver}"
+		
+	cd "Drawpile-${pkgver}"
+
+	mkdir -p "${pkgdir}"/usr/bin
+	cp "${srcdir}"/pkg/usr/bin/drawpile-srv "${pkgdir}"/usr/bin
+}
+
+package_drawpile-tools() {
+	pkgdesc+=' (tools)'
+	
+	cd "Drawpile-${pkgver}"
 
-	DESTDIR="${pkgdir}" make -C 'build' install
-	rm -rfv "${pkgdir}"/usr/{share,bin/drawpile{,-2.*}}
+	mkdir -p "${pkgdir}"/usr/bin
+	cp "${srcdir}"/pkg/usr/bin/{dprectool,drawpile-cmd,drawpile-timelapse} "${pkgdir}"/usr/bin
 }