From 6d16352de522a75c8da9c5cc94840f039d420f2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Sat, 2 Apr 2022 00:36:54 +0200 Subject: [PATCH] orage: upgrade 4.12.1 -> 4.16.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * License checksum changed by polishing [1} * Patch does not apply but took care for libical3 - see announcement below [1] https://gitlab.xfce.org/apps/orage/-/commit/723fb89b3011db32a64986ea9ae560ae009f68fd Release notes for 4.16.0 ======================== Note: GlobalTime and Orage panel plugin are being deprecated and will be removed in a future release. Their features will be integrated with or provided by existing Xfce components. See https://gitlab.xfce.org/apps/orage/-/issues/3#note_43209 Finalize port to GTK 3, small fixes and cleanup for 4.16.0 (see MRs for more details): - Add new application icon (!18) - Fix some memory leaks - i18n: Use `xfce_textdomain()` to initialize translations - Trace messages cleanup (!15) - Update COPYING (Issue #10, !17) - Use stdout and stderr correctly in main.c - Build tz_convert only with bundled libical (!14) - Switch to reverse-DNS naming for icon and desktop files (!13) - D-Bus service cleanup (!12) - Fix `orage_exec()` and its calls - Update project files (!10) - Fixed strptime parse issue on FreeBSD (#6, !11) - Fix make distcheck warnning - Fixed libpopt detection on FreeBSD (!9) - Fix build warnings 3: Clang static analyzer (!6) - Added 'git' to program version string and 'sed' check (!7) - Fix build warnings 2: Compilation (!4) - Fix build warnings 1: Autotools (!3) - Add basic GitLab pipeline (!2) Commits from merge request !1 (GTK 3 port), which also includes 4.15.x below: - Reverted to c60567fe - Fixed typos - Added support for 'legacy' non RGBA GTK colours. Both RGBA and old colous are now supported. - Replaced unused parameters '(void)' castings with GLib G_GNUC_UNUSED. Added GLib check to configure. - Removed trailing whitespaces and corrected formatting - Updated version numbers - Aligned new appointment->alarm Sound and Procedure entry fields and removed unused code. - Renamed 'OragePlugin *clock' to 'OragePlugin *plugin' or 'OragePlugin *orage_plugin' - Fixed libical support, supported libical version is now >= 3.0. - Added variable tmp only when HAVE_LIBICAL is not defined - Dead code removal - Removed outdated is_utc, libical uses UTC timezone. This patch allows to use libical 3.0 - Updated with 'Ical week start day' issue - Fixed: "'Ical week start day' configuration parameter is ignored". Issue #5 - Changed version number to 4.15.2 - Translation Updates Signed-off-by: Andreas Müller Signed-off-by: Khem Raj --- ...etting-is_utc-member-of-icaltimetype.patch | 77 ------------------- .../{orage_4.12.1.bb => orage_4.16.0.bb} | 12 +-- 2 files changed, 6 insertions(+), 83 deletions(-) delete mode 100644 meta-xfce/recipes-apps/orage/orage/0001-drop-setting-is_utc-member-of-icaltimetype.patch rename meta-xfce/recipes-apps/orage/{orage_4.12.1.bb => orage_4.16.0.bb} (57%) diff --git a/meta-xfce/recipes-apps/orage/orage/0001-drop-setting-is_utc-member-of-icaltimetype.patch b/meta-xfce/recipes-apps/orage/orage/0001-drop-setting-is_utc-member-of-icaltimetype.patch deleted file mode 100644 index 517de5f9229..00000000000 --- a/meta-xfce/recipes-apps/orage/orage/0001-drop-setting-is_utc-member-of-icaltimetype.patch +++ /dev/null @@ -1,77 +0,0 @@ -From 5bdf11fe3638d279edcad911906f801751e024da Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Tue, 23 Jul 2019 14:22:08 -0700 -Subject: [PATCH] drop setting is_utc member of icaltimetype - -This seems to be gone in libical3 - -Upstream-Status: Pending - -Signed-off-by: Khem Raj ---- - src/ical-code.c | 7 ------- - 1 file changed, 7 deletions(-) - -diff --git a/src/ical-code.c b/src/ical-code.c -index d583140..d8e5543 100644 ---- a/src/ical-code.c -+++ b/src/ical-code.c -@@ -129,7 +129,6 @@ static struct icaltimetype ical_get_current_local_time() - && (strcmp(g_par.local_timezone, "floating") != 0)) - ctime = icaltime_current_time_with_zone(local_icaltimezone); - else { / * use floating time * / -- ctime.is_utc = 0; - ctime.is_date = 0; - ctime.is_daylight = 0; - ctime.zone = NULL; -@@ -2579,7 +2578,6 @@ static struct icaltimetype count_first_alarm_time(xfical_period per - * when counting alarm time. */ - if (rel == ICAL_RELATED_START) { - per.stime.is_date = 0; -- per.stime.is_utc = 1; - per.stime.is_daylight = 0; - per.stime.zone = utc_icaltimezone; - per.stime.hour = 0; -@@ -2588,7 +2586,6 @@ static struct icaltimetype count_first_alarm_time(xfical_period per - } - else { - per.etime.is_date = 0; -- per.etime.is_utc = 1; - per.etime.is_daylight = 0; - per.etime.zone = utc_icaltimezone; - per.etime.hour = 0; -@@ -2613,7 +2610,6 @@ static struct icaltimetype count_next_alarm_time(struct icaltimetype start_time - /* HACK: convert to UTC time so that we can use time arithmetic - * when counting alarm time. */ - start_time.is_date = 0; -- start_time.is_utc = 1; - start_time.is_daylight = 0; - start_time.zone = utc_icaltimezone; - start_time.hour = 0; -@@ -2768,7 +2764,6 @@ static alarm_struct *process_alarm_trigger(icalcomponent *c - */ - if (icaltime_is_date(per.stime)) { - if (local_icaltimezone != utc_icaltimezone) { -- next_alarm_time.is_utc = 0; - next_alarm_time.is_daylight = 0; - next_alarm_time.zone = local_icaltimezone; - } -@@ -2850,7 +2845,6 @@ orage_message(120, P_N "Alarm rec loop next_start:%s next_alarm:%s per.stime:%s" - */ - if (icaltime_is_date(per.stime)) { - if (local_icaltimezone != utc_icaltimezone) { -- next_alarm_time.is_utc = 0; - next_alarm_time.is_daylight = 0; - next_alarm_time.zone = local_icaltimezone; - } -@@ -2944,7 +2938,6 @@ orage_message(120, P_N "*****After loop Alarm %s %s", icaltime_as_ical_string(ne - */ - if (icaltime_is_date(per.stime)) { - if (local_icaltimezone != utc_icaltimezone) { -- next_alarm_time.is_utc = 0; - next_alarm_time.is_daylight = 0; - next_alarm_time.zone = local_icaltimezone; - } --- -2.22.0 - diff --git a/meta-xfce/recipes-apps/orage/orage_4.12.1.bb b/meta-xfce/recipes-apps/orage/orage_4.16.0.bb similarity index 57% rename from meta-xfce/recipes-apps/orage/orage_4.12.1.bb rename to meta-xfce/recipes-apps/orage/orage_4.16.0.bb index ed7f42024e3..f56050018be 100644 --- a/meta-xfce/recipes-apps/orage/orage_4.12.1.bb +++ b/meta-xfce/recipes-apps/orage/orage_4.16.0.bb @@ -1,20 +1,20 @@ SUMMARY = "Xfce Calender" SECTION = "x11/application" LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=9ac2e7cff1ddaf48b6eab6028f23ef88" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" DEPENDS = "gtk+ xfce4-panel libical popt" inherit xfce-app mime-xdg -SRC_URI += "file://0001-drop-setting-is_utc-member-of-icaltimetype.patch" - -SRC_URI[md5sum] = "2b7f5d38cb5c6edbcc65d0f52a742e46" -SRC_URI[sha256sum] = "3cf9aa441ae83c8688865f82217025cdf3ebaa152cce4571777b8c2aa8dd9062" +SRC_URI[sha256sum] = "26111a3b6a2007c82f1e0a1e0591b774a0b132f3a7f1cde53d9be661b2f11700" PACKAGECONFIG ??= "" PACKAGECONFIG[notify] = "--enable-libnotify,--disable-libnotify,libnotify" PACKAGES =+ "xfce4-orageclock-plugin" -FILES:${PN} += "${datadir}/dbus-1" +FILES:${PN} += " \ + ${datadir}/dbus-1 \ + ${datadir}/metainfo \ +" FILES:xfce4-orageclock-plugin = "${libdir}/xfce4/panel/plugins/*.so ${datadir}/xfce4/panel/plugins" FILES:${PN}-dev += "${libdir}/xfce4/panel/plugins/*.la"