From d6dd1669ecf48ea4b6651a6d2e84075fbaafa10e Mon Sep 17 00:00:00 2001
From: Tim Biermann <tbier@posteo.de>
Date: Wed, 7 Jun 2023 21:23:50 +0200
Subject: [PATCH] librsvg: adopted port; dropped spurious dependency: brotli;
 new optional dependency: vala; removed *.la files

---
 librsvg/.footprint |  2 --
 librsvg/.signature |  6 +++---
 librsvg/Pkgfile    | 44 ++++++++++++++++++++------------------------
 3 files changed, 23 insertions(+), 29 deletions(-)

diff --git a/librsvg/.footprint b/librsvg/.footprint
index 9d7981c51..5bbab81bb 100644
--- a/librsvg/.footprint
+++ b/librsvg/.footprint
@@ -13,12 +13,10 @@ drwxr-xr-x	root/root	usr/lib/gdk-pixbuf-2.0/
 drwxr-xr-x	root/root	usr/lib/gdk-pixbuf-2.0/2.10.0/
 drwxr-xr-x	root/root	usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/
 -rw-r--r--	root/root	usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-svg.a
--rwxr-xr-x	root/root	usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-svg.la
 -rwxr-xr-x	root/root	usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-svg.so
 drwxr-xr-x	root/root	usr/lib/girepository-1.0/
 -rw-r--r--	root/root	usr/lib/girepository-1.0/Rsvg-2.0.typelib
 -rw-r--r--	root/root	usr/lib/librsvg-2.a
--rwxr-xr-x	root/root	usr/lib/librsvg-2.la
 lrwxrwxrwx	root/root	usr/lib/librsvg-2.so -> librsvg-2.so.2.48.0
 lrwxrwxrwx	root/root	usr/lib/librsvg-2.so.2 -> librsvg-2.so.2.48.0
 -rwxr-xr-x	root/root	usr/lib/librsvg-2.so.2.48.0
diff --git a/librsvg/.signature b/librsvg/.signature
index ae99abcc9..413d79eab 100644
--- a/librsvg/.signature
+++ b/librsvg/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/Sxoe+V2yYKAsNIX36nLe2kdoA6wijAtXJDkUQ5Y67LIx+EYGl7LlK5JF/26lzxCWnI4fSTUEE6z6NNGZJROnQ0=
-SHA256 (Pkgfile) = 3bc61f7b55a634c04ac885dc1037b1fbd60b94629bb406b30cdf40a4e255e596
-SHA256 (.footprint) = 74f543c2b76869e2d275a31900b4cbe7689dbe81f4ee6d654ee890c7d9aeabf3
+RWSE3ohX2g5d/QxWPD8mXMlzGvCPa+684uM8Y4lNrI+f307egHLpcAJ+y9F4aEg7n7apHnR5+kBg/C8fZKj1FPssmYd9smikDgU=
+SHA256 (Pkgfile) = 16fceea8e382cf3410be8a27902cda9cc5af95c64c376bcf9abe51a373a45f01
+SHA256 (.footprint) = 229026b2994c9e6bc682a791476eee7269507cedfa12d043d2377711219a44a2
 SHA256 (librsvg-2.56.1.tar.xz) = 1685aeacae9a441dcb12c0c3ec63706172a2f52705dafbefb8e7311d4d5e430b
diff --git a/librsvg/Pkgfile b/librsvg/Pkgfile
index ad7f5c3d7..642187fc8 100644
--- a/librsvg/Pkgfile
+++ b/librsvg/Pkgfile
@@ -1,39 +1,35 @@
 # Description: SVG rendering library with cairo backend
 # URL: https://wiki.gnome.org/Projects/LibRsvg
-# Maintainer: Danny Rawlins, crux at romster dot me
-# Depends on: brotli gdk-pixbuf pango rust
-# Optional: clang graphite2 lld sccache
+# Maintainer: Tim Biermann, tbier at posteo dot de
+# Depends on: gdk-pixbuf pango rust
+# Optional: graphite2 sccache vala
 
 name=librsvg
 version=2.56.1
-release=1
+release=2
 source=(https://download.gnome.org/sources/$name/${version%.*}/$name-$version.tar.xz)
 
 build() {
-	cd $name-$version
+  cd $name-$version
 
-	prt-get isinst sccache && export RUSTC_WRAPPER=/usr/bin/sccache
-	mkdir "$PKGMK_SOURCE_DIR/rust" || true
-	export CARGO_HOME="$PKGMK_SOURCE_DIR/rust"
+  prt-get isinst sccache && export RUSTC_WRAPPER=/usr/bin/sccache
+  [[ ! -e $PKGMK_SOURCE_DIR/rust ]] && mkdir $PKGMK_SOURCE_DIR/rust
 
-	export RUSTFLAGS+=' -C link-arg=-flto=thin'
-	prt-get isinst lld && export LD=ld.lld LDFLAGS+=' -Wl,-fuse-ld=lld' RUSTFLAGS+=' -C link-arg=-fuse-ld=lld'
-	prt-get isinst clang && export CC='clang' CXX='clang++' AR='llvm-ar' NM='llvm-nm' RANLIB='llvm-ranlib' \
-		CFLAGS+=' -flto=thin' CXXFLAGS+=' -flto=thin' LDFLAGS+=' -Wl,-flto=thin'
+  prt-get isinst vala && PKGMK_LIBRSVG+=' --enable-vala'
 
-	# causes segfault if set
-	unset __GL_NO_DSO_FINALIZER
+  export CARGO_PROFILE_RELEASE_LTO=true
+  export CARGO_PROFILE_RELEASE_CODEGEN_UNITS=1
 
-	./configure \
-		--prefix=/usr \
-		--disable-gtk-doc \
-		--disable-tools \
-		--disable-debug \
-		--disable-nls \
-		--enable-pixbuf-loader
+  ./configure $PKGMK_LIBRSVG \
+    --prefix=/usr \
+    --enable-pixbuf-loader \
+    --disable-gtk-doc \
+    --disable-debug \
+    --disable-nls
 
-	make
-	make DESTDIR=$PKG install
+  make
+  make DESTDIR=$PKG install
 
-	rm -r $PKG/usr/share/doc
+  find $PKG/usr/lib -type f -name '*.la' -print -delete
+  rm -r $PKG/usr/share/doc
 }