sync with `resvg` aur pkg

2 files changed, 52 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4e1a05fcf263..09fffcd820d0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = resvg-git
 	pkgdesc = SVG rendering library and CLI
-	pkgver = 0.5.0.r6.gec7f425
+	pkgver = 0.9.0.r11.ge207cc3
 	pkgrel = 1
 	url = https://github.com/RazrFalcon/resvg
 	arch = i686
@@ -8,9 +8,17 @@ pkgbase = resvg-git
 	license = MPL2
 	makedepends = cargo
 	makedepends = qt5-base
+	makedepends = qt5-tools
+	makedepends = kio
+	makedepends = cairo
 	makedepends = pango
 	makedepends = git
-	makedepends = gdk-pixbuf2
+	makedepends = cmake
+	makedepends = extra-cmake-modules
+	depends = gdk-pixbuf2
+	optdepends = qt5-base: For the Qt backend
+	optdepends = cairo: For the cairo backend
+	optdepends = kio: For the dolphin thumbnailer
 	provides = resvg
 	conflicts = resvg
 	source = git+https://github.com/RazrFalcon/resvg.git#branch=master
diff --git a/PKGBUILD b/PKGBUILD
index 7bfc81099a5a..8ada701a5825 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,14 +1,20 @@
 _pkgname=resvg
 pkgname=${_pkgname}-git
-pkgver=0.5.0.r6.gec7f425
+pkgver=0.9.0.r11.ge207cc3
 pkgrel=1
 pkgdesc='SVG rendering library and CLI'
 arch=(i686 x86_64)
 url="https://github.com/RazrFalcon/$_pkgname"
 license=(MPL2)
-makedepends=(cargo qt5-base pango git gdk-pixbuf2)
-conflicts=(resvg)
-provides=(resvg)
+depends=(gdk-pixbuf2)
+optdepends=(
+	'qt5-base: For the Qt backend'
+	'cairo: For the cairo backend'
+	'kio: For the dolphin thumbnailer'
+)
+makedepends=(cargo qt5-base qt5-tools kio cairo pango git cmake extra-cmake-modules)
+conflicts=($_pkgname)
+provides=($_pkgname)
 source=("git+${url}.git#branch=master")
 sha256sums=('SKIP')
 
@@ -19,13 +25,35 @@ pkgver() {
 
 build() {
 	cd "${srcdir}/${_pkgname}"
-	for dir in capi tools/rendersvg; do
+	for dir in capi tools/{render,u}svg; do
 	(
 		msg2 "Building $dir"
 		cd "$dir"
-		cargo build --release --features='qt-backend cairo-backend'
+		if grep -q cairo-backend Cargo.toml; then
+			cargo build --release --features='qt-backend cairo-backend'
+		else
+			cargo build --release
+		fi
 	)
 	done
+	(
+		msg2 "Building tools/viewsvg"
+		cd tools/viewsvg
+		qmake PREFIX="$pkgdir/usr"
+		make
+	)
+	(
+		msg2 "Building tools/kde-dolphin-thumbnailer"
+		cd tools/kde-dolphin-thumbnailer
+		mkdir -p build
+		cd build
+		cmake .. \
+			-DCMAKE_CXX_FLAGS="-L../../../target/release" \
+			-DCMAKE_INSTALL_PREFIX="$pkgdir/$(qtpaths --install-prefix)" \
+			-DQT_PLUGIN_INSTALL_DIR="$pkgdir/$(qtpaths --plugin-dir)" \
+			-DCMAKE_BUILD_TYPE=Release
+		make
+	)
 	
 	msg2 'Building docs'
 	cargo doc --release --no-deps -p resvg-capi
@@ -34,10 +62,16 @@ build() {
 package() {
 	cd "${srcdir}/${_pkgname}"
 	
-	install -Dm755 target/release/rendersvg   "$pkgdir/usr/bin/rendersvg"
+	for tool in {render,u}svg; do
+		install -Dm755 target/release/$tool "$pkgdir/usr/bin/$tool"
+	done
+	install -Dm755 tools/viewsvg/viewsvg "$pkgdir/usr/bin/viewsvg"
+	(
+		cd tools/kde-dolphin-thumbnailer/build
+		make install
+	)
 	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"
 	cp -r target/doc/* "$pkgdir/usr/share/doc/resvg"
 }