commit 9976a2d
hovercats
·
2024-11-11 17:41:48 +0000 UTC
parent 37ec260
pango: switch to muon
6 files changed,
+66,
-5
+7,
-3
1@@ -2,7 +2,9 @@
2
3 export DESTDIR="$1"
4
5-patch -p1 < 0001-remove-fribidi-dependency.patch
6+for p in *.patch; do
7+ patch -p1 < "$p"
8+done
9
10 # Disable download of missing (optional) dependencies
11 # during the build. This cannot be turned off otherwise.
12@@ -12,7 +14,7 @@ rm -rf subprojects
13 : > examples/meson.build
14 : > docs/meson.build
15
16-meson setup \
17+muon setup \
18 -Dprefix=/usr \
19 -Dlibdir=/usr/lib \
20 -Dbuildtype=release \
21@@ -21,7 +23,9 @@ meson setup \
22 -Doptimization=s \
23 -Dgtk_doc=false \
24 -Dintrospection=disabled \
25+ -Dpkg_config_path=/usr/lib/pkgconfig \
26+ -Ddefault_library=shared \
27 build
28
29 samu -C build
30-samu -C build install
31+muon -C build install
+1,
-0
1@@ -1,2 +1,3 @@
2 1e977d6167bf7832b196cfe44389224d3dd5579624f3dfe9faf381bb07159387a4
3 b4ed0bf9d11532bb2e511d3daeefea6ac422b33a52d70819344f9322e5f2f0eac4
4+50367d5261af8875a0a0a14b8fd3827089b90c8400bf55e9fa85849093696dac5f
+0,
-1
1@@ -4,4 +4,3 @@ freetype-harfbuzz
2 glib
3 libXft
4 libXrender
5-meson make
1@@ -0,0 +1,56 @@
2+From 11bfb8875a538370ba5f63ff720fdb824355f869 Mon Sep 17 00:00:00 2001
3+From: hovercats <hovercatswithlasereyes@protonmail.com>
4+Date: Thu, 3 Oct 2024 12:51:51 +0200
5+Subject: [PATCH] fix muon not being able to find pango-enum-types files
6+
7+---
8+ pango/meson.build | 31 ++++++++++++++++++++++++-------
9+ 1 file changed, 24 insertions(+), 7 deletions(-)
10+
11+diff --git a/pango/meson.build b/pango/meson.build
12+index 82242ab..6f45319 100644
13+--- a/pango/meson.build
14++++ b/pango/meson.build
15+@@ -84,15 +84,32 @@ pango_features_h = configure_file(
16+ )
17+
18+ # Enumerations for GType
19+-pango_enums = gnome.mkenums(
20+- 'pango-enum-types',
21+- sources: pango_headers,
22+- c_template: 'pango-enum-types.c.template',
23+- h_template: 'pango-enum-types.h.template',
24++pango_enums = []
25++pango_enums += custom_target('pango-enum-types_h',
26++ capture: true,
27++ output: 'pango-enum-types.h',
28++ input: pango_headers,
29+ install_dir: join_paths(pango_includedir, pango_api_path),
30+- install_header: true,
31++ install: true,
32++ command: [
33++ find_program('glib-mkenums'),
34++ '--template', files('pango-enum-types.h.template'),
35++ '@INPUT@',
36++ ],
37++)
38++
39++pango_enums += custom_target('pango-enum-types_c',
40++ capture: true,
41++ output: 'pango-enum-types.c',
42++ input: pango_headers,
43++ command: [
44++ find_program('glib-mkenums'),
45++ '--template', files('pango-enum-types.c.template'),
46++ '@INPUT@',
47++ ],
48+ )
49+-pango_enum_h = pango_enums[1]
50++
51++pango_enum_h = pango_enums[0]
52+
53+ if host_system == 'windows'
54+ pango_rc = configure_file(
55+--
56+2.45.1
57+
+1,
-0
1@@ -1,2 +1,3 @@
2 https://github.com/GNOME/pango/archive/1.54.tar.gz
3 patches/0001-remove-fribidi-dependency.patch
4+patches/0002-fix-muon-not-being-able-to-find-pango-enum-types-fil.patch
+1,
-1
1@@ -1 +1 @@
2-1.54 3
3+1.54 4