From owner-dev-commits-ports-main@freebsd.org Wed May 26 23:50:17 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 529AE649094; Wed, 26 May 2021 23:50:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Fr73r6x1Xz504G; Wed, 26 May 2021 23:50:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A3EFD1A1B9; Wed, 26 May 2021 23:50:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 14QNoGql012953; Wed, 26 May 2021 23:50:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 14QNoGvI012945; Wed, 26 May 2021 23:50:16 GMT (envelope-from git) Date: Wed, 26 May 2021 23:50:16 GMT Message-Id: <202105262350.14QNoGvI012945@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Neel Chauhan Subject: git: 563f5b42363f - main - deskutils/gnome-todo: Update to 40.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: nc X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 563f5b42363f4dd7aa03175d0ba20a764d642874 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 May 2021 23:50:17 -0000 The branch main has been updated by nc: URL: https://cgit.FreeBSD.org/ports/commit/?id=563f5b42363f4dd7aa03175d0ba20a764d642874 commit 563f5b42363f4dd7aa03175d0ba20a764d642874 Author: Neel Chauhan AuthorDate: 2021-05-26 23:49:21 +0000 Commit: Neel Chauhan CommitDate: 2021-05-26 23:50:04 +0000 deskutils/gnome-todo: Update to 40.0 --- deskutils/gnome-todo/Makefile | 23 +- deskutils/gnome-todo/distinfo | 6 +- .../files/patch-plugins_eds_gtd-eds-autoptr_h | 15 - .../files/patch-plugins_eds_gtd-provider-eds_c | 36 -- .../files/patch-plugins_eds_gtd-task-eds_c | 441 --------------------- .../files/patch-plugins_eds_gtd-task-list-eds_c | 71 ---- .../gnome-todo/files/patch-plugins_eds_meson_build | 19 - .../gnome-todo/files/patch-src_plugins_meson.build | 10 + deskutils/gnome-todo/pkg-plist | 46 ++- 9 files changed, 56 insertions(+), 611 deletions(-) diff --git a/deskutils/gnome-todo/Makefile b/deskutils/gnome-todo/Makefile index a7097bb84c82..a0f81584da98 100644 --- a/deskutils/gnome-todo/Makefile +++ b/deskutils/gnome-todo/Makefile @@ -1,8 +1,7 @@ # Created by: Gustau Perez PORTNAME= gnome-todo -PORTVERSION= 3.28.1 -PORTREVISION= 4 +PORTVERSION= 40.0 CATEGORIES= deskutils gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome3 @@ -14,24 +13,22 @@ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= appstream-util:devel/appstream-glib -LIB_DEPENDS= libpeas-1.0.so:devel/libpeas \ - libgoa-1.0.so:net/gnome-online-accounts \ +LIB_DEPENDS= libgoa-1.0.so:net/gnome-online-accounts \ + libgraphene-1.0.so:graphics/graphene \ + libical.so:devel/libical \ + libpeas-1.0.so:devel/libpeas \ libsecret-1.so:security/libsecret \ - libsoup-2.4.so:devel/libsoup \ - libical.so:devel/libical + libsoup-2.4.so:devel/libsoup PORTSCOUT= limitw:1,even USES= compiler:c11 gettext gnome localbase meson pkgconfig \ python:3.4+,build shebangfix tar:xz -USE_GNOME= cairo evolutiondataserver3 gnomedesktop3 gtk30 introspection +USE_GNOME= cairo evolutiondataserver3 gnomedesktop3 gtk40 introspection \ + libadwaita USE_LDCONFIG= yes -INSTALLS_ICONS= yes -SHEBANG_FILES= meson_post_install.py +#INSTALLS_ICONS= yes -GLIB_SCHEMAS= org.gnome.todo.background.gschema.xml \ - org.gnome.todo.enums.xml \ - org.gnome.todo.gschema.xml \ - org.gnome.todo.txt.gschema.xml +GLIB_SCHEMAS= org.gnome.todo.gschema.xml .include diff --git a/deskutils/gnome-todo/distinfo b/deskutils/gnome-todo/distinfo index a0450801a744..c88f0e56e8e2 100644 --- a/deskutils/gnome-todo/distinfo +++ b/deskutils/gnome-todo/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1526105432 -SHA256 (gnome3/gnome-todo-3.28.1.tar.xz) = c7571fc040d8901dd0e528282ef0655687f23f29d304057c72548ab3e2c2cf23 -SIZE (gnome3/gnome-todo-3.28.1.tar.xz) = 751448 +TIMESTAMP = 1622067595 +SHA256 (gnome3/gnome-todo-40.0.tar.xz) = 68097c96f0675c7142667d104344e83472dd7fcc538fec0acdbf6026bb9ca1b1 +SIZE (gnome3/gnome-todo-40.0.tar.xz) = 520180 diff --git a/deskutils/gnome-todo/files/patch-plugins_eds_gtd-eds-autoptr_h b/deskutils/gnome-todo/files/patch-plugins_eds_gtd-eds-autoptr_h deleted file mode 100644 index a7d65cdbceeb..000000000000 --- a/deskutils/gnome-todo/files/patch-plugins_eds_gtd-eds-autoptr_h +++ /dev/null @@ -1,15 +0,0 @@ -$OpenBSD: patch-plugins_eds_gtd-eds-autoptr_h,v 1.2 2019/11/02 10:04:20 ajacoutot Exp $ - -Fix for evolution-data-server >= 3.34 (From upstream via Arch Linux). - -Index: plugins/eds/gtd-eds-autoptr.h ---- plugins/eds/gtd-eds-autoptr.h.orig -+++ plugins/eds/gtd-eds-autoptr.h -@@ -23,6 +23,5 @@ - #include - - 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/deskutils/gnome-todo/files/patch-plugins_eds_gtd-provider-eds_c b/deskutils/gnome-todo/files/patch-plugins_eds_gtd-provider-eds_c deleted file mode 100644 index f1ac8ea3dc08..000000000000 --- a/deskutils/gnome-todo/files/patch-plugins_eds_gtd-provider-eds_c +++ /dev/null @@ -1,36 +0,0 @@ -$OpenBSD: patch-plugins_eds_gtd-provider-eds_c,v 1.1 2019/11/02 10:04:20 ajacoutot Exp $ - -Fix for evolution-data-server >= 3.34 (From upstream via Arch Linux). - -Index: plugins/eds/gtd-provider-eds.c ---- plugins/eds/gtd-provider-eds.c.orig -+++ 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/deskutils/gnome-todo/files/patch-plugins_eds_gtd-task-eds_c b/deskutils/gnome-todo/files/patch-plugins_eds_gtd-task-eds_c deleted file mode 100644 index 8099ceefdafc..000000000000 --- a/deskutils/gnome-todo/files/patch-plugins_eds_gtd-task-eds_c +++ /dev/null @@ -1,441 +0,0 @@ -$OpenBSD: patch-plugins_eds_gtd-task-eds_c,v 1.1 2019/11/02 10:04:20 ajacoutot Exp $ - -Fix for evolution-data-server >= 3.34 (From upstream via Arch Linux). - -Index: plugins/eds/gtd-task-eds.c ---- plugins/eds/gtd-task-eds.c.orig -+++ 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); -+ 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.tzid = g_strdup ("UTC"); -+ comp_dt = e_cal_component_datetime_new_take (idt, g_strdup ("UTC")); - -- comp_dt.value = idt; -+ e_cal_component_set_due (self->component, comp_dt); - -- e_cal_component_set_due (self->component, &comp_dt); -+ e_cal_component_datetime_free (comp_dt); - -- e_cal_component_free_datetime (&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/deskutils/gnome-todo/files/patch-plugins_eds_gtd-task-list-eds_c b/deskutils/gnome-todo/files/patch-plugins_eds_gtd-task-list-eds_c deleted file mode 100644 index 33f83c583305..000000000000 --- a/deskutils/gnome-todo/files/patch-plugins_eds_gtd-task-list-eds_c +++ /dev/null @@ -1,71 +0,0 @@ -$OpenBSD: patch-plugins_eds_gtd-task-list-eds_c,v 1.1 2019/11/02 10:04:20 ajacoutot Exp $ - -Fix for evolution-data-server >= 3.34 (From upstream via Arch Linux). - -Index: plugins/eds/gtd-task-list-eds.c ---- plugins/eds/gtd-task-list-eds.c.orig -+++ 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/deskutils/gnome-todo/files/patch-plugins_eds_meson_build b/deskutils/gnome-todo/files/patch-plugins_eds_meson_build deleted file mode 100644 index 7645b10090b3..000000000000 --- a/deskutils/gnome-todo/files/patch-plugins_eds_meson_build +++ /dev/null @@ -1,19 +0,0 @@ -$OpenBSD: patch-plugins_eds_meson_build,v 1.1 2019/11/02 10:04:20 ajacoutot Exp $ - -Fix for evolution-data-server >= 3.34 (From upstream via Arch Linux). - -Index: plugins/eds/meson.build ---- plugins/eds/meson.build.orig -+++ plugins/eds/meson.build -@@ -8,10 +8,9 @@ plugins_ldflags += ['-Wl,--undefined=gtd_plugin_eds_re - ################ - - 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/deskutils/gnome-todo/files/patch-src_plugins_meson.build b/deskutils/gnome-todo/files/patch-src_plugins_meson.build new file mode 100644 index 000000000000..8e6e0c3cfc46 --- /dev/null +++ b/deskutils/gnome-todo/files/patch-src_plugins_meson.build @@ -0,0 +1,10 @@ +--- src/plugins/meson.build.orig 2021-05-26 23:37:29 UTC ++++ src/plugins/meson.build +@@ -13,7 +13,6 @@ plugins_conf = configuration_data() + plugins_conf.set('VERSION', gnome_todo_version) + + subdir('all-tasks-panel') +-subdir('background') + subdir('dark-theme') + subdir('eds') + subdir('inbox-panel') diff --git a/deskutils/gnome-todo/pkg-plist b/deskutils/gnome-todo/pkg-plist index dbdeeae26c35..776e27d21eeb 100644 --- a/deskutils/gnome-todo/pkg-plist +++ b/deskutils/gnome-todo/pkg-plist @@ -1,41 +1,58 @@ bin/gnome-todo include/gnome-todo/gnome-todo.h include/gnome-todo/gtd-activatable.h -include/gnome-todo/gtd-enums.h +include/gnome-todo/gtd-animatable.h +include/gnome-todo/gtd-animation-utils.h +include/gnome-todo/gtd-bin-layout.h +include/gnome-todo/gtd-clock.h +include/gnome-todo/gtd-easing.h +include/gnome-todo/gtd-interval.h +include/gnome-todo/gtd-keyframe-transition.h +include/gnome-todo/gtd-list-model-filter.h +include/gnome-todo/gtd-list-store.h include/gnome-todo/gtd-manager.h +include/gnome-todo/gtd-max-size-layout.h +include/gnome-todo/gtd-menu-button.h include/gnome-todo/gtd-notification.h include/gnome-todo/gtd-object.h +include/gnome-todo/gtd-omni-area-addin.h +include/gnome-todo/gtd-omni-area.h include/gnome-todo/gtd-panel.h +include/gnome-todo/gtd-property-transition.h +include/gnome-todo/gtd-provider-popover.h include/gnome-todo/gtd-provider.h +include/gnome-todo/gtd-star-widget.h include/gnome-todo/gtd-task-list-view.h include/gnome-todo/gtd-task-list.h include/gnome-todo/gtd-task.h -include/gnome-todo/gtd-timer.h +include/gnome-todo/gtd-timeline.h +include/gnome-todo/gtd-transition.h include/gnome-todo/gtd-types.h include/gnome-todo/gtd-utils.h +include/gnome-todo/gtd-widget.h include/gnome-todo/gtd-window.h +include/gnome-todo/gtd-workspace.h lib/girepository-1.0/Gtd-1.0.typelib -lib/gnome-todo/plugins/score/score.plugin -lib/gnome-todo/plugins/score/score/__init__.py -lib/gnome-todo/plugins/unscheduled-panel/unscheduled-panel.plugin -lib/gnome-todo/plugins/unscheduled-panel/unscheduled-panel/__init__.py libdata/pkgconfig/gnome-todo.pc share/applications/org.gnome.Todo.desktop share/dbus-1/services/org.gnome.Todo.service share/gir-1.0/Gtd-1.0.gir -%%DATADIR%%/org.gnome.Todo.Autostart.desktop -share/icons/hicolor/16x16/apps/org.gnome.Todo.png -share/icons/hicolor/22x22/apps/org.gnome.Todo.png -share/icons/hicolor/256x256/apps/org.gnome.Todo.png -share/icons/hicolor/32x32/apps/org.gnome.Todo.png -share/icons/hicolor/48x48/apps/org.gnome.Todo.png -share/icons/hicolor/512x512/apps/org.gnome.Todo.png +share/icons/hicolor/scalable/apps/org.gnome.Todo.Devel.svg +share/icons/hicolor/scalable/apps/org.gnome.Todo.svg +share/icons/hicolor/symbolic/actions/builder-view-left-pane-symbolic.svg +share/icons/hicolor/symbolic/actions/drag-handle-symbolic.svg +share/icons/hicolor/symbolic/actions/mail-inbox-symbolic.svg +share/icons/hicolor/symbolic/actions/view-tasks-all-symbolic.svg +share/icons/hicolor/symbolic/actions/view-tasks-today-symbolic.svg +share/icons/hicolor/symbolic/actions/view-tasks-unscheduled-symbolic.svg +share/icons/hicolor/symbolic/actions/view-tasks-week-symbolic.svg share/icons/hicolor/symbolic/apps/org.gnome.Todo-symbolic.svg share/locale/af/LC_MESSAGES/gnome-todo.mo share/locale/ar/LC_MESSAGES/gnome-todo.mo share/locale/be/LC_MESSAGES/gnome-todo.mo share/locale/ca/LC_MESSAGES/gnome-todo.mo share/locale/ca@valencia/LC_MESSAGES/gnome-todo.mo +share/locale/ckb/LC_MESSAGES/gnome-todo.mo share/locale/cs/LC_MESSAGES/gnome-todo.mo share/locale/da/LC_MESSAGES/gnome-todo.mo share/locale/de/LC_MESSAGES/gnome-todo.mo @@ -61,6 +78,9 @@ share/locale/kk/LC_MESSAGES/gnome-todo.mo share/locale/ko/LC_MESSAGES/gnome-todo.mo share/locale/lt/LC_MESSAGES/gnome-todo.mo share/locale/lv/LC_MESSAGES/gnome-todo.mo +share/locale/mjw/LC_MESSAGES/gnome-todo.mo +share/locale/ml/LC_MESSAGES/gnome-todo.mo +share/locale/ms/LC_MESSAGES/gnome-todo.mo share/locale/nb/LC_MESSAGES/gnome-todo.mo share/locale/ne/LC_MESSAGES/gnome-todo.mo share/locale/nl/LC_MESSAGES/gnome-todo.mo