Date: Wednesday, July 22, 2020 @ 00:47:55 Author: heftig Revision: 392343
archrelease: copy trunk to extra-x86_64 Added: harfbuzz/repos/extra-x86_64/PKGBUILD (from rev 392342, harfbuzz/trunk/PKGBUILD) Deleted: harfbuzz/repos/extra-x86_64/0001-meson-Make-Requires-in-.pc-files-match-autotools.patch harfbuzz/repos/extra-x86_64/PKGBUILD -------------------------------------------------------------+ 0001-meson-Make-Requires-in-.pc-files-match-autotools.patch | 42 --- PKGBUILD | 134 +++++----- 2 files changed, 67 insertions(+), 109 deletions(-) Deleted: 0001-meson-Make-Requires-in-.pc-files-match-autotools.patch =================================================================== --- 0001-meson-Make-Requires-in-.pc-files-match-autotools.patch 2020-07-22 00:47:40 UTC (rev 392342) +++ 0001-meson-Make-Requires-in-.pc-files-match-autotools.patch 2020-07-22 00:47:55 UTC (rev 392343) @@ -1,42 +0,0 @@ -From 0b5b0f4bc6f6c5c8d64cfd04d8d55cefa5509ddc Mon Sep 17 00:00:00 2001 -From: "Jan Alexander Steffens (heftig)" <jan.steff...@gmail.com> -Date: Thu, 2 Jul 2020 16:41:22 +0000 -Subject: [PATCH] meson: Make Requires in .pc files match autotools - -Libreoffice tries to use only harfbuzz-icu.pc and assumes this includes --lharfbuzz. ---- - src/meson.build | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/src/meson.build b/src/meson.build -index 36df8cb13..d3b3246ef 100644 ---- a/src/meson.build -+++ b/src/meson.build -@@ -501,6 +501,7 @@ pkgmod.generate(libharfbuzz, - - pkgmod.generate(libharfbuzz_subset, - description: 'HarfBuzz font subsetter', -+ requires: [libharfbuzz], - subdirs: [meson.project_name()], - version: meson.project_version(), - ) -@@ -531,6 +532,7 @@ if have_icu and not have_icu_builtin - - pkgmod.generate(libharfbuzz_icu, - description: 'HarfBuzz text shaping library ICU integration', -+ requires: [libharfbuzz], - subdirs: [meson.project_name()], - version: meson.project_version(), - ) -@@ -644,6 +646,7 @@ if have_gobject - - pkgmod.generate(libharfbuzz_gobject, - description: 'HarfBuzz text shaping library GObject integration', -+ requires: [libharfbuzz, glib_dep, gobject_dep], - subdirs: [meson.project_name()], - version: meson.project_version(), - ) --- -2.27.0 - Deleted: PKGBUILD =================================================================== --- PKGBUILD 2020-07-22 00:47:40 UTC (rev 392342) +++ PKGBUILD 2020-07-22 00:47:55 UTC (rev 392343) @@ -1,67 +0,0 @@ -# Maintainer: Jan Alexander Steffens (heftig) <hef...@archlinux.org> -# Maintainer: Jan de Groot <j...@archlinux.org> - -pkgbase=harfbuzz -pkgname=(harfbuzz harfbuzz-icu) -pkgver=2.6.8 -pkgrel=2 -pkgdesc="OpenType text shaping engine" -url="https://www.freedesktop.org/wiki/Software/HarfBuzz" -arch=(x86_64) -license=(MIT) -makedepends=(glib2 freetype2 graphite cairo icu gobject-introspection gtk-doc - ragel git python meson) -checkdepends=(python-fonttools python-setuptools) -_commit=e4203c14699cc0903a2b4611167a7b99532cfdb0 # tags/2.6.8^0 -source=("git+https://github.com/harfbuzz/harfbuzz#commit=$_commit" - 0001-meson-Make-Requires-in-.pc-files-match-autotools.patch) -sha256sums=('SKIP' - 'ebf92aed7613da18817fedccab0962e50308b93f8218e79aae36b6587453cbba') - -pkgver() { - cd harfbuzz - git describe --tags | sed 's/-/+/g' -} - -prepare() { - cd harfbuzz - git apply -3 ../0001-meson-Make-Requires-in-.pc-files-match-autotools.patch -} - -build() { - arch-meson harfbuzz build \ - -D graphite=enabled - meson compile -C build -} - -check() { - TMPDIR="$srcdir" meson test -C build --print-errorlogs - rm -rf "$srcdir"/tmp* -} - -package_harfbuzz() { - depends=(glib2 freetype2 graphite libglib-2.0.so libfreetype.so - libgobject-2.0.so) - provides=(libharfbuzz.so libharfbuzz-subset.so libharfbuzz-gobject.so) - optdepends=('cairo: hb-view program') - - DESTDIR="$pkgdir" meson install -C build - - # Split harfbuzz-icu - mkdir -p hb-icu/usr/{include/harfbuzz,lib/pkgconfig} - mv -t hb-icu/usr/lib "$pkgdir"/usr/lib/libharfbuzz-icu* - mv -t hb-icu/usr/lib/pkgconfig "$pkgdir"/usr/lib/pkgconfig/harfbuzz-icu.pc - mv -t hb-icu/usr/include/harfbuzz "$pkgdir"/usr/include/harfbuzz/hb-icu.h - - install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 harfbuzz/COPYING -} - -package_harfbuzz-icu() { - pkgdesc="$pkgdesc (ICU integration)" - depends=("harfbuzz=$pkgver-$pkgrel" icu libharfbuzz.so) - provides=(libharfbuzz-icu.so) - - mv hb-icu/* "$pkgdir" - - install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 harfbuzz/COPYING -} Copied: harfbuzz/repos/extra-x86_64/PKGBUILD (from rev 392342, harfbuzz/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2020-07-22 00:47:55 UTC (rev 392343) @@ -0,0 +1,67 @@ +# Maintainer: Jan Alexander Steffens (heftig) <hef...@archlinux.org> +# Contributor: Jan de Groot <j...@archlinux.org> + +pkgbase=harfbuzz +pkgname=(harfbuzz harfbuzz-icu) +pkgver=2.6.8 +pkgrel=3 +pkgdesc="OpenType text shaping engine" +url="https://www.freedesktop.org/wiki/Software/HarfBuzz" +arch=(x86_64) +license=(MIT) +makedepends=(glib2 freetype2 graphite cairo icu gobject-introspection gtk-doc + ragel git python meson) +checkdepends=(python-fonttools python-setuptools) +_commit=e4203c14699cc0903a2b4611167a7b99532cfdb0 # tags/2.6.8^0 +source=("git+https://github.com/harfbuzz/harfbuzz#commit=$_commit") +sha256sums=('SKIP') + +pkgver() { + cd harfbuzz + git describe --tags | sed 's/-/+/g' +} + +prepare() { + cd harfbuzz + + # Meson fixes + git cherry-pick -n 53b0a183c7a4 3adcf398a02f +} + +build() { + arch-meson harfbuzz build \ + -D graphite=enabled + meson compile -C build +} + +check() { + TMPDIR="$srcdir" meson test -C build --print-errorlogs + rm -rf "$srcdir"/tmp* +} + +package_harfbuzz() { + depends=(glib2 freetype2 graphite libglib-2.0.so libfreetype.so + libgobject-2.0.so) + provides=(libharfbuzz.so libharfbuzz-subset.so libharfbuzz-gobject.so) + optdepends=('cairo: hb-view program') + + DESTDIR="$pkgdir" meson install -C build + + # Split harfbuzz-icu + mkdir -p hb-icu/usr/{include/harfbuzz,lib/pkgconfig} + mv -t hb-icu/usr/lib "$pkgdir"/usr/lib/libharfbuzz-icu* + mv -t hb-icu/usr/lib/pkgconfig "$pkgdir"/usr/lib/pkgconfig/harfbuzz-icu.pc + mv -t hb-icu/usr/include/harfbuzz "$pkgdir"/usr/include/harfbuzz/hb-icu.h + + install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 harfbuzz/COPYING +} + +package_harfbuzz-icu() { + pkgdesc="$pkgdesc (ICU integration)" + depends=("harfbuzz=$pkgver-$pkgrel" icu libharfbuzz.so) + provides=(libharfbuzz-icu.so) + + mv hb-icu/* "$pkgdir" + + install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 harfbuzz/COPYING +}