Date: Wednesday, July 22, 2020 @ 00:47:41 Author: heftig Revision: 664787
2.6.8-3: FS#67344 Fix cmake script Modified: lib32-harfbuzz/trunk/PKGBUILD Deleted: lib32-harfbuzz/trunk/0001-meson-Make-Requires-in-.pc-files-match-autotools.patch -------------------------------------------------------------+ 0001-meson-Make-Requires-in-.pc-files-match-autotools.patch | 42 ---------- PKGBUILD | 14 +-- 2 files changed, 7 insertions(+), 49 deletions(-) Deleted: 0001-meson-Make-Requires-in-.pc-files-match-autotools.patch =================================================================== --- 0001-meson-Make-Requires-in-.pc-files-match-autotools.patch 2020-07-21 23:15:29 UTC (rev 664786) +++ 0001-meson-Make-Requires-in-.pc-files-match-autotools.patch 2020-07-22 00:47:41 UTC (rev 664787) @@ -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 - Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-07-21 23:15:29 UTC (rev 664786) +++ PKGBUILD 2020-07-22 00:47:41 UTC (rev 664787) @@ -1,10 +1,10 @@ # Maintainer: Jan Alexander Steffens (heftig) <hef...@archlinux.org> -# Maintainer: Florian Pritz <bluew...@xinu.at> +# Contributor: Florian Pritz <bluew...@xinu.at> pkgbase=lib32-harfbuzz pkgname=(lib32-harfbuzz lib32-harfbuzz-icu) pkgver=2.6.8 -pkgrel=2 +pkgrel=3 pkgdesc="OpenType text shaping engine (32-bit)" url="https://www.freedesktop.org/wiki/Software/HarfBuzz" arch=(x86_64) @@ -13,10 +13,8 @@ meson harfbuzz) 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') +source=("git+https://github.com/harfbuzz/harfbuzz#commit=$_commit") +sha256sums=('SKIP') pkgver() { cd harfbuzz @@ -25,7 +23,9 @@ prepare() { cd harfbuzz - git apply -3 ../0001-meson-Make-Requires-in-.pc-files-match-autotools.patch + + # Meson fixes + git cherry-pick -n 53b0a183c7a4 3adcf398a02f } build() {