[arch-commits] Commit in harfbuzz/trunk (2 files)

[Jan Steffens]

    Date: Thursday, July 2, 2020 @ 16:54:09
  Author: heftig
Revision: 390740

2.6.8-2: fix libreoffice build

Added:
  harfbuzz/trunk/0001-meson-Make-Requires-in-.pc-files-match-autotools.patch
Modified:
  harfbuzz/trunk/PKGBUILD

-------------------------------------------------------------+
 0001-meson-Make-Requires-in-.pc-files-match-autotools.patch |   42 ++++++++++
 PKGBUILD                                                    |    9 +-
 2 files changed, 48 insertions(+), 3 deletions(-)

Added: 0001-meson-Make-Requires-in-.pc-files-match-autotools.patch
===================================================================
--- 0001-meson-Make-Requires-in-.pc-files-match-autotools.patch	                        (rev 0)
+++ 0001-meson-Make-Requires-in-.pc-files-match-autotools.patch	2020-07-02 16:54:09 UTC (rev 390740)
@@ -0,0 +1,42 @@
+From 0b5b0f4bc6f6c5c8d64cfd04d8d55cefa5509ddc Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens at 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-02 06:56:37 UTC (rev 390739)
+++ PKGBUILD	2020-07-02 16:54:09 UTC (rev 390740)
@@ -4,7 +4,7 @@
 pkgbase=harfbuzz
 pkgname=(harfbuzz harfbuzz-icu)
 pkgver=2.6.8
-pkgrel=1
+pkgrel=2
 pkgdesc="OpenType text shaping engine"
 url="https://www.freedesktop.org/wiki/Software/HarfBuzz"
 arch=(x86_64)
@@ -13,8 +13,10 @@
              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')
+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
@@ -23,6 +25,7 @@
 
 prepare() {
   cd harfbuzz
+  git apply -3 ../0001-meson-Make-Requires-in-.pc-files-match-autotools.patch
 }
 
 build() {