xfce4-orage: update to 4.16.0

4.16.0 (2022-03-17)
======
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:
  Albanian, Amharic, Arabic, Armenian (Armenia), Asturian, Basque,
  Belarusian, Bulgarian, Catalan, Chinese (China), Chinese (Taiwan),
  Croatian, Czech, Danish, Dutch, English (Australia), English (United
  Kingdom), Estonian, Finnish, French, Galician, German, Greek, Hebrew,
  Hungarian, Icelandic, Indonesian, Italian, Japanese, Kazakh, Korean,
  Latvian, Lithuanian, Malay, Norwegian Bokmål, Norwegian Nynorsk,
  Occitan (post 1500), Polish, Portuguese, Portuguese (Brazil),
  Romanian, Russian, Serbian, Slovak, Spanish, Swedish, Thai, Turkish,
  Ukrainian, Urdu, Urdu (Pakistan), Uyghur

4.15.1 (2021-12-15, unreleased version)
======
Notes from old ChangeLog file:
* Fixed libbsd dependency: reverted libical strl* functions back to
  str* or changed orage functions from strl* to g_strl*.
* Automake changes: silent mode is now default
* Minimum autogen required version is 4.16.0
* Ported GlobalTime to GTK3:
  * Replaced GlobalTime background and foreground colours from GdkColor to
    GdkRGBA (old colours from GlobalTime configuration is not valid
    anymore)
* Ported panel-plugin to GTK3.
  * Changed to plugin to use panel plugin class. Initial patches
    contributed by Patronos.

