summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authornotfood2019-03-09 12:56:54 -0500
committernotfood2019-03-09 12:56:54 -0500
commitd63b02e7c63f424a1432fa556fd44b3e6ca1c2b3 (patch)
tree0cf7147074665ef1a96b46d61625acc9b30eed71
parentc8b2febe050f6162aa44e509d3c0375171767db8 (diff)
downloadaur-d63b02e7c63f424a1432fa556fd44b3e6ca1c2b3.tar.gz
2.1.2
-rw-r--r--.SRCINFO20
-rw-r--r--PKGBUILD44
2 files changed, 23 insertions, 41 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 49fa767c56b..46354cf0fa9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = drawpile
pkgdesc = Collaborative drawing program specially made for use with pen tablets
- pkgver = 2.0.11
- pkgrel = 3
+ pkgver = 2.1.2
+ pkgrel = 1
url = http://drawpile.net/
arch = i686
arch = x86_64
@@ -10,23 +10,24 @@ pkgbase = drawpile
makedepends = qt5-multimedia
makedepends = qt5-tools
makedepends = qt5-svg
- makedepends = ninja
makedepends = cmake
makedepends = extra-cmake-modules
- source = http://drawpile.net/files/src/drawpile-2.0.11.tar.gz
- sha256sums = f34a9be3414dca26d059e292e994eaa05932cca70a465a39be9c02067b460140
+ source = http://drawpile.net/files/src/drawpile-2.1.2.tar.gz
+ sha256sums = 11d69427abe60a3c3a7cdbac4252bacbea1bf712d89125306eb0277ec2b0730a
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
pkgname = drawpile-client
pkgdesc = Collaborative drawing program specially made for use with pen tablets (client)
- depends = drawpile-common
+ install = drawpile.install
depends = karchive
depends = qt5-multimedia
+ depends = desktop-file-utils
optdepends = kdnssd: automatic service discovery (such as printers)
optdepends = giflib: GIF support
optdepends = miniupnpc: UPnP support
@@ -34,14 +35,7 @@ pkgname = drawpile-client
pkgname = drawpile-server
pkgdesc = Collaborative drawing program specially made for use with pen tablets (server)
- depends = drawpile-common
depends = karchive
optdepends = libmicrohttpd: web-admin feature
optdepends = libsystemd: systemd and logging support
-pkgname = drawpile-common
- pkgdesc = Collaborative drawing program specially made for use with pen tablets (common files)
- install = drawpile.install
- arch = any
- depends = desktop-file-utils
-
diff --git a/PKGBUILD b/PKGBUILD
index 4aacae3183b..6853596fae4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,18 +1,19 @@
-# Maintainer: Manuel Hüsers <manuel.huesers@uni-ol.de>
+# Maintainer: MV <notfood.dev@gmail.com>
+# Contributor: Manuel Hüsers <manuel.huesers@uni-ol.de>
# Contributor: Alexander Rødseth <rodseth@gmail.com>
# Contributor: Franco Iacomella <yaco@gnu.org>
pkgbase='drawpile'
-pkgname=("${pkgbase}"{,'-client','-server','-common'})
-pkgver=2.0.11
-pkgrel=3
+pkgname=("${pkgbase}"{,'-client','-server'})
+pkgver=2.1.2
+pkgrel=1
pkgdesc='Collaborative drawing program specially made for use with pen tablets'
arch=('i686' 'x86_64')
url='http://drawpile.net/'
license=('GPL3')
-makedepends=('karchive' 'qt5-multimedia' 'qt5-tools' 'qt5-svg' 'ninja' 'cmake' 'extra-cmake-modules')
+makedepends=('karchive' 'qt5-multimedia' 'qt5-tools' 'qt5-svg' 'cmake' 'extra-cmake-modules')
source=("http://drawpile.net/files/src/${pkgbase}-${pkgver}.tar.gz")
-sha256sums=('f34a9be3414dca26d059e292e994eaa05932cca70a465a39be9c02067b460140')
+sha256sums=('11d69427abe60a3c3a7cdbac4252bacbea1bf712d89125306eb0277ec2b0730a')
_cmakeargs+=('-Wno-dev' '-DKIS_TABLET=ON')
@@ -24,51 +25,38 @@ build() {
mkdir -p 'build'
cd 'build'
- cmake .. -DCMAKE_INSTALL_PREFIX='/usr' -G Ninja "${_cmakeargs[@]}"
- ninja
+ cmake .. -DCMAKE_INSTALL_PREFIX='/usr' "${_cmakeargs[@]}"
+ make
}
package_drawpile() {
pkgdesc+=' (meta package)'
arch=('any')
depends=("${pkgbase}-client" "${pkgbase}-server")
+ conflicts=("${pkgbase}-common")
}
package_drawpile-client() {
pkgdesc+=' (client)'
- depends=("${pkgbase}-common" 'karchive' 'qt5-multimedia')
+ depends=('karchive' 'qt5-multimedia' 'desktop-file-utils')
optdepends=('kdnssd: automatic service discovery (such as printers)'
'giflib: GIF support'
'miniupnpc: UPnP support'
'qt5-color-widgets: alternative color wheel')
+ install="${pkgbase}.install"
cd "${pkgbase}-${pkgver}"
- DESTDIR="${pkgdir}" ninja -C 'build' install
- rm -rfv "${pkgdir}"/usr/{share,bin/drawpile-srv}
+ DESTDIR="${pkgdir}" make -C 'build' install
+ rm -rfv "${pkgdir}"/usr/bin/drawpile-srv
}
package_drawpile-server() {
pkgdesc+=' (server)'
- depends=("${pkgbase}-common" 'karchive')
+ depends=('karchive')
optdepends=('libmicrohttpd: web-admin feature'
'libsystemd: systemd and logging support')
cd "${pkgbase}-${pkgver}"
- DESTDIR="${pkgdir}" ninja -C 'build' install
+ DESTDIR="${pkgdir}" make -C 'build' install
rm -rfv "${pkgdir}"/usr/{share,bin/drawpile{,-2.*}}
}
-
-package_drawpile-common() {
- pkgdesc+=' (common files)'
- arch=('any')
- depends=('desktop-file-utils')
- install="${pkgbase}.install"
- cd "${pkgbase}-${pkgver}"
-
- DESTDIR="${pkgdir}" ninja -C 'build' install
- rm -rfv "${pkgdir}/usr/bin"
- install -Dvm644 "desktop/${pkgbase}.svg" \
- "${pkgdir}/usr/share/pixmaps/${pkgbase}.svg"
- install -Dvm644 "desktop/${pkgbase}.desktop" \
- "${pkgdir}/usr/share/applications/${pkgbase}.desktop"
-}