From 5a6b76e99037400a87d1695f0507c6a68998527181e23c7c0dd4791a07db3b3a Mon Sep 17 00:00:00 2001 From: Sergey Matveev Date: Wed, 23 Apr 2025 11:16:03 +0300 Subject: [PATCH] Update Zathura --- build/distfiles/.gitignore | 12 +++--- ...676.tar.zst.do => girara-0.4.5.tar.zst.do} | 4 +- build/distfiles/json-glib-1.10.6.tar.xz.meta4 | 16 ++++++++ build/distfiles/meson-1.7.2.tar.gz.meta4 | 37 +++++++++++++++++++ build/distfiles/zathura-0.5.11.tar.xz.meta4 | 16 ++++++++ .../distfiles/zathura-cb-0.1.11.tar.xz.meta4 | 16 ++++++++ .../zathura-djvu-0.2.10.tar.xz.meta4 | 16 ++++++++ .../zathura-pdf-mupdf-0.4.4.tar.xz.meta4 | 16 ++++++++ build/skel/devel/json-glib-1.10.6.do | 28 ++++++++++++++ .../{zathura-0.5.2.do => zathura-0.5.11.do} | 14 ++++--- 10 files changed, 162 insertions(+), 13 deletions(-) rename build/distfiles/{girara-0.4.3-7-gf6d0676.tar.zst.do => girara-0.4.5.tar.zst.do} (60%) create mode 100644 build/distfiles/json-glib-1.10.6.tar.xz.meta4 create mode 100644 build/distfiles/meson-1.7.2.tar.gz.meta4 create mode 100644 build/distfiles/zathura-0.5.11.tar.xz.meta4 create mode 100644 build/distfiles/zathura-cb-0.1.11.tar.xz.meta4 create mode 100644 build/distfiles/zathura-djvu-0.2.10.tar.xz.meta4 create mode 100644 build/distfiles/zathura-pdf-mupdf-0.4.4.tar.xz.meta4 create mode 100644 build/skel/devel/json-glib-1.10.6.do rename build/skel/graphics/{zathura-0.5.2.do => zathura-0.5.11.do} (87%) diff --git a/build/distfiles/.gitignore b/build/distfiles/.gitignore index 1fe2cd6..30f0c1e 100644 --- a/build/distfiles/.gitignore +++ b/build/distfiles/.gitignore @@ -56,7 +56,7 @@ /ggml-large-v2.bin /ggml-large-v3.bin /ghostscript-10.03.1.tar.gz -/girara-0.4.3-7-gf6d0676.tar.zst +/girara-0.4.5.tar.zst /girara.git/ /git-2.49.0.tar.xz /glib-2.58.3.tar.xz @@ -100,6 +100,7 @@ /iniparser-v4.2.2.tar.zst /iniparser.git/ /irssi-1.4.5.tar.xz +/json-glib-1.10.6.tar.xz /lame-3.100.tar.gz /lcms2-2.16.tar.gz /less-668.tar.gz @@ -163,6 +164,7 @@ /mapnik-v3.1.0.tar.bz2 /meson-0.56.0.tar.gz /meson-0.63.3.tar.gz +/meson-1.7.2.tar.gz /meta4ra-0.11.0.tar.zst /MIME-Base32-1.303.tar.gz /mkvtoolnix-58.0.0.tar.xz @@ -264,9 +266,9 @@ /xapian-core-1.4.25.tar.xz /xmlto-0.0.26.tar.bz2 /xxhash-v0.8.3.tar.gz -/zathura-0.5.2.tar.xz -/zathura-cb-0.1.10.tar.xz -/zathura-djvu-0.2.9.tar.xz -/zathura-pdf-mupdf-0.4.3.tar.xz +/zathura-0.5.11.tar.xz +/zathura-cb-0.1.11.tar.xz +/zathura-djvu-0.2.10.tar.xz +/zathura-pdf-mupdf-0.4.4.tar.xz /zsh-5.9.tar.xz /zstd-1.5.7.tar.gz diff --git a/build/distfiles/girara-0.4.3-7-gf6d0676.tar.zst.do b/build/distfiles/girara-0.4.5.tar.zst.do similarity index 60% rename from build/distfiles/girara-0.4.3-7-gf6d0676.tar.zst.do rename to build/distfiles/girara-0.4.5.tar.zst.do index 7d249e8..5ca8805 100644 --- a/build/distfiles/girara-0.4.3-7-gf6d0676.tar.zst.do +++ b/build/distfiles/girara-0.4.5.tar.zst.do @@ -1,7 +1,7 @@ [ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../.. sname=$1.do . "$BASS_ROOT"/lib/rc -[ -d girara.git ] || git clone --depth 1 --bare https://git.pwmt.org/pwmt/girara.git >&2 +[ -d girara.git ] || git clone --depth 1 --bare https://github.com/pwmt/girara.git >&2 cd girara.git -commit=f6d06766e57812254c04635e98a01976fd8761c2 +commit=5be5b1f7afd3bd61666babdd04f4015b931c990c git fetch origin $commit >&2 git archive --prefix=${1%.tar.zst}/ $commit | $COMPRESSOR diff --git a/build/distfiles/json-glib-1.10.6.tar.xz.meta4 b/build/distfiles/json-glib-1.10.6.tar.xz.meta4 new file mode 100644 index 0000000..07c4519 --- /dev/null +++ b/build/distfiles/json-glib-1.10.6.tar.xz.meta4 @@ -0,0 +1,16 @@ + + + + eeb9f3d5ff37f5899882c859f3cc92f0352baf7e1d1f1f72046c4bb8780148a5 + 125ba305d5d33ecb1a1fbe46322c5035c7f97bd49e8eeef26e3c9c5d829693978fdc10bbe3d926cd4d07f8fd80c9df282d5ff7fe80ab4a6ab8e17c93e9d362d4 + 336125494f90bf6675d360e7e01abe03b9e212adabbeb8581e8188355ae25fff + 07911477f935a8f54b41848f4fe56da21fc23effcad0e31e3fe19e66b54fa6811257cabe3b50ea88d316d22d262351bb1be2d0558395eeaf2bc6ea775fc23f00 + e1c0e33b17333cf94beb381f505c1819090a11b616dcc23a883f231029dff277c2482823278cbf7b8a07e237d45cbfc7b05f132e1234beff609a739fd5704c6e + 77f4bcbf9339528f166b8073458693f0a20b77b7059dbc2db61746a1928b0293 + ab835a7595ef42e347c564ecc6ad32386997fe31bf20e18c7459bd8020de73b227cbbfed3b23ee9512b6d9c84fa337fbf51fe0c2f485b71b8ca077f735e6d679 + d359d0b8b40b68309ad48b0f6a8aab739729a4ce7cc43d1e63f5dd0c49d26fc7 + b7e2ee146b17c92656017ee8585336ac + 253324 + https://download.gnome.org/sources/json-glib/1.10/json-glib-1.10.6.tar.xz + + diff --git a/build/distfiles/meson-1.7.2.tar.gz.meta4 b/build/distfiles/meson-1.7.2.tar.gz.meta4 new file mode 100644 index 0000000..57f7ca5 --- /dev/null +++ b/build/distfiles/meson-1.7.2.tar.gz.meta4 @@ -0,0 +1,37 @@ + + + + c15ca311c54865959b37383c00d321f9f556f690f22d01a55bf07ec348d4d108 + f5a19d7c0dfa35efda5bdef972fa6362a64fee2c74be0c09dee6d52c30a8b0169dbe7fab3199add306c778f6a57196251b44ec27ff6b5e038e12c11b27513a54 + 87a9ebc972dd6fb2bacdad32f69ceee97b9fb5bc7ac74b87aa0955c2a3e9a4fc + 813e06ce726de1f6bd16ad64c88ed0719a4995420955aa732dcf27f98570a031ce7f200c9cc0dc6c66211ce02876f37fefa272a94ed46a1826b955d1420708dc + c3c71ae0e0c31d8d72e200bb5fd5e6584ce41aabe1e85575d50371f82ed02c6e346da3b0b4a2786199b9410daaa1622807a88bfc8ac991cf134bad4a53b3c863 + 4d40d63aa748a9c139cc41ab9bffe43edd113c5639d78bde81544ca955aea890 + 9934968d4cc3fa4a4d6d13e0b9c724d33efaf4b00534dd2abbd7cceb6c72c4777a109dde68dee3e8200def562ee960058ac3f68820186791a2e146dcaa83859c + 53416104d3c5a3c9b72882daa72c74b26acf36378914d4f10ef351974b0cf879 + f9d061095ac32cb7ccfdad5cef8ff5f1 + + 5009274 + https://github.com/mesonbuild/meson/releases/download/1.7.2/meson-1.7.2.tar.gz + + diff --git a/build/distfiles/zathura-0.5.11.tar.xz.meta4 b/build/distfiles/zathura-0.5.11.tar.xz.meta4 new file mode 100644 index 0000000..04fbdfd --- /dev/null +++ b/build/distfiles/zathura-0.5.11.tar.xz.meta4 @@ -0,0 +1,16 @@ + + + + 00cbe687fa65ff203dc743eecab2c32eea74d3b28b874b299e88bc875e631fd3 + 18d23fe10565cff6012c13d25977f7ec41262d697ef1ac11285312e32ad519de7d53e19b999b51e89f952b77e39947fe880e79bf961f1f23858db3f64239b564 + 309be2a22ca0bd299aa6c1c9d7507edc652036853ee238425769e5d4812b364f + 6558bcba199ec1337c87b987e630a0f53ea8d43fc2fc4e47d4f1883f460e555f2df8c2cc7d8a7df88089b8a28d7283ecda3741a7418c62671ec14811bcd2d24b + 36b972257f8e749a3af7e166b74184ba5e11306e3bbc1ec0102c6b8fd14742d39245e9683ec8bab1c87596e915f28f19db28697dae8191afba4eedb4137c233c + 54458a9998af0fb8faef2e934a81127bbe4b790c86dcd2c8b8f32365f3d1b53c + ba86b6ad779692f2495df20fa4187d510cd38ca08bba2839cfddfe690f5e759b2f0cfdd76a6a3651670b9eedfd228752f63586cad3e8fafd8a9f9b305e371b85 + 600d36a154db72ba8cf0cf9d4abdabe1b7a49191ae9a904c97f398c70a102020 + 48bb597ddcdf06b9b9c8ec0cafd4b2fd + 167820 + https://pwmt.org/projects/zathura/download/zathura-0.5.11.tar.xz + + diff --git a/build/distfiles/zathura-cb-0.1.11.tar.xz.meta4 b/build/distfiles/zathura-cb-0.1.11.tar.xz.meta4 new file mode 100644 index 0000000..f6ee5b6 --- /dev/null +++ b/build/distfiles/zathura-cb-0.1.11.tar.xz.meta4 @@ -0,0 +1,16 @@ + + + + 31fe8029190d43198c1d3a0fb2ae7951cdcc6c60538c830bb0eb4f6666566a71 + 59abd86594ede671b65e03c5a3577804edd7235ce74b7242907b3e744fa0982e12490c6ed98e556aa6c79c30e21b1683e3dea96d2a884f04bfd50f592c80e0ee + ff831bd9b2712c1025e6db8c5138237cf42f16b14c88c22f81fe96031dfba392 + dcfb876ba778ae54939fe0294c54adeffdeaacffbe1fc6370e14dd7e0e05820cbc9be09a998ed84ceb05c6a38913a9979c1c5f7741c6fb9043efd684b2498a67 + f927c4021937505bbc83d47959f4275701449dc4e889dd4a92ef7feecfcdf5ae772d34bb787ef8638c5fe209a1851ce355740c2b80921139f10fc059bd67f39d + 4e201ea54cdc20a93258c43556f6389441af99740de7dca6ca1ff524172fbd47 + c13f5999a4deea20e8fad1320a7569c602ef9acca744d43ac4d837ef0350d7e7d7590db52891593d575b248b9c6c8d8b32c67b958e3b3248cf004a45cd41dcb7 + 336bf471f520484a8d92572a411f14713ac4f8c1e6f45ee584f1a1f40d273905 + 3b9945a8e5818f3ea50184c06fb421a9 + 6748 + https://pwmt.org/projects/zathura-cb/download/zathura-cb-0.1.11.tar.xz + + diff --git a/build/distfiles/zathura-djvu-0.2.10.tar.xz.meta4 b/build/distfiles/zathura-djvu-0.2.10.tar.xz.meta4 new file mode 100644 index 0000000..7db587b --- /dev/null +++ b/build/distfiles/zathura-djvu-0.2.10.tar.xz.meta4 @@ -0,0 +1,16 @@ + + + + f8be54aec62d7b2dee85bcdc7375db55981eb5bab7f79d46537a849b81b06db7 + f779eeeba40abe444960716b8c14c51c32a3830a3f779074ea773bd9ff0d71736433ed29862bdf137a34ebb934bb562aa14031c07dda5cf97ddf278e47feb750 + f656a07a0d0bb5e1b289a665a2070ca4420beeb237ab7d2ff888123f348c4e3c + d9f7db46f290165fd7ca2bdd0de55a56f3d980c93f52190a210e52d42eed3d453987df795128def6f605bf3772d9af5ab01627e0411280e01cc7b130eb093d52 + c743e60588e07fe18f7da8db1ae9ae997ffb50ef696258f1901523159ff4d29e5649b13d6e52f53cf79f19429083308390c0b4923081451bf5c4bfb9ac6e8903 + 32e9d89929a76cd7d3fcbaf79f441868bdabedf17317d1d1843faa1f19338d95 + bbd6fe9f1cf00c5521fee20a231000025f19ed717ba2c7410737ddfb35c5c1abb5445d5792194671cec6ea72c4556bde6440d1d7a674d93bed9964a352d8e03b + 74fd37a313f2e3946bba8258699912ea2ad42ef7adeb32b0dddb854c6c5ec597 + 50f87237a39fdf2d2ccfd38810b0df24 + 9408 + https://pwmt.org/projects/zathura-djvu/download/zathura-djvu-0.2.10.tar.xz + + diff --git a/build/distfiles/zathura-pdf-mupdf-0.4.4.tar.xz.meta4 b/build/distfiles/zathura-pdf-mupdf-0.4.4.tar.xz.meta4 new file mode 100644 index 0000000..9c1b9ca --- /dev/null +++ b/build/distfiles/zathura-pdf-mupdf-0.4.4.tar.xz.meta4 @@ -0,0 +1,16 @@ + + + + 6af466893c27b176de7ff131a1449ce64b4bcb8f3bd40e26eb2fb7b0d0bdcfd7 + 2f46a5c61f80c49bf0bf828b593d9512fdeaa1db2cf6f168408b029c11d46ba3df1a003c1c8662380439a37b7f14b2d3f6dfaff78978384df9fe5c1aa1b97439 + 7bd501d32c2bf75d16abc23b716ad61403fd9dd6205a15f95440407e6a7eabce + 0623c5a88483c0b8a784c44f10da44a0924413bbc0eae0baf1e01935ea5fa433ec259b7244c84ac00d187712129b59255d4a32daf6b3ded6bf95890c64513e18 + 32be4b4458547860e28bb90bf8b8f0f2e5c26f369d55f6f25e0e73b9e7c4a82b6110fd42bd55120f1be358b9d7a6c72cc1c883e192d007a05a85f501c504e1a1 + 0125624901cabe3a2fe63315a46e7d966a323c028ff53890dfaf7856adb1f4fc + 8f9a4ede71314bcf4d9f87817bcefd3694122c485751c66de3b92c91ced202a3543feb52345ca87e2e4c912954c6fbbefb1c89470b7685ff73e2a4edfc5271c4 + 3577686ea00663a3d13892a58602003fd773701b54074e4230620e20f832492c + 71fd31ec5e8412f9faefe5f3b757d0fd + 9512 + https://pwmt.org/projects/zathura-pdf-mupdf/download/zathura-pdf-mupdf-0.4.4.tar.xz + + diff --git a/build/skel/devel/json-glib-1.10.6.do b/build/skel/devel/json-glib-1.10.6.do new file mode 100644 index 0000000..655be11 --- /dev/null +++ b/build/skel/devel/json-glib-1.10.6.do @@ -0,0 +1,28 @@ +[ -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 +lang/Python-3.7.3 +" +meson=meson-1.7.2 +redo-ifchange $bdeps "$DISTFILES"/$NAME.tar.xz "$DISTFILES"/$meson.tar.gz +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 +. ./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 build >&2 +../$meson/meson.py compile -C build >&2 +../$meson/meson.py install -C build >&2 + +cd "$SKELBINS"/$ARCH +"$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.11.do similarity index 87% rename from build/skel/graphics/zathura-0.5.2.do rename to build/skel/graphics/zathura-0.5.11.do index d0ba0bf..aa16981 100644 --- a/build/skel/graphics/zathura-0.5.2.do +++ b/build/skel/graphics/zathura-0.5.11.do @@ -11,14 +11,16 @@ devel/ninja-v1.12.1 lang/Python-3.7.3 " rdeps=" +databases/sqlite-3450100 +devel/json-glib-1.10.6 graphics/djvulibre-3.5.28 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 -cb=zathura-cb-0.1.10 -girara=girara-0.4.3-7-gf6d0676 +meson=meson-1.7.2 +pdfmupdf=zathura-pdf-mupdf-0.4.4 +djvu=zathura-djvu-0.2.10 +cb=zathura-cb-0.1.11 +girara=girara-0.4.5 redo-ifchange $bdeps \ "$DISTFILES"/$NAME.tar.xz \ "$DISTFILES"/$pdfmupdf.tar.xz \ @@ -43,7 +45,7 @@ tar xf "$DISTFILES"/$girara.tar.zst mv $girara girara rm girara.wrap cd .. -../$meson/meson.py build --prefix="$SKELBINS"/$ARCH/$NAME-$hsh -Dsqlite=disabled >&2 +../$meson/meson.py build --prefix="$SKELBINS"/$ARCH/$NAME-$hsh >&2 cd build ninja >&2 ninja install >&2 -- 2.48.1