commit 05f4317

hovercats  ·  2024-11-08 11:23:49 +0000 UTC
parent 0a89268 
freetype-harfbuzz: switch to muon
3 files changed,  +7, -8
M repo/freetype-harfbuzz/build
M repo/freetype-harfbuzz/depends
M repo/freetype-harfbuzz/version
M repo/freetype-harfbuzz/build
+6, -6 
 1@@ -7,7 +7,7 @@ export CXXFLAGS="$CXXFLAGS -I/usr/include"
 2 build_freetype() (
 3     cd freetype
 4 
 5-    meson setup \
 6+    muon setup \
 7         -Dprefix=/usr \
 8         -Ddefault_library=both \
 9 		-Dbuildtype=release \
10@@ -20,7 +20,7 @@ build_freetype() (
11         build
12 
13     samu -C build
14-    samu -C build install
15+    muon -C build install
16 )
17 
18 build_harfbuzz() (
19@@ -32,9 +32,9 @@ build_harfbuzz() (
20 # further.
21 kiss list icu  >/dev/null 2>&1 || icu_enabled=disabled
22 
23-    meson setup \
24+    muon setup \
25         -Dprefix=/usr \
26-        -Dpkg_config_path="$DESTDIR/usr/lib/pkgconfig" \
27+        -Dpkg_config_path="$DESTDIR/usr/lib/pkgconfig:/usr/lib/pkgconfig" \
28 		-Dbuildtype=release \
29 		-Db_colorout=never \
30 		-Ddebug=false \
31@@ -51,7 +51,7 @@ kiss list icu  >/dev/null 2>&1 || icu_enabled=disabled
32         build
33 
34     samu -C build
35-    samu -C build install
36+    muon -C build install
37 )
38 
39 # Point Freetype to the Harfbuzz files.
40@@ -65,4 +65,4 @@ export CXXFLAGS="$CXXFLAGS -L$DESTDIR/usr/lib"
41 
42 build_freetype -Dharfbuzz=disabled
43 build_harfbuzz
44-build_freetype -Dharfbuzz=enabled  --reconfigure
45+build_freetype -Dharfbuzz=enabled
M repo/freetype-harfbuzz/depends
+0, -1 
1@@ -11,5 +11,4 @@ libdrm
2 libpng
3 libxcb
4 libxshmfence
5-meson   make
6 pixman
M repo/freetype-harfbuzz/version
+1, -1 
1@@ -1 +1 @@
2-2.13.3+9.0.0 2
3+2.13.3+9.0.0 3