Full commit list:
- Version 4.15.1 release time
- Updated with panel plugin changes
- Changed 'save' signal to member of plugin class
- Dead code removal
- Added FIXME comments
- Changed int parameter to gint
- Removed invalid "column-homogeneous" property from box property
- Fixed plugin tooltip
- Fixed rc file write
- Fixed panel plugin blocking/unblocking when configuration menu is
closed
- Fixed "properties_frame" handling
- Added log domain for panel plugin
- Fixed object "dialog" getters and setters
- Fixed class based plugin intialization
- Added xfce_titled_dialog_get_type == 0 check
- Updated TODO message
- Removed redundant declaration
- Replaced GTK_STOCK_OK with "_OK"
- Replaced deprected GTK2 code with alternative GTK3 code
- Replaced gtk_tool_button_new_from_stock with
orage_toolbar_append_button
- Removed deprecated gtk_widget_get_default_style
- Removed redundant const qualifiers
- Fixed typo
- Replaced gtk_font_button_get_font_name with gtk_font_chooser_get_font
and added g_free for release memory from allocated font name
- Disable unused parameter warning
- Changed variable clock_rotation_array from char to const gchar
- Changed OS default background to white and foreground (text colour)
to black
- Replaced gtk_style_context_get_property with gtk_style_context_get
- Fixed casting of GtkStyleProvider
- Replaced deprecated gtk_css_provider_get_default with
gtk_css_provider_new
- Suppressed deprecated warnings
- Changed clock background and font colour from GtkColour to GtkRGBA
- Casted GtkWidget to GtkLabel
- Replaced gtk_widget_override_font with gtk_label_set_attributes
- Replaced hbox with box
- Replaced table with grid
- Suppresed unused parameter warning
- Fixed tooltips for GTK3 (removed gtk_tooltips_new and related)
- Removed unused code
- Fixed panel plugin type name
- Code cleanup: replaced ';;' with ';'
- Patches from issues #4: started to porting orage plugin to class
structure.
- Replaced string constants which was used in several places with macros
- Added patches from issues #2 and #3. These patches allows to compile
panel-pugin, but compiled code is still non functional (needs cleanup
from remaining GTK2 version).
- Enabled XFCE API for GTK3 (X-XFCE-API=2.0)
- Internal libical and tz_convert fixes to get it compiled on Fedora35
- Suppressed unused parameter warnings
- Replaced subdir object build with convenience library
- Enabled building panel plugin
- Enabled building 'xfce-xfcalendar-settings.desktop'
- Fixed compiler warnings about coparing signed and unsigned
- Replaced gtk_hbox_new with gtk_box_new
- Suppressed deperecation warnings for
gtk_widget_override_background_color and gtk_widget_override_color
- Isolated deprecated color modify functions
- Replaced deprecated gtk_font_button_get_font_name with
gtk_font_chooser_get_font
- Replaced deprecated gtk_widget_modify_font and
gtk_widget_override_font with gtk_label_set_attributes
- GNU intltool 0.51.0 (Ubuntu 21.04) needs that 'm4' directory exists
before calling intltoolize
- Replaced Globaltime colours from GdkColor to GdkRGBA
- Replaced GTK_STOCK_OK in globaltime timezone selection with "_OK" and
changed orage timezone selection to match as possible with globaltime
timezone slection (in future globaltime tz selection will be merged
with orage tz selection)
- Replaced gtk_image_new_from_stock with gtk_image_new_from_icon_name
- Replaced stock ID based buttons with named icon based
- Fixed grid cell lengths for two last rows in "Text Default
Formatting" table
- Replaced table with grid
- Replaced all boxes in gt_prefs.c with grid
- Removed redundant gtk_box_pack_start
- Removed redundant warning macros
- Replaced deprecated gtk_widget_modify_font with
gtk_widget_override_font
- Fixed GlobalTime raising event handling
- Added more debug info for tray icon rising
- Ported code that use GdkEventClient to GTK3
- Replaced box with grid
- Replaced clocks.hdr_hbox box with grid
- Replaced clocks.main_hbox hbox with grid
- Disabled unused parameter warning
- Fixed pointer error while pressing any button (re-added functions.h)
- Added .gitignore
- Added X11 library check to configure
- Created convinience library for shared files (shared between Orage
and Globaltime)
- Re-enabled building Globaltime
- Fixed libbsd dependency: reverted libical strl* functions back to str*
- Added new TODOs and removed already done
- Updated changes in version 4.15.x
- Removing dependency to libbsd: replaced strlcpy, strlcat, etc
functions with g_strl* functions
- Added silent automake rules as default
- Updated required XDT_AUTOGEN_REQUIRED_VERSION to 4.16.0
- Fixed Orage internal CSS filenames
- Changed working version to 4.15.1
- Reverted back required autogen version

4.15.0 (2021-10-07, unreleased version)
======
Most code ported to GTK3, tested only on FreeBSD.
- GTK3 port

6 files changed, 47 insertions, 118 deletions

diff --git a/time/xfce4-orage/DESCR b/time/xfce4-orage/DESCR
index 1c0af6e95aa..df8c0cce697 100644
--- a/time/xfce4-orage/DESCR
+++ b/time/xfce4-orage/DESCR
@@ -1,4 +1 @@
 Time-managing application for the Xfce desktop environment.
-
-Note this application is no longer maintained upstream, and its Xfce
-panel plugin no longer builds with 4.16.
diff --git a/time/xfce4-orage/Makefile b/time/xfce4-orage/Makefile
index 2f3b2591e28..e44f5c7839b 100644
--- a/time/xfce4-orage/Makefile
+++ b/time/xfce4-orage/Makefile
@@ -1,17 +1,16 @@
-# $NetBSD: Makefile,v 1.62 2021/12/08 16:06:49 adam Exp $
+# $NetBSD: Makefile,v 1.63 2022/04/02 01:24:17 gutteridge Exp $
 
-VERSION=	4.12.1
-PKGREVISION= 26
+VERSION=	4.16.0
 DISTNAME=	orage-${VERSION}
 PKGNAME=	xfce4-orage-${VERSION}
 CATEGORIES=	time
-MASTER_SITES=	http://archive.xfce.org/src/apps/orage/4.12/
+MASTER_SITES=	https://archive.xfce.org/src/apps/orage/${VERSION:R}/
 
