diff options
| -rw-r--r-- | user/fontconfig/APKBUILD | 35 | ||||
| -rw-r--r-- | user/fontconfig/disable-crbug.patch | 13 |
2 files changed, 31 insertions, 17 deletions
diff --git a/user/fontconfig/APKBUILD b/user/fontconfig/APKBUILD index aeae4256d..415f0c925 100644 --- a/user/fontconfig/APKBUILD +++ b/user/fontconfig/APKBUILD @@ -1,40 +1,41 @@ # Contributor: Mika Havela <mika.havela@gmail.com> -# Maintainer: +# Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=fontconfig -pkgver=2.13.1 +pkgver=2.15.0 pkgrel=0 pkgdesc="Library for configuring and customizing font access" url="https://www.freedesktop.org/wiki/Software/fontconfig/" arch="all" -options="!check" # Fails test with fixed fonts license="MIT" depends="" -makedepends="freetype-dev expat-dev python3-dev gperf util-linux-dev" +makedepends="expat-dev freetype-dev gperf meson python3-dev util-linux-dev" triggers="$pkgname.trigger=/usr/share/fonts/*" subpackages="$pkgname-dev $pkgname-lang" -source="https://www.freedesktop.org/software/fontconfig/release/${pkgname}-${pkgver}.tar.gz" +source="https://www.freedesktop.org/software/fontconfig/release/${pkgname}-${pkgver}.tar.xz + disable-crbug.patch + " build() { - # regenerate hash functions - rm -f src/fcobjshash.h - - ./configure \ - --build=$CBUILD \ - --host=$CHOST \ + meson setup \ --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ - --enable-static \ - --disable-docs - make + --wrap-mode=nofallback \ + -Dnls=enabled \ + -Dtests=enabled \ + -Dtools=enabled \ + build + + meson compile -C build } check() { - make check + meson test -C build } package() { - make -j1 DESTDIR="$pkgdir" install + DESTDIR="$pkgdir" meson install -C build } -sha512sums="830df32e944ee21ad02a9df04787b9902af36ffc13913524acef6e38799a38c5df7a6e407cc0ff9c24455520549d53b3d85d22642a229ac654dc9269926f130b fontconfig-2.13.1.tar.gz" +sha512sums="754cd5fffa198fc07a39cf7df683e9adfa7f54ab41fdff8c0eacc078fd35d3e01069ba343f2b045e0b40df88d9f1fc1ee0f7565799f9cb194a59cf95b64c4417 fontconfig-2.15.0.tar.xz +4295ce39520f0b24348ee0ad742de627a7f46084744022d8920da6a67a15e529fd89d31e7cfa33c2b7e613186bf9c20ad03a090f18dab63a66fbf9f50bbe6bfb disable-crbug.patch" diff --git a/user/fontconfig/disable-crbug.patch b/user/fontconfig/disable-crbug.patch new file mode 100644 index 000000000..2c2720ac6 --- /dev/null +++ b/user/fontconfig/disable-crbug.patch @@ -0,0 +1,13 @@ +i.e. the comment. + +--- fontconfig-2.15.0/test/meson.build.old 2020-12-16 23:27:27.000000000 -0600 ++++ fontconfig-2.15.0/test/meson.build 2025-05-09 20:36:03.552602973 -0500 +@@ -14,8 +14,6 @@ + # FIXME: ['test-migration.c'], + ['test-bz106632.c', {'c_args': ['-DFONTFILE="@0@"'.format(join_paths(meson.current_source_dir(), '4x6.pcf'))]}], + ['test-issue107.c'], # FIXME: fails on mingw +- # FIXME: this needs NotoSans-hinted.zip font downloaded and unpacked into test build directory! see run-test.sh +- ['test-crbug1004254.c', {'dependencies': dependency('threads')}], # for pthread + ] + + if get_option('default_library') == 'static' |