Date: Monday, June 28, 2021 @ 22:43:35 Author: heftig Revision: 967802
archrelease: copy trunk to multilib-x86_64 Added: lib32-fontconfig/repos/multilib-x86_64/PKGBUILD (from rev 967801, lib32-fontconfig/trunk/PKGBUILD) lib32-fontconfig/repos/multilib-x86_64/fontconfig-32.hook (from rev 967801, lib32-fontconfig/trunk/fontconfig-32.hook) lib32-fontconfig/repos/multilib-x86_64/fontconfig-32.install (from rev 967801, lib32-fontconfig/trunk/fontconfig-32.install) Deleted: lib32-fontconfig/repos/multilib-x86_64/PKGBUILD lib32-fontconfig/repos/multilib-x86_64/fontconfig-32.hook lib32-fontconfig/repos/multilib-x86_64/fontconfig-32.install -----------------------+ PKGBUILD | 137 +++++++++++++++++++++++------------------------- fontconfig-32.hook | 28 ++++----- fontconfig-32.install | 22 +++---- 3 files changed, 92 insertions(+), 95 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2021-06-28 22:43:02 UTC (rev 967801) +++ PKGBUILD 2021-06-28 22:43:35 UTC (rev 967802) @@ -1,70 +0,0 @@ -# Maintainer: Maxime Gauduin <aluc...@archlinux.org> -# Contributor: Jan Alexander Steffens (heftig) <hef...@archlinux.org> -# Contributor: Jan de Groot <j...@archlinux.org> - -pkgname=lib32-fontconfig -pkgver=2.13.93 -pkgrel=4 -epoch=2 -pkgdesc='Library for configuring and customizing font access' -url=https://www.freedesktop.org/wiki/Software/fontconfig/ -arch=(x86_64) -license=(custom) -depends=( - fontconfig - lib32-expat - libfreetype.so -) -makedepends=( - git - meson - gperf - lib32-freetype2 -) -provides=(libfontconfig.so) -install=fontconfig-32.install -_tag=d06103e3e764bd43758e213414a1716858ab384c -source=( - git+https://gitlab.freedesktop.org/fontconfig/fontconfig.git#tag=${_tag} - fontconfig-32.hook -) -b2sums=('SKIP' - '1cba71810c9bde6ecb6fac124e458fb7260be3ea72ade82b836e0e8e1eaa7c7df31e6e92e405fa420325cec0ce14d0f19630e777308032b0c26ec96a3d668d93') - -prepare() { - cd fontconfig - git cherry-pick -n 4e42925096e9 # Fix meson install - git cherry-pick -n 10c7390e358c # Fix default font dirs - git cherry-pick -n df29933e1a06 # https://bugs.archlinux.org/task/70141 -} - -pkgver() { - cd fontconfig - git describe --tags -} - -build() { - export CC='gcc -m32' - export CXX='g++ -m32' - export PKG_CONFIG=i686-pc-linux-gnu-pkg-config - arch-meson fontconfig build \ - --libdir=/usr/lib32 \ - -D doc=disabled - meson compile -C build -} - -check() { - meson test -C build --print-errorlogs -} - -package() { - DESTDIR="${pkgdir}" meson install -C build - rm -r "${pkgdir}"/{etc,usr/{include,share}} - mv "${pkgdir}"/usr/bin/fc-cache{,-32} - find "${pkgdir}"/usr/bin -type f -not -name '*-32' -delete - install -Dm 644 *.hook -t "${pkgdir}"/usr/share/libalpm/hooks/ - install -dm 755 "${pkgdir}"/usr/share/licenses - ln -s fontconfig "${pkgdir}"/usr/share/licenses/lib32-fontconfig -} - -# vim:set sw=2 et: Copied: lib32-fontconfig/repos/multilib-x86_64/PKGBUILD (from rev 967801, lib32-fontconfig/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2021-06-28 22:43:35 UTC (rev 967802) @@ -0,0 +1,67 @@ +# Maintainer: Maxime Gauduin <aluc...@archlinux.org> +# Contributor: Jan Alexander Steffens (heftig) <hef...@archlinux.org> +# Contributor: Jan de Groot <j...@archlinux.org> + +pkgname=lib32-fontconfig +pkgver=2.13.94 +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=( + fontconfig + lib32-expat + libfreetype.so +) +makedepends=( + git + meson + gperf + lib32-freetype2 +) +provides=(libfontconfig.so) +install=fontconfig-32.install +_tag=42ca13917a2f8bebfb9e6f174062e68419df3572 +source=( + git+https://gitlab.freedesktop.org/fontconfig/fontconfig.git#tag=${_tag} + fontconfig-32.hook +) +b2sums=('SKIP' + '1cba71810c9bde6ecb6fac124e458fb7260be3ea72ade82b836e0e8e1eaa7c7df31e6e92e405fa420325cec0ce14d0f19630e777308032b0c26ec96a3d668d93') + +prepare() { + cd fontconfig +} + +pkgver() { + cd fontconfig + git describe --tags +} + +build() { + export CC='gcc -m32' + export CXX='g++ -m32' + export PKG_CONFIG=i686-pc-linux-gnu-pkg-config + arch-meson fontconfig build \ + --libdir=/usr/lib32 \ + -D doc=disabled + meson compile -C build +} + +check() { + meson test -C build --print-errorlogs +} + +package() { + meson install -C build --destdir "${pkgdir}" + rm -r "${pkgdir}"/{etc,usr/{include,share}} + mv "${pkgdir}"/usr/bin/fc-cache{,-32} + find "${pkgdir}"/usr/bin -type f -not -name '*-32' -delete + install -Dm 644 *.hook -t "${pkgdir}"/usr/share/libalpm/hooks/ + install -dm 755 "${pkgdir}"/usr/share/licenses + ln -s fontconfig "${pkgdir}"/usr/share/licenses/lib32-fontconfig +} + +# vim:set sw=2 et: Deleted: fontconfig-32.hook =================================================================== --- fontconfig-32.hook 2021-06-28 22:43:02 UTC (rev 967801) +++ fontconfig-32.hook 2021-06-28 22:43:35 UTC (rev 967802) @@ -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 32-bit fontconfig cache... -When = PostTransaction -Exec = /usr/bin/fc-cache-32 -s Copied: lib32-fontconfig/repos/multilib-x86_64/fontconfig-32.hook (from rev 967801, lib32-fontconfig/trunk/fontconfig-32.hook) =================================================================== --- fontconfig-32.hook (rev 0) +++ fontconfig-32.hook 2021-06-28 22:43:35 UTC (rev 967802) @@ -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 32-bit fontconfig cache... +When = PostTransaction +Exec = /usr/bin/fc-cache-32 -s Deleted: fontconfig-32.install =================================================================== --- fontconfig-32.install 2021-06-28 22:43:02 UTC (rev 967801) +++ fontconfig-32.install 2021-06-28 22:43:35 UTC (rev 967802) @@ -1,11 +0,0 @@ -post_upgrade() { - # a full forced directory scan is required here - echo "Rebuilding 32-bit fontconfig cache..." - /usr/bin/fc-cache-32 -rs -} - -post_install() { - post_upgrade $1 0 -} - -# vim:set sw=2 et: Copied: lib32-fontconfig/repos/multilib-x86_64/fontconfig-32.install (from rev 967801, lib32-fontconfig/trunk/fontconfig-32.install) =================================================================== --- fontconfig-32.install (rev 0) +++ fontconfig-32.install 2021-06-28 22:43:35 UTC (rev 967802) @@ -0,0 +1,11 @@ +post_upgrade() { + # a full forced directory scan is required here + echo "Rebuilding 32-bit fontconfig cache..." + /usr/bin/fc-cache-32 -rs +} + +post_install() { + post_upgrade $1 0 +} + +# vim:set sw=2 et: