Update to 2.2.0

3 files changed, 9 insertions, 43 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1cfbbf11c1da..58cc5645ee15 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,7 @@
-# Generated by mksrcinfo v8
-# Sun Dec  9 19:10:02 UTC 2018
 pkgbase = kxstitch
 	pkgdesc = The program that lets you create cross stitch patterns and charts.
-	pkgver = 2.1.1
-	pkgrel = 10
+	pkgver = 2.2.0
+	pkgrel = 1
 	url = https://userbase.kde.org/KXStitch
 	install = kxstitch.install
 	arch = i686
@@ -15,16 +13,10 @@ pkgbase = kxstitch
 	makedepends = kdoctools
 	depends = plasma-workspace
 	depends = libmagick
-	source = https://download.kde.org/stable/kxstitch/2.1.1/kxstitch-2.1.1.tar.xz
+	source = https://download.kde.org/stable/kxstitch/2.2.0/kxstitch-2.2.0.tar.xz
 	source = kxstitch.install
-	source = qt5.11.patch::https://cgit.kde.org/kxstitch.git/patch/?id=ca0f451dceecadc696ba6777084f22ceb5d372f0
-	source = imagemagick7.patch
-	source = color-find.patch::https://cgit.kde.org/kxstitch.git/patch/?id=26f7fce0508a149aefb9e9256f682abe87211760
-	sha1sums = 6f712bca3173b90149b67640fb1b63d02725c9ef
+	sha1sums = d0bb8ea0bfaf9dd3bd4b89fcc8dd238f7bfe5100
 	sha1sums = 8e58ce0776eff7ef29394a2f7a089191a4af0b1d
-	sha1sums = ea1531ae76c79d124bbddb70db85d76062424f66
-	sha1sums = 59dc498eb3e555b0f85a717f0588b3a217f8cbbb
-	sha1sums = 757f0f2c32846d32bfe2d060d0c4e88a1027cb70
 
 pkgname = kxstitch
 
diff --git a/PKGBUILD b/PKGBUILD
index 5c5914110e0c..bd7ef44c17e5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,40 +1,26 @@
 # Maintainer: zoe <chp321@gmail.com>
 # Contributor : enckse <enckse [at] gmail [dot] com>
 pkgname=kxstitch
-pkgver=2.1.1
-pkgrel=10
+pkgver=2.2.0
+pkgrel=1
 pkgdesc="The program that lets you create cross stitch patterns and charts."
 arch=('i686' 'x86_64')
 depends=('plasma-workspace' 'libmagick')
 makedepends=('cmake' 'doxygen' 'extra-cmake-modules' 'kdoctools')
 url="https://userbase.kde.org/KXStitch"
 license=('GPL')
-_patches="https://cgit.kde.org/kxstitch.git/patch/?id="
 source=("https://download.kde.org/stable/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.xz"
-       "${pkgname}.install"
-       "qt5.11.patch::${_patches}ca0f451dceecadc696ba6777084f22ceb5d372f0"
-       "imagemagick7.patch"
-       "color-find.patch::${_patches}26f7fce0508a149aefb9e9256f682abe87211760")
-sha1sums=('6f712bca3173b90149b67640fb1b63d02725c9ef'
-          '8e58ce0776eff7ef29394a2f7a089191a4af0b1d'
-          'ea1531ae76c79d124bbddb70db85d76062424f66'
-          '59dc498eb3e555b0f85a717f0588b3a217f8cbbb'
-          '757f0f2c32846d32bfe2d060d0c4e88a1027cb70')
+       "${pkgname}.install")
+sha1sums=('d0bb8ea0bfaf9dd3bd4b89fcc8dd238f7bfe5100'
+          '8e58ce0776eff7ef29394a2f7a089191a4af0b1d')
 install=${pkgname}.install
 
 build() {
     cd "${srcdir}/kxstitch-${pkgver}"
-    cp ../*.patch .
-    patch -p1 < qt5.11.patch
-    patch -p1 < imagemagick7.patch
-    patch -p1 < color-find.patch
     rm -rf build
     mkdir build
     cd build
     cmake -DCMAKE_INSTALL_PREFIX=`qtpaths --install-prefix` .. \
-          -DImageMagick_Magick++_INCLUDE_DIRS=/usr/include/ImageMagick-7 \
-          -DImageMagick_Magick++_LIBRARY=/usr/lib/libMagick++-7.Q16HDRI.so \
-          -DImageMagick_MagickCore_LIBRARY=/usr/lib/libMagickCore-7.Q16HDRI.so \
           -DCMAKE_BUILD_TYPE="Release"
     make
 }
diff --git a/imagemagick7.patch b/imagemagick7.patch
deleted file mode 100644
index e96ffa2fb0e3..000000000000
--- a/imagemagick7.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5eb5f73..8fa5678 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -37,7 +37,6 @@ find_package (KF5 REQUIRED COMPONENTS
-     XmlGui
- )
- 
--find_package (ImageMagick COMPONENTS MagickCore Magick++ REQUIRED)
- find_package (X11 REQUIRED)
- find_package (Doxygen)
- find_package (SharedMimeInfo)