* [PR PATCH] libportal: update to 0.4, gnome-todo: update to 41.0
@ 2022-02-06 20:33 paper42
2022-02-12 22:43 ` [PR PATCH] [Updated] " paper42
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: paper42 @ 2022-02-06 20:33 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1247 bytes --]
There is a new pull request by paper42 against master on the void-packages repository
https://github.com/paper42/void-packages libportal-0.4
https://github.com/void-linux/void-packages/pull/35451
libportal: update to 0.4, gnome-todo: update to 41.0
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/35451.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libportal-0.4-35451.patch --]
[-- Type: text/x-diff, Size: 24979 bytes --]
From d4cc517463a27265567ad70382f13e7fd0666af3 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 6 Feb 2022 21:21:17 +0100
Subject: [PATCH 1/2] libportal: update to 0.4.
---
srcpkgs/libportal/patches/optional_docs.patch | 35 -------------------
srcpkgs/libportal/template | 6 ++--
2 files changed, 3 insertions(+), 38 deletions(-)
delete mode 100644 srcpkgs/libportal/patches/optional_docs.patch
diff --git a/srcpkgs/libportal/patches/optional_docs.patch b/srcpkgs/libportal/patches/optional_docs.patch
deleted file mode 100644
index 57ec166c895d..000000000000
--- a/srcpkgs/libportal/patches/optional_docs.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From b7157e5d0c80981c74acfc7258683e84969649b0 Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <hadess@hadess.net>
-Date: Wed, 18 Mar 2020 16:11:41 +0100
-Subject: [PATCH] build: Make docs building optional
-
----
- meson.build | 4 +++-
- meson_options.txt | 3 ++-
- 2 files changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index 3ca0fb3..49fa112 100644
---- a/meson.build
-+++ b/meson.build
-@@ -25,7 +25,9 @@ top_inc = include_directories('.')
- libportal_inc = include_directories('libportal')
-
- subdir('libportal')
--subdir('doc')
-+if get_option('gtk_doc')
-+ subdir('doc')
-+endif
- if get_option('build-portal-test')
- subdir('portal-test')
- endif
-diff --git a/meson_options.txt b/meson_options.txt
-index f138e4f..8501dc9 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -1,3 +1,4 @@
- option('build-portal-test', type: 'boolean', value: false,
- description : 'Build the portal-test application')
--
-+option('gtk_doc', type: 'boolean', value: true,
-+ description : 'Build API reference with gtk-doc')
diff --git a/srcpkgs/libportal/template b/srcpkgs/libportal/template
index 48211c3767e1..2e8cd79422b2 100644
--- a/srcpkgs/libportal/template
+++ b/srcpkgs/libportal/template
@@ -1,7 +1,7 @@
# Template file for 'libportal'
pkgname=libportal
-version=0.3
-revision=2
+version=0.4
+revision=1
build_style=meson
configure_args="$(vopt_bool gtk_doc gtk_doc)"
hostmakedepends="pkg-config gtk-doc glib-devel"
@@ -11,7 +11,7 @@ maintainer="q66 <daniel@octaforge.org>"
license="LGPL-2.0-or-later"
homepage="https://github.com/flatpak/libportal"
distfiles="https://github.com/flatpak/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz"
-checksum=fd35d66357169e63e33ef46c43fdf22ddc07dbd960ec3462b58ca9ef15a65bd7
+checksum=3cd5f50907831cf236b40aa14c5a14ccbbf08828cecb3286efa82ce03cacef28
build_options="gtk_doc"
From b9e86b49a1ded151f6b9875c1f53c8a203458471 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 4 Feb 2022 02:26:52 +0100
Subject: [PATCH 2/2] gnome-todo: update to 41.0.
* import a patch for libadwaita 1.0.0
---
.../patches/gnome-todo-eds-libecal-2.0.patch | 567 ------------------
srcpkgs/gnome-todo/patches/libadwaita1.patch | 11 +
srcpkgs/gnome-todo/template | 13 +-
3 files changed, 18 insertions(+), 573 deletions(-)
delete mode 100644 srcpkgs/gnome-todo/patches/gnome-todo-eds-libecal-2.0.patch
create mode 100644 srcpkgs/gnome-todo/patches/libadwaita1.patch
diff --git a/srcpkgs/gnome-todo/patches/gnome-todo-eds-libecal-2.0.patch b/srcpkgs/gnome-todo/patches/gnome-todo-eds-libecal-2.0.patch
deleted file mode 100644
index 549c3ce9c4a0..000000000000
--- a/srcpkgs/gnome-todo/patches/gnome-todo-eds-libecal-2.0.patch
+++ /dev/null
@@ -1,567 +0,0 @@
-diff --git a/plugins/eds/gtd-eds-autoptr.h b/plugins/eds/gtd-eds-autoptr.h
-index eb9b011..78bd944 100644
---- a/plugins/eds/gtd-eds-autoptr.h
-+++ b/plugins/eds/gtd-eds-autoptr.h
-@@ -23,6 +23,5 @@
- #include <libecal/libecal.h>
-
- G_DEFINE_AUTOPTR_CLEANUP_FUNC (ECalComponent, g_object_unref);
--G_DEFINE_AUTOPTR_CLEANUP_FUNC (ECalComponentId, e_cal_component_free_id);
-+G_DEFINE_AUTOPTR_CLEANUP_FUNC (ECalComponentId, e_cal_component_id_free);
- G_DEFINE_AUTOPTR_CLEANUP_FUNC (ECalClient, g_object_unref);
--G_DEFINE_AUTOPTR_CLEANUP_FUNC (ESource, g_object_unref);
-diff --git a/plugins/eds/gtd-provider-eds.c b/plugins/eds/gtd-provider-eds.c
-index a403226..def4235 100644
---- a/plugins/eds/gtd-provider-eds.c
-+++ b/plugins/eds/gtd-provider-eds.c
-@@ -554,6 +554,7 @@ gtd_provider_eds_create_task (GtdProvider *provider,
-
- e_cal_client_create_object (client,
- e_cal_component_get_icalcomponent (component),
-+ E_CAL_OPERATION_FLAG_NONE,
- NULL,
- (GAsyncReadyCallback) on_task_created_cb,
- new_task);
-@@ -587,6 +588,7 @@ gtd_provider_eds_update_task (GtdProvider *provider,
- e_cal_client_modify_object (client,
- e_cal_component_get_icalcomponent (component),
- E_CAL_OBJ_MOD_THIS,
-+ E_CAL_OPERATION_FLAG_NONE,
- NULL,
- (GAsyncReadyCallback) on_task_modified_cb,
- task);
-@@ -616,9 +618,10 @@ gtd_provider_eds_remove_task (GtdProvider *provider,
- gtd_object_push_loading (GTD_OBJECT (provider));
-
- e_cal_client_remove_object (client,
-- id->uid,
-- id->rid,
-+ e_cal_component_id_get_uid (id),
-+ e_cal_component_id_get_rid (id),
- E_CAL_OBJ_MOD_THIS,
-+ E_CAL_OPERATION_FLAG_NONE,
- NULL,
- (GAsyncReadyCallback) on_task_removed_cb,
- provider);
-diff --git a/plugins/eds/gtd-task-eds.c b/plugins/eds/gtd-task-eds.c
-index 2c8cd8e..bd8f7ac 100644
---- a/plugins/eds/gtd-task-eds.c
-+++ b/plugins/eds/gtd-task-eds.c
-@@ -46,19 +46,19 @@ static GParamSpec *properties [N_PROPS];
- */
-
- static GDateTime*
--convert_icaltime (const icaltimetype *date)
-+convert_icaltime (const ICalTime *date)
- {
- GDateTime *dt;
-
- if (!date)
- return NULL;
-
-- dt = g_date_time_new_utc (date->year,
-- date->month,
-- date->day,
-- date->is_date ? 0 : date->hour,
-- date->is_date ? 0 : date->minute,
-- date->is_date ? 0 : date->second);
-+ dt = g_date_time_new_utc (i_cal_time_get_year (date),
-+ i_cal_time_get_month (date),
-+ i_cal_time_get_day (date),
-+ i_cal_time_is_date (date) ? 0 : i_cal_time_get_hour (date),
-+ i_cal_time_is_date (date) ? 0 : i_cal_time_get_minute (date),
-+ i_cal_time_is_date (date) ? 0 : i_cal_time_get_second (date));
-
- return dt;
- }
-@@ -67,19 +67,20 @@ static void
- set_description (GtdTaskEds *self,
- const gchar *description)
- {
-- ECalComponentText text;
-+ ECalComponentText *text;
- GSList note;
-
-- text.value = description && *description ? description : "";
-- text.altrep = NULL;
-+ text = e_cal_component_text_new (description ? description : "", NULL);
-
-- note.data = &text;
-+ note.data = text;
- note.next = NULL;
-
- g_clear_pointer (&self->description, g_free);
- self->description = g_strdup (description);
-
-- e_cal_component_set_description_list (self->component, ¬e);
-+ e_cal_component_set_descriptions (self->component, (description && *description) ? ¬e : NULL);
-+
-+ e_cal_component_text_free (text);
- }
-
- static void
-@@ -90,7 +91,7 @@ setup_description (GtdTaskEds *self)
- GSList *l;
-
- /* concatenates the multiple descriptions a task may have */
-- e_cal_component_get_description_list (self->component, &text_list);
-+ text_list = e_cal_component_get_descriptions (self->component);
-
- for (l = text_list; l != NULL; l = l->next)
- {
-@@ -105,21 +106,21 @@ setup_description (GtdTaskEds *self)
- {
- carrier = g_strconcat (desc,
- "\n",
-- text->value,
-+ e_cal_component_text_get_value (text),
- NULL);
- g_free (desc);
- desc = carrier;
- }
- else
- {
-- desc = g_strdup (text->value);
-+ desc = g_strdup (e_cal_component_text_get_value (text));
- }
- }
- }
-
- set_description (self, desc);
-
-- e_cal_component_free_text_list (text_list);
-+ g_slist_free_full (text_list, e_cal_component_text_free);
- }
-
-
-@@ -138,7 +139,7 @@ gtd_task_eds_get_uid (GtdObject *object)
- self = GTD_TASK_EDS (object);
-
- if (self->component)
-- e_cal_component_get_uid (self->component, &uid);
-+ uid = e_cal_component_get_uid (self->component);
- else
- uid = NULL;
-
-@@ -159,7 +160,7 @@ gtd_task_eds_set_uid (GtdObject *object,
- if (!self->component)
- return;
-
-- e_cal_component_get_uid (self->component, ¤t_uid);
-+ current_uid = e_cal_component_get_uid (self->component);
-
- if (g_strcmp0 (current_uid, uid) != 0)
- {
-@@ -177,7 +178,7 @@ gtd_task_eds_set_uid (GtdObject *object,
- static gboolean
- gtd_task_eds_get_complete (GtdTask *task)
- {
-- icalproperty_status status;
-+ ICalPropertyStatus status;
- GtdTaskEds *self;
- gboolean completed;
-
-@@ -185,8 +186,8 @@ gtd_task_eds_get_complete (GtdTask *task)
-
- self = GTD_TASK_EDS (task);
-
-- e_cal_component_get_status (self->component, &status);
-- completed = status == ICAL_STATUS_COMPLETED;
-+ status = e_cal_component_get_status (self->component);
-+ completed = status == I_CAL_STATUS_COMPLETED;
-
- return completed;
- }
-@@ -195,8 +196,8 @@ static void
- gtd_task_eds_set_complete (GtdTask *task,
- gboolean complete)
- {
-- icalproperty_status status;
-- icaltimetype *dt;
-+ ICalPropertyStatus status;
-+ ICalTime *dt;
- GtdTaskEds *self;
- gint percent;
-
-@@ -209,54 +210,54 @@ gtd_task_eds_set_complete (GtdTask *task,
- percent = 100;
- status = ICAL_STATUS_COMPLETED;
-
-- dt = g_new0 (icaltimetype, 1);
-- dt->year = g_date_time_get_year (now);
-- dt->month = g_date_time_get_month (now);
-- dt->day = g_date_time_get_day_of_month (now);
-- dt->hour = g_date_time_get_hour (now);
-- dt->minute = g_date_time_get_minute (now);
-- dt->second = g_date_time_get_seconds (now);
-- dt->zone = icaltimezone_get_utc_timezone ();
-+ dt = i_cal_time_new_null_time ();
-+ i_cal_time_set_date (dt,
-+ g_date_time_get_year (now),
-+ g_date_time_get_month (now),
-+ g_date_time_get_day_of_month (now));
-+ i_cal_time_set_time (dt,
-+ g_date_time_get_hour (now),
-+ g_date_time_get_minute (now),
-+ g_date_time_get_seconds (now));
-+ i_cal_time_set_timezone (dt, i_cal_timezone_get_utc_timezone ());
-
- /* convert timezone
- *
- * FIXME: This does not do anything until we have an ical
- * timezone associated with the task
- */
-- icaltimezone_convert_time (dt, NULL, icaltimezone_get_utc_timezone ());
-+ i_cal_time_convert_timezone (dt, NULL, i_cal_timezone_get_utc_timezone ());
- }
- else
- {
- dt = NULL;
- percent = 0;
-- status = ICAL_STATUS_NEEDSACTION;
-+ status = I_CAL_STATUS_NEEDSACTION;
- }
-
-- e_cal_component_set_percent_as_int (self->component, percent);
-+ e_cal_component_set_percent_complete (self->component, percent);
- e_cal_component_set_status (self->component, status);
- e_cal_component_set_completed (self->component, dt);
-
-- if (dt)
-- e_cal_component_free_icaltimetype (dt);
-+ g_clear_object (&dt);
- }
-
- static GDateTime*
- gtd_task_eds_get_creation_date (GtdTask *task)
- {
-- icaltimetype *idt;
-+ ICalTime *idt;
- GtdTaskEds *self;
- GDateTime *dt;
-
- self = GTD_TASK_EDS (task);
-- idt = NULL;
- dt = NULL;
-
-- e_cal_component_get_created (self->component, &idt);
-+ idt = e_cal_component_get_created (self->component);
-
- if (idt)
- dt = convert_icaltime (idt);
-
-- g_clear_pointer (&idt, e_cal_component_free_icaltimetype);
-+ g_clear_object (&idt);
-
- return dt;
- }
-@@ -286,7 +287,7 @@ gtd_task_eds_set_description (GtdTask *task,
- static GDateTime*
- gtd_task_eds_get_due_date (GtdTask *task)
- {
-- ECalComponentDateTime comp_dt;
-+ ECalComponentDateTime *comp_dt;
- GtdTaskEds *self;
- GDateTime *date;
-
-@@ -294,10 +295,12 @@ gtd_task_eds_get_due_date (GtdTask *task)
-
- self = GTD_TASK_EDS (task);
-
-- e_cal_component_get_due (self->component, &comp_dt);
-+ comp_dt = e_cal_component_get_due (self->component);
-+ if (!comp_dt)
-+ return NULL;
-
-- date = convert_icaltime (comp_dt.value);
-- e_cal_component_free_datetime (&comp_dt);
-+ date = convert_icaltime (e_cal_component_datetime_get_value (comp_dt));
-+ e_cal_component_datetime_free (comp_dt);
-
- return date;
- }
-@@ -317,11 +320,10 @@ gtd_task_eds_set_due_date (GtdTask *task,
-
- if (dt != current_dt)
- {
-- ECalComponentDateTime comp_dt;
-- icaltimetype *idt;
-+ ECalComponentDateTime *comp_dt;
-+ ICalTime *idt;
-
-- comp_dt.value = NULL;
-- comp_dt.tzid = NULL;
-+ comp_dt = NULL;
- idt = NULL;
-
- if (!current_dt ||
-@@ -329,36 +331,34 @@ gtd_task_eds_set_due_date (GtdTask *task,
- dt &&
- g_date_time_compare (current_dt, dt) != 0))
- {
-- idt = g_new0 (icaltimetype, 1);
-+ idt = i_cal_time_new_null_time ();
-
- g_date_time_ref (dt);
-
- /* Copy the given dt */
-- idt->year = g_date_time_get_year (dt);
-- idt->month = g_date_time_get_month (dt);
-- idt->day = g_date_time_get_day_of_month (dt);
-- idt->hour = g_date_time_get_hour (dt);
-- idt->minute = g_date_time_get_minute (dt);
-- idt->second = g_date_time_get_seconds (dt);
-- idt->is_date = (idt->hour == 0 &&
-- idt->minute == 0 &&
-- idt->second == 0);
--
-- comp_dt.tzid = g_strdup ("UTC");
-+ i_cal_time_set_date (idt,
-+ g_date_time_get_year (dt),
-+ g_date_time_get_month (dt),
-+ g_date_time_get_day_of_month (dt));
-+ i_cal_time_set_time (idt,
-+ g_date_time_get_hour (dt),
-+ g_date_time_get_minute (dt),
-+ g_date_time_get_seconds (dt));
-+ i_cal_time_set_is_date (idt,
-+ i_cal_time_get_hour (idt) == 0 &&
-+ i_cal_time_get_minute (idt) == 0 &&
-+ i_cal_time_get_second (idt) == 0);
-
-- comp_dt.value = idt;
-+ comp_dt = e_cal_component_datetime_new_take (idt, g_strdup ("UTC"));
-
-- e_cal_component_set_due (self->component, &comp_dt);
-+ e_cal_component_set_due (self->component, comp_dt);
-
-- e_cal_component_free_datetime (&comp_dt);
-+ e_cal_component_datetime_free (comp_dt);
-
- g_date_time_unref (dt);
- }
- else if (!dt)
- {
-- idt = NULL;
-- comp_dt.tzid = NULL;
--
- e_cal_component_set_due (self->component, NULL);
- }
- }
-@@ -369,19 +369,13 @@ gtd_task_eds_set_due_date (GtdTask *task,
- static gint32
- gtd_task_eds_get_priority (GtdTask *task)
- {
-- g_autofree gint *priority = NULL;
- GtdTaskEds *self;
-
- g_assert (GTD_IS_TASK_EDS (task));
-
- self = GTD_TASK_EDS (task);
-
-- e_cal_component_get_priority (self->component, &priority);
--
-- if (!priority)
-- return -1;
--
-- return *priority;
-+ return e_cal_component_get_priority (self->component);
- }
-
- static void
-@@ -394,29 +388,26 @@ gtd_task_eds_set_priority (GtdTask *task,
-
- self = GTD_TASK_EDS (task);
-
-- e_cal_component_set_priority (self->component, &priority);
-+ e_cal_component_set_priority (self->component, priority);
- }
-
- static const gchar*
- gtd_task_eds_get_title (GtdTask *task)
- {
-- ECalComponentText summary;
- GtdTaskEds *self;
-
- g_return_val_if_fail (GTD_IS_TASK_EDS (task), NULL);
-
- self = GTD_TASK_EDS (task);
-
-- e_cal_component_get_summary (self->component, &summary);
--
-- return summary.value;
-+ return i_cal_component_get_summary (e_cal_component_get_icalcomponent (self->component));
- }
-
- static void
- gtd_task_eds_set_title (GtdTask *task,
- const gchar *title)
- {
-- ECalComponentText new_summary;
-+ ECalComponentText *new_summary;
- GtdTaskEds *self;
-
- g_return_if_fail (GTD_IS_TASK_EDS (task));
-@@ -424,10 +415,11 @@ gtd_task_eds_set_title (GtdTask *task,
-
- self = GTD_TASK_EDS (task);
-
-- new_summary.value = title;
-- new_summary.altrep = NULL;
-+ new_summary = e_cal_component_text_new (title, NULL);
-
-- e_cal_component_set_summary (self->component, &new_summary);
-+ e_cal_component_set_summary (self->component, new_summary);
-+
-+ e_cal_component_text_free (new_summary);
- }
-
-
-@@ -436,10 +428,10 @@ gtd_task_eds_subtask_added (GtdTask *task,
- GtdTask *subtask)
- {
- g_autoptr (GList) subtasks = NULL;
-- ECalComponentId *id;
-+ const gchar *uid;
- ECalComponent *comp;
-- icalcomponent *ical_comp;
-- icalproperty *property;
-+ ICalComponent *ical_comp;
-+ ICalProperty *property;
- GtdTaskEds *subtask_self;
- GtdTaskEds *self;
-
-@@ -450,17 +442,17 @@ gtd_task_eds_subtask_added (GtdTask *task,
- /* Hook with parent's :subtask_added */
- GTD_TASK_CLASS (gtd_task_eds_parent_class)->subtask_added (task, subtask);
-
-- id = e_cal_component_get_id (self->component);
-+ uid = e_cal_component_get_uid (self->component);
- comp = subtask_self->component;
- ical_comp = e_cal_component_get_icalcomponent (comp);
-- property = icalcomponent_get_first_property (ical_comp, ICAL_RELATEDTO_PROPERTY);
-+ property = i_cal_component_get_first_property (ical_comp, I_CAL_RELATEDTO_PROPERTY);
-
- if (property)
-- icalproperty_set_relatedto (property, id->uid);
-+ i_cal_property_set_relatedto (property, uid);
- else
-- icalcomponent_add_property (ical_comp, icalproperty_new_relatedto (id->uid));
-+ i_cal_component_take_property (ical_comp, i_cal_property_new_relatedto (uid));
-
-- e_cal_component_free_id (id);
-+ g_clear_object (&property);
- }
-
- static void
-@@ -468,8 +460,8 @@ gtd_task_eds_subtask_removed (GtdTask *task,
- GtdTask *subtask)
- {
- g_autoptr (GList) subtasks = NULL;
-- icalcomponent *ical_comp;
-- icalproperty *property;
-+ ICalComponent *ical_comp;
-+ ICalProperty *property;
- GtdTaskEds *subtask_self;
-
- subtask_self = GTD_TASK_EDS (subtask);
-@@ -480,12 +472,13 @@ gtd_task_eds_subtask_removed (GtdTask *task,
-
- /* Remove the parent link from the subtask's component */
- ical_comp = e_cal_component_get_icalcomponent (subtask_self->component);
-- property = icalcomponent_get_first_property (ical_comp, ICAL_RELATEDTO_PROPERTY);
-+ property = i_cal_component_get_first_property (ical_comp, I_CAL_RELATEDTO_PROPERTY);
-
- if (!property)
- return;
-
-- icalcomponent_remove_property (ical_comp, property);
-+ i_cal_component_remove_property (ical_comp, property);
-+ g_object_unref (property);
- }
-
-
-diff --git a/plugins/eds/gtd-task-list-eds.c b/plugins/eds/gtd-task-list-eds.c
-index eb48a73..5b71718 100644
---- a/plugins/eds/gtd-task-list-eds.c
-+++ b/plugins/eds/gtd-task-list-eds.c
-@@ -85,19 +85,19 @@ setup_parent_task (GtdTaskListEds *self,
- GtdTask *task)
- {
- ECalComponent *component;
-- icalcomponent *ical_comp;
-- icalproperty *property;
-+ ICalComponent *ical_comp;
-+ ICalProperty *property;
- GtdTask *parent_task;
- const gchar *parent_uid;
-
- component = gtd_task_eds_get_component (GTD_TASK_EDS (task));
- ical_comp = e_cal_component_get_icalcomponent (component);
-- property = icalcomponent_get_first_property (ical_comp, ICAL_RELATEDTO_PROPERTY);
-+ property = i_cal_component_get_first_property (ical_comp, I_CAL_RELATEDTO_PROPERTY);
-
- if (!property)
- return;
-
-- parent_uid = icalproperty_get_relatedto (property);
-+ parent_uid = i_cal_property_get_relatedto (property);
- parent_task = gtd_task_list_get_task_by_id (GTD_TASK_LIST (self), parent_uid);
-
- if (parent_task)
-@@ -112,6 +112,8 @@ setup_parent_task (GtdTaskListEds *self,
-
- g_ptr_array_add (self->pending_subtasks, data);
- }
-+
-+ g_object_unref (property);
- }
-
- static void
-@@ -161,8 +163,8 @@ on_view_objects_added_cb (ECalClientView *view,
- GtdTask *task;
- const gchar *uid;
-
-- component = e_cal_component_new_from_string (icalcomponent_as_ical_string (l->data));
-- e_cal_component_get_uid (component, &uid);
-+ component = e_cal_component_new_from_icalcomponent (i_cal_component_clone (l->data));
-+ uid = e_cal_component_get_uid (component);
-
- task = gtd_task_list_get_task_by_id (self, uid);
-
-@@ -211,8 +213,8 @@ on_view_objects_modified_cb (ECalClientView *view,
- GtdTask *task;
- const gchar *uid;
-
-- component = e_cal_component_new_from_string (icalcomponent_as_ical_string (l->data));
-- e_cal_component_get_uid (component, &uid);
-+ component = e_cal_component_new_from_icalcomponent (i_cal_component_clone (l->data));
-+ uid = e_cal_component_get_uid (component);
-
- task = gtd_task_list_get_task_by_id (self, uid);
-
-@@ -244,7 +246,7 @@ on_view_objects_removed_cb (ECalClientView *view,
- GtdTask *task;
-
- id = l->data;
-- task = gtd_task_list_get_task_by_id (self, id->uid);
-+ task = gtd_task_list_get_task_by_id (self, e_cal_component_id_get_uid (id));
-
- if (!task)
- continue;
-diff --git a/plugins/eds/meson.build b/plugins/eds/meson.build
-index ea84426..b37f0c6 100644
---- a/plugins/eds/meson.build
-+++ b/plugins/eds/meson.build
-@@ -8,10 +8,9 @@ plugins_ldflags += ['-Wl,--undefined=gtd_plugin_eds_register_types']
- ################
-
- eds_plugin_deps = [
-- dependency('libecal-1.2', version: '>= 3.13.90'),
-+ dependency('libecal-2.0', version: '>= 3.33.1'),
- dependency('libedataserver-1.2', version: '>= 3.17.1'),
- dependency('libedataserverui-1.2', version: '>= 3.17.1'),
-- dependency('libical', version: '>= 0.43'),
- ]
-
- eds_plugin_deps += gnome_todo_deps
diff --git a/srcpkgs/gnome-todo/patches/libadwaita1.patch b/srcpkgs/gnome-todo/patches/libadwaita1.patch
new file mode 100644
index 000000000000..691cf990ec4b
--- /dev/null
+++ b/srcpkgs/gnome-todo/patches/libadwaita1.patch
@@ -0,0 +1,11 @@
+--- 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>
diff --git a/srcpkgs/gnome-todo/template b/srcpkgs/gnome-todo/template
index 5fe6d1d7bc84..e796a86716f5 100644
--- a/srcpkgs/gnome-todo/template
+++ b/srcpkgs/gnome-todo/template
@@ -1,19 +1,20 @@
# Template file for 'gnome-todo'
pkgname=gnome-todo
-version=3.28.1
-revision=7
+version=41.0
+revision=1
build_style=meson
-build_helper="gir qemu"
+build_helper="gir"
configure_args="-Dintrospection=$(vopt_if gir true false)"
-hostmakedepends="glib-devel intltool itstool pkg-config
+hostmakedepends="pkg-config glib-devel gettext itstool
$(vopt_if gir 'gobject-introspection')"
-makedepends="evolution-data-server-devel libpeas-devel rest-devel"
+makedepends="gtk4-devel libadwaita-devel gnome-online-accounts-devel
+ libpeas-devel libportal-devel evolution-data-server-devel"
short_desc="Task manager designed to perfectly fit the GNOME desktop"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Todo"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c7571fc040d8901dd0e528282ef0655687f23f29d304057c72548ab3e2c2cf23
+checksum=5a657c978f451f61fb773f0b14f3121b9236fc504b41eb20940b4ed2004224e5
build_options="gir"
build_options_default="gir"
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PR PATCH] [Updated] libportal: update to 0.4, gnome-todo: update to 41.0
2022-02-06 20:33 [PR PATCH] libportal: update to 0.4, gnome-todo: update to 41.0 paper42
@ 2022-02-12 22:43 ` paper42
2022-02-19 20:56 ` paper42
2022-02-19 21:57 ` [PR PATCH] [Merged]: " paper42
2 siblings, 0 replies; 4+ messages in thread
From: paper42 @ 2022-02-12 22:43 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1252 bytes --]
There is an updated pull request by paper42 against master on the void-packages repository
https://github.com/paper42/void-packages libportal-0.4
https://github.com/void-linux/void-packages/pull/35451
libportal: update to 0.4, gnome-todo: update to 41.0
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/35451.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libportal-0.4-35451.patch --]
[-- Type: text/x-diff, Size: 26781 bytes --]
From 2675dfe2520220a9724fa176cff0c6f4c23fe71e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 6 Feb 2022 21:21:17 +0100
Subject: [PATCH 1/2] libportal: update to 0.4.
---
srcpkgs/libportal/patches/optional_docs.patch | 35 -------------------
srcpkgs/libportal/template | 6 ++--
2 files changed, 3 insertions(+), 38 deletions(-)
delete mode 100644 srcpkgs/libportal/patches/optional_docs.patch
diff --git a/srcpkgs/libportal/patches/optional_docs.patch b/srcpkgs/libportal/patches/optional_docs.patch
deleted file mode 100644
index 57ec166c895d..000000000000
--- a/srcpkgs/libportal/patches/optional_docs.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From b7157e5d0c80981c74acfc7258683e84969649b0 Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <hadess@hadess.net>
-Date: Wed, 18 Mar 2020 16:11:41 +0100
-Subject: [PATCH] build: Make docs building optional
-
----
- meson.build | 4 +++-
- meson_options.txt | 3 ++-
- 2 files changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index 3ca0fb3..49fa112 100644
---- a/meson.build
-+++ b/meson.build
-@@ -25,7 +25,9 @@ top_inc = include_directories('.')
- libportal_inc = include_directories('libportal')
-
- subdir('libportal')
--subdir('doc')
-+if get_option('gtk_doc')
-+ subdir('doc')
-+endif
- if get_option('build-portal-test')
- subdir('portal-test')
- endif
-diff --git a/meson_options.txt b/meson_options.txt
-index f138e4f..8501dc9 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -1,3 +1,4 @@
- option('build-portal-test', type: 'boolean', value: false,
- description : 'Build the portal-test application')
--
-+option('gtk_doc', type: 'boolean', value: true,
-+ description : 'Build API reference with gtk-doc')
diff --git a/srcpkgs/libportal/template b/srcpkgs/libportal/template
index 48211c3767e1..2e8cd79422b2 100644
--- a/srcpkgs/libportal/template
+++ b/srcpkgs/libportal/template
@@ -1,7 +1,7 @@
# Template file for 'libportal'
pkgname=libportal
-version=0.3
-revision=2
+version=0.4
+revision=1
build_style=meson
configure_args="$(vopt_bool gtk_doc gtk_doc)"
hostmakedepends="pkg-config gtk-doc glib-devel"
@@ -11,7 +11,7 @@ maintainer="q66 <daniel@octaforge.org>"
license="LGPL-2.0-or-later"
homepage="https://github.com/flatpak/libportal"
distfiles="https://github.com/flatpak/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz"
-checksum=fd35d66357169e63e33ef46c43fdf22ddc07dbd960ec3462b58ca9ef15a65bd7
+checksum=3cd5f50907831cf236b40aa14c5a14ccbbf08828cecb3286efa82ce03cacef28
build_options="gtk_doc"
From 5748a664330a44f4b5d804de82b55ca478fde19a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 4 Feb 2022 02:26:52 +0100
Subject: [PATCH 2/2] gnome-todo: update to 41.0.
---
.../patches/fix-build-race-condition.patch | 65 ++
.../patches/gnome-todo-eds-libecal-2.0.patch | 567 ------------------
srcpkgs/gnome-todo/patches/libadwaita1.patch | 11 +
srcpkgs/gnome-todo/template | 13 +-
4 files changed, 83 insertions(+), 573 deletions(-)
create mode 100644 srcpkgs/gnome-todo/patches/fix-build-race-condition.patch
delete mode 100644 srcpkgs/gnome-todo/patches/gnome-todo-eds-libecal-2.0.patch
create mode 100644 srcpkgs/gnome-todo/patches/libadwaita1.patch
diff --git a/srcpkgs/gnome-todo/patches/fix-build-race-condition.patch b/srcpkgs/gnome-todo/patches/fix-build-race-condition.patch
new file mode 100644
index 000000000000..cffd79bd7dc9
--- /dev/null
+++ b/srcpkgs/gnome-todo/patches/fix-build-race-condition.patch
@@ -0,0 +1,65 @@
+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
+
diff --git a/srcpkgs/gnome-todo/patches/gnome-todo-eds-libecal-2.0.patch b/srcpkgs/gnome-todo/patches/gnome-todo-eds-libecal-2.0.patch
deleted file mode 100644
index 549c3ce9c4a0..000000000000
--- a/srcpkgs/gnome-todo/patches/gnome-todo-eds-libecal-2.0.patch
+++ /dev/null
@@ -1,567 +0,0 @@
-diff --git a/plugins/eds/gtd-eds-autoptr.h b/plugins/eds/gtd-eds-autoptr.h
-index eb9b011..78bd944 100644
---- a/plugins/eds/gtd-eds-autoptr.h
-+++ b/plugins/eds/gtd-eds-autoptr.h
-@@ -23,6 +23,5 @@
- #include <libecal/libecal.h>
-
- G_DEFINE_AUTOPTR_CLEANUP_FUNC (ECalComponent, g_object_unref);
--G_DEFINE_AUTOPTR_CLEANUP_FUNC (ECalComponentId, e_cal_component_free_id);
-+G_DEFINE_AUTOPTR_CLEANUP_FUNC (ECalComponentId, e_cal_component_id_free);
- G_DEFINE_AUTOPTR_CLEANUP_FUNC (ECalClient, g_object_unref);
--G_DEFINE_AUTOPTR_CLEANUP_FUNC (ESource, g_object_unref);
-diff --git a/plugins/eds/gtd-provider-eds.c b/plugins/eds/gtd-provider-eds.c
-index a403226..def4235 100644
---- a/plugins/eds/gtd-provider-eds.c
-+++ b/plugins/eds/gtd-provider-eds.c
-@@ -554,6 +554,7 @@ gtd_provider_eds_create_task (GtdProvider *provider,
-
- e_cal_client_create_object (client,
- e_cal_component_get_icalcomponent (component),
-+ E_CAL_OPERATION_FLAG_NONE,
- NULL,
- (GAsyncReadyCallback) on_task_created_cb,
- new_task);
-@@ -587,6 +588,7 @@ gtd_provider_eds_update_task (GtdProvider *provider,
- e_cal_client_modify_object (client,
- e_cal_component_get_icalcomponent (component),
- E_CAL_OBJ_MOD_THIS,
-+ E_CAL_OPERATION_FLAG_NONE,
- NULL,
- (GAsyncReadyCallback) on_task_modified_cb,
- task);
-@@ -616,9 +618,10 @@ gtd_provider_eds_remove_task (GtdProvider *provider,
- gtd_object_push_loading (GTD_OBJECT (provider));
-
- e_cal_client_remove_object (client,
-- id->uid,
-- id->rid,
-+ e_cal_component_id_get_uid (id),
-+ e_cal_component_id_get_rid (id),
- E_CAL_OBJ_MOD_THIS,
-+ E_CAL_OPERATION_FLAG_NONE,
- NULL,
- (GAsyncReadyCallback) on_task_removed_cb,
- provider);
-diff --git a/plugins/eds/gtd-task-eds.c b/plugins/eds/gtd-task-eds.c
-index 2c8cd8e..bd8f7ac 100644
---- a/plugins/eds/gtd-task-eds.c
-+++ b/plugins/eds/gtd-task-eds.c
-@@ -46,19 +46,19 @@ static GParamSpec *properties [N_PROPS];
- */
-
- static GDateTime*
--convert_icaltime (const icaltimetype *date)
-+convert_icaltime (const ICalTime *date)
- {
- GDateTime *dt;
-
- if (!date)
- return NULL;
-
-- dt = g_date_time_new_utc (date->year,
-- date->month,
-- date->day,
-- date->is_date ? 0 : date->hour,
-- date->is_date ? 0 : date->minute,
-- date->is_date ? 0 : date->second);
-+ dt = g_date_time_new_utc (i_cal_time_get_year (date),
-+ i_cal_time_get_month (date),
-+ i_cal_time_get_day (date),
-+ i_cal_time_is_date (date) ? 0 : i_cal_time_get_hour (date),
-+ i_cal_time_is_date (date) ? 0 : i_cal_time_get_minute (date),
-+ i_cal_time_is_date (date) ? 0 : i_cal_time_get_second (date));
-
- return dt;
- }
-@@ -67,19 +67,20 @@ static void
- set_description (GtdTaskEds *self,
- const gchar *description)
- {
-- ECalComponentText text;
-+ ECalComponentText *text;
- GSList note;
-
-- text.value = description && *description ? description : "";
-- text.altrep = NULL;
-+ text = e_cal_component_text_new (description ? description : "", NULL);
-
-- note.data = &text;
-+ note.data = text;
- note.next = NULL;
-
- g_clear_pointer (&self->description, g_free);
- self->description = g_strdup (description);
-
-- e_cal_component_set_description_list (self->component, ¬e);
-+ e_cal_component_set_descriptions (self->component, (description && *description) ? ¬e : NULL);
-+
-+ e_cal_component_text_free (text);
- }
-
- static void
-@@ -90,7 +91,7 @@ setup_description (GtdTaskEds *self)
- GSList *l;
-
- /* concatenates the multiple descriptions a task may have */
-- e_cal_component_get_description_list (self->component, &text_list);
-+ text_list = e_cal_component_get_descriptions (self->component);
-
- for (l = text_list; l != NULL; l = l->next)
- {
-@@ -105,21 +106,21 @@ setup_description (GtdTaskEds *self)
- {
- carrier = g_strconcat (desc,
- "\n",
-- text->value,
-+ e_cal_component_text_get_value (text),
- NULL);
- g_free (desc);
- desc = carrier;
- }
- else
- {
-- desc = g_strdup (text->value);
-+ desc = g_strdup (e_cal_component_text_get_value (text));
- }
- }
- }
-
- set_description (self, desc);
-
-- e_cal_component_free_text_list (text_list);
-+ g_slist_free_full (text_list, e_cal_component_text_free);
- }
-
-
-@@ -138,7 +139,7 @@ gtd_task_eds_get_uid (GtdObject *object)
- self = GTD_TASK_EDS (object);
-
- if (self->component)
-- e_cal_component_get_uid (self->component, &uid);
-+ uid = e_cal_component_get_uid (self->component);
- else
- uid = NULL;
-
-@@ -159,7 +160,7 @@ gtd_task_eds_set_uid (GtdObject *object,
- if (!self->component)
- return;
-
-- e_cal_component_get_uid (self->component, ¤t_uid);
-+ current_uid = e_cal_component_get_uid (self->component);
-
- if (g_strcmp0 (current_uid, uid) != 0)
- {
-@@ -177,7 +178,7 @@ gtd_task_eds_set_uid (GtdObject *object,
- static gboolean
- gtd_task_eds_get_complete (GtdTask *task)
- {
-- icalproperty_status status;
-+ ICalPropertyStatus status;
- GtdTaskEds *self;
- gboolean completed;
-
-@@ -185,8 +186,8 @@ gtd_task_eds_get_complete (GtdTask *task)
-
- self = GTD_TASK_EDS (task);
-
-- e_cal_component_get_status (self->component, &status);
-- completed = status == ICAL_STATUS_COMPLETED;
-+ status = e_cal_component_get_status (self->component);
-+ completed = status == I_CAL_STATUS_COMPLETED;
-
- return completed;
- }
-@@ -195,8 +196,8 @@ static void
- gtd_task_eds_set_complete (GtdTask *task,
- gboolean complete)
- {
-- icalproperty_status status;
-- icaltimetype *dt;
-+ ICalPropertyStatus status;
-+ ICalTime *dt;
- GtdTaskEds *self;
- gint percent;
-
-@@ -209,54 +210,54 @@ gtd_task_eds_set_complete (GtdTask *task,
- percent = 100;
- status = ICAL_STATUS_COMPLETED;
-
-- dt = g_new0 (icaltimetype, 1);
-- dt->year = g_date_time_get_year (now);
-- dt->month = g_date_time_get_month (now);
-- dt->day = g_date_time_get_day_of_month (now);
-- dt->hour = g_date_time_get_hour (now);
-- dt->minute = g_date_time_get_minute (now);
-- dt->second = g_date_time_get_seconds (now);
-- dt->zone = icaltimezone_get_utc_timezone ();
-+ dt = i_cal_time_new_null_time ();
-+ i_cal_time_set_date (dt,
-+ g_date_time_get_year (now),
-+ g_date_time_get_month (now),
-+ g_date_time_get_day_of_month (now));
-+ i_cal_time_set_time (dt,
-+ g_date_time_get_hour (now),
-+ g_date_time_get_minute (now),
-+ g_date_time_get_seconds (now));
-+ i_cal_time_set_timezone (dt, i_cal_timezone_get_utc_timezone ());
-
- /* convert timezone
- *
- * FIXME: This does not do anything until we have an ical
- * timezone associated with the task
- */
-- icaltimezone_convert_time (dt, NULL, icaltimezone_get_utc_timezone ());
-+ i_cal_time_convert_timezone (dt, NULL, i_cal_timezone_get_utc_timezone ());
- }
- else
- {
- dt = NULL;
- percent = 0;
-- status = ICAL_STATUS_NEEDSACTION;
-+ status = I_CAL_STATUS_NEEDSACTION;
- }
-
-- e_cal_component_set_percent_as_int (self->component, percent);
-+ e_cal_component_set_percent_complete (self->component, percent);
- e_cal_component_set_status (self->component, status);
- e_cal_component_set_completed (self->component, dt);
-
-- if (dt)
-- e_cal_component_free_icaltimetype (dt);
-+ g_clear_object (&dt);
- }
-
- static GDateTime*
- gtd_task_eds_get_creation_date (GtdTask *task)
- {
-- icaltimetype *idt;
-+ ICalTime *idt;
- GtdTaskEds *self;
- GDateTime *dt;
-
- self = GTD_TASK_EDS (task);
-- idt = NULL;
- dt = NULL;
-
-- e_cal_component_get_created (self->component, &idt);
-+ idt = e_cal_component_get_created (self->component);
-
- if (idt)
- dt = convert_icaltime (idt);
-
-- g_clear_pointer (&idt, e_cal_component_free_icaltimetype);
-+ g_clear_object (&idt);
-
- return dt;
- }
-@@ -286,7 +287,7 @@ gtd_task_eds_set_description (GtdTask *task,
- static GDateTime*
- gtd_task_eds_get_due_date (GtdTask *task)
- {
-- ECalComponentDateTime comp_dt;
-+ ECalComponentDateTime *comp_dt;
- GtdTaskEds *self;
- GDateTime *date;
-
-@@ -294,10 +295,12 @@ gtd_task_eds_get_due_date (GtdTask *task)
-
- self = GTD_TASK_EDS (task);
-
-- e_cal_component_get_due (self->component, &comp_dt);
-+ comp_dt = e_cal_component_get_due (self->component);
-+ if (!comp_dt)
-+ return NULL;
-
-- date = convert_icaltime (comp_dt.value);
-- e_cal_component_free_datetime (&comp_dt);
-+ date = convert_icaltime (e_cal_component_datetime_get_value (comp_dt));
-+ e_cal_component_datetime_free (comp_dt);
-
- return date;
- }
-@@ -317,11 +320,10 @@ gtd_task_eds_set_due_date (GtdTask *task,
-
- if (dt != current_dt)
- {
-- ECalComponentDateTime comp_dt;
-- icaltimetype *idt;
-+ ECalComponentDateTime *comp_dt;
-+ ICalTime *idt;
-
-- comp_dt.value = NULL;
-- comp_dt.tzid = NULL;
-+ comp_dt = NULL;
- idt = NULL;
-
- if (!current_dt ||
-@@ -329,36 +331,34 @@ gtd_task_eds_set_due_date (GtdTask *task,
- dt &&
- g_date_time_compare (current_dt, dt) != 0))
- {
-- idt = g_new0 (icaltimetype, 1);
-+ idt = i_cal_time_new_null_time ();
-
- g_date_time_ref (dt);
-
- /* Copy the given dt */
-- idt->year = g_date_time_get_year (dt);
-- idt->month = g_date_time_get_month (dt);
-- idt->day = g_date_time_get_day_of_month (dt);
-- idt->hour = g_date_time_get_hour (dt);
-- idt->minute = g_date_time_get_minute (dt);
-- idt->second = g_date_time_get_seconds (dt);
-- idt->is_date = (idt->hour == 0 &&
-- idt->minute == 0 &&
-- idt->second == 0);
--
-- comp_dt.tzid = g_strdup ("UTC");
-+ i_cal_time_set_date (idt,
-+ g_date_time_get_year (dt),
-+ g_date_time_get_month (dt),
-+ g_date_time_get_day_of_month (dt));
-+ i_cal_time_set_time (idt,
-+ g_date_time_get_hour (dt),
-+ g_date_time_get_minute (dt),
-+ g_date_time_get_seconds (dt));
-+ i_cal_time_set_is_date (idt,
-+ i_cal_time_get_hour (idt) == 0 &&
-+ i_cal_time_get_minute (idt) == 0 &&
-+ i_cal_time_get_second (idt) == 0);
-
-- comp_dt.value = idt;
-+ comp_dt = e_cal_component_datetime_new_take (idt, g_strdup ("UTC"));
-
-- e_cal_component_set_due (self->component, &comp_dt);
-+ e_cal_component_set_due (self->component, comp_dt);
-
-- e_cal_component_free_datetime (&comp_dt);
-+ e_cal_component_datetime_free (comp_dt);
-
- g_date_time_unref (dt);
- }
- else if (!dt)
- {
-- idt = NULL;
-- comp_dt.tzid = NULL;
--
- e_cal_component_set_due (self->component, NULL);
- }
- }
-@@ -369,19 +369,13 @@ gtd_task_eds_set_due_date (GtdTask *task,
- static gint32
- gtd_task_eds_get_priority (GtdTask *task)
- {
-- g_autofree gint *priority = NULL;
- GtdTaskEds *self;
-
- g_assert (GTD_IS_TASK_EDS (task));
-
- self = GTD_TASK_EDS (task);
-
-- e_cal_component_get_priority (self->component, &priority);
--
-- if (!priority)
-- return -1;
--
-- return *priority;
-+ return e_cal_component_get_priority (self->component);
- }
-
- static void
-@@ -394,29 +388,26 @@ gtd_task_eds_set_priority (GtdTask *task,
-
- self = GTD_TASK_EDS (task);
-
-- e_cal_component_set_priority (self->component, &priority);
-+ e_cal_component_set_priority (self->component, priority);
- }
-
- static const gchar*
- gtd_task_eds_get_title (GtdTask *task)
- {
-- ECalComponentText summary;
- GtdTaskEds *self;
-
- g_return_val_if_fail (GTD_IS_TASK_EDS (task), NULL);
-
- self = GTD_TASK_EDS (task);
-
-- e_cal_component_get_summary (self->component, &summary);
--
-- return summary.value;
-+ return i_cal_component_get_summary (e_cal_component_get_icalcomponent (self->component));
- }
-
- static void
- gtd_task_eds_set_title (GtdTask *task,
- const gchar *title)
- {
-- ECalComponentText new_summary;
-+ ECalComponentText *new_summary;
- GtdTaskEds *self;
-
- g_return_if_fail (GTD_IS_TASK_EDS (task));
-@@ -424,10 +415,11 @@ gtd_task_eds_set_title (GtdTask *task,
-
- self = GTD_TASK_EDS (task);
-
-- new_summary.value = title;
-- new_summary.altrep = NULL;
-+ new_summary = e_cal_component_text_new (title, NULL);
-
-- e_cal_component_set_summary (self->component, &new_summary);
-+ e_cal_component_set_summary (self->component, new_summary);
-+
-+ e_cal_component_text_free (new_summary);
- }
-
-
-@@ -436,10 +428,10 @@ gtd_task_eds_subtask_added (GtdTask *task,
- GtdTask *subtask)
- {
- g_autoptr (GList) subtasks = NULL;
-- ECalComponentId *id;
-+ const gchar *uid;
- ECalComponent *comp;
-- icalcomponent *ical_comp;
-- icalproperty *property;
-+ ICalComponent *ical_comp;
-+ ICalProperty *property;
- GtdTaskEds *subtask_self;
- GtdTaskEds *self;
-
-@@ -450,17 +442,17 @@ gtd_task_eds_subtask_added (GtdTask *task,
- /* Hook with parent's :subtask_added */
- GTD_TASK_CLASS (gtd_task_eds_parent_class)->subtask_added (task, subtask);
-
-- id = e_cal_component_get_id (self->component);
-+ uid = e_cal_component_get_uid (self->component);
- comp = subtask_self->component;
- ical_comp = e_cal_component_get_icalcomponent (comp);
-- property = icalcomponent_get_first_property (ical_comp, ICAL_RELATEDTO_PROPERTY);
-+ property = i_cal_component_get_first_property (ical_comp, I_CAL_RELATEDTO_PROPERTY);
-
- if (property)
-- icalproperty_set_relatedto (property, id->uid);
-+ i_cal_property_set_relatedto (property, uid);
- else
-- icalcomponent_add_property (ical_comp, icalproperty_new_relatedto (id->uid));
-+ i_cal_component_take_property (ical_comp, i_cal_property_new_relatedto (uid));
-
-- e_cal_component_free_id (id);
-+ g_clear_object (&property);
- }
-
- static void
-@@ -468,8 +460,8 @@ gtd_task_eds_subtask_removed (GtdTask *task,
- GtdTask *subtask)
- {
- g_autoptr (GList) subtasks = NULL;
-- icalcomponent *ical_comp;
-- icalproperty *property;
-+ ICalComponent *ical_comp;
-+ ICalProperty *property;
- GtdTaskEds *subtask_self;
-
- subtask_self = GTD_TASK_EDS (subtask);
-@@ -480,12 +472,13 @@ gtd_task_eds_subtask_removed (GtdTask *task,
-
- /* Remove the parent link from the subtask's component */
- ical_comp = e_cal_component_get_icalcomponent (subtask_self->component);
-- property = icalcomponent_get_first_property (ical_comp, ICAL_RELATEDTO_PROPERTY);
-+ property = i_cal_component_get_first_property (ical_comp, I_CAL_RELATEDTO_PROPERTY);
-
- if (!property)
- return;
-
-- icalcomponent_remove_property (ical_comp, property);
-+ i_cal_component_remove_property (ical_comp, property);
-+ g_object_unref (property);
- }
-
-
-diff --git a/plugins/eds/gtd-task-list-eds.c b/plugins/eds/gtd-task-list-eds.c
-index eb48a73..5b71718 100644
---- a/plugins/eds/gtd-task-list-eds.c
-+++ b/plugins/eds/gtd-task-list-eds.c
-@@ -85,19 +85,19 @@ setup_parent_task (GtdTaskListEds *self,
- GtdTask *task)
- {
- ECalComponent *component;
-- icalcomponent *ical_comp;
-- icalproperty *property;
-+ ICalComponent *ical_comp;
-+ ICalProperty *property;
- GtdTask *parent_task;
- const gchar *parent_uid;
-
- component = gtd_task_eds_get_component (GTD_TASK_EDS (task));
- ical_comp = e_cal_component_get_icalcomponent (component);
-- property = icalcomponent_get_first_property (ical_comp, ICAL_RELATEDTO_PROPERTY);
-+ property = i_cal_component_get_first_property (ical_comp, I_CAL_RELATEDTO_PROPERTY);
-
- if (!property)
- return;
-
-- parent_uid = icalproperty_get_relatedto (property);
-+ parent_uid = i_cal_property_get_relatedto (property);
- parent_task = gtd_task_list_get_task_by_id (GTD_TASK_LIST (self), parent_uid);
-
- if (parent_task)
-@@ -112,6 +112,8 @@ setup_parent_task (GtdTaskListEds *self,
-
- g_ptr_array_add (self->pending_subtasks, data);
- }
-+
-+ g_object_unref (property);
- }
-
- static void
-@@ -161,8 +163,8 @@ on_view_objects_added_cb (ECalClientView *view,
- GtdTask *task;
- const gchar *uid;
-
-- component = e_cal_component_new_from_string (icalcomponent_as_ical_string (l->data));
-- e_cal_component_get_uid (component, &uid);
-+ component = e_cal_component_new_from_icalcomponent (i_cal_component_clone (l->data));
-+ uid = e_cal_component_get_uid (component);
-
- task = gtd_task_list_get_task_by_id (self, uid);
-
-@@ -211,8 +213,8 @@ on_view_objects_modified_cb (ECalClientView *view,
- GtdTask *task;
- const gchar *uid;
-
-- component = e_cal_component_new_from_string (icalcomponent_as_ical_string (l->data));
-- e_cal_component_get_uid (component, &uid);
-+ component = e_cal_component_new_from_icalcomponent (i_cal_component_clone (l->data));
-+ uid = e_cal_component_get_uid (component);
-
- task = gtd_task_list_get_task_by_id (self, uid);
-
-@@ -244,7 +246,7 @@ on_view_objects_removed_cb (ECalClientView *view,
- GtdTask *task;
-
- id = l->data;
-- task = gtd_task_list_get_task_by_id (self, id->uid);
-+ task = gtd_task_list_get_task_by_id (self, e_cal_component_id_get_uid (id));
-
- if (!task)
- continue;
-diff --git a/plugins/eds/meson.build b/plugins/eds/meson.build
-index ea84426..b37f0c6 100644
---- a/plugins/eds/meson.build
-+++ b/plugins/eds/meson.build
-@@ -8,10 +8,9 @@ plugins_ldflags += ['-Wl,--undefined=gtd_plugin_eds_register_types']
- ################
-
- eds_plugin_deps = [
-- dependency('libecal-1.2', version: '>= 3.13.90'),
-+ dependency('libecal-2.0', version: '>= 3.33.1'),
- dependency('libedataserver-1.2', version: '>= 3.17.1'),
- dependency('libedataserverui-1.2', version: '>= 3.17.1'),
-- dependency('libical', version: '>= 0.43'),
- ]
-
- eds_plugin_deps += gnome_todo_deps
diff --git a/srcpkgs/gnome-todo/patches/libadwaita1.patch b/srcpkgs/gnome-todo/patches/libadwaita1.patch
new file mode 100644
index 000000000000..691cf990ec4b
--- /dev/null
+++ b/srcpkgs/gnome-todo/patches/libadwaita1.patch
@@ -0,0 +1,11 @@
+--- 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>
diff --git a/srcpkgs/gnome-todo/template b/srcpkgs/gnome-todo/template
index 5fe6d1d7bc84..e796a86716f5 100644
--- a/srcpkgs/gnome-todo/template
+++ b/srcpkgs/gnome-todo/template
@@ -1,19 +1,20 @@
# Template file for 'gnome-todo'
pkgname=gnome-todo
-version=3.28.1
-revision=7
+version=41.0
+revision=1
build_style=meson
-build_helper="gir qemu"
+build_helper="gir"
configure_args="-Dintrospection=$(vopt_if gir true false)"
-hostmakedepends="glib-devel intltool itstool pkg-config
+hostmakedepends="pkg-config glib-devel gettext itstool
$(vopt_if gir 'gobject-introspection')"
-makedepends="evolution-data-server-devel libpeas-devel rest-devel"
+makedepends="gtk4-devel libadwaita-devel gnome-online-accounts-devel
+ libpeas-devel libportal-devel evolution-data-server-devel"
short_desc="Task manager designed to perfectly fit the GNOME desktop"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Todo"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c7571fc040d8901dd0e528282ef0655687f23f29d304057c72548ab3e2c2cf23
+checksum=5a657c978f451f61fb773f0b14f3121b9236fc504b41eb20940b4ed2004224e5
build_options="gir"
build_options_default="gir"
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PR PATCH] [Updated] libportal: update to 0.4, gnome-todo: update to 41.0
2022-02-06 20:33 [PR PATCH] libportal: update to 0.4, gnome-todo: update to 41.0 paper42
2022-02-12 22:43 ` [PR PATCH] [Updated] " paper42
@ 2022-02-19 20:56 ` paper42
2022-02-19 21:57 ` [PR PATCH] [Merged]: " paper42
2 siblings, 0 replies; 4+ messages in thread
From: paper42 @ 2022-02-19 20:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1252 bytes --]
There is an updated pull request by paper42 against master on the void-packages repository
https://github.com/paper42/void-packages libportal-0.4
https://github.com/void-linux/void-packages/pull/35451
libportal: update to 0.4, gnome-todo: update to 41.0
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/35451.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libportal-0.4-35451.patch --]
[-- Type: text/x-diff, Size: 26884 bytes --]
From f36acf8a3b7e277065dd61ecf6016c33d7cb359f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 6 Feb 2022 21:21:17 +0100
Subject: [PATCH 1/2] libportal: update to 0.4.
---
srcpkgs/libportal/patches/optional_docs.patch | 35 -------------------
srcpkgs/libportal/template | 6 ++--
2 files changed, 3 insertions(+), 38 deletions(-)
delete mode 100644 srcpkgs/libportal/patches/optional_docs.patch
diff --git a/srcpkgs/libportal/patches/optional_docs.patch b/srcpkgs/libportal/patches/optional_docs.patch
deleted file mode 100644
index 57ec166c895d..000000000000
--- a/srcpkgs/libportal/patches/optional_docs.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From b7157e5d0c80981c74acfc7258683e84969649b0 Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <hadess@hadess.net>
-Date: Wed, 18 Mar 2020 16:11:41 +0100
-Subject: [PATCH] build: Make docs building optional
-
----
- meson.build | 4 +++-
- meson_options.txt | 3 ++-
- 2 files changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index 3ca0fb3..49fa112 100644
---- a/meson.build
-+++ b/meson.build
-@@ -25,7 +25,9 @@ top_inc = include_directories('.')
- libportal_inc = include_directories('libportal')
-
- subdir('libportal')
--subdir('doc')
-+if get_option('gtk_doc')
-+ subdir('doc')
-+endif
- if get_option('build-portal-test')
- subdir('portal-test')
- endif
-diff --git a/meson_options.txt b/meson_options.txt
-index f138e4f..8501dc9 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -1,3 +1,4 @@
- option('build-portal-test', type: 'boolean', value: false,
- description : 'Build the portal-test application')
--
-+option('gtk_doc', type: 'boolean', value: true,
-+ description : 'Build API reference with gtk-doc')
diff --git a/srcpkgs/libportal/template b/srcpkgs/libportal/template
index 48211c3767e1..2e8cd79422b2 100644
--- a/srcpkgs/libportal/template
+++ b/srcpkgs/libportal/template
@@ -1,7 +1,7 @@
# Template file for 'libportal'
pkgname=libportal
-version=0.3
-revision=2
+version=0.4
+revision=1
build_style=meson
configure_args="$(vopt_bool gtk_doc gtk_doc)"
hostmakedepends="pkg-config gtk-doc glib-devel"
@@ -11,7 +11,7 @@ maintainer="q66 <daniel@octaforge.org>"
license="LGPL-2.0-or-later"
homepage="https://github.com/flatpak/libportal"
distfiles="https://github.com/flatpak/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz"
-checksum=fd35d66357169e63e33ef46c43fdf22ddc07dbd960ec3462b58ca9ef15a65bd7
+checksum=3cd5f50907831cf236b40aa14c5a14ccbbf08828cecb3286efa82ce03cacef28
build_options="gtk_doc"
From 25809ca6d8a826cbbbea5ca3c6ab3b4d05a65e7c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 4 Feb 2022 02:26:52 +0100
Subject: [PATCH 2/2] gnome-todo: update to 41.0.
---
.../patches/fix-build-race-condition.patch | 65 ++
.../patches/gnome-todo-eds-libecal-2.0.patch | 567 ------------------
srcpkgs/gnome-todo/patches/libadwaita1.patch | 11 +
srcpkgs/gnome-todo/template | 18 +-
4 files changed, 88 insertions(+), 573 deletions(-)
create mode 100644 srcpkgs/gnome-todo/patches/fix-build-race-condition.patch
delete mode 100644 srcpkgs/gnome-todo/patches/gnome-todo-eds-libecal-2.0.patch
create mode 100644 srcpkgs/gnome-todo/patches/libadwaita1.patch
diff --git a/srcpkgs/gnome-todo/patches/fix-build-race-condition.patch b/srcpkgs/gnome-todo/patches/fix-build-race-condition.patch
new file mode 100644
index 000000000000..cffd79bd7dc9
--- /dev/null
+++ b/srcpkgs/gnome-todo/patches/fix-build-race-condition.patch
@@ -0,0 +1,65 @@
+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
+
diff --git a/srcpkgs/gnome-todo/patches/gnome-todo-eds-libecal-2.0.patch b/srcpkgs/gnome-todo/patches/gnome-todo-eds-libecal-2.0.patch
deleted file mode 100644
index 549c3ce9c4a0..000000000000
--- a/srcpkgs/gnome-todo/patches/gnome-todo-eds-libecal-2.0.patch
+++ /dev/null
@@ -1,567 +0,0 @@
-diff --git a/plugins/eds/gtd-eds-autoptr.h b/plugins/eds/gtd-eds-autoptr.h
-index eb9b011..78bd944 100644
---- a/plugins/eds/gtd-eds-autoptr.h
-+++ b/plugins/eds/gtd-eds-autoptr.h
-@@ -23,6 +23,5 @@
- #include <libecal/libecal.h>
-
- G_DEFINE_AUTOPTR_CLEANUP_FUNC (ECalComponent, g_object_unref);
--G_DEFINE_AUTOPTR_CLEANUP_FUNC (ECalComponentId, e_cal_component_free_id);
-+G_DEFINE_AUTOPTR_CLEANUP_FUNC (ECalComponentId, e_cal_component_id_free);
- G_DEFINE_AUTOPTR_CLEANUP_FUNC (ECalClient, g_object_unref);
--G_DEFINE_AUTOPTR_CLEANUP_FUNC (ESource, g_object_unref);
-diff --git a/plugins/eds/gtd-provider-eds.c b/plugins/eds/gtd-provider-eds.c
-index a403226..def4235 100644
---- a/plugins/eds/gtd-provider-eds.c
-+++ b/plugins/eds/gtd-provider-eds.c
-@@ -554,6 +554,7 @@ gtd_provider_eds_create_task (GtdProvider *provider,
-
- e_cal_client_create_object (client,
- e_cal_component_get_icalcomponent (component),
-+ E_CAL_OPERATION_FLAG_NONE,
- NULL,
- (GAsyncReadyCallback) on_task_created_cb,
- new_task);
-@@ -587,6 +588,7 @@ gtd_provider_eds_update_task (GtdProvider *provider,
- e_cal_client_modify_object (client,
- e_cal_component_get_icalcomponent (component),
- E_CAL_OBJ_MOD_THIS,
-+ E_CAL_OPERATION_FLAG_NONE,
- NULL,
- (GAsyncReadyCallback) on_task_modified_cb,
- task);
-@@ -616,9 +618,10 @@ gtd_provider_eds_remove_task (GtdProvider *provider,
- gtd_object_push_loading (GTD_OBJECT (provider));
-
- e_cal_client_remove_object (client,
-- id->uid,
-- id->rid,
-+ e_cal_component_id_get_uid (id),
-+ e_cal_component_id_get_rid (id),
- E_CAL_OBJ_MOD_THIS,
-+ E_CAL_OPERATION_FLAG_NONE,
- NULL,
- (GAsyncReadyCallback) on_task_removed_cb,
- provider);
-diff --git a/plugins/eds/gtd-task-eds.c b/plugins/eds/gtd-task-eds.c
-index 2c8cd8e..bd8f7ac 100644
---- a/plugins/eds/gtd-task-eds.c
-+++ b/plugins/eds/gtd-task-eds.c
-@@ -46,19 +46,19 @@ static GParamSpec *properties [N_PROPS];
- */
-
- static GDateTime*
--convert_icaltime (const icaltimetype *date)
-+convert_icaltime (const ICalTime *date)
- {
- GDateTime *dt;
-
- if (!date)
- return NULL;
-
-- dt = g_date_time_new_utc (date->year,
-- date->month,
-- date->day,
-- date->is_date ? 0 : date->hour,
-- date->is_date ? 0 : date->minute,
-- date->is_date ? 0 : date->second);
-+ dt = g_date_time_new_utc (i_cal_time_get_year (date),
-+ i_cal_time_get_month (date),
-+ i_cal_time_get_day (date),
-+ i_cal_time_is_date (date) ? 0 : i_cal_time_get_hour (date),
-+ i_cal_time_is_date (date) ? 0 : i_cal_time_get_minute (date),
-+ i_cal_time_is_date (date) ? 0 : i_cal_time_get_second (date));
-
- return dt;
- }
-@@ -67,19 +67,20 @@ static void
- set_description (GtdTaskEds *self,
- const gchar *description)
- {
-- ECalComponentText text;
-+ ECalComponentText *text;
- GSList note;
-
-- text.value = description && *description ? description : "";
-- text.altrep = NULL;
-+ text = e_cal_component_text_new (description ? description : "", NULL);
-
-- note.data = &text;
-+ note.data = text;
- note.next = NULL;
-
- g_clear_pointer (&self->description, g_free);
- self->description = g_strdup (description);
-
-- e_cal_component_set_description_list (self->component, ¬e);
-+ e_cal_component_set_descriptions (self->component, (description && *description) ? ¬e : NULL);
-+
-+ e_cal_component_text_free (text);
- }
-
- static void
-@@ -90,7 +91,7 @@ setup_description (GtdTaskEds *self)
- GSList *l;
-
- /* concatenates the multiple descriptions a task may have */
-- e_cal_component_get_description_list (self->component, &text_list);
-+ text_list = e_cal_component_get_descriptions (self->component);
-
- for (l = text_list; l != NULL; l = l->next)
- {
-@@ -105,21 +106,21 @@ setup_description (GtdTaskEds *self)
- {
- carrier = g_strconcat (desc,
- "\n",
-- text->value,
-+ e_cal_component_text_get_value (text),
- NULL);
- g_free (desc);
- desc = carrier;
- }
- else
- {
-- desc = g_strdup (text->value);
-+ desc = g_strdup (e_cal_component_text_get_value (text));
- }
- }
- }
-
- set_description (self, desc);
-
-- e_cal_component_free_text_list (text_list);
-+ g_slist_free_full (text_list, e_cal_component_text_free);
- }
-
-
-@@ -138,7 +139,7 @@ gtd_task_eds_get_uid (GtdObject *object)
- self = GTD_TASK_EDS (object);
-
- if (self->component)
-- e_cal_component_get_uid (self->component, &uid);
-+ uid = e_cal_component_get_uid (self->component);
- else
- uid = NULL;
-
-@@ -159,7 +160,7 @@ gtd_task_eds_set_uid (GtdObject *object,
- if (!self->component)
- return;
-
-- e_cal_component_get_uid (self->component, ¤t_uid);
-+ current_uid = e_cal_component_get_uid (self->component);
-
- if (g_strcmp0 (current_uid, uid) != 0)
- {
-@@ -177,7 +178,7 @@ gtd_task_eds_set_uid (GtdObject *object,
- static gboolean
- gtd_task_eds_get_complete (GtdTask *task)
- {
-- icalproperty_status status;
-+ ICalPropertyStatus status;
- GtdTaskEds *self;
- gboolean completed;
-
-@@ -185,8 +186,8 @@ gtd_task_eds_get_complete (GtdTask *task)
-
- self = GTD_TASK_EDS (task);
-
-- e_cal_component_get_status (self->component, &status);
-- completed = status == ICAL_STATUS_COMPLETED;
-+ status = e_cal_component_get_status (self->component);
-+ completed = status == I_CAL_STATUS_COMPLETED;
-
- return completed;
- }
-@@ -195,8 +196,8 @@ static void
- gtd_task_eds_set_complete (GtdTask *task,
- gboolean complete)
- {
-- icalproperty_status status;
-- icaltimetype *dt;
-+ ICalPropertyStatus status;
-+ ICalTime *dt;
- GtdTaskEds *self;
- gint percent;
-
-@@ -209,54 +210,54 @@ gtd_task_eds_set_complete (GtdTask *task,
- percent = 100;
- status = ICAL_STATUS_COMPLETED;
-
-- dt = g_new0 (icaltimetype, 1);
-- dt->year = g_date_time_get_year (now);
-- dt->month = g_date_time_get_month (now);
-- dt->day = g_date_time_get_day_of_month (now);
-- dt->hour = g_date_time_get_hour (now);
-- dt->minute = g_date_time_get_minute (now);
-- dt->second = g_date_time_get_seconds (now);
-- dt->zone = icaltimezone_get_utc_timezone ();
-+ dt = i_cal_time_new_null_time ();
-+ i_cal_time_set_date (dt,
-+ g_date_time_get_year (now),
-+ g_date_time_get_month (now),
-+ g_date_time_get_day_of_month (now));
-+ i_cal_time_set_time (dt,
-+ g_date_time_get_hour (now),
-+ g_date_time_get_minute (now),
-+ g_date_time_get_seconds (now));
-+ i_cal_time_set_timezone (dt, i_cal_timezone_get_utc_timezone ());
-
- /* convert timezone
- *
- * FIXME: This does not do anything until we have an ical
- * timezone associated with the task
- */
-- icaltimezone_convert_time (dt, NULL, icaltimezone_get_utc_timezone ());
-+ i_cal_time_convert_timezone (dt, NULL, i_cal_timezone_get_utc_timezone ());
- }
- else
- {
- dt = NULL;
- percent = 0;
-- status = ICAL_STATUS_NEEDSACTION;
-+ status = I_CAL_STATUS_NEEDSACTION;
- }
-
-- e_cal_component_set_percent_as_int (self->component, percent);
-+ e_cal_component_set_percent_complete (self->component, percent);
- e_cal_component_set_status (self->component, status);
- e_cal_component_set_completed (self->component, dt);
-
-- if (dt)
-- e_cal_component_free_icaltimetype (dt);
-+ g_clear_object (&dt);
- }
-
- static GDateTime*
- gtd_task_eds_get_creation_date (GtdTask *task)
- {
-- icaltimetype *idt;
-+ ICalTime *idt;
- GtdTaskEds *self;
- GDateTime *dt;
-
- self = GTD_TASK_EDS (task);
-- idt = NULL;
- dt = NULL;
-
-- e_cal_component_get_created (self->component, &idt);
-+ idt = e_cal_component_get_created (self->component);
-
- if (idt)
- dt = convert_icaltime (idt);
-
-- g_clear_pointer (&idt, e_cal_component_free_icaltimetype);
-+ g_clear_object (&idt);
-
- return dt;
- }
-@@ -286,7 +287,7 @@ gtd_task_eds_set_description (GtdTask *task,
- static GDateTime*
- gtd_task_eds_get_due_date (GtdTask *task)
- {
-- ECalComponentDateTime comp_dt;
-+ ECalComponentDateTime *comp_dt;
- GtdTaskEds *self;
- GDateTime *date;
-
-@@ -294,10 +295,12 @@ gtd_task_eds_get_due_date (GtdTask *task)
-
- self = GTD_TASK_EDS (task);
-
-- e_cal_component_get_due (self->component, &comp_dt);
-+ comp_dt = e_cal_component_get_due (self->component);
-+ if (!comp_dt)
-+ return NULL;
-
-- date = convert_icaltime (comp_dt.value);
-- e_cal_component_free_datetime (&comp_dt);
-+ date = convert_icaltime (e_cal_component_datetime_get_value (comp_dt));
-+ e_cal_component_datetime_free (comp_dt);
-
- return date;
- }
-@@ -317,11 +320,10 @@ gtd_task_eds_set_due_date (GtdTask *task,
-
- if (dt != current_dt)
- {
-- ECalComponentDateTime comp_dt;
-- icaltimetype *idt;
-+ ECalComponentDateTime *comp_dt;
-+ ICalTime *idt;
-
-- comp_dt.value = NULL;
-- comp_dt.tzid = NULL;
-+ comp_dt = NULL;
- idt = NULL;
-
- if (!current_dt ||
-@@ -329,36 +331,34 @@ gtd_task_eds_set_due_date (GtdTask *task,
- dt &&
- g_date_time_compare (current_dt, dt) != 0))
- {
-- idt = g_new0 (icaltimetype, 1);
-+ idt = i_cal_time_new_null_time ();
-
- g_date_time_ref (dt);
-
- /* Copy the given dt */
-- idt->year = g_date_time_get_year (dt);
-- idt->month = g_date_time_get_month (dt);
-- idt->day = g_date_time_get_day_of_month (dt);
-- idt->hour = g_date_time_get_hour (dt);
-- idt->minute = g_date_time_get_minute (dt);
-- idt->second = g_date_time_get_seconds (dt);
-- idt->is_date = (idt->hour == 0 &&
-- idt->minute == 0 &&
-- idt->second == 0);
--
-- comp_dt.tzid = g_strdup ("UTC");
-+ i_cal_time_set_date (idt,
-+ g_date_time_get_year (dt),
-+ g_date_time_get_month (dt),
-+ g_date_time_get_day_of_month (dt));
-+ i_cal_time_set_time (idt,
-+ g_date_time_get_hour (dt),
-+ g_date_time_get_minute (dt),
-+ g_date_time_get_seconds (dt));
-+ i_cal_time_set_is_date (idt,
-+ i_cal_time_get_hour (idt) == 0 &&
-+ i_cal_time_get_minute (idt) == 0 &&
-+ i_cal_time_get_second (idt) == 0);
-
-- comp_dt.value = idt;
-+ comp_dt = e_cal_component_datetime_new_take (idt, g_strdup ("UTC"));
-
-- e_cal_component_set_due (self->component, &comp_dt);
-+ e_cal_component_set_due (self->component, comp_dt);
-
-- e_cal_component_free_datetime (&comp_dt);
-+ e_cal_component_datetime_free (comp_dt);
-
- g_date_time_unref (dt);
- }
- else if (!dt)
- {
-- idt = NULL;
-- comp_dt.tzid = NULL;
--
- e_cal_component_set_due (self->component, NULL);
- }
- }
-@@ -369,19 +369,13 @@ gtd_task_eds_set_due_date (GtdTask *task,
- static gint32
- gtd_task_eds_get_priority (GtdTask *task)
- {
-- g_autofree gint *priority = NULL;
- GtdTaskEds *self;
-
- g_assert (GTD_IS_TASK_EDS (task));
-
- self = GTD_TASK_EDS (task);
-
-- e_cal_component_get_priority (self->component, &priority);
--
-- if (!priority)
-- return -1;
--
-- return *priority;
-+ return e_cal_component_get_priority (self->component);
- }
-
- static void
-@@ -394,29 +388,26 @@ gtd_task_eds_set_priority (GtdTask *task,
-
- self = GTD_TASK_EDS (task);
-
-- e_cal_component_set_priority (self->component, &priority);
-+ e_cal_component_set_priority (self->component, priority);
- }
-
- static const gchar*
- gtd_task_eds_get_title (GtdTask *task)
- {
-- ECalComponentText summary;
- GtdTaskEds *self;
-
- g_return_val_if_fail (GTD_IS_TASK_EDS (task), NULL);
-
- self = GTD_TASK_EDS (task);
-
-- e_cal_component_get_summary (self->component, &summary);
--
-- return summary.value;
-+ return i_cal_component_get_summary (e_cal_component_get_icalcomponent (self->component));
- }
-
- static void
- gtd_task_eds_set_title (GtdTask *task,
- const gchar *title)
- {
-- ECalComponentText new_summary;
-+ ECalComponentText *new_summary;
- GtdTaskEds *self;
-
- g_return_if_fail (GTD_IS_TASK_EDS (task));
-@@ -424,10 +415,11 @@ gtd_task_eds_set_title (GtdTask *task,
-
- self = GTD_TASK_EDS (task);
-
-- new_summary.value = title;
-- new_summary.altrep = NULL;
-+ new_summary = e_cal_component_text_new (title, NULL);
-
-- e_cal_component_set_summary (self->component, &new_summary);
-+ e_cal_component_set_summary (self->component, new_summary);
-+
-+ e_cal_component_text_free (new_summary);
- }
-
-
-@@ -436,10 +428,10 @@ gtd_task_eds_subtask_added (GtdTask *task,
- GtdTask *subtask)
- {
- g_autoptr (GList) subtasks = NULL;
-- ECalComponentId *id;
-+ const gchar *uid;
- ECalComponent *comp;
-- icalcomponent *ical_comp;
-- icalproperty *property;
-+ ICalComponent *ical_comp;
-+ ICalProperty *property;
- GtdTaskEds *subtask_self;
- GtdTaskEds *self;
-
-@@ -450,17 +442,17 @@ gtd_task_eds_subtask_added (GtdTask *task,
- /* Hook with parent's :subtask_added */
- GTD_TASK_CLASS (gtd_task_eds_parent_class)->subtask_added (task, subtask);
-
-- id = e_cal_component_get_id (self->component);
-+ uid = e_cal_component_get_uid (self->component);
- comp = subtask_self->component;
- ical_comp = e_cal_component_get_icalcomponent (comp);
-- property = icalcomponent_get_first_property (ical_comp, ICAL_RELATEDTO_PROPERTY);
-+ property = i_cal_component_get_first_property (ical_comp, I_CAL_RELATEDTO_PROPERTY);
-
- if (property)
-- icalproperty_set_relatedto (property, id->uid);
-+ i_cal_property_set_relatedto (property, uid);
- else
-- icalcomponent_add_property (ical_comp, icalproperty_new_relatedto (id->uid));
-+ i_cal_component_take_property (ical_comp, i_cal_property_new_relatedto (uid));
-
-- e_cal_component_free_id (id);
-+ g_clear_object (&property);
- }
-
- static void
-@@ -468,8 +460,8 @@ gtd_task_eds_subtask_removed (GtdTask *task,
- GtdTask *subtask)
- {
- g_autoptr (GList) subtasks = NULL;
-- icalcomponent *ical_comp;
-- icalproperty *property;
-+ ICalComponent *ical_comp;
-+ ICalProperty *property;
- GtdTaskEds *subtask_self;
-
- subtask_self = GTD_TASK_EDS (subtask);
-@@ -480,12 +472,13 @@ gtd_task_eds_subtask_removed (GtdTask *task,
-
- /* Remove the parent link from the subtask's component */
- ical_comp = e_cal_component_get_icalcomponent (subtask_self->component);
-- property = icalcomponent_get_first_property (ical_comp, ICAL_RELATEDTO_PROPERTY);
-+ property = i_cal_component_get_first_property (ical_comp, I_CAL_RELATEDTO_PROPERTY);
-
- if (!property)
- return;
-
-- icalcomponent_remove_property (ical_comp, property);
-+ i_cal_component_remove_property (ical_comp, property);
-+ g_object_unref (property);
- }
-
-
-diff --git a/plugins/eds/gtd-task-list-eds.c b/plugins/eds/gtd-task-list-eds.c
-index eb48a73..5b71718 100644
---- a/plugins/eds/gtd-task-list-eds.c
-+++ b/plugins/eds/gtd-task-list-eds.c
-@@ -85,19 +85,19 @@ setup_parent_task (GtdTaskListEds *self,
- GtdTask *task)
- {
- ECalComponent *component;
-- icalcomponent *ical_comp;
-- icalproperty *property;
-+ ICalComponent *ical_comp;
-+ ICalProperty *property;
- GtdTask *parent_task;
- const gchar *parent_uid;
-
- component = gtd_task_eds_get_component (GTD_TASK_EDS (task));
- ical_comp = e_cal_component_get_icalcomponent (component);
-- property = icalcomponent_get_first_property (ical_comp, ICAL_RELATEDTO_PROPERTY);
-+ property = i_cal_component_get_first_property (ical_comp, I_CAL_RELATEDTO_PROPERTY);
-
- if (!property)
- return;
-
-- parent_uid = icalproperty_get_relatedto (property);
-+ parent_uid = i_cal_property_get_relatedto (property);
- parent_task = gtd_task_list_get_task_by_id (GTD_TASK_LIST (self), parent_uid);
-
- if (parent_task)
-@@ -112,6 +112,8 @@ setup_parent_task (GtdTaskListEds *self,
-
- g_ptr_array_add (self->pending_subtasks, data);
- }
-+
-+ g_object_unref (property);
- }
-
- static void
-@@ -161,8 +163,8 @@ on_view_objects_added_cb (ECalClientView *view,
- GtdTask *task;
- const gchar *uid;
-
-- component = e_cal_component_new_from_string (icalcomponent_as_ical_string (l->data));
-- e_cal_component_get_uid (component, &uid);
-+ component = e_cal_component_new_from_icalcomponent (i_cal_component_clone (l->data));
-+ uid = e_cal_component_get_uid (component);
-
- task = gtd_task_list_get_task_by_id (self, uid);
-
-@@ -211,8 +213,8 @@ on_view_objects_modified_cb (ECalClientView *view,
- GtdTask *task;
- const gchar *uid;
-
-- component = e_cal_component_new_from_string (icalcomponent_as_ical_string (l->data));
-- e_cal_component_get_uid (component, &uid);
-+ component = e_cal_component_new_from_icalcomponent (i_cal_component_clone (l->data));
-+ uid = e_cal_component_get_uid (component);
-
- task = gtd_task_list_get_task_by_id (self, uid);
-
-@@ -244,7 +246,7 @@ on_view_objects_removed_cb (ECalClientView *view,
- GtdTask *task;
-
- id = l->data;
-- task = gtd_task_list_get_task_by_id (self, id->uid);
-+ task = gtd_task_list_get_task_by_id (self, e_cal_component_id_get_uid (id));
-
- if (!task)
- continue;
-diff --git a/plugins/eds/meson.build b/plugins/eds/meson.build
-index ea84426..b37f0c6 100644
---- a/plugins/eds/meson.build
-+++ b/plugins/eds/meson.build
-@@ -8,10 +8,9 @@ plugins_ldflags += ['-Wl,--undefined=gtd_plugin_eds_register_types']
- ################
-
- eds_plugin_deps = [
-- dependency('libecal-1.2', version: '>= 3.13.90'),
-+ dependency('libecal-2.0', version: '>= 3.33.1'),
- dependency('libedataserver-1.2', version: '>= 3.17.1'),
- dependency('libedataserverui-1.2', version: '>= 3.17.1'),
-- dependency('libical', version: '>= 0.43'),
- ]
-
- eds_plugin_deps += gnome_todo_deps
diff --git a/srcpkgs/gnome-todo/patches/libadwaita1.patch b/srcpkgs/gnome-todo/patches/libadwaita1.patch
new file mode 100644
index 000000000000..691cf990ec4b
--- /dev/null
+++ b/srcpkgs/gnome-todo/patches/libadwaita1.patch
@@ -0,0 +1,11 @@
+--- 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>
diff --git a/srcpkgs/gnome-todo/template b/srcpkgs/gnome-todo/template
index 5fe6d1d7bc84..fe2e78bab912 100644
--- a/srcpkgs/gnome-todo/template
+++ b/srcpkgs/gnome-todo/template
@@ -1,19 +1,25 @@
# Template file for 'gnome-todo'
pkgname=gnome-todo
-version=3.28.1
-revision=7
+version=41.0
+revision=1
build_style=meson
-build_helper="gir qemu"
+build_helper="gir"
configure_args="-Dintrospection=$(vopt_if gir true false)"
-hostmakedepends="glib-devel intltool itstool pkg-config
+hostmakedepends="pkg-config glib-devel gettext itstool
$(vopt_if gir 'gobject-introspection')"
-makedepends="evolution-data-server-devel libpeas-devel rest-devel"
+makedepends="gtk4-devel libadwaita-devel gnome-online-accounts-devel
+ libpeas-devel libportal-devel evolution-data-server-devel"
short_desc="Task manager designed to perfectly fit the GNOME desktop"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Todo"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c7571fc040d8901dd0e528282ef0655687f23f29d304057c72548ab3e2c2cf23
+checksum=5a657c978f451f61fb773f0b14f3121b9236fc504b41eb20940b4ed2004224e5
build_options="gir"
build_options_default="gir"
+
+do_check() {
+ glib-compile-schemas data
+ GSETTINGS_SCHEMA_DIR=$wrksrc/data ninja -C build test
+}
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PR PATCH] [Merged]: libportal: update to 0.4, gnome-todo: update to 41.0
2022-02-06 20:33 [PR PATCH] libportal: update to 0.4, gnome-todo: update to 41.0 paper42
2022-02-12 22:43 ` [PR PATCH] [Updated] " paper42
2022-02-19 20:56 ` paper42
@ 2022-02-19 21:57 ` paper42
2 siblings, 0 replies; 4+ messages in thread
From: paper42 @ 2022-02-19 21:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1090 bytes --]
There's a merged pull request on the void-packages repository
libportal: update to 0.4, gnome-todo: update to 41.0
https://github.com/void-linux/void-packages/pull/35451
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-02-19 21:57 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-02-06 20:33 [PR PATCH] libportal: update to 0.4, gnome-todo: update to 41.0 paper42
2022-02-12 22:43 ` [PR PATCH] [Updated] " paper42
2022-02-19 20:56 ` paper42
2022-02-19 21:57 ` [PR PATCH] [Merged]: " paper42
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).