-HOMEPAGE=	http://www.kolumbus.fi/~w408237/orage/
+HOMEPAGE=	https://docs.xfce.org/apps/orage/start
 LICENSE=	gnu-gpl-v2
 COMMENT=	Xfce time managing application
 
-EXTRACT_SUFX=           .tar.bz2
+EXTRACT_SUFX=	.tar.bz2
 
 USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
@@ -38,11 +37,19 @@ SUBST_SED.zoneinfo+=	-e 's|zone\.tab|tab/zone_sun.tab|g'
 SUBST_SED.zoneinfo+=	-e 's|iso3166\.tab|tab/country.tab|g'
 .endif
 
+BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.52.0
+.include "../../devel/glib2/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../sysutils/dbus/buildlink3.mk"
 .include "../../sysutils/dbus-glib/buildlink3.mk"
 .include "../../sysutils/libnotify/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
+BUILDLINK_API_DEPENDS.gtk3+=	gtk3+>=3.24.0
+.include "../../x11/gtk3/buildlink3.mk"
+BUILDLINK_API_DEPENDS.libxfce4ui+=	libxfce4ui>=4.16.0
+.include "../../x11/libxfce4ui/buildlink3.mk"
+BUILDLINK_API_DEPENDS.xfce4-panel+=	xfce4-panel>=4.16.0
+.include "../../x11/xfce4-panel/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+BUILDLINK_API_DEPENDS.libical+=	libical>=3.0
 .include "../../time/libical/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/time/xfce4-orage/PLIST b/time/xfce4-orage/PLIST
index 07bf10c84ab..687963dbb4d 100644
--- a/time/xfce4-orage/PLIST
+++ b/time/xfce4-orage/PLIST
@@ -1,22 +1,24 @@
-@comment $NetBSD: PLIST,v 1.10 2021/11/30 14:57:00 gutteridge Exp $
+@comment $NetBSD: PLIST,v 1.11 2022/04/02 01:24:17 gutteridge Exp $
 bin/globaltime
 bin/orage
-man/man1/globaltime.1
-man/man1/orage.1
-man/man1/tz_convert.1
-share/applications/globaltime.desktop
-share/applications/xfcalendar.desktop
-share/applications/xfce-xfcalendar-settings.desktop
-share/dbus-1/services/org.xfce.calendar.service
+lib/xfce4/panel/plugins/liborageclock.la
+share/applications/org.xfce.orage-settings.desktop
+share/applications/org.xfce.orage.desktop
+share/applications/org.xfce.orage.globaltime.desktop
 share/dbus-1/services/org.xfce.orage.service
-share/icons/hicolor/160x160/apps/orage.xpm
-share/icons/hicolor/160x160/apps/orage_ice.xpm
-share/icons/hicolor/160x160/apps/orage_round.xpm
-share/icons/hicolor/160x160/apps/orage_sun.xpm
-share/icons/hicolor/48x48/apps/orage_globaltime.png
-share/icons/hicolor/48x48/apps/xfcalendar.png
-share/icons/hicolor/scalable/apps/orage_globaltime.svg
-share/icons/hicolor/scalable/apps/xfcalendar.svg
+share/icons/hicolor/128x128/apps/org.xfce.orage.png
+share/icons/hicolor/160x160/apps/org.xfce.orage.xpm
+share/icons/hicolor/160x160/apps/org.xfce.orage_ice.xpm
+share/icons/hicolor/160x160/apps/org.xfce.orage_round.xpm
+share/icons/hicolor/160x160/apps/org.xfce.orage_sun.xpm
+share/icons/hicolor/16x16/apps/org.xfce.orage.png
+share/icons/hicolor/24x24/apps/org.xfce.orage.png
+share/icons/hicolor/32x32/apps/org.xfce.orage.png
+share/icons/hicolor/48x48/apps/org.xfce.orage.globaltime.png
+share/icons/hicolor/48x48/apps/org.xfce.orage.png
+share/icons/hicolor/64x64/apps/org.xfce.orage.png
+share/icons/hicolor/scalable/apps/org.xfce.orage.globaltime.svg
+share/icons/hicolor/scalable/apps/org.xfce.orage.svg
 share/locale/am/LC_MESSAGES/orage.mo
 share/locale/ar/LC_MESSAGES/orage.mo
 share/locale/ast/LC_MESSAGES/orage.mo
