librsvg, GDK-PixBuf and GTK3 skels

diff --git a/build/distfiles/.gitignore b/build/distfiles/.gitignore
index e12c1cd4203f2d03d73060d706209d939a3843b1934a116714a2cb45ff8a195f..b09e78a51bb7d39c3cc62d01df3dff32675cceeae08527fa47181ee2ebcd5cee 100644 (file)
--- a/build/distfiles/.gitignore
+++ b/build/distfiles/.gitignore
@@ -36,6 +36,7 @@
 /gcc-4.7.4.tar.bz2
 /gcc-8.5.0.tar.xz
 /gdal-2.4.4.tar.gz
+/gdk-pixbuf-2.42.12.tar.xz
 /geos-3.12.1.tar.bz2
 /getopt-1.1.6.tar.gz
 /ghostscript-10.03.1.tar.gz
@@ -65,6 +66,7 @@
 /gpgme-1.23.2.tar.bz2
 /graphviz-11.0.0.tar.xz
 /grep-3.11.tar.xz
+/gtk+-3.24.42.tar.xz
 /guix.git/
 /harfbuzz-8.5.0.tar.xz
 /herbe-1.0.0-10-gdec89e4.tar.zst
@@ -107,6 +109,7 @@
 /libplacebo-v6.338.0-117-g5c1e6da2.tar.zst
 /libplacebo/
 /libpng-1.6.43.tar.xz
+/librsvg-2.40.21.tar.xz
 /libsndfile-1.0.31.tar.bz2
 /libtap-0.1.0-44-gb53e4ef.tar.zst
 /libtap.git/

diff --git a/build/distfiles/gdk-pixbuf-2.42.12.tar.xz.meta4 b/build/distfiles/gdk-pixbuf-2.42.12.tar.xz.meta4
new file mode 100644 (file)
index 0000000..11abd09
--- /dev/null
+++ b/build/distfiles/gdk-pixbuf-2.42.12.tar.xz.meta4
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metalink xmlns="urn:ietf:params:xml:ns:metalink">
+  <file name="gdk-pixbuf-2.42.12.tar.xz">
+    <hash type="blake3-256">edf54b48c7008c0ec52e0224b6a10ea680bbb94c23b71fbe5d19ae8e72706bc6</hash>
+    <hash type="blake2b-512">718a96c9efb836a275692ccbc403df0eb285918c5867d344406f660898c7ce8aad8cce7187faf7f6e9cdcfd1b051d5384f57644d946b888baddbaafb8f99309c</hash>
+    <hash type="blake2b-256">64881f5c403cb76fa3d301b659d1f1740c9af58ba49c7c0233c22e9cc6bcee6b</hash>
+    <hash type="skein-512">7e77008be494c0810e4072f6a5a5adcd472a77983160e8303b3de6b91082a788aa65930bb05406f125e9501e930f6c36660cfd729fea04032af52669a536e62d</hash>
+    <hash type="shake128">233ea0cc7dc0f7db4defa31abfe37fb549c9e5cfba9dea2d15ba6a301d7c4237</hash>
+    <hash type="shake256">ebffa908f62159131312334d3546308cb4602d402192c4c84542ba335c6a8ef2062abbba680d52d4e97e85b58f80f65e092ea8348a8a93d780aab53d23557083</hash>
+    <hash type="sha-512">ae9fcc9b4e8fd10a4c9bf34c3a755205dae7bbfe13fbc93ec4e63323dad10cc862df6a9e2e2e63c84ffa01c5e120a3be06ac9fad2a7c5e58d3dc6ba14d1766e8</hash>
+    <hash type="sha-256">b9505b3445b9a7e48ced34760c3bcb73e966df3ac94c95a148cb669ab748e3c7</hash>
+    <hash type="streebog-512">20a2963bd705f4e01827b7cd2869e50a6b79e00cdf42656d9d05398748a06285fa1f342fec6009c0eb29ecb19fe5e14359122d50525c1ecc44cb1e9939a8a006</hash>
+    <hash type="streebog-256">537989697192bf8223b8d5a065bb0db358eebb51c3d3d4c6e9a335096484dd4f</hash>
+    <hash type="xxh3-128">29929a3581d2a5c1ba0530b30a341bb4</hash>
+    <size>6525072</size>
+    <url>https://download.gnome.org/sources/gdk-pixbuf/2.42/gdk-pixbuf-2.42.12.tar.xz</url>
+  </file>
+</metalink>

