v0.11.0

3 files changed, 16 insertions, 28 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a6117cd2a710..37f3901c25eb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,23 +1,21 @@
 pkgbase = resvg-qt
 	pkgdesc = SVG rendering library and CLI (Linked against Qt)
-	pkgver = 0.9.1
+	pkgver = 0.11.0
 	pkgrel = 1
 	url = https://github.com/RazrFalcon/resvg
 	arch = i686
 	arch = x86_64
 	license = MPL2
 	makedepends = cargo
+	makedepends = clang
 	makedepends = qt5-tools
 	makedepends = cmake
 	makedepends = extra-cmake-modules
-	depends = gdk-pixbuf2
 	depends = qt5-base
 	provides = resvg
 	conflicts = resvg
-	source = resvg-qt-0.9.1.tar.gz::https://github.com/RazrFalcon/resvg/archive/v0.9.1.tar.gz
-	source = qt-5.15.patch::https://github.com/RazrFalcon/resvg/commit/8ea12d08a4402eb49a8d371cf7dde1a7e047bb47.patch
-	sha256sums = 678e2bb453bd1b979fe1371f6a68da830f300067717604d8b9e83a196528bf36
-	sha256sums = 10f8ac12ac63c12905c7ac4f373e619653ed772e34c60bcaabe180364c5f7f13
+	source = resvg-0.11.0.tar.gz::https://github.com/RazrFalcon/resvg/archive/v0.11.0.tar.gz
+	sha256sums = bf348c37705e69e4684bd361914f165789cb679ccb47335ff6605b8e1a1c9b4e
 
 pkgname = resvg-qt
 
diff --git a/.gitignore b/.gitignore
index 903ac8a08375..f6b7a7c17eb7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 /src/
 /pkg/
 /*.tar.gz
-/*.pkg.tar.xz
-/qt-5.15.patch
+/*.pkg.tar.*
+/*.log
+
diff --git a/PKGBUILD b/PKGBUILD
index cbc30d7cbdac..d381488a0de3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Philipp A. <flying-sheep@web.de>
 _name=resvg
 pkgname=$_name-qt
-pkgver=0.9.1
+pkgver=0.11.0
 pkgrel=1
 pkgdesc='SVG rendering library and CLI (Linked against Qt)'
 arch=(i686 x86_64)
@@ -9,25 +9,14 @@ url="https://github.com/RazrFalcon/$_name"
 license=(MPL2)
 provides=(resvg)
 conflicts=(resvg)
-depends=(gdk-pixbuf2 qt5-base)
-makedepends=(cargo qt5-tools cmake extra-cmake-modules)
-source=(
-	"$pkgname-$pkgver.tar.gz::$url/archive/v$pkgver.tar.gz"
-	"qt-5.15.patch::$url/commit/8ea12d08a4402eb49a8d371cf7dde1a7e047bb47.patch"
-)
-sha256sums=(
-	'678e2bb453bd1b979fe1371f6a68da830f300067717604d8b9e83a196528bf36'
-	'10f8ac12ac63c12905c7ac4f373e619653ed772e34c60bcaabe180364c5f7f13'
-)
-
-prepare() {
-	cd "$_name-$pkgver"
-	patch --forward --strip=1 --input="$srcdir/qt-5.15.patch"
-}
+depends=(qt5-base)
+makedepends=(cargo clang qt5-tools cmake extra-cmake-modules)
+source=("$_name-$pkgver.tar.gz::$url/archive/v$pkgver.tar.gz")
+sha256sums=('bf348c37705e69e4684bd361914f165789cb679ccb47335ff6605b8e1a1c9b4e')
 
 build() {
 	cd "$_name-$pkgver"
-	for dir in capi tools/{render,u}svg; do
+	for dir in usvg c-api .; do
 	(
 		msg2 "Building $dir"
 		cd "$dir"
@@ -52,12 +41,12 @@ build() {
 package() {
 	cd "$_name-$pkgver"
 	
-	for tool in {render,u}svg; do
+	for tool in resvg usvg; do
 		install -Dm755 target/release/$tool "$pkgdir/usr/bin/$tool"
 	done
 	install -Dm755 tools/viewsvg/viewsvg      "$pkgdir/usr/bin/viewsvg"
 	install -Dm755 target/release/libresvg.so "$pkgdir/usr/lib/libresvg.so"
-	install -Dm644 capi/include/resvg.h       "$pkgdir/usr/include/resvg.h"
-	install -d "$pkgdir/usr/share/doc/resvg"
+	install -d "$pkgdir/usr/share/doc/resvg"  "$pkgdir/usr/include"
+	install -Dm644 c-api/*.h "$pkgdir/usr/include/"
 	cp -r target/doc/* "$pkgdir/usr/share/doc/resvg"
 }