x11/gnome/todo: backport build fix from upstream merge request, ok aja@

https://gitlab.gnome.org/GNOME/gnome-todo/-/merge_requests/120
This commit is contained in:
sthen 2022-05-18 10:54:12 +00:00
parent 57ac8ce978
commit e16ba71291
2 changed files with 69 additions and 2 deletions

View File

@ -0,0 +1,56 @@
https://gitlab.gnome.org/GNOME/gnome-todo/-/merge_requests/120
Index: src/meson.build
--- src/meson.build.orig
+++ src/meson.build
@@ -16,6 +16,25 @@ vcs_identifier_h = declare_dependency(sources: vcs_tag
gnome_todo_deps += vcs_identifier_h
+#########
+# Enums #
+#########
+
+enum_headers = files(
+ join_paths('animation', 'gtd-animation-enums.h'),
+)
+
+enum_types = 'gtd-enum-types'
+
+gtd_enum_types = gnome.mkenums(
+ enum_types,
+ sources: enum_headers,
+ c_template: enum_types + '.c.template',
+ h_template: enum_types + '.h.template'
+)
+
+sources += gtd_enum_types
+
###########
# Plugins #
###########
@@ -41,24 +60,6 @@ subdir('plugins')
gtd_deps = gnome_todo_deps + [
plugins_dep,
]
-
-
-#########
-# Enums #
-#########
-
-enum_headers = files(
- join_paths('animation', 'gtd-animation-enums.h'),
-)
-
-enum_types = 'gtd-enum-types'
-
-sources += gnome.mkenums(
- enum_types,
- sources: enum_headers,
- c_template: enum_types + '.c.template',
- h_template: enum_types + '.h.template'
-)
################

View File

@ -1,9 +1,20 @@
XXX requires libportal
#1 https://gitlab.gnome.org/GNOME/gnome-todo/-/merge_requests/120
#2 XXX requires libportal
Index: src/plugins/meson.build
--- src/plugins/meson.build.orig
+++ src/plugins/meson.build
@@ -13,7 +13,6 @@ plugins_conf = configuration_data()
@@ -3,7 +3,8 @@ plugins_incs = [
include_directories('..'),
]
-plugins_sources = []
+# Ensure enum types header is generated before building plugins
+plugins_sources = [ gtd_enum_types[1] ]
plugins_deps = [ gnome_todo_deps ]
plugins_ldflags = []
plugins_libs = []
@@ -13,7 +14,6 @@ plugins_conf = configuration_data()
plugins_conf.set('VERSION', gnome_todo_version)
subdir('all-tasks-panel')