From: Jan Rękorajski <baggins@pld-linux.org>
Date: Sat, 15 Oct 2016 18:01:53 +0000 (+0200)
Subject: - fix vala build errors
X-Git-Tag: auto/th/california-0.4.0-6
X-Git-Url: https://git.pld-linux.org/?a=commitdiff_plain;h=refs%2Ftags%2Fauto%2Fth%2Fcalifornia-0.4.0-6;p=packages%2Fcalifornia.git

- fix vala build errors
- rel 6
---

diff --git a/california.spec b/california.spec
index b08c38e..3fad957 100644
--- a/california.spec
+++ b/california.spec
@@ -2,12 +2,13 @@ Summary:	California - GNOME 3 Calendar
 Summary(pl.UTF-8):	California - kalendarz dla GNOME 3
 Name:		california
 Version:	0.4.0
-Release:	5
+Release:	6
 License:	LGPL v2.1+
 Group:		X11/Applications
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/california/0.4/%{name}-%{version}.tar.xz
 # Source0-md5:	cd8fa9cc399ee918e55b051e3b9f3124
 Patch0:		evolution-data-server-3.14.patch
+Patch1:		vala.patch
 URL:		https://wiki.gnome.org/Apps/California
 BuildRequires:	evolution-data-server-devel >= 3.8.5
 BuildRequires:	gettext-tools
@@ -50,6 +51,7 @@ interfejs.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %configure 
diff --git a/vala.patch b/vala.patch
new file mode 100644
index 0000000..11bb969
--- /dev/null
+++ b/vala.patch
@@ -0,0 +1,24 @@
+diff -ur california-0.4.0/src/application/california-application.vala california-0.4.0.vala/src/application/california-application.vala
+--- california-0.4.0/src/application/california-application.vala	2015-03-24 00:36:24.000000000 +0100
++++ california-0.4.0.vala/src/application/california-application.vala	2016-10-15 19:56:29.327866569 +0200
+@@ -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 },
+diff -ur california-0.4.0/src/host/host-main-window.vala california-0.4.0.vala/src/host/host-main-window.vala
+--- california-0.4.0/src/host/host-main-window.vala	2015-03-24 00:36:24.000000000 +0100
++++ california-0.4.0.vala/src/host/host-main-window.vala	2016-10-15 19:56:51.822151619 +0200
+@@ -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 },