@@ -24,6 +26,7 @@ share/locale/be/LC_MESSAGES/orage.mo
 share/locale/bg/LC_MESSAGES/orage.mo
 share/locale/ca/LC_MESSAGES/orage.mo
 share/locale/cs/LC_MESSAGES/orage.mo
+share/locale/da/LC_MESSAGES/orage.mo
 share/locale/de/LC_MESSAGES/orage.mo
 share/locale/el/LC_MESSAGES/orage.mo
 share/locale/en_AU/LC_MESSAGES/orage.mo
@@ -38,7 +41,9 @@ share/locale/gl/LC_MESSAGES/orage.mo
 share/locale/he/LC_MESSAGES/orage.mo
 share/locale/hr/LC_MESSAGES/orage.mo
 share/locale/hu/LC_MESSAGES/orage.mo
+share/locale/hy_AM/LC_MESSAGES/orage.mo
 share/locale/id/LC_MESSAGES/orage.mo
+share/locale/is/LC_MESSAGES/orage.mo
 share/locale/it/LC_MESSAGES/orage.mo
 share/locale/ja/LC_MESSAGES/orage.mo
 share/locale/kk/LC_MESSAGES/orage.mo
@@ -70,24 +75,7 @@ share/locale/ur_PK/LC_MESSAGES/orage.mo
 share/locale/vi/LC_MESSAGES/orage.mo
 share/locale/zh_CN/LC_MESSAGES/orage.mo
 share/locale/zh_TW/LC_MESSAGES/orage.mo
-share/orage/doc/C/images/default_calendar.png
-share/orage/doc/C/images/orage_appointment.png
-share/orage/doc/C/images/orage_appointment_alarm.png
-share/orage/doc/C/images/orage_appointment_recurrence.png
-share/orage/doc/C/images/orage_calendar_edit_menu.png
-share/orage/doc/C/images/orage_calendar_file_menu.png
-share/orage/doc/C/images/orage_calendar_help_menu.png
-share/orage/doc/C/images/orage_calendar_view_menu.png
-share/orage/doc/C/images/orage_daylist.png
-share/orage/doc/C/images/orage_desktop_menuitem.png
-share/orage/doc/C/images/orage_eventlist.png
-share/orage/doc/C/images/orage_exchange_foreign.png
-share/orage/doc/C/images/orage_exchange_impexp.png
-share/orage/doc/C/images/orage_exchange_oragefiles.png
-share/orage/doc/C/images/orage_preferences_display.png
-share/orage/doc/C/images/orage_preferences_extra.png
-share/orage/doc/C/images/orage_preferences_main.png
-share/orage/doc/C/orage.html
+share/metainfo/org.xfce.orage.appdata.xml
 share/orage/sounds/Boiling.wav
 share/orage/sounds/KDE_Beep_Digital_1.ogg
 share/orage/sounds/KDE_Beep_Digital_2.ogg
@@ -96,4 +84,4 @@ share/orage/sounds/Phone.wav
 share/orage/sounds/Spo.wav
 share/orage/sounds/Tear.wav
 share/orage/sounds/Wall_c.wav