diff --git a/build/distfiles/gtk+-3.24.42.tar.xz.meta4 b/build/distfiles/gtk+-3.24.42.tar.xz.meta4
new file mode 100644 (file)
index 0000000..b7ef03e
--- /dev/null
+++ b/build/distfiles/gtk+-3.24.42.tar.xz.meta4
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metalink xmlns="urn:ietf:params:xml:ns:metalink">
+  <file name="gtk+-3.24.42.tar.xz">
+    <hash type="blake3-256">4c48074ac84aa02cde9ae09b640216cfbf5e2503a0d6f7ca2e6b6e0b0d22f524</hash>
+    <hash type="blake2b-512">04675abfa056d19a8324c8310789227e661458cfa356b670ba79d61a9498fa1c65161d19799d33d717742912cdddc3400a548573809d5dd4e0f289d0c75e88d9</hash>
+    <hash type="blake2b-256">be82288371a4aded4f0eee00fc303656377f3ca6c84b0ec67e15554f3ff0abd2</hash>
+    <hash type="skein-512">16dce71739344e987bfd01fd6444871feca8eb46f84406a63adf7886e193373553c8a7e23e4dfb7301e7b6beacba6bbcf6549ec3736af93fa10dfd859fbcfb8f</hash>
+    <hash type="shake128">d39ae53831a9a486b97c597ee38a53592bc083e69d4e21355562b64bf96e6df9</hash>
+    <hash type="shake256">fc0629231f740c6a08b2f50dfe4ed32b253e30b27546b098908242b6ca37b104f736519bf8e522e3e61e40cb833ce0014fd0fd3c789c866c9a0f98e68d997320</hash>
+    <hash type="sha-512">53e86e35d33f82384f1d40bd91feee67be68bc9003abd095842991441b1f2ee11a5b431168963270d3ffc0c653d26673ca97cdd55a8f577ef21dbd5d6004b643</hash>
+    <hash type="sha-256">50f89f615092d4dd01bbd759719f8bd380e5f149f6fd78a94725e2de112377e2</hash>
+    <hash type="streebog-512">596edaa31f059578df93c05c0e18b9083c45493e980fd58e9740ff05422895324768b1c280c0fd466f98a3a7a090853c716b83bc0ff307b65992bdbf8bbd2446</hash>
+    <hash type="streebog-256">3af054b80587834c1b6454904494011afbb2340647884319298cbca32a28e535</hash>
+    <hash type="xxh3-128">ff766a416459ef32a211c6e7a892dcfc</hash>
+    <size>13226980</size>
+    <url>https://download.gnome.org/sources/gtk%2B/3.24/gtk%2B-3.24.42.tar.xz</url>
+  </file>
+</metalink>

