From e43861837cc2790f55ec88b7ecde82517d03d8b3 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Thu, 27 Dec 2018 01:05:10 -0200 Subject: [PATCH] california: remove Upstream has been dead for years and it can't be built with newer VALAs closes #6232 Co-authored-by: Rasmus Thomsen --- srcpkgs/california/INSTALL.msg | 1 + srcpkgs/california/patches/libecal.patch | 37 ------------------- .../patches/vala-no_static_const.patch | 22 ----------- srcpkgs/california/template | 20 ++++------ 4 files changed, 8 insertions(+), 72 deletions(-) create mode 100644 srcpkgs/california/INSTALL.msg delete mode 100644 srcpkgs/california/patches/libecal.patch delete mode 100644 srcpkgs/california/patches/vala-no_static_const.patch diff --git a/srcpkgs/california/INSTALL.msg b/srcpkgs/california/INSTALL.msg new file mode 100644 index 00000000000..e2c0d6252f1 --- /dev/null +++ b/srcpkgs/california/INSTALL.msg @@ -0,0 +1 @@ +california is no longer provided by Void Linux, and will be fully removed from the repos on 2019/03/27 diff --git a/srcpkgs/california/patches/libecal.patch b/srcpkgs/california/patches/libecal.patch deleted file mode 100644 index c6c24d0ad00..00000000000 --- a/srcpkgs/california/patches/libecal.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff --git a/src/backing/eds/backing-eds-calendar-source.vala b/src/backing/eds/backing-eds-calendar-source.vala -index 7e30e08..eba3ac6 100644 ---- a/src/backing/eds/backing-eds-calendar-source.vala -+++ b/src/backing/eds/backing-eds-calendar-source.vala -@@ -257,7 +257,7 @@ internal class EdsCalendarSource : CalendarSource { - // Invoked by EdsStore prior to making it available outside of unit - internal async void open_async(Cancellable? cancellable) throws Error { - client = (E.CalClient) yield E.CalClient.connect(eds_source, E.CalClientSourceType.EVENTS, -- cancellable); -+ 30, cancellable); - - client.bind_property("readonly", this, PROP_READONLY, BindingFlags.SYNC_CREATE); - client.notify["readonly"].connect(() => { -diff --git a/vapi/libecal-1.2.vapi b/vapi/libecal-1.2.vapi -index 6ead3ec..1f39d14 100644 ---- a/vapi/libecal-1.2.vapi -+++ b/vapi/libecal-1.2.vapi -@@ -23,8 +23,8 @@ namespace E { - public bool check_save_schedules (); - public static bool check_timezones (iCal.icalcomponent comp, GLib.List comps, GLib.Callback tzlookup, void* ecalclient, GLib.Cancellable cancellable) throws GLib.Error; - [CCode (finish_name = "e_cal_client_connect_finish")] -- public static async unowned E.Client connect (E.Source source, E.CalClientSourceType source_type, GLib.Cancellable cancellable) throws GLib.Error; -- public static unowned E.Client connect_sync (E.Source source, E.CalClientSourceType source_type, GLib.Cancellable cancellable) throws GLib.Error; -+ public static async unowned E.Client connect (E.Source source, E.CalClientSourceType source_type, uint32 wait_for_connected_seconds, GLib.Cancellable cancellable) throws GLib.Error; -+ public static unowned E.Client connect_sync (E.Source source, E.CalClientSourceType source_type, uint32 wait_for_connected_seconds, GLib.Cancellable cancellable) throws GLib.Error; - [CCode (finish_name = "e_cal_client_create_object_finish")] - public async void create_object (iCal.icalcomponent icalcomp, GLib.Cancellable? cancellable, out string out_uid) throws GLib.Error; - public bool create_object_sync (iCal.icalcomponent icalcomp, out string out_uid, GLib.Cancellable? cancellable) throws GLib.Error; -@@ -599,6 +599,8 @@ namespace E { - [CCode (cheader_filename = "libecal/libecal.h")] - public const string CAL_STATIC_CAPABILITY_NO_GEN_OPTIONS; - [CCode (cheader_filename = "libecal/libecal.h")] -+ public const string CAL_STATIC_CAPABILITY_NO_MEMO_START_DATE; -+ [CCode (cheader_filename = "libecal/libecal.h")] - public const string CAL_STATIC_CAPABILITY_NO_ORGANIZER; - [CCode (cheader_filename = "libecal/libecal.h")] - public const string CAL_STATIC_CAPABILITY_NO_PROCEDURE_ALARMS; diff --git a/srcpkgs/california/patches/vala-no_static_const.patch b/srcpkgs/california/patches/vala-no_static_const.patch deleted file mode 100644 index 91e4757d609..00000000000 --- a/srcpkgs/california/patches/vala-no_static_const.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- california-0.4.0/src/application/california-application.vala 2015-03-24 00:36:24.000000000 +0100 -+++ california-0.4.0/src/application/california-application.vala 2017-02-12 16:21:50.338328785 +0100 -@@ -55,7 +55,7 @@ - } - } - -- private static const ActionEntry[] action_entries = { -+ private const ActionEntry[] action_entries = { - // public actions - { ACTION_CALENDAR_MANAGER, on_calendar_manager }, - { ACTION_HELP, on_help }, ---- california-0.4.0/src/host/host-main-window.vala 2015-03-24 00:36:24.000000000 +0100 -+++ california-0.4.0/src/host/host-main-window.vala 2017-02-12 16:22:17.723370162 +0100 -@@ -71,7 +71,7 @@ - private const string ACTION_RESET_FONT = "reset-font"; - private const string ACCEL_RESET_FONT = "KP_Multiply"; - -- private static const ActionEntry[] action_entries = { -+ private const ActionEntry[] action_entries = { - { ACTION_QUICK_CREATE_EVENT, on_quick_create_event }, - { ACTION_JUMP_TO_TODAY, on_jump_to_today }, - { ACTION_NEXT, on_next }, diff --git a/srcpkgs/california/template b/srcpkgs/california/template index ad7b28762ce..738eb0587ce 100644 --- a/srcpkgs/california/template +++ b/srcpkgs/california/template @@ -1,15 +1,9 @@ # Template file for 'california' -pkgname="california" -version="0.4.0" -revision=3 -build_style=gnu-configure -short_desc="A new calendar application for GNOME 3" -maintainer="Luca - " -license="LGPL-2.1" -patch_args="-p1" +pkgname=california +version=0.4.0 +revision=4 +noarch=yes +build_style=meta +short_desc="A new calendar application for GNOME 3 (removed package)" +license="metapackage" homepage="https://wiki.gnome.org/Apps/California" -hostmakedepends="pkg-config intltool itstool vala xdg-utils yelp-tools gobject-introspection" -makedepends="libgee08-devel evolution-data-server-devel gtk+3-devel" -distfiles="$GNOME_SITE/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum="b25f356363a9f8f8f93c7ab78af02de39f9c3b71964663129ac9904de9147eb6" -nocross="gobject-introspection cannot be cross compiled"