commit bcd542b

hovercats  ·  2024-11-11 20:23:48 +0000 UTC
parent 9976a2d
atk: switch to muon
6 files changed,  +65, -4
+7, -2
 1@@ -2,9 +2,12 @@
 2 
 3 export DESTDIR="$1"
 4 
 5+patch -p1 < 0001-fix-enum-types-for-muon.patch
 6+
 7 : > tests/meson.build
 8+: > po/meson.build
 9 
10-meson setup \
11+muon setup \
12     -Dprefix=/usr \
13     -Dsysconfdir=/etc \
14     -Dmandir=/usr/share/man \
15@@ -14,7 +17,9 @@ meson setup \
16 	-Doptimization=s \
17     -Ddocs=false \
18     -Dintrospection=false \
19+    -Dpkg_config_path=/usr/lib/pkgconfig \
20+    -Ddefault_library=shared \
21     build
22 
23 samu -C build
24-samu -C build install
25+muon -C build install
+1, -0
1@@ -1 +1,2 @@
2 cbc1b7ba03009ee5cc0e646d8a86117e0d65bf8d105f2e8714fbde0299a8012eff
3+12d9b86e8a12ab67b1f676e0167c23b6def96024e7d33f7d29dfcf9cae261fec85
+0, -1
1@@ -1,3 +1,2 @@
2 glib
3 libffi
4-meson   make
+55, -0
 1@@ -0,0 +1,55 @@
 2+From 9cd30f390bd4faf06ac5bfc135aa83fa134324ad Mon Sep 17 00:00:00 2001
 3+From: hovercats <hovercatswithlasereyes@protonmail.com>
 4+Date: Thu, 3 Oct 2024 13:05:43 +0200
 5+Subject: [PATCH] fix enum-types for muon
 6+
 7+---
 8+ atk/meson.build | 30 ++++++++++++++++++++++++------
 9+ 1 file changed, 24 insertions(+), 6 deletions(-)
10+
11+diff --git a/atk/meson.build b/atk/meson.build
12+index d19bbba..070730f 100644
13+--- a/atk/meson.build
14++++ b/atk/meson.build
15+@@ -94,14 +94,32 @@ atk_marshals = gnome.genmarshal('atkmarshal',
16+ atk_marshal_h = atk_marshals[1]
17+ 
18+ # Enumerations for GType
19+-atk_enums = gnome.mkenums('atk-enum-types',
20+-  sources: atk_headers,
21+-  c_template: 'atk-enum-types.c.template',
22+-  h_template: 'atk-enum-types.h.template',
23++atk_enums = []
24++atk_enums += custom_target('atk-enum-types_h',
25++  capture: true,
26++  output: 'atk-enum-types.h',
27++  input: atk_headers,
28+   install_dir: join_paths(atk_includedir, atk_api_path),
29+-  install_header: true,
30++  install: true,
31++  command: [
32++    find_program('glib-mkenums'),
33++    '--template', files('atk-enum-types.h.template'),
34++    '@INPUT@',
35++  ],
36++)
37++
38++atk_enums += custom_target('atk-enum-types_c',
39++  capture: true,
40++  output: 'atk-enum-types.c',
41++  input: atk_headers,
42++  command: [
43++    find_program('glib-mkenums'),
44++    '--template', files('atk-enum-types.c.template'),
45++    '@INPUT@',
46++  ],
47+ )
48+-atk_enum_h = atk_enums[1]
49++
50++atk_enum_h = atk_enums[0]
51+ 
52+ atk_cflags = [
53+   '-DG_LOG_DOMAIN="Atk"',
54+-- 
55+2.45.1
56+
+1, -0
1@@ -1 +1,2 @@
2 https://ftp.gnome.org/pub/gnome/sources/atk/2.38/atk-2.38.0.tar.xz
3+patches/0001-fix-enum-types-for-muon.patch
+1, -1
1@@ -1 +1 @@
2-2.38.0 2
3+2.38.0 3