[arch-commits] Commit in lib32-harfbuzz/repos/multilib-x86_64 (3 files)

Jan Steffens heftig at archlinux.org
Thu Jul 2 16:58:05 UTC 2020


    Date: Thursday, July 2, 2020 @ 16:57:27
  Author: heftig
Revision: 657500

archrelease: copy trunk to multilib-x86_64

Added:
  lib32-harfbuzz/repos/multilib-x86_64/0001-meson-Make-Requires-in-.pc-files-match-autotools.patch
    (from rev 657499, lib32-harfbuzz/trunk/0001-meson-Make-Requires-in-.pc-files-match-autotools.patch)
  lib32-harfbuzz/repos/multilib-x86_64/PKGBUILD
    (from rev 657499, lib32-harfbuzz/trunk/PKGBUILD)
Deleted:
  lib32-harfbuzz/repos/multilib-x86_64/PKGBUILD

-------------------------------------------------------------+
 0001-meson-Make-Requires-in-.pc-files-match-autotools.patch |   42 ++
 PKGBUILD                                                    |  141 +++++-----
 2 files changed, 114 insertions(+), 69 deletions(-)

Copied: lib32-harfbuzz/repos/multilib-x86_64/0001-meson-Make-Requires-in-.pc-files-match-autotools.patch (from rev 657499, lib32-harfbuzz/trunk/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:57:27 UTC (rev 657500)
@@ -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
+

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-07-02 16:56:17 UTC (rev 657499)
+++ PKGBUILD	2020-07-02 16:57:27 UTC (rev 657500)
@@ -1,69 +0,0 @@
-# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
-# Maintainer: Florian Pritz <bluewind at xinu.at>
-
-pkgbase=lib32-harfbuzz
-pkgname=(lib32-harfbuzz lib32-harfbuzz-icu)
-pkgver=2.6.8
-pkgrel=1
-pkgdesc="OpenType text shaping engine (32-bit)"
-url="https://www.freedesktop.org/wiki/Software/HarfBuzz"
-arch=(x86_64)
-license=(MIT)
-makedepends=(lib32-glib2 lib32-freetype2 lib32-cairo lib32-icu ragel git python
-             meson harfbuzz)
-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
-}
-
-build() {
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG="i686-pc-linux-gnu-pkg-config"
-
-  arch-meson harfbuzz build \
-    --libdir=/usr/lib32 \
-    -D introspection=disabled \
-    -D gtk_doc=disabled
-  meson compile -C build
-}
-
-check() {
-  TMPDIR="$srcdir" meson test -C build --print-errorlogs
-  rm -rf "$srcdir"/tmp*
-}
-
-package_lib32-harfbuzz() {
-  depends=(lib32-glib2 lib32-freetype2 libglib-2.0.so libfreetype.so
-           libgobject-2.0.so harfbuzz)
-  provides=(libharfbuzz.so libharfbuzz-subset.so libharfbuzz-gobject.so)
-
-  DESTDIR="$pkgdir" meson install -C build
-  rm -rf "${pkgdir}"/usr/{include,share,bin}
-
-  # Split harfbuzz-icu
-  mkdir -p hb-icu/usr/lib32/pkgconfig
-  mv -t hb-icu/usr/lib32 "$pkgdir"/usr/lib32/libharfbuzz-icu*
-  mv -t hb-icu/usr/lib32/pkgconfig "$pkgdir"/usr/lib32/pkgconfig/harfbuzz-icu.pc
-
-  install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 harfbuzz/COPYING
-}
-
-package_lib32-harfbuzz-icu() {
-  pkgdesc="$pkgdesc (ICU integration)"
-  depends=("lib32-harfbuzz=$pkgver-$pkgrel" lib32-icu libharfbuzz.so harfbuzz-icu)
-  provides=(libharfbuzz-icu.so)
-
-  mv hb-icu/* "$pkgdir"
-
-  install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 harfbuzz/COPYING
-}

Copied: lib32-harfbuzz/repos/multilib-x86_64/PKGBUILD (from rev 657499, lib32-harfbuzz/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-07-02 16:57:27 UTC (rev 657500)
@@ -0,0 +1,72 @@
+# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
+# Maintainer: Florian Pritz <bluewind at xinu.at>
+
+pkgbase=lib32-harfbuzz
+pkgname=(lib32-harfbuzz lib32-harfbuzz-icu)
+pkgver=2.6.8
+pkgrel=2
+pkgdesc="OpenType text shaping engine (32-bit)"
+url="https://www.freedesktop.org/wiki/Software/HarfBuzz"
+arch=(x86_64)
+license=(MIT)
+makedepends=(lib32-glib2 lib32-freetype2 lib32-cairo lib32-icu ragel git python
+             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')
+
+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() {
+  export CC="gcc -m32"
+  export CXX="g++ -m32"
+  export PKG_CONFIG="i686-pc-linux-gnu-pkg-config"
+
+  arch-meson harfbuzz build \
+    --libdir=/usr/lib32 \
+    -D introspection=disabled \
+    -D gtk_doc=disabled
+  meson compile -C build
+}
+
+check() {
+  TMPDIR="$srcdir" meson test -C build --print-errorlogs
+  rm -rf "$srcdir"/tmp*
+}
+
+package_lib32-harfbuzz() {
+  depends=(lib32-glib2 lib32-freetype2 libglib-2.0.so libfreetype.so
+           libgobject-2.0.so harfbuzz)
+  provides=(libharfbuzz.so libharfbuzz-subset.so libharfbuzz-gobject.so)
+
+  DESTDIR="$pkgdir" meson install -C build
+  rm -rf "${pkgdir}"/usr/{include,share,bin}
+
+  # Split harfbuzz-icu
+  mkdir -p hb-icu/usr/lib32/pkgconfig
+  mv -t hb-icu/usr/lib32 "$pkgdir"/usr/lib32/libharfbuzz-icu*
+  mv -t hb-icu/usr/lib32/pkgconfig "$pkgdir"/usr/lib32/pkgconfig/harfbuzz-icu.pc
+
+  install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 harfbuzz/COPYING
+}
+
+package_lib32-harfbuzz-icu() {
+  pkgdesc="$pkgdesc (ICU integration)"
+  depends=("lib32-harfbuzz=$pkgver-$pkgrel" lib32-icu libharfbuzz.so harfbuzz-icu)
+  provides=(libharfbuzz-icu.so)
+
+  mv hb-icu/* "$pkgdir"
+
+  install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 harfbuzz/COPYING
+}


More information about the arch-commits mailing list