diff options
| -rw-r--r-- | PKGBUILD | 19 | ||||
| -rw-r--r-- | add_cinnamon_settings_online_support.patch | 38 | ||||
| -rw-r--r-- | set_window_icon_name.patch | 9 |
3 files changed, 31 insertions, 35 deletions
@@ -2,7 +2,7 @@ pkgname=gnome-calendar-linuxmint _pkgname=gnome-calendar -pkgver=3.32.2 +pkgver=3.34.2 pkgrel=1 pkgdesc='Simple and beautiful calendar application designed to perfectly fit the GNOME desktop. With Linux Mint patches' arch=(x86_64) @@ -13,6 +13,7 @@ depends=( geoclue2 gsettings-desktop-schemas libdazzle + libgweather ) optdepends=( 'evolution: ICS file import' @@ -20,24 +21,22 @@ optdepends=( makedepends=( appstream-glib git - gtk-doc + gnome-control-center meson python ) provides=(${_pkgname}) conflicts=(${_pkgname}) groups=(gnome) -_commit=366f6f7aadebcb5bb61dfa6a1416384f90a3a4cd # tags/3.32.2^0 +_commit=98881b9071ce39b8704e9b5af4eb1faa064ba3fa # tags/3.34.2^0 source=( "git+https://gitlab.gnome.org/GNOME/gnome-calendar.git#commit=$_commit" - "null-icaltime.diff" "add_cinnamon_settings_online_support.patch" "set_window_icon_name.patch" ) sha256sums=('SKIP' - 'c1aa738a4ff275f725d0aa5406312600503b2b59270448a9e6b30b82a924dc27' - '2445f754a044dd1ccb8c948b5d5b43248b61ec3570fc76416f74148abc5abf4d' - 'd0c4affaa3edcb0c44ff1ef06a4e78951b7b5820becdbfdf7d41d90d523f3c08') + '9b81f538a4ebc74c66b6ea80a02303fe6adfc92dc183e6a96e0f090ac777e7d9' + '1788c8cb1fbf8bd5cf81d700d9f5f7eb1e5eea265e35930dc70df147f79ebc9a') pkgver() { cd $_pkgname @@ -46,8 +45,6 @@ pkgver() { prepare() { cd $_pkgname - # Set datetime to NULL in case there is no available date - patch -Np1 -i ../null-icaltime.diff # Add support so that gnome-calendar run within Cinnamon by calling cinnamon-settings online-accounts patch -Np0 -i ../add_cinnamon_settings_online_support.patch @@ -57,12 +54,10 @@ prepare() { } build() { - arch-meson $_pkgname build -D documentation=true + arch-meson $_pkgname build ninja -C build } - - check() { meson test -C build --print-errorlogs } diff --git a/add_cinnamon_settings_online_support.patch b/add_cinnamon_settings_online_support.patch index e1aae0c00644..0c44aaf7944e 100644 --- a/add_cinnamon_settings_online_support.patch +++ b/add_cinnamon_settings_online_support.patch @@ -1,26 +1,28 @@ ---- src/gcal-source-dialog.c -+++ src/gcal-source-dialog.c -@@ -696,6 +696,17 @@ - const gchar *arg) +--- src/gui/gcal-window.c ++++ src/gui/gcal-window.c +@@ -394,8 +394,22 @@ + gpointer user_data) { - GDBusProxy *proxy; + GApplication *application = g_application_get_default (); +- +- gcal_utils_launch_online_accounts_panel (g_application_get_dbus_connection (application), NULL, NULL); + gchar *desktop_environment; + + desktop_environment = getenv ("XDG_CURRENT_DESKTOP"); + if (desktop_environment) ++ { ++ if (g_strcmp0 (desktop_environment, "X-Cinnamon") == 0 || g_strcmp0 (desktop_environment, "Cinnamon") == 0) + { -+ if (g_strcmp0 (desktop_environment, "X-Cinnamon") == 0 || g_strcmp0 (desktop_environment, "Cinnamon") == 0) -+ { -+ g_spawn_command_line_async ("cinnamon-settings online-accounts", NULL); -+ return; -+ } +++ g_spawn_command_line_async ("cinnamon-settings online-accounts", NULL); +++ return; + } ++ else if (g_strcmp0 (desktop_environment, "GNOME") == 0) ++ { ++ gcal_utils_launch_online_accounts_panel (g_application_get_dbus_connection (application), NULL, NULL); ++ } ++ } ++ + } - proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION, - G_DBUS_PROXY_FLAGS_NONE, -@@ -2338,4 +2349,4 @@ - g_return_if_fail (source && E_IS_SOURCE (source)); - - g_set_object (&dialog->source, source); --} -+} + static void + diff --git a/set_window_icon_name.patch b/set_window_icon_name.patch index d834d51fd30c..03e2b4b99dea 100644 --- a/set_window_icon_name.patch +++ b/set_window_icon_name.patch @@ -1,12 +1,11 @@ ---- src/gcal-window.c -+++ src/gcal-window.c -@@ -1571,6 +1571,8 @@ +--- src/gui/gcal-window.c ++++ src/gui/gcal-window.c +@@ -1131,6 +1131,8 @@ gcal_window_add_accelerator (app, "win.change-view(3)", "<Ctrl>3"); - gcal_window_add_accelerator (app, "win.toggle-search-bar", "<Ctrl>f"); gcal_window_add_accelerator (app, "app.quit", "<Ctrl>q"); + gcal_window_add_accelerator (app, "win.new-event", "<Ctrl>n"); + + gtk_window_set_icon_name (self, "org.gnome.Calendar"); } /** - |