diff options
| author | zoe | 2018-04-24 12:08:05 +0200 |
|---|---|---|
| committer | zoe | 2018-04-24 12:08:05 +0200 |
| commit | eb59921ae4d1531429d46b5ceca91a58c158a8ae (patch) | |
| tree | 14d86d21f44bb2f368fa72180bdac8e2b69ba623 | |
| parent | 4dccdce2aeadf608498744ef1268025cc8b03314 (diff) | |
| download | aur-eb59921ae4d1531429d46b5ceca91a58c158a8ae.tar.gz | |
Update to 2.1.1 ; conflicts with libmagick6
| -rw-r--r-- | .SRCINFO | 9 | ||||
| -rw-r--r-- | PKGBUILD | 12 |
2 files changed, 14 insertions, 7 deletions
@@ -1,8 +1,8 @@ # Generated by mksrcinfo v8 -# Sat Jan 20 17:37:33 UTC 2018 +# Tue Apr 24 10:07:17 UTC 2018 pkgbase = kxstitch pkgdesc = The program that lets you create cross stitch patterns and charts. - pkgver = 2.1.0 + pkgver = 2.1.1 pkgrel = 1 url = https://userbase.kde.org/KXStitch install = kxstitch.install @@ -17,9 +17,10 @@ pkgbase = kxstitch makedepends = kdoctools depends = plasma-workspace depends = imagemagick - source = https://download.kde.org/stable/kxstitch/2.1.0/kxstitch-2.1.0.tar.xz + conflicts = libmagick6 + source = https://download.kde.org/stable/kxstitch/2.1.1/kxstitch-2.1.1.tar.xz source = kxstitch.install - sha1sums = b1a98ecc8262f69c5e7aae0677546210b52fca08 + sha1sums = 6f712bca3173b90149b67640fb1b63d02725c9ef sha1sums = 8e58ce0776eff7ef29394a2f7a089191a4af0b1d pkgname = kxstitch @@ -1,17 +1,23 @@ # Maintainer: zoe <chp321@gmail.com> # Contributor : enckse <enckse [at] gmail [dot] com> pkgname=kxstitch -pkgver=2.1.0 +pkgver=2.1.1 pkgrel=1 pkgdesc="The program that lets you create cross stitch patterns and charts." arch=('i686' 'x86_64') depends=('plasma-workspace' 'imagemagick') +conflicts=('libmagick6') makedepends=('cmake' 'automoc4' 'doxygen' 'patch' 'extra-cmake-modules' 'kdoctools') url="https://userbase.kde.org/KXStitch" license=('GPL') source=("https://download.kde.org/stable/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.xz" - "${pkgname}.install") -sha1sums=('b1a98ecc8262f69c5e7aae0677546210b52fca08' '8e58ce0776eff7ef29394a2f7a089191a4af0b1d') + "${pkgname}.install" + #"imagemagick.patch::https://github.com/KDE/kxstitch/commit/295773f44bfda1227d85edf065a8de14dc889159.diff" + ) +sha1sums=('6f712bca3173b90149b67640fb1b63d02725c9ef' + '8e58ce0776eff7ef29394a2f7a089191a4af0b1d' + #'e2d3c7ee0d9b62b7e0b1e4bcb327ee90f6edce3a' + ) install=${pkgname}.install build() { |