Date: Friday, February 4, 2022 @ 09:28:20 Author: andyrtr Revision: 436182
archrelease: copy trunk to testing-x86_64 Added: fontconfig/repos/testing-x86_64/40-fontconfig-config.hook (from rev 436181, fontconfig/trunk/40-fontconfig-config.hook) fontconfig/repos/testing-x86_64/40-fontconfig-config.script (from rev 436181, fontconfig/trunk/40-fontconfig-config.script) fontconfig/repos/testing-x86_64/PKGBUILD (from rev 436181, fontconfig/trunk/PKGBUILD) fontconfig/repos/testing-x86_64/fontconfig.hook (from rev 436181, fontconfig/trunk/fontconfig.hook) fontconfig/repos/testing-x86_64/fontconfig.install (from rev 436181, fontconfig/trunk/fontconfig.install) Deleted: fontconfig/repos/testing-x86_64/40-fontconfig-config.hook fontconfig/repos/testing-x86_64/40-fontconfig-config.script fontconfig/repos/testing-x86_64/PKGBUILD fontconfig/repos/testing-x86_64/fontconfig.hook fontconfig/repos/testing-x86_64/fontconfig.install -----------------------------+ 40-fontconfig-config.hook | 22 +++--- 40-fontconfig-config.script | 24 +++---- PKGBUILD | 134 +++++++++++++++++++++--------------------- fontconfig.hook | 28 ++++---- fontconfig.install | 52 ++++++++-------- 5 files changed, 130 insertions(+), 130 deletions(-) Deleted: 40-fontconfig-config.hook =================================================================== --- 40-fontconfig-config.hook 2022-02-04 09:28:12 UTC (rev 436181) +++ 40-fontconfig-config.hook 2022-02-04 09:28:20 UTC (rev 436182) @@ -1,11 +0,0 @@ -[Trigger] -Type = Path -Operation = Install -Operation = Remove -Target = usr/share/fontconfig/conf.default/* - -[Action] -Description = Updating fontconfig configuration... -When = PostTransaction -Exec = /usr/share/libalpm/scripts/40-fontconfig-config /etc/fonts/conf.d -NeedsTargets Copied: fontconfig/repos/testing-x86_64/40-fontconfig-config.hook (from rev 436181, fontconfig/trunk/40-fontconfig-config.hook) =================================================================== --- 40-fontconfig-config.hook (rev 0) +++ 40-fontconfig-config.hook 2022-02-04 09:28:20 UTC (rev 436182) @@ -0,0 +1,11 @@ +[Trigger] +Type = Path +Operation = Install +Operation = Remove +Target = usr/share/fontconfig/conf.default/* + +[Action] +Description = Updating fontconfig configuration... +When = PostTransaction +Exec = /usr/share/libalpm/scripts/40-fontconfig-config /etc/fonts/conf.d +NeedsTargets Deleted: 40-fontconfig-config.script =================================================================== --- 40-fontconfig-config.script 2022-02-04 09:28:12 UTC (rev 436181) +++ 40-fontconfig-config.script 2022-02-04 09:28:20 UTC (rev 436182) @@ -1,12 +0,0 @@ -#!/bin/bash - -while read -r f; do - link="${1:?}/${f##*/}" - if [[ -e $f && ! -e $link ]]; then - ln -sT "/$f" "$link" - elif [[ ! -e $f && -L $link ]]; then - rm -f "$link" - fi -done - -# vim:set sw=2 et: Copied: fontconfig/repos/testing-x86_64/40-fontconfig-config.script (from rev 436181, fontconfig/trunk/40-fontconfig-config.script) =================================================================== --- 40-fontconfig-config.script (rev 0) +++ 40-fontconfig-config.script 2022-02-04 09:28:20 UTC (rev 436182) @@ -0,0 +1,12 @@ +#!/bin/bash + +while read -r f; do + link="${1:?}/${f##*/}" + if [[ -e $f && ! -e $link ]]; then + ln -sT "/$f" "$link" + elif [[ ! -e $f && -L $link ]]; then + rm -f "$link" + fi +done + +# vim:set sw=2 et: Deleted: PKGBUILD =================================================================== --- PKGBUILD 2022-02-04 09:28:12 UTC (rev 436181) +++ PKGBUILD 2022-02-04 09:28:20 UTC (rev 436182) @@ -1,67 +0,0 @@ -# Maintainer: Jan Alexander Steffens (heftig) <hef...@archlinux.org> -# Maintainer: Jan de Groot <j...@archlinux.org> - -pkgname=fontconfig -pkgver=2.13.95 -pkgrel=1 -epoch=2 -pkgdesc="Library for configuring and customizing font access" -url=https://www.freedesktop.org/wiki/Software/fontconfig/ -arch=(x86_64) -license=(custom) -depends=(libexpat.so libfreetype.so) -makedepends=(git meson gperf expat freetype2 - docbook-utils docbook-sgml perl-sgmls) -provides=(libfontconfig.so fontconfig-docs) -conflicts=(fontconfig-docs) -replaces=('fontconfig-docs<2:2.13.93-1') -install=fontconfig.install -backup=(etc/fonts/fonts.conf) -_commit=53fa8a380152801f8a142a271f0458fb5b6f8381 # tags/2.13.95^0 -source=("git+https://gitlab.freedesktop.org/fontconfig/fontconfig.git#commit=$_commit" - 40-fontconfig-config.script - 40-fontconfig-config.hook - fontconfig.hook) -b2sums=('SKIP' - '7fb63e76ab126bc0a7decfd74c53429ad1ce6d13de2f14037259616d8d4150b8fa4601c7f02b75918ccd5995d424816dc9d01a5fe7e39dc3dd1fcc83dfdb0fe8' - 'b06b3f2b8c0c38139a9247c26a641e6dc01d50b530478dd14133175a603f60b0af901af16c9fcf1ce73d23786ea14bfdbacd39f1dcfd88f6382965ad22be1411' - 'dfbf47c069c88da7687511356cef5bb94b7190e558a6f08390d6976fa7065ba7137ccb0a5ca1defdef655091afe74eb8a3d33fb9f3e0633409aa79f753ad276d') - -prepare() { - cd fontconfig -} - -pkgver() { - cd fontconfig - git describe --tags | sed 's/-/+/g' -} - -build() { - arch-meson fontconfig build \ - -D doc-txt=disabled \ - -D doc-pdf=disabled \ - -D doc-html=enabled - meson compile -C build -} - -check() { - meson test -C build --print-errorlogs -} - -package() { - meson install -C build --destdir "$pkgdir" - - # Handle conf.d using the hook to avoid overwriting the symlinks on upgrade - mkdir -p "$pkgdir/usr/share/fontconfig/conf.default" - for _f in "$pkgdir"/etc/fonts/conf.d/*.conf; do - ln -sr "$pkgdir"/usr/share/fontconfig/conf.{avail,default}/"${_f##*/}" - rm "$_f" - done - - install -Dt "$pkgdir/usr/share/libalpm/hooks" -m644 *.hook - install -D 40-fontconfig-config.script \ - "$pkgdir/usr/share/libalpm/scripts/40-fontconfig-config" - install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 fontconfig/COPYING -} - -# vim:set sw=2 et: Copied: fontconfig/repos/testing-x86_64/PKGBUILD (from rev 436181, fontconfig/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2022-02-04 09:28:20 UTC (rev 436182) @@ -0,0 +1,67 @@ +# Maintainer: Jan Alexander Steffens (heftig) <hef...@archlinux.org> +# Maintainer: Jan de Groot <j...@archlinux.org> + +pkgname=fontconfig +pkgver=2.13.96 +pkgrel=1 +epoch=2 +pkgdesc="Library for configuring and customizing font access" +url=https://www.freedesktop.org/wiki/Software/fontconfig/ +arch=(x86_64) +license=(custom) +depends=(libexpat.so libfreetype.so) +makedepends=(git meson gperf expat freetype2 + docbook-utils docbook-sgml perl-sgmls) +provides=(libfontconfig.so fontconfig-docs) +conflicts=(fontconfig-docs) +replaces=('fontconfig-docs<2:2.13.93-1') +install=fontconfig.install +backup=(etc/fonts/fonts.conf) +_commit=d37f97223a4715176c0889e91685dc796457e25f # tags/2.13.96^0 +source=("git+https://gitlab.freedesktop.org/fontconfig/fontconfig.git#commit=$_commit" + 40-fontconfig-config.script + 40-fontconfig-config.hook + fontconfig.hook) +b2sums=('SKIP' + '7fb63e76ab126bc0a7decfd74c53429ad1ce6d13de2f14037259616d8d4150b8fa4601c7f02b75918ccd5995d424816dc9d01a5fe7e39dc3dd1fcc83dfdb0fe8' + 'b06b3f2b8c0c38139a9247c26a641e6dc01d50b530478dd14133175a603f60b0af901af16c9fcf1ce73d23786ea14bfdbacd39f1dcfd88f6382965ad22be1411' + 'dfbf47c069c88da7687511356cef5bb94b7190e558a6f08390d6976fa7065ba7137ccb0a5ca1defdef655091afe74eb8a3d33fb9f3e0633409aa79f753ad276d') + +prepare() { + cd fontconfig +} + +pkgver() { + cd fontconfig + git describe --tags | sed 's/-/+/g' +} + +build() { + arch-meson fontconfig build \ + -D doc-txt=disabled \ + -D doc-pdf=disabled \ + -D doc-html=enabled + meson compile -C build +} + +check() { + meson test -C build --print-errorlogs +} + +package() { + meson install -C build --destdir "$pkgdir" + + # Handle conf.d using the hook to avoid overwriting the symlinks on upgrade + mkdir -p "$pkgdir/usr/share/fontconfig/conf.default" + for _f in "$pkgdir"/etc/fonts/conf.d/*.conf; do + ln -sr "$pkgdir"/usr/share/fontconfig/conf.{avail,default}/"${_f##*/}" + rm "$_f" + done + + install -Dt "$pkgdir/usr/share/libalpm/hooks" -m644 *.hook + install -D 40-fontconfig-config.script \ + "$pkgdir/usr/share/libalpm/scripts/40-fontconfig-config" + install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 fontconfig/COPYING +} + +# vim:set sw=2 et: Deleted: fontconfig.hook =================================================================== --- fontconfig.hook 2022-02-04 09:28:12 UTC (rev 436181) +++ fontconfig.hook 2022-02-04 09:28:20 UTC (rev 436182) @@ -1,14 +0,0 @@ -[Trigger] -Type = Path -Operation = Install -Operation = Upgrade -Operation = Remove -Target = etc/fonts/conf.d/* -Target = usr/share/fonts/* -Target = usr/share/fontconfig/conf.avail/* -Target = usr/share/fontconfig/conf.default/* - -[Action] -Description = Updating fontconfig cache... -When = PostTransaction -Exec = /usr/bin/fc-cache -s Copied: fontconfig/repos/testing-x86_64/fontconfig.hook (from rev 436181, fontconfig/trunk/fontconfig.hook) =================================================================== --- fontconfig.hook (rev 0) +++ fontconfig.hook 2022-02-04 09:28:20 UTC (rev 436182) @@ -0,0 +1,14 @@ +[Trigger] +Type = Path +Operation = Install +Operation = Upgrade +Operation = Remove +Target = etc/fonts/conf.d/* +Target = usr/share/fonts/* +Target = usr/share/fontconfig/conf.avail/* +Target = usr/share/fontconfig/conf.default/* + +[Action] +Description = Updating fontconfig cache... +When = PostTransaction +Exec = /usr/bin/fc-cache -s Deleted: fontconfig.install =================================================================== --- fontconfig.install 2022-02-04 09:28:12 UTC (rev 436181) +++ fontconfig.install 2022-02-04 09:28:20 UTC (rev 436182) @@ -1,26 +0,0 @@ -post_upgrade() { - if (( $(vercmp $2 2:2.13.93-1) < 0 )); then - echo "Creating fontconfig configuration..." - find usr/share/fontconfig/conf.default -mindepth 1 | - /usr/share/libalpm/scripts/40-fontconfig-config /etc/fonts/conf.d - - (( $(vercmp $2 0) > 0 )) && cat <<END - ->>> If you have configured NoExtract to prevent symlinks in /etc/fonts/conf.d/ - from being restored, these symlinks have been recreated one last time. You - can now delete the symlinks and remove the paths from NoExtract and they - will not be created again. - -END - fi - - # a full forced directory scan is required here - echo "Rebuilding fontconfig cache..." - /usr/bin/fc-cache -rs -} - -post_install() { - post_upgrade $1 0 -} - -# vim:set sw=2 et: Copied: fontconfig/repos/testing-x86_64/fontconfig.install (from rev 436181, fontconfig/trunk/fontconfig.install) =================================================================== --- fontconfig.install (rev 0) +++ fontconfig.install 2022-02-04 09:28:20 UTC (rev 436182) @@ -0,0 +1,26 @@ +post_upgrade() { + if (( $(vercmp $2 2:2.13.93-1) < 0 )); then + echo "Creating fontconfig configuration..." + find usr/share/fontconfig/conf.default -mindepth 1 | + /usr/share/libalpm/scripts/40-fontconfig-config /etc/fonts/conf.d + + (( $(vercmp $2 0) > 0 )) && cat <<END + +>>> If you have configured NoExtract to prevent symlinks in /etc/fonts/conf.d/ + from being restored, these symlinks have been recreated one last time. You + can now delete the symlinks and remove the paths from NoExtract and they + will not be created again. + +END + fi + + # a full forced directory scan is required here + echo "Rebuilding fontconfig cache..." + /usr/bin/fc-cache -rs +} + +post_install() { + post_upgrade $1 0 +} + +# vim:set sw=2 et: