Jan Alexander Steffens (heftig) pushed to branch main at Arch Linux / Packaging / Packages / fontconfig
Commits: c281f0e5 by Jan Alexander Steffens (heftig) at 2025-01-23T02:40:42+01:00 2:2.16.0-2: Return to expat Fixes: https://gitlab.archlinux.org/archlinux/packaging/packages/fontconfig/-/issues/1 - - - - - 3 changed files: - .SRCINFO - PKGBUILD - + keys/pgp/ECFFBC3A6B365E721E5BD79830757AA21971A672.asc Changes: ===================================== .SRCINFO ===================================== @@ -1,7 +1,7 @@ pkgbase = fontconfig pkgdesc = Library for configuring and customizing font access pkgver = 2.16.0 - pkgrel = 1 + pkgrel = 2 epoch = 2 url = https://www.freedesktop.org/wiki/Software/fontconfig/ install = fontconfig.install @@ -14,18 +14,19 @@ pkgbase = fontconfig makedepends = meson makedepends = perl-sgmls depends = bash + depends = expat depends = freetype2 depends = glibc - depends = libxml2 provides = fontconfig-docs conflicts = fontconfig-docs replaces = fontconfig-docs<2:2.13.93-1 backup = etc/fonts/fonts.conf - source = git+https://gitlab.freedesktop.org/fontconfig/fontconfig.git#tag=2.16.0 + source = git+https://gitlab.freedesktop.org/fontconfig/fontconfig.git?signed#tag=2.16.0 source = 40-fontconfig-config.script source = 40-fontconfig-config.hook source = fontconfig.hook validpgpkeys = F77A64C4B5B45FF8763A278F65755979B34E1294 + validpgpkeys = ECFFBC3A6B365E721E5BD79830757AA21971A672 b2sums = 839b16dbb95da285518bbbe303e2acdf3537be96bd161e20501409cb9891d824c65e9f98ee038310b7ab3857745993138f21a91f193120d782e289ec3206d94e b2sums = 7fb63e76ab126bc0a7decfd74c53429ad1ce6d13de2f14037259616d8d4150b8fa4601c7f02b75918ccd5995d424816dc9d01a5fe7e39dc3dd1fcc83dfdb0fe8 b2sums = b06b3f2b8c0c38139a9247c26a641e6dc01d50b530478dd14133175a603f60b0af901af16c9fcf1ce73d23786ea14bfdbacd39f1dcfd88f6382965ad22be1411 @@ -33,10 +34,10 @@ pkgbase = fontconfig pkgname = fontconfig depends = bash + depends = expat depends = freetype2 depends = glibc - depends = libxml2 + depends = libexpat.so depends = libfreetype.so - depends = libxml2.so provides = fontconfig-docs provides = libfontconfig.so ===================================== PKGBUILD ===================================== @@ -3,7 +3,7 @@ pkgname=fontconfig pkgver=2.16.0 -pkgrel=1 +pkgrel=2 epoch=2 pkgdesc="Library for configuring and customizing font access" url=https://www.freedesktop.org/wiki/Software/fontconfig/ @@ -11,9 +11,9 @@ arch=(x86_64) license=('HPND AND Unicode-DFS-2016') depends=( bash + expat freetype2 glibc - libxml2 ) makedepends=( docbook-sgml @@ -29,8 +29,7 @@ replaces=('fontconfig-docs<2:2.13.93-1') backup=(etc/fonts/fonts.conf) install=fontconfig.install source=( - # Signed with a newer key (ECFFBC3A6B365E721E5BD79830757AA21971A672) that cannot be found - "git+https://gitlab.freedesktop.org/fontconfig/fontconfig.git#tag=$pkgver"; + "git+https://gitlab.freedesktop.org/fontconfig/fontconfig.git?signed#tag=$pkgver"; 40-fontconfig-config.script 40-fontconfig-config.hook fontconfig.hook @@ -41,6 +40,7 @@ b2sums=('839b16dbb95da285518bbbe303e2acdf3537be96bd161e20501409cb9891d824c65e9f9 'dfbf47c069c88da7687511356cef5bb94b7190e558a6f08390d6976fa7065ba7137ccb0a5ca1defdef655091afe74eb8a3d33fb9f3e0633409aa79f753ad276d') validpgpkeys=( F77A64C4B5B45FF8763A278F65755979B34E1294 # Akira TAGOH <ak...@tagoh.org> + ECFFBC3A6B365E721E5BD79830757AA21971A672 # Akira TAGOH <ak...@tagoh.org> ) prepare() { @@ -54,7 +54,6 @@ build() { -D doc-html=enabled -D doc-pdf=disabled -D doc-txt=disabled - -D xml-backend=libxml2 ) arch-meson fontconfig build "${meson_options[@]}" @@ -67,8 +66,8 @@ check() { package() { depends+=( + libexpat.so libfreetype.so - libxml2.so ) provides+=(libfontconfig.so) ===================================== keys/pgp/ECFFBC3A6B365E721E5BD79830757AA21971A672.asc ===================================== @@ -0,0 +1,13 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mDMEYNnpghYJKwYBBAHaRw8BAQdACm8DxTjDT3IeuCPr82y4WqbYtW/nUw2JmVRt +8c8lPHy0HUFraXJhIFRBR09IIDxha2lyYUB0YWdvaC5vcmc+iJQEExYKADwWIQTs +/7w6azZech5b15gwdXqiGXGmcgUCYNnpggIbAwULCQgHAgMiAgEGFQoJCAsCBBYC +AwECHgcCF4AACgkQMHV6ohlxpnKklAEAmep+BVHDxTSitGTgamkSHlxYAF7SCxp0 +KgLi0FNyHSsBANSs5NFvEBAzOX/yage2xJAk4Akpq7a0mi1GKZo25VoHuDgEYNnp +ghIKKwYBBAGXVQEFAQEHQAbhvkkMdqfKvY1aXAahNOJ/kpCMBGJgi9c7+SOq9ktJ +AwEIB4h4BBgWCgAgFiEE7P+8Oms2XnIeW9eYMHV6ohlxpnIFAmDZ6YICGwwACgkQ +MHV6ohlxpnKWcQEAjBm7dJQ3yV8ojaiaybsBl0Epl/VlFJI6PY8WCXEpL+ABAJwV +w3wisTSm4KZU/eI3MXiEJ3poop5APrqRM2kK1JAO +=bVS3 +-----END PGP PUBLIC KEY BLOCK----- View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/fontconfig/-/commit/c281f0e54c2493874e56b93c8cf210934b4855db -- View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/fontconfig/-/commit/c281f0e54c2493874e56b93c8cf210934b4855db You're receiving this email because of your account on gitlab.archlinux.org.