diff --git a/build/distfiles/librsvg-2.40.21.tar.xz.meta4 b/build/distfiles/librsvg-2.40.21.tar.xz.meta4
new file mode 100644 (file)
index 0000000..d12da42
--- /dev/null
+++ b/build/distfiles/librsvg-2.40.21.tar.xz.meta4
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metalink xmlns="urn:ietf:params:xml:ns:metalink">
+  <file name="librsvg-2.40.21.tar.xz">
+    <hash type="blake3-256">0ce1906c5136a1d9fe596a4ec0a01afe3700af3c5c917439f00b280b78d738e8</hash>
+    <hash type="blake2b-512">a3fd7915d39984057e860da90115d9d95cef97e61d3f5e4c3aaaf399c4b3bfe781e6a7b969958ae84a3b7f2c788576fe26f56b037ca0a6a2e059b53f2bd1b9fc</hash>
+    <hash type="blake2b-256">332a6015679bb0dadd6ee9948aaa9014b6a1d58c6e36e8bbe0a0be4f510cd3ea</hash>
+    <hash type="skein-512">01d3c8e0d714dbb740438bd9c624afde6926514664fefab06b58d20908fb6702c99181bf3a54e1bf4dcf71ccfb0b68af347540d00dacee6664deceeda5cab2b3</hash>
+    <hash type="shake128">09f77d7d0c1eb5c8e750c546eeb6ba1c12457fa450363b00e11cd71689f7601a</hash>
+    <hash type="shake256">48eef2737db2ce7b49b6c071f144153be9203f3d6915c9639cbe39d8bbfb30f4c2d66b4286a68f533e09c1b627f73a0ade6c0c1f2329409aa053b1f65835c466</hash>
+    <hash type="sha-512">db0563d8e0edaae642a6b2bcd239cf54191495058ac8c7ff614ebaf88c0e30bd58dbcd41f58d82a9d5ed200ced45fc5bae22f2ed3cf3826e9348a497009e1280</hash>
+    <hash type="sha-256">f7628905f1cada84e87e2b14883ed57d8094dca3281d5bcb24ece4279e9a92ba</hash>
+    <hash type="streebog-512">667d75b448f158d4d2b9ae694ae09eb686c76949f8ca7d35fcf8b19337b2c1b52c23d59dd5aa1a7caea0867e9ea3d0d2fb325af933116a44a8e9dc4c2f21c23c</hash>
+    <hash type="streebog-256">dfac2b1ac89856fc0ba1d1545ca3f015bc5bb76d3a59b2d9ed51b14141f8d93e</hash>
+    <hash type="xxh3-128">985e9bd56a6a21cb430b73e2d695a8b3</hash>
+    <size>1655860</size>
+    <url>https://download.gnome.org/sources/librsvg/2.40/librsvg-2.40.21.tar.xz</url>
+  </file>
+</metalink>

diff --git a/build/distfiles/meson-0.61.0.tar.gz.meta4 b/build/distfiles/meson-0.61.0.tar.gz.meta4
deleted file mode 100644 (file)
index be9629c..0000000
--- a/build/distfiles/meson-0.61.0.tar.gz.meta4
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metalink xmlns="urn:ietf:params:xml:ns:metalink">
-  <file name="meson-0.61.0.tar.gz">
-    <hash type="blake3-256">756aa4ef1a1cfcd766a03c3236022ab0882e4d377a8be1da14a52fda6602050c</hash>
-    <hash type="blake2b-512">cd86e3d716ad479ec2c3007eb53c20182382b823b1dfb38b41cf91d665930b70c07a869348ba2fcf78f374915aa7c55344e2e848c7f8b3e624349eea2838ceb4</hash>
-    <hash type="blake2b-256">6e88c5d597b3c8993ef934935ded1de3023f8132e21aa54e061369c59f069e04</hash>
-    <hash type="skein-512">d8ad3599fe98f43e53e4658d85bf2616976fa4216df8c3cae5231f56e2bf17d4ce46a37ade97516f25d87be4baaf7f37c4574198498137b971ba665e8722f2a8</hash>
-    <hash type="shake128">59642d0f6b3a07ca848e217342f8973d8d5d6026cf63bb6e06a27858bfadea5f</hash>
-    <hash type="shake256">692b412b34b992df6ca6922f683f73814df1fd6ac4fa2fc48eef55f515d4f978a9a4f9012a694bd3946d9eaa21315ec0b4e2bae905e6e6d923a137ccc4fb0be1</hash>
-    <hash type="sha-512">ff739f767710c09a1b238f135c81bdb79675d06cec1b091503809cdbd71f0f92fd76bf068650bbec60688b79fbda94e56cb3203c948aa79f16a88f6d9db219d1</hash>
-    <hash type="sha-256">ea9f33246b1f23f02e90a50e75e0f41e526f6dabf0c24f3e00e27a3f5abdc35c</hash>
-    <hash type="streebog-512">b121387debd62a6b33594172ac0535a7f5d01b2894b013981812d99f89bf50090c275e82754f34fbdd7ae797ca5f6fef1941e529f3097f485fddee9774ad0173</hash>
-    <hash type="streebog-256">cb69c8480407fe4bde358c298293efc56bf6da013f44cee2d74ed7e8645edb51</hash>
-    <hash type="xxh3-128">166a4f26cfbfece3f438d2d2fa53a6b7</hash>
-    <size>2007070</size>
-    <url>https://files.pythonhosted.org/packages/6e/88/c5d597b3c8993ef934935ded1de3023f8132e21aa54e061369c59f069e04/meson-0.61.0.tar.gz</url>
-  </file>
-</metalink>

