revision

2 files changed, 36 insertions, 39 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 09fffcd820d0..87d7d63a9abb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = resvg-git
 	pkgdesc = SVG rendering library and CLI
-	pkgver = 0.9.0.r11.ge207cc3
+	pkgver = 0.40.0.r3.g25fd2503
 	pkgrel = 1
 	url = https://github.com/RazrFalcon/resvg
 	arch = i686
@@ -9,7 +9,7 @@ pkgbase = resvg-git
 	makedepends = cargo
 	makedepends = qt5-base
 	makedepends = qt5-tools
-	makedepends = kio
+	makedepends = kio5
 	makedepends = cairo
 	makedepends = pango
 	makedepends = git
@@ -18,11 +18,10 @@ pkgbase = resvg-git
 	depends = gdk-pixbuf2
 	optdepends = qt5-base: For the Qt backend
 	optdepends = cairo: For the cairo backend
-	optdepends = kio: For the dolphin thumbnailer
+	optdepends = kio5: For the dolphin thumbnailer
 	provides = resvg
 	conflicts = resvg
 	source = git+https://github.com/RazrFalcon/resvg.git#branch=master
 	sha256sums = SKIP
 
 pkgname = resvg-git
-
diff --git a/PKGBUILD b/PKGBUILD
index 8ada701a5825..6fa7fe63f912 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,8 @@
+
+
 _pkgname=resvg
 pkgname=${_pkgname}-git
-pkgver=0.9.0.r11.ge207cc3
+pkgver=0.40.0.r3.g25fd2503
 pkgrel=1
 pkgdesc='SVG rendering library and CLI'
 arch=(i686 x86_64)
@@ -10,68 +12,64 @@ depends=(gdk-pixbuf2)
 optdepends=(
 	'qt5-base: For the Qt backend'
 	'cairo: For the cairo backend'
-	'kio: For the dolphin thumbnailer'
+	'kio5: For the dolphin thumbnailer'
 )
-makedepends=(cargo qt5-base qt5-tools kio cairo pango git cmake extra-cmake-modules)
+makedepends=(cargo qt5-base qt5-tools kio5 cairo pango git cmake extra-cmake-modules)
 conflicts=($_pkgname)
 provides=($_pkgname)
 source=("git+${url}.git#branch=master")
 sha256sums=('SKIP')
 
 pkgver() {
-	cd "${srcdir}/${_pkgname}"
+	cd "resvg"
 	git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g;s/^v//'
 }
 
+prepare() {
+	cd "resvg"
+	cargo fetch --locked --target "$CARCH-unknown-linux-gnu"
+	mkdir -p tools/kde-dolphin-thumbnailer/build
+}
+
 build() {
-	cd "${srcdir}/${_pkgname}"
-	for dir in capi tools/{render,u}svg; do
-	(
-		msg2 "Building $dir"
-		cd "$dir"
-		if grep -q cairo-backend Cargo.toml; then
-			cargo build --release --features='qt-backend cairo-backend'
-		else
-			cargo build --release
-		fi
-	)
-	done
+	cd "resvg"
+
+	export RUSTUP_TOOLCHAIN=stable
+	export CARGO_TARGET_DIR=target
+	cargo build --workspace --frozen --release --all-features
+
 	(
-		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
+		cd tools/kde-dolphin-thumbnailer/build
 		cmake .. \
+			-Wno-dev \
 			-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
 }
 
+check() {
+	cd "resvg"
+	export RUSTUP_TOOLCHAIN=stable
+	cargo test --frozen --all-features
+}
+
 package() {
-	cd "${srcdir}/${_pkgname}"
-	
-	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"
+	cd "resvg"
+	install -Dm755 -t "$pkgdir/usr/bin/" target/release/{resvg,usvg} tools/viewsvg/viewsvg
+	make -C tools/kde-dolphin-thumbnailer/build install
+	install -Dm755 -t "$pkgdir/usr/lib/" target/release/libresvg.so
+	install -Dm644 -t "$pkgdir/usr/include/" crates/c-api/*.h
 	install -d "$pkgdir/usr/share/doc/resvg"
 	cp -r target/doc/* "$pkgdir/usr/share/doc/resvg"
 }