Received: from mail-ej1-f41.google.com (mail-ej1-f41.google.com [209.85.218.41]) by mx.groups.io with SMTP id smtpd.web11.6521.1603965835491692855 for ; Thu, 29 Oct 2020 03:03:55 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20161025 header.b=tlJ9IVqd; spf=pass (domain: gmail.com, ip: 209.85.218.41, mailfrom: alex.kanavin@gmail.com) Received: by mail-ej1-f41.google.com with SMTP id bn26so2983573ejb.6 for ; Thu, 29 Oct 2020 03:03:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=DiR+pRHauRP4c3PW6o4LY7KwqKPUCFmbBUcz0TjdntQ=; b=tlJ9IVqdyGcJOsyYX+AnK857xRtBsIF223ed/zBKkSb2+85oOMiacIS4NNZjlOpgyC ElijR4AMwFCP27G+CuFgZhgg9BFFhRvI8bwnM+621LHk9AtNuFZdDGO+1aFUNuR9QNum tkGulFxkTDm2r/9vwn5Ynx4ns/Y4CEKNLiU2OWz5y1zRVMVi9i8xvFkzNvyQPFRN3Oiz 9GyUCZ82AfOQ7Q5eCbOJUW0loLKgCQmn1lE+8tnyySOjhoDhdlIzQdNpVtFkSrrocm33 6D3cAq/Dl0vnuC6RJRLUWhzPsFVAYqO9shuNARH3eRXXnAU15AB5vQ1a7CsE3D5pngAI ck1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=DiR+pRHauRP4c3PW6o4LY7KwqKPUCFmbBUcz0TjdntQ=; b=pT+WBIts+nJT5U61iv7jnaziKx3he/d5TQEuGZhtD5qAtMfPMCYzoKTS0LIe+64C3j YGp4/RycsoAZb2N//jNym3SVw/Wx+kPyU/BVcgByPlYdbtpGbTVkBYAIaSTTDBY9wbcj t/pfe8Q7xqmbWnKTs+vNpACvAhs0+nXtM17/UF0OI+PiTgxEcgtr4EC0XUiavOiIZyJE YgrfkUwG0JqEJpEGp0YyIKAyNuJ6vv1DUK66rA2cE2B99HsySJ1BIGSniXlD/WqoFjWH +7NQvRrL3VgFKQ4+NnHvMJ2DHXxHcN1QcLRoAv7DyXwSX13seH87+sxlUnDmWFPV4jbK rmxw== X-Gm-Message-State: AOAM530aZEYF71TRLcRvBuh16YcZ/I9zfpDhdJZwl6CRRTIQ4T8ZmUSW xGWAS50jSYH6KzFSLCRS8Uor5PkMq5Wh0Q== X-Google-Smtp-Source: ABdhPJxhKm2kvzvZDseFPo9w6eeFbpH/4nvCDn0+xlwr1EV8cq9u6m5tWmbEylW7bzJEGvTlvGyEiA== X-Received: by 2002:a17:906:5d9:: with SMTP id t25mr3155471ejt.443.1603965833529; Thu, 29 Oct 2020 03:03:53 -0700 (PDT) Return-Path: Received: from linux-f9zs.fritz.box ([2a02:2450:1011:4f7:596d:bf31:3950:5bda]) by smtp.gmail.com with ESMTPSA id q2sm1196316ejd.20.2020.10.29.03.03.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Oct 2020 03:03:53 -0700 (PDT) From: "Alexander Kanavin" To: openembedded-devel@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 4/4] gnome-calendar: update to 3.38.1, add libhandy 1.x support Date: Thu, 29 Oct 2020 11:03:39 +0100 Message-Id: <20201029100339.26698-4-alex.kanavin@gmail.com> X-Mailer: git-send-email 2.29.0 In-Reply-To: <20201029100339.26698-1-alex.kanavin@gmail.com> References: <20201029100339.26698-1-alex.kanavin@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Signed-off-by: Alexander Kanavin --- ...61b6ce8f0f8053e1609decbdbdc164ec8448.patch | 242 ++++++++++++++++++ ...dar_3.36.2.bb => gnome-calendar_3.38.1.bb} | 3 +- 2 files changed, 244 insertions(+), 1 deletion(-) create mode 100644 meta-gnome/recipes-gnome/gnome-calendar/files/8be361b6ce8f0f8053e1609decbdbdc164ec8448.patch rename meta-gnome/recipes-gnome/gnome-calendar/{gnome-calendar_3.36.2.bb => gnome-calendar_3.38.1.bb} (78%) diff --git a/meta-gnome/recipes-gnome/gnome-calendar/files/8be361b6ce8f0f8053e1609decbdbdc164ec8448.patch b/meta-gnome/recipes-gnome/gnome-calendar/files/8be361b6ce8f0f8053e1609decbdbdc164ec8448.patch new file mode 100644 index 000000000..eabf61aa5 --- /dev/null +++ b/meta-gnome/recipes-gnome/gnome-calendar/files/8be361b6ce8f0f8053e1609decbdbdc164ec8448.patch @@ -0,0 +1,242 @@ +From 8be361b6ce8f0f8053e1609decbdbdc164ec8448 Mon Sep 17 00:00:00 2001 +From: Evangelos Ribeiro Tzaras +Date: Sat, 5 Sep 2020 02:06:34 +0200 +Subject: [PATCH] project: Switch to libhandy-1 + +This commit updates the dependencies for libhandy to the tagged 1.0 +release and changes the code to accomodate the changes from +libhandy-0 to libhandy-1. + +Notable changes: +edit-dialog: HdyDialog has been dropped in [1] +alarm-row: action child type in HdyActionRow has been removed. + +[1] https://gitlab.gnome.org/GNOME/libhandy/-/merge_requests/434 +Upstream-Status: Backport +Signed-off-by: Alexander Kanavin +--- + build-aux/flatpak/org.gnome.Calendar.json | 4 ++-- + meson.build | 2 +- + src/gui/gcal-alarm-row.c | 2 +- + src/gui/gcal-alarm-row.ui | 2 +- + src/gui/gcal-application.c | 4 ++++ + src/gui/gcal-edit-dialog.c | 4 ++-- + src/gui/gcal-edit-dialog.h | 3 +-- + src/gui/gcal-edit-dialog.ui | 20 ++++++++++---------- + 8 files changed, 22 insertions(+), 19 deletions(-) + +diff --git a/build-aux/flatpak/org.gnome.Calendar.json b/build-aux/flatpak/org.gnome.Calendar.json +index 18893ad6..0772ca8d 100644 +--- a/build-aux/flatpak/org.gnome.Calendar.json ++++ b/build-aux/flatpak/org.gnome.Calendar.json +@@ -174,8 +174,8 @@ + "sources" : [ + { + "type" : "git", +- "url" : "https://source.puri.sm/Librem5/libhandy.git", +- "branch" : "libhandy-0-0" ++ "url" : "https://gitlab.gnome.org/GNOME/libhandy.git", ++ "tag" : "1.0.0" + } + ] + }, +diff --git a/meson.build b/meson.build +index 2a546252..b81b95c9 100644 +--- a/meson.build ++++ b/meson.build +@@ -165,7 +165,7 @@ libedataserver_dep = dependency('libedataserver-1.2', version: '>= 3.17.1') + libecal_dep = dependency('libecal-2.0', version: '>= 3.33.2') + libsoup_dep = dependency('libsoup-2.4') + libdazzle_dep = dependency('libdazzle-1.0', version: '>= 3.33.1') +-libhandy_dep = dependency('libhandy-0.0', version: '>= 0.0.9') ++libhandy_dep = dependency('libhandy-1', version: '>= 1.0.0') + glib_dep = dependency('glib-2.0', version: '>= 2.58.0') + gtk_dep = dependency('gtk+-3.0', version: '>= 3.22.20') + gio_dep = dependency('gio-2.0', version: '>= 2.58.0') +diff --git a/src/gui/gcal-alarm-row.c b/src/gui/gcal-alarm-row.c +index 1f95426c..1ada82f4 100644 +--- a/src/gui/gcal-alarm-row.c ++++ b/src/gui/gcal-alarm-row.c +@@ -214,7 +214,7 @@ setup_alarm (GcalAlarmRow *self) + duration = e_cal_component_alarm_trigger_get_duration (trigger); + formatted_duration = format_alarm_duration (duration); + +- hdy_action_row_set_title (HDY_ACTION_ROW (self), formatted_duration); ++ hdy_preferences_row_set_title (HDY_PREFERENCES_ROW (self), formatted_duration); + + action = e_cal_component_alarm_get_action (self->alarm); + gtk_toggle_button_set_active (self->volume_button, action == E_CAL_COMPONENT_ALARM_AUDIO); +diff --git a/src/gui/gcal-alarm-row.ui b/src/gui/gcal-alarm-row.ui +index 7d416c4c..bca8af50 100644 +--- a/src/gui/gcal-alarm-row.ui ++++ b/src/gui/gcal-alarm-row.ui +@@ -3,7 +3,7 @@ +