diff --git a/build/skel/devel/cmake-3.28.3.do b/build/skel/devel/cmake-3.28.3.do
index caa6aeca2b7a1052c2d0c71fd1cb3c4feaf93cdfea3b0892d4314c13bbf4a30c..3b0a0a6a3c58487e3b8194a76c979b6c03cca7aa7379319b9329a194eae431dd 100644 (file)
--- a/build/skel/devel/cmake-3.28.3.do
+++ b/build/skel/devel/cmake-3.28.3.do
@@ -14,10 +14,8 @@ tar xf "$DISTFILES"/$NAME.tar.gz
 "$BASS_ROOT"/bin/rm-r "$SKELBINS"/$ARCH/$NAME-$hsh
 
 cd $NAME
-uv_flags=""
-if uname -a | grep -q BSD ; then uv_flags="--bootstrap-system-libuv" ; fi
 OPENSSL_ROOT_DIR=$tmp/local ./bootstrap \
-    --prefix="$SKELBINS"/$ARCH/$NAME-$hsh --parallel=$MAKE_JOBS $uv_flags >&2
+    --prefix="$SKELBINS"/$ARCH/$NAME-$hsh --parallel=$MAKE_JOBS >&2
 make -j$MAKE_JOBS >&2
 make install >&2
 

diff --git a/build/skel/graphics/gdk-pixbuf-2.42.12.do b/build/skel/graphics/gdk-pixbuf-2.42.12.do
new file mode 100644 (file)
index 0000000..28c7f69
--- /dev/null
+++ b/build/skel/graphics/gdk-pixbuf-2.42.12.do
@@ -0,0 +1,56 @@
+[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../..
+sname=$1.do . "$BASS_ROOT"/lib/rc
+. "$BASS_ROOT"/build/skel/common.rc
+
+bdeps="
+rc-paths
+stow
+archivers/zstd
+devel/pkgconf-2.1.1
+devel/ninja-v1.12.1
+"
+rdeps="
+graphics/libjpeg-turbo-3.0.3
+graphics/libpng-1.6.43
+graphics/tiff-4.6.0
+"
+meson=meson-0.63.3
+redo-ifchange $bdeps \
+    "$DISTFILES"/$NAME.tar.xz \
+    "$DISTFILES"/$meson.tar.gz \
+    $rdeps
+hsh=$("$BASS_ROOT"/build/bin/cksum $BASS_REV $SPATH)
+. "$BASS_ROOT"/build/lib/create-tmp-for-build.rc
+"$BASS_ROOT"/build/bin/pkg-inst $bdeps $rdeps
+. ./rc
+$TAR xf "$DISTFILES"/$meson.tar.gz
+$TAR xf "$DISTFILES"/$NAME.tar.xz
+"$BASS_ROOT"/bin/rm-r "$SKELBINS"/$ARCH/$NAME-$hsh
+
+cd $NAME
+../$meson/meson.py setup --prefix="$SKELBINS"/$ARCH/$NAME-$hsh \
+    -Dpng=enabled \
+    -Djpeg=enabled \
+    -Dtiff=enabled \
+    -Dgtk_doc=false \
+    -Ddocs=false \
+    -Dman=false \
+    -Dtests=false \
+    -Dinstalled_tests=false \
+    _build >&2
+../$meson/meson.py compile -C _build >&2
+../$meson/meson.py install -C _build >&2
+
+cd "$SKELBINS"/$ARCH
+"$BASS_ROOT"/build/lib/prepare-preinst-010-rdeps $NAME-$hsh $rdeps
+
+mkdir $NAME-$hsh/skelpkg/$NAME-$hsh/hooks/postinst
+cat >$NAME-$hsh/skelpkg/$NAME-$hsh/hooks/postinst/010add-girs <<EOF
+#!/bin/sh -e
+p=\$(realpath local/share)
+[ -n "\$p" ]
+echo export XDG_DATA_DIRS=\$p:\$XDG_DATA_DIRS >>rc
+EOF
+chmod +x $NAME-$hsh/skelpkg/$NAME-$hsh/hooks/postinst/010add-girs
+
+"$BASS_ROOT"/build/lib/mk-pkg $NAME-$hsh

diff --git a/build/skel/graphics/gtk+-3.24.42.do b/build/skel/graphics/gtk+-3.24.42.do
new file mode 100644 (file)
index 0000000..4e23f8c
--- /dev/null
+++ b/build/skel/graphics/gtk+-3.24.42.do
@@ -0,0 +1,47 @@
+[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../..
+sname=$1.do . "$BASS_ROOT"/lib/rc
+. "$BASS_ROOT"/build/skel/common.rc
+
+bdeps="
+rc-paths
+stow
+archivers/zstd
+devel/cmake-3.28.3
+devel/ninja-v1.12.1
+devel/pkgconf-2.1.1
+"
+rdeps="
+graphics/cairo-1.16.0
+graphics/gdk-pixbuf-2.42.12
+"
+meson=meson-0.63.3
+redo-ifchange $bdeps \
+    "$DISTFILES"/$NAME.tar.xz \
+    "$DISTFILES"/$meson.tar.gz \
+    $rdeps
+hsh=$("$BASS_ROOT"/build/bin/cksum $BASS_REV $SPATH)
+. "$BASS_ROOT"/build/lib/create-tmp-for-build.rc
+"$BASS_ROOT"/build/bin/pkg-inst $bdeps $rdeps
+. ./rc
+$TAR xf "$DISTFILES"/$meson.tar.gz
+$TAR xf "$DISTFILES"/$NAME.tar.xz
+"$BASS_ROOT"/bin/rm-r "$SKELBINS"/$ARCH/$NAME-$hsh
+
+cd $NAME
+orig="$XDG_DATA_DIRS"
+unset XDG_DATA_DIRS
+../$meson/meson.py setup --prefix="$SKELBINS"/$ARCH/$NAME-$hsh \
+    -Dgtk_doc=false \
+    -Dwayland_backend=false \
+    -Dinstalled_tests=false \
+    -Dtests=false \
+    -Ddemos=false \
+    -Dexamples=false \
+    _build >&2
+../$meson/meson.py compile -C _build >&2 || :
+XDG_DATA_DIRS=$tmp/local/share ../$meson/meson.py compile -C _build >&2
+../$meson/meson.py install -C _build >&2
+
+cd "$SKELBINS"/$ARCH
+"$BASS_ROOT"/build/lib/prepare-preinst-010-rdeps $NAME-$hsh $rdeps
+"$BASS_ROOT"/build/lib/mk-pkg $NAME-$hsh

diff --git a/build/skel/graphics/imagemagick-7.1.1-33.do b/build/skel/graphics/imagemagick-7.1.1-33.do
index 46bf6f7c34b0c12a82187cc2a0a11d897fb318f5e6a14e7a646748704b125ed3..25a2451b6b62191fa7c83b0569b76faaa507e41efade0c80d3942dd403f5c914 100644 (file)
--- a/build/skel/graphics/imagemagick-7.1.1-33.do
+++ b/build/skel/graphics/imagemagick-7.1.1-33.do
@@ -9,6 +9,7 @@ graphics/ghostscript-10.03.1
 graphics/libjpeg-turbo-3.0.3
 graphics/libjxl-v0.10-snapshot-179-gcdb6a667
 graphics/libpng-1.6.43
+graphics/librsvg-2.40.21
 graphics/libwebp-1.4.0
 graphics/openjpeg-2.5.2
 graphics/tiff-4.6.0
@@ -27,6 +28,7 @@ cd $NAME
     --with-jpeg=yes \
     --with-jxl=yes \
     --with-png=yes \
+    --with-rsvg=yes \
     --with-webp=yes >&2
 gmake -j$MAKE_JOBS >&2
 gmake install >&2

diff --git a/build/skel/graphics/imlib2-1.12.2.do b/build/skel/graphics/imlib2-1.12.2.do
index 5af5e45f485bdce4dbbcaf1e21ac523ef2b3aec3b8da183cfb66b8ec3ece3698..fa0d02f2ecb231a216bbd833501ca127d69f65accb64b0bcc7598bfbb64e7251 100644 (file)
--- a/build/skel/graphics/imlib2-1.12.2.do
+++ b/build/skel/graphics/imlib2-1.12.2.do
@@ -5,11 +5,12 @@ sname=$1.do . "$BASS_ROOT"/lib/rc
 bdeps="rc-paths stow archivers/zstd devel/pkgconf-2.1.1"
 rdeps="
 graphics/freetype-2.9.1
-graphics/libpng-1.6.43
+graphics/libavif-v1.0.0-535-g7fbc20c
 graphics/libjpeg-turbo-3.0.3
 graphics/libjxl-v0.10-snapshot-179-gcdb6a667
-graphics/libavif-v1.0.0-535-g7fbc20c
+graphics/libpng-1.6.43
 graphics/libwebp-1.4.0
+graphics/tiff-4.6.0
 "
 redo-ifchange $bdeps "$DISTFILES"/$NAME.tar.xz $rdeps
 hsh=$("$BASS_ROOT"/build/bin/cksum $BASS_REV $SPATH)

diff --git a/build/skel/graphics/librsvg-2.40.21.do b/build/skel/graphics/librsvg-2.40.21.do
new file mode 100644 (file)
index 0000000..ee85486
--- /dev/null
+++ b/build/skel/graphics/librsvg-2.40.21.do
@@ -0,0 +1,24 @@
+[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../..
+sname=$1.do . "$BASS_ROOT"/lib/rc
+. "$BASS_ROOT"/build/skel/common.rc
+
+bdeps="rc-paths stow archivers/zstd devel/gmake-4.4.1 devel/pkgconf-2.1.1"
+rdeps=graphics/gdk-pixbuf-2.42.12
+redo-ifchange $bdeps "$DISTFILES"/$NAME.tar.xz $rdeps
+hsh=$("$BASS_ROOT"/build/bin/cksum $BASS_REV $SPATH)
+. "$BASS_ROOT"/build/lib/create-tmp-for-build.rc
+"$BASS_ROOT"/build/bin/pkg-inst $bdeps $rdeps
+. ./rc
+$TAR xf "$DISTFILES"/$NAME.tar.xz
+"$BASS_ROOT"/bin/rm-r "$SKELBINS"/$ARCH/$NAME-$hsh
+
+cd $NAME
+./configure --prefix="$SKELBINS"/$ARCH/$NAME-$hsh \
+    --disable-dependency-tracking \
+    --disable-pixbuf-loader >&2
+gmake -j$MAKE_JOBS >&2
+gmake install >&2
+
+cd "$SKELBINS"/$ARCH
+"$BASS_ROOT"/build/lib/prepare-preinst-010-rdeps $NAME-$hsh $rdeps
+"$BASS_ROOT"/build/lib/mk-pkg $NAME-$hsh

diff --git a/build/skel/graphics/mupdf-1.24.0-170-g05063f228.do b/build/skel/graphics/mupdf-1.24.0-170-g05063f228.do
index 3e3784ba178cc99a087ddd6003631f6a2e4106919a1b355171f693e569305850..88d9d3f28ac0b093f95bd021a7a01d65752846835ec6739b3a4c047a9041c741 100644 (file)
--- a/build/skel/graphics/mupdf-1.24.0-170-g05063f228.do
+++ b/build/skel/graphics/mupdf-1.24.0-170-g05063f228.do
@@ -29,14 +29,4 @@ XCFLAGS=-fPIC gmake -j$MAKE_JOBS \
 
 cd "$SKELBINS"/$ARCH
 "$BASS_ROOT"/build/lib/prepare-preinst-010-rdeps $NAME-$hsh $rdeps
-
-mkdir $NAME-$hsh/skelpkg/$NAME-$hsh/hooks/postinst
-cat >$NAME-$hsh/skelpkg/$NAME-$hsh/hooks/postinst/010preload-libjpeg <<EOF
-#!/bin/sh -e
-p=\$(realpath local/lib/libjpeg.so)
-[ -n "\$p" ]
-echo export LD_PRELOAD=\$p >>rc
-EOF
-chmod +x $NAME-$hsh/skelpkg/$NAME-$hsh/hooks/postinst/010preload-libjpeg 
-
 "$BASS_ROOT"/build/lib/mk-pkg $NAME-$hsh

diff --git a/build/skel/graphics/zathura-0.5.2.do b/build/skel/graphics/zathura-0.5.2.do
index 78d41ec1e54882f2dd4c14c9950454f6c1a383adc8d02702a99ad8ac4166f9d1..d76bb7371eb3adfff5b2b611791769bc5ebc06035a7e78c579fc2353b221debd 100644 (file)
--- a/build/skel/graphics/zathura-0.5.2.do
+++ b/build/skel/graphics/zathura-0.5.2.do
@@ -3,7 +3,11 @@ sname=$1.do . "$BASS_ROOT"/lib/rc
 . "$BASS_ROOT"/build/skel/common.rc
 
 bdeps=" rc-paths stow archivers/zstd devel/pkgconf-2.1.1 devel/ninja-v1.12.1"
-rdeps="graphics/mupdf-1.24.0-170-g05063f228 graphics/djvulibre-3.5.28"
+rdeps="
+graphics/djvulibre-3.5.28
+graphics/gtk+-3.24.42
+graphics/mupdf-1.24.0-170-g05063f228
+"
 meson=meson-0.63.3
 pdfmupdf=zathura-pdf-mupdf-0.4.3
 djvu=zathura-djvu-0.2.9

diff --git a/build/skel/www/links-2.29.do b/build/skel/www/links-2.29.do
index 86d11c238c4d35ca03a856814feda3e48bffd526a02a22e63f52ab78e75b049b..2f0cb019a63da650cef8705ef6b6457fa52d724a61ad4cb3a0dfd502bbc40521 100644 (file)
--- a/build/skel/www/links-2.29.do
+++ b/build/skel/www/links-2.29.do
@@ -3,7 +3,12 @@ sname=$1.do . "$BASS_ROOT"/lib/rc
 . "$BASS_ROOT"/build/skel/common.rc
 
 bdeps="rc-paths stow archivers/zstd devel/pkgconf-2.1.1"
-rdeps="graphics/libpng-1.6.43"
+rdeps="
+graphics/gdk-pixbuf-2.42.12
+graphics/libpng-1.6.43
+graphics/librsvg-2.40.21
+graphics/openjpeg-2.5.2
+"
 redo-ifchange $bdeps "$DISTFILES"/$NAME.tar.bz2 $rdeps
 hsh=$("$BASS_ROOT"/build/bin/cksum $BASS_REV $SPATH)
 . "$BASS_ROOT"/build/lib/create-tmp-for-build.rc
@@ -13,6 +18,7 @@ tar xf "$DISTFILES"/$NAME.tar.bz2
 "$BASS_ROOT"/bin/rm-r "$SKELBINS"/$ARCH/$NAME-$hsh
 
 cd $NAME
+patch <"$BASS_ROOT"/build/skel/www/links-forced-jpeg.patch >&2
 ./configure --prefix="$SKELBINS"/$ARCH/$NAME-$hsh --enable-graphics >&2
 make -j$MAKE_JOBS >&2
 make install >&2