Endeavour: update to 42.0, rename from gnome-todo

This commit is contained in:
Michal Vasilek 2022-09-20 00:41:00 +02:00
parent b7c2d908ba
commit 95fffc81a3
6 changed files with 99 additions and 137 deletions

View File

@ -0,0 +1,84 @@
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,7 +1,8 @@
# Template file for 'gnome-todo'
pkgname=gnome-todo
version=41.0
revision=2
# Template file for 'Endeavour'
pkgname=Endeavour
version=42.0
revision=1
wrksrc="${pkgname}-v${version}"
build_style=meson
build_helper="gir"
configure_args="-Dintrospection=$(vopt_if gir true false)"
@ -10,11 +11,11 @@ hostmakedepends="pkg-config glib-devel gettext itstool
makedepends="gtk4-devel libadwaita-devel gnome-online-accounts-devel
libpeas-devel libportal-gtk4-devel evolution-data-server-devel"
short_desc="Task manager designed to perfectly fit the GNOME desktop"
maintainer="Enno Boland <gottox@voidlinux.org>"
maintainer="Michal Vasilek <michal@vasilek.cz>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Todo"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
checksum=5a657c978f451f61fb773f0b14f3121b9236fc504b41eb20940b4ed2004224e5
distfiles="https://gitlab.gnome.org/World/Endeavour/-/archive/v${version}/Endeavour-v${version}.tar.gz"
checksum=6ad8d5f06b86715e6bd43f1bcbd1d4cf2dd9d5b7ee1876b7ffce88bcc5a4bbd8
build_options="gir"
build_options_default="gir"
@ -23,3 +24,9 @@ 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"
build_style=meta
}

1
srcpkgs/gnome-todo Symbolic link
View File

@ -0,0 +1 @@
Endeavour

View File

@ -1,65 +0,0 @@
From a27a2128ce8f67d74895a721322768c2032400fe Mon Sep 17 00:00:00 2001
From: Neel Chauhan <neel@neelc.org>
Date: Wed, 29 Sep 2021 14:16:20 -0700
Subject: [PATCH] Fix race condition on enums when we bulid with a single core
---
src/meson.build | 35 +++++++++++++++++------------------
1 file changed, 17 insertions(+), 18 deletions(-)
diff --git a/src/meson.build b/src/meson.build
index ebafc5fd..a671e682 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -16,6 +16,23 @@ 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'
+
+sources += gnome.mkenums(
+ enum_types,
+ sources: enum_headers,
+ c_template: enum_types + '.c.template',
+ h_template: enum_types + '.h.template'
+)
+
###########
# Plugins #
###########
@@ -43,24 +60,6 @@ gtd_deps = gnome_todo_deps + [
]
-#########
-# 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 #
################
--
GitLab

View File

@ -1,11 +0,0 @@
--- a/src/gui/gtd-window.ui
+++ b/src/gui/gtd-window.ui
@@ -20,7 +20,7 @@
<!-- Main leaflet -->
<child>
<object class="AdwLeaflet" id="content_box">
- <property name="can-swipe-back">true</property>
+ <property name="can-navigate-forward">true</property>
<property name="width-request">360</property>
<child>

View File

@ -1,54 +0,0 @@
From 3e1f4da8c0e536c09ffaf3b43fe2eb5dc17cc23e Mon Sep 17 00:00:00 2001
From: Georges Basile Stavracas Neto <georges.stavracas@gmail.com>
Date: Thu, 18 Nov 2021 19:46:13 -0300
Subject: [PATCH] flatpak: Adjust to libportal changes
---
build-aux/flatpak/org.gnome.Todo.json | 3 +++
src/plugins/background/gtd-plugin-background.c | 2 +-
src/plugins/background/meson.build | 2 +-
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/build-aux/flatpak/org.gnome.Todo.json b/build-aux/flatpak/org.gnome.Todo.json
index 034e200c..44b83d66 100644
--- a/build-aux/flatpak/org.gnome.Todo.json
+++ b/build-aux/flatpak/org.gnome.Todo.json
@@ -143,6 +143,9 @@
{
"name" : "libportal",
"buildsystem" : "meson",
+ "config-opts" : [
+ "-Dbackends=gtk4"
+ ],
"sources" : [
{
"type" : "git",
diff --git a/src/plugins/background/gtd-plugin-background.c b/src/plugins/background/gtd-plugin-background.c
index cf48786c..f64d07aa 100644
--- a/src/plugins/background/gtd-plugin-background.c
+++ b/src/plugins/background/gtd-plugin-background.c
@@ -28,7 +28,7 @@
#include <gtk/gtk.h>
#include <libportal/portal.h>
-#include <libportal/portal-gtk4.h>
+#include <libportal-gtk4/portal-gtk4.h>
#define AUTOSTART_NOTIFICATION_ID "Gtd::BackgroundPlugin::autostart_notification"
#define AUTOSTART_NOTIFICATION_TIMEOUT 3 /* seconds */
diff --git a/src/plugins/background/meson.build b/src/plugins/background/meson.build
index a671a4f3..59d3635f 100644
--- a/src/plugins/background/meson.build
+++ b/src/plugins/background/meson.build
@@ -1,7 +1,7 @@
plugins_ldflags += ['-Wl,--undefined=gtd_plugin_background_register_types']
plugins_deps += [
- dependency('libportal'),
+ dependency('libportal-gtk4'),
]
plugins_sources += files(
--
GitLab