commit d23ad72cbf884cba0472179fe65c7974fd30ab98
parent 9c36827d9432a02914d5c0988d4bcff30354718f
Author: aabacchus <ben@bvnf.space>
Date: Wed, 4 May 2022 01:03:15 +0100
graphite-harfbuzz: also install ICU files correctly
now that harfbuzz-icu was dropped as a dependency
Diffstat:
2 files changed, 23 insertions(+), 10 deletions(-)
diff --git a/graphite-harfbuzz/build b/graphite-harfbuzz/build
@@ -1,8 +1,8 @@
#!/bin/sh -e
-# miktex requires harfbuzz to be built with graphite.
+# miktex requires harfbuzz to be built with graphite and ICU.
# This build tries to add the graphite integration to a system already using
-# both freetype and icu in its harfbuzz.
+# freetype in its harfbuzz.
# Point Harfbuzz to the Freetype files.
export CFLAGS="$CFLAGS -I/usr/include/freetype2"
@@ -10,7 +10,7 @@ export CXXFLAGS="$CXXFLAGS -I/usr/include/freetype2"
export LDFLAGS="$LDFLAGS -L/usr/lib"
# Will store the built package's files to
-# allow us to cherry-pick the graphite related files.
+# allow us to cherry-pick the graphite and ICU related files.
mkdir -p tmp
export DESTDIR="$PWD/tmp"
@@ -25,14 +25,27 @@ meson \
-Dbenchmark=disabled \
-Dcairo=disabled \
-Ddocs=disabled \
+ -Dtests=disabled \
-Dgraphite=enabled \
. output
ninja -C output
ninja -C output install
-install -Dm644 -t "$1/usr/include/harfbuzz" tmp/usr/include/harfbuzz/hb-graphite2.h
-install -Dm644 -t "$1/usr/include/harfbuzz" tmp/usr/lib/pkgconfig/harfbuzz.pc
-# copy, rather than install, to preserve symlinks and different perms
-mkdir -p "$1/usr/lib"
-cp -pd tmp/usr/lib/libharfbuzz* "$1/usr/lib"
+mkdir -p \
+ "$1/usr/include/harfbuzz" \
+ "$1/usr/lib/pkgconfig" \
+ "$1/usr/lib/cmake/harfbuzz"
+
+cp tmp/usr/include/harfbuzz/hb-graphite2.h \
+ tmp/usr/include/harfbuzz/hb-icu.h \
+ "$1/usr/include/harfbuzz"
+
+cp tmp/usr/lib/pkgconfig/harfbuzz.pc \
+ tmp/usr/lib/pkgconfig/harfbuzz-icu.pc \
+ "$1/usr/lib/pkgconfig"
+
+cp tmp/usr/lib/cmake/harfbuzz/harfbuzz-config.cmake \
+ "$1/usr/lib/cmake/harfbuzz"
+
+cp -P tmp/usr/lib/libharfbuzz* "$1/usr/lib"
diff --git a/graphite-harfbuzz/post-install b/graphite-harfbuzz/post-install
@@ -4,8 +4,8 @@ cat << EOF
########################################################################
# #
# This package is a bit messy and replaces your system harfbuzz libs #
-# with kiss-alternatives. I wouln't trust me with such important files,#
-# so be careful, because I might not have updated this properly. #
+# with kiss-alternatives. Be careful when trusting me with such #
+# important files! #
# #
# To build MiKTeX, you'll need to run the following command: #
# #
