From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) by mx.groups.io with SMTP id smtpd.web11.1084.1607733191905919146 for ; Fri, 11 Dec 2020 16:33:12 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20161025 header.b=SrP2sSaz; spf=pass (domain: gmail.com, ip: 209.85.214.174, mailfrom: akuster808@gmail.com) Received: by mail-pl1-f174.google.com with SMTP id t18so5470344plo.0 for ; Fri, 11 Dec 2020 16:33:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=L+j2syjTEy6IPcFw5/vlPrnpSysDu+PbCzFWm6LiVjI=; b=SrP2sSaznJTFCWTjSk662JEDR589ZX7s2zzgOPe+xjdUzH35IF3bqOHNgndjhw0tFr Zo+3rqiQT8rftcQKLqsvb3We99QFjUOmPvQtvFuwPLibO8hwFg1L23SgrLyNJPgFgcS0 Tx1evLOnJP11huuchl4izi6nzNSCm78t6iFhfP208LMSjH5s25mJ8B24gx3SoNAZsQvh B4I5oKkC13TdskvNegz+LQIhHB6tCOr+mFSpUsmMdgmYT3KIMAUIOv9q/AqAdVMqWYJg kfhTAieOp9ZTxzdSvOXIjooLQQ5JomAyRvjEZEFGT+9bS6VR0sWkvzcZzDcKvniCkyj+ 5OoA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=L+j2syjTEy6IPcFw5/vlPrnpSysDu+PbCzFWm6LiVjI=; b=hsn6XYrz+agbTru1zV0eFcQXpqLGM/WKndlcDi7dr8CJf7Qz8VIxfkHUTam/vA86Gl RDIwxIO3Mjsm8aqKj6EJPudAaBwkxruTIL9ahycHWZlB2ze5N3EtkJsKo+b+IpZ0XsDF 1S3vkfAmPJDuCSHQcq+IRK8lRkzok3oRhUyJEvTXAwm+sUoON2xJBWl0qxThLlNlez7S 2LXMeTTrKgiZ/079IpitVgPvPxCFYzK5a1cCS8bRkdlgOaWvs8rthqiCo+mZb6rWsBQc COkRUZh9xzOz8nvO/mtLZfWaLCRkxXUe5hFY1Rec7DWY9FOm0EyyXFw9a2g5VYCA7fVm 8APw== X-Gm-Message-State: AOAM5300aOlEeBFr5s8ca/dGOdS8QmaAYBQDprNQJmPUPdVXYhCWGVTh pDUxxbV7tn60HwY3jzztk+Culwe/pUPVBw== X-Google-Smtp-Source: ABdhPJwlaojyOfrfyeZatpwlbiiaoDRvZesnkT+tRNTVWJhc/TA+1zpTKAg6jintLYV1V91WF58qNA== X-Received: by 2002:a17:902:8e87:b029:d8:e26a:77ea with SMTP id bg7-20020a1709028e87b02900d8e26a77eamr13462954plb.18.1607733190976; Fri, 11 Dec 2020 16:33:10 -0800 (PST) Return-Path: Received: from akuster-ThinkPad-T460s.mvista.com ([2601:202:4180:a5c0:159e:b7b3:814a:a500]) by smtp.gmail.com with ESMTPSA id 3sm11671295pfv.92.2020.12.11.16.33.10 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Dec 2020 16:33:10 -0800 (PST) From: "akuster" To: openembedded-devel@lists.openembedded.org Subject: [meta-gnome][gatesgarth][PATCH 1/1] Revert "gnome-calendar: update to 3.38.1, add libhandy 1.x support" Date: Fri, 11 Dec 2020 16:33:08 -0800 Message-Id: <20201212003308.10862-2-akuster808@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201212003308.10862-1-akuster808@gmail.com> References: <20201212003308.10862-1-akuster808@gmail.com> This change causes build failure: Found CMake: NO | Run-time dependency libhandy-1 found: NO (tried pkgconfig) | | ../gnome-calendar-3.38.1/meson.build:166:0: ERROR: Dependency "libhandy-1" not found, tried pkgconfig Gategarth Core version of libandy is 0.0.13 so this patch is puzzling This reverts commit 46ac17595bbd74a3dbcfbc7b5e1456ff78f5dca7. Signed-off-by: Armin Kuster --- ...61b6ce8f0f8053e1609decbdbdc164ec8448.patch | 242 ------------------ ...dar_3.38.1.bb => gnome-calendar_3.36.2.bb} | 3 +- 2 files changed, 1 insertion(+), 244 deletions(-) delete mode 100644 meta-gnome/recipes-gnome/gnome-calendar/files/8be361b6ce8f0f8053e1609decbdbdc164ec8448.patch rename meta-gnome/recipes-gnome/gnome-calendar/{gnome-calendar_3.38.1.bb => gnome-calendar_3.36.2.bb} (78%) diff --git a/meta-gnome/recipes-gnome/gnome-calendar/files/8be361b6ce8f0f8053e1609decbdbdc164ec8448.patch b/meta-gnome/recipes-gnome/gnome-calendar/files/8be361b6ce8f0f8053e1609decbdbdc164ec8448.patch deleted file mode 100644 index eabf61aa5fc..00000000000 --- a/meta-gnome/recipes-gnome/gnome-calendar/files/8be361b6ce8f0f8053e1609decbdbdc164ec8448.patch +++ /dev/null @@ -1,242 +0,0 @@ -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 @@ -