summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorSean Enck2018-06-11 19:58:17 -0400
committerSean Enck2018-06-11 19:58:17 -0400
commit776234ef352f59d4282d331646c99695eb26c380 (patch)
treed37a228f0796836ef9f97cfb22ed49e141cdccb6
parente9b01ae5daf6e7b444b0da159104f058a77a93f4 (diff)
downloadaur-776234ef352f59d4282d331646c99695eb26c380.tar.gz
requiring image and libmagick >= 7, dropping conflict
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD7
2 files changed, 6 insertions, 9 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 1fed420051f9..6e9a8e480a83 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,7 @@
-# Generated by mksrcinfo v8
-# Mon Jun 4 09:15:58 UTC 2018
pkgbase = kxstitch
pkgdesc = The program that lets you create cross stitch patterns and charts.
pkgver = 2.1.1
- pkgrel = 2
+ pkgrel = 3
url = https://userbase.kde.org/KXStitch
install = kxstitch.install
arch = i686
@@ -15,9 +13,9 @@ pkgbase = kxstitch
makedepends = patch
makedepends = extra-cmake-modules
makedepends = kdoctools
+ makedepends = libmagick>=7.0.0
depends = plasma-workspace
- depends = imagemagick
- conflicts = libmagick6
+ depends = imagemagick>=7.0.0
source = https://download.kde.org/stable/kxstitch/2.1.1/kxstitch-2.1.1.tar.xz
source = kxstitch.install
source = kxstitch-qt5.11.patch
diff --git a/PKGBUILD b/PKGBUILD
index 5936d9da8e11..7364a3cf9edd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,12 +2,11 @@
# Contributor : enckse <enckse [at] gmail [dot] com>
pkgname=kxstitch
pkgver=2.1.1
-pkgrel=2
+pkgrel=3
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')
+depends=('plasma-workspace' 'imagemagick>=7.0.0')
+makedepends=('cmake' 'automoc4' 'doxygen' 'patch' 'extra-cmake-modules' 'kdoctools' 'libmagick>=7.0.0')
url="https://userbase.kde.org/KXStitch"
license=('GPL')
source=("https://download.kde.org/stable/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.xz"