Endeavour: update to 43.0.

This commit is contained in:
oreo639 2022-11-21 16:24:29 -08:00 committed by Michal Vasilek
parent 1324f71aa8
commit f31cca68bf
2 changed files with 5 additions and 93 deletions

View File

@ -1,84 +0,0 @@
From b492285e2a4fafad887df2c4fd2a5bdb53ce39fb Mon Sep 17 00:00:00 2001
From: Jamie Murphy <hello@itsjamie.dev>
Date: Fri, 5 Aug 2022 18:52:20 -0700
Subject: [PATCH] build: Generate enum headers first
Fixes #380, #398, !120, !110
---
src/meson.build | 38 +++++++++++++++++++-------------------
src/plugins/meson.build | 3 ++-
2 files changed, 21 insertions(+), 20 deletions(-)
diff --git a/src/meson.build b/src/meson.build
index deb410a2..8f621e78 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -16,6 +16,25 @@ vcs_identifier_h = declare_dependency(sources: vcs_tag)
endeavour_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 #
###########
@@ -42,25 +61,6 @@ gtd_deps = endeavour_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'
-)
-
-
################
# Header files #
################
diff --git a/src/plugins/meson.build b/src/plugins/meson.build
index 3d7ac4e4..2a13aff5 100644
--- a/src/plugins/meson.build
+++ b/src/plugins/meson.build
@@ -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 = [ endeavour_deps ]
plugins_ldflags = []
plugins_libs = []
--
GitLab

View File

@ -1,29 +1,25 @@
# Template file for 'Endeavour'
pkgname=Endeavour
version=42.0
version=43.0
revision=1
build_style=meson
build_helper="gir"
configure_args="-Dintrospection=$(vopt_if gir true false)"
hostmakedepends="pkg-config glib-devel gettext itstool
gtk-update-icon-cache
$(vopt_if gir 'gobject-introspection')"
makedepends="gtk4-devel libadwaita-devel gnome-online-accounts-devel
libpeas-devel libportal-gtk4-devel evolution-data-server-devel"
libpeas-devel evolution-data-server-devel"
short_desc="Task manager designed to perfectly fit the GNOME desktop"
maintainer="Michal Vasilek <michal@vasilek.cz>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Todo"
distfiles="https://gitlab.gnome.org/World/Endeavour/-/archive/v${version}/Endeavour-v${version}.tar.gz"
checksum=6ad8d5f06b86715e6bd43f1bcbd1d4cf2dd9d5b7ee1876b7ffce88bcc5a4bbd8
distfiles="https://gitlab.gnome.org/World/Endeavour/-/archive/${version}/Endeavour-${version}.tar.gz"
checksum=f5f442611f03b2471a522e976bfb156de36824b1ecf8c13a9b35a996f50670a3
build_options="gir"
build_options_default="gir"
do_check() {
glib-compile-schemas data
GSETTINGS_SCHEMA_DIR=$wrksrc/data ninja -C build test
}
gnome-todo_package() {
depends="${sourcepkg}>=${version}_${revision}"
short_desc+=" - transitional dummy package"