-share/xfce4/panel/plugins/xfce4-orageclock-plugin.desktop
+share/xfce4/panel/plugins/org.xfce.orage.clock-plugin.desktop
diff --git a/time/xfce4-orage/distinfo b/time/xfce4-orage/distinfo
index 81fd06d303e..d8d28ffa434 100644
--- a/time/xfce4-orage/distinfo
+++ b/time/xfce4-orage/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.13 2021/10/26 11:24:46 nia Exp $
+$NetBSD: distinfo,v 1.14 2022/04/02 01:24:17 gutteridge Exp $
 
-BLAKE2s (orage-4.12.1.tar.bz2) = 3a2b84c7abba78130359c7f1ba70083dcd1c7b0e9ae81ed0abbed2eac410fa41
-SHA512 (orage-4.12.1.tar.bz2) = 3fec0201171140586cdc9bcf151450a7086515e18b5815afe4fe4c4726ba554c50582b0479e52985b330140c51b7233ef81f678f986f848afbeee74c66b2d196
-Size (orage-4.12.1.tar.bz2) = 2590788 bytes
+BLAKE2s (orage-4.16.0.tar.bz2) = 028cd13507c94e51036c2c65fccc3cac874e8935c33b9e9e1502cb10f7d2a541
+SHA512 (orage-4.16.0.tar.bz2) = 00f5dd069a90f5398cc6789006ba503097b5246111f88e28952de4fe7927deba8e8cfb136ed1ebe8a90e1bd656116259204f25af852aa0e502be38f37459243b
+Size (orage-4.16.0.tar.bz2) = 2054409 bytes
 SHA1 (patch-src_appointment.c) = 2122b4c398033339c396ca9f0c8980f5fbcc76bb
-SHA1 (patch-src_functions.c) = d6bbbdb0c306648dffd175b6a667f10808f4f761
-SHA1 (patch-src_ical-code.c) = c260f12ca80054894a571d9b47691fb8c9c3e56c
+SHA1 (patch-src_functions.c) = c832ed3fe093026cfe174577cc267c6b4a747172
diff --git a/time/xfce4-orage/patches/patch-src_functions.c b/time/xfce4-orage/patches/patch-src_functions.c
index 68685c7d509..74dd8657a21 100644
--- a/time/xfce4-orage/patches/patch-src_functions.c
+++ b/time/xfce4-orage/patches/patch-src_functions.c
@@ -1,12 +1,12 @@
-$NetBSD: patch-src_functions.c,v 1.1 2018/05/17 09:13:02 jperkin Exp $
+$NetBSD: patch-src_functions.c,v 1.2 2022/04/02 01:24:17 gutteridge Exp $
 
 Set _XOPEN_SOURCE correctly on SunOS.
 
---- src/functions.c.orig	2015-04-10 10:26:26.000000000 +0000
+--- src/functions.c.orig	2022-03-17 12:46:01.000000000 +0000
 +++ src/functions.c
-@@ -21,8 +21,10 @@
- 
-  */
+@@ -25,8 +25,10 @@
+ #include <config.h>
+ #endif
  
 +#if !defined(__sun) || (!defined(_XOPEN_SOURCE) && (__STDC_VERSION__-0 < 199901L))
  #define _XOPEN_SOURCE /* glibc2 needs this */
diff --git a/time/xfce4-orage/patches/patch-src_ical-code.c b/time/xfce4-orage/patches/patch-src_ical-code.c
deleted file mode 100644
index bdbfa8133e2..00000000000
--- a/time/xfce4-orage/patches/patch-src_ical-code.c
+++ /dev/null
@@ -1,62 +0,0 @@
-$NetBSD: patch-src_ical-code.c,v 1.1 2018/04/25 21:44:44 markd Exp $
-
-Work with libical-3
-
---- src/ical-code.c.orig	2015-04-10 10:26:26.000000000 +0000
-+++ src/ical-code.c
-@@ -129,7 +129,6 @@ static struct icaltimetype ical_get_curr
-         &&   (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_a
-  * 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_a
-         }
-         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_al
- /* 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_trigg
-      */
-     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 n
-          */
-         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 
-          */
-         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;
-             }