From owner-svn-ports-all@freebsd.org Wed May 17 09:47:53 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 46CE9D6F193; Wed, 17 May 2017 09:47:53 +0000 (UTC) (envelope-from kwm@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 173A7B3C; Wed, 17 May 2017 09:47:53 +0000 (UTC) (envelope-from kwm@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v4H9lqBm050272; Wed, 17 May 2017 09:47:52 GMT (envelope-from kwm@FreeBSD.org) Received: (from kwm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v4H9lpjk050270; Wed, 17 May 2017 09:47:51 GMT (envelope-from kwm@FreeBSD.org) Message-Id: <201705170947.v4H9lpjk050270@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kwm set sender to kwm@FreeBSD.org using -f From: Koop Mast Date: Wed, 17 May 2017 09:47:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r441072 - in head/deskutils/california: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 May 2017 09:47:53 -0000 Author: kwm Date: Wed May 17 09:47:51 2017 New Revision: 441072 URL: https://svnweb.freebsd.org/changeset/ports/441072 Log: Unbreak by adding patch to fix the build with newer evolution-data-server. While here list missing indirect dependancies. Obtained from: upstream Added: head/deskutils/california/files/ head/deskutils/california/files/patch-backing_eds_calendar-source.vala (contents, props changed) Modified: head/deskutils/california/Makefile Modified: head/deskutils/california/Makefile ============================================================================== --- head/deskutils/california/Makefile Wed May 17 09:45:20 2017 (r441071) +++ head/deskutils/california/Makefile Wed May 17 09:47:51 2017 (r441072) @@ -10,20 +10,21 @@ DIST_SUBDIR= gnome3 MAINTAINER= gnome@FreeBSD.org COMMENT= Calendar client for GNOME 3 -IGNORE= Not compatible with evolution-data-server 3.16.0 - BUILD_DEPENDS= itstool:textproc/itstool \ xdg-open:devel/xdg-utils LIB_DEPENDS= libwebkitgtk-3.0.so:www/webkit-gtk3 \ libsoup-2.4.so:devel/libsoup \ libgee-0.8.so:devel/libgee \ libgdata.so:devel/libgdata \ + libical.so:devel/libical \ + libsecret-1.so:security/libsecret \ + libjson-glib-1.0.so:devel/json-glib \ libgoa-1.0.so:net/gnome-online-accounts RUN_DEPENDS= xdg-open:devel/xdg-utils USES= desktop-file-utils gettext gmake libtool pathfix \ pkgconfig tar:xz -USE_GNOME= evolutiondataserver3 glib20 gnomedocutils gnomeprefix \ +USE_GNOME= cairo evolutiondataserver3 glib20 gnomedocutils gnomeprefix \ gtk30 intlhack introspection USE_LDCONFIG= yes GNU_CONFIGURE= yes Added: head/deskutils/california/files/patch-backing_eds_calendar-source.vala ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/deskutils/california/files/patch-backing_eds_calendar-source.vala Wed May 17 09:47:51 2017 (r441072) @@ -0,0 +1,43 @@ +From 4b61966a93e7be65ed35e8a509e2b7538b136c3c Mon Sep 17 00:00:00 2001 +From: Adam Dingle +Date: Thu, 24 Mar 2016 12:35:04 -0400 +Subject: Fix build with newer evolution-data-server: bug 743961 + +Thanks to Milan Crha for this fix. + +https://bugzilla.gnome.org/show_bug.cgi?id=743961 +--- + configure.ac | 2 +- + src/backing/eds/backing-eds-calendar-source.vala | 2 +- + vapi/libecal-1.2.vapi | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/backing/eds/backing-eds-calendar-source.vala b/src/backing/eds/backing-eds-calendar-source.vala +index 7e30e08..da88db4 100644 +--- src/backing/eds/backing-eds-calendar-source.vala ++++ src/backing/eds/backing-eds-calendar-source.vala +@@ -256,7 +256,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, ++ client = (E.CalClient) yield E.CalClient.connect(eds_source, E.CalClientSourceType.EVENTS, 1, + cancellable); + + client.bind_property("readonly", this, PROP_READONLY, BindingFlags.SYNC_CREATE); +diff --git a/vapi/libecal-1.2.vapi b/vapi/libecal-1.2.vapi +index 6ead3ec..46fd711 100644 +--- vapi/libecal-1.2.vapi ++++ vapi/libecal-1.2.vapi +@@ -23,7 +23,7 @@ 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 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, 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; +-- +cgit v0.12 +