[packages/ical] - rel 25; fix build with tcl/tk 8.6

[arekm]

commit c3d5c048c548f17d7d82ac40a86563434f0d8c9c
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Tue Jun 3 10:59:16 2014 +0200

    - rel 25; fix build with tcl/tk 8.6

 ical-build.patch | 11 +++++++++++
 ical.spec        |  6 ++++--
 2 files changed, 15 insertions(+), 2 deletions(-)
---
diff --git a/ical.spec b/ical.spec
index 919ae0d..87e1fbe 100644
--- a/ical.spec
+++ b/ical.spec
@@ -2,7 +2,7 @@ Summary:	An X Window System-based calendar program
 Summary(pl.UTF-8):	Kalendarz działający pod X Window System
 Name:		ical
 Version:	2.2
-Release:	24
+Release:	25
 License:	distributable
 Group:		X11/Applications
 Source0:	http://www.research.digial.com/SRC/personal/Sanjay_Ghemawat/ical/icalbins/%{name}-%{version}.tar.gz
@@ -16,6 +16,7 @@ Patch4:		%{name}-OPTF.patch
 Patch5:		%{name}-protos.patch
 Patch6:		%{name}-tcl84.patch
 Patch7:		%{name}-prototypes.patch
+Patch8:		%{name}-build.patch
 URL:		http://www.research.digital.com/SRC/personal/Sanjay_Ghemawat/ical/home.html
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -50,6 +51,7 @@ dzielić kalendarze pomiędzy różnymi użytkownikami.
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
 
 %{__perl} -pi -e 's@/lib(.*T.*_LIB_FILE)@/%{_lib}$1@' configure.in
 
@@ -64,7 +66,7 @@ cd ..
 	--with-tclsh=/usr/bin/tclsh
 
 %{__make} \
-	OPTF="%{rpmcflags}"
+	OPTF="%{rpmcflags} %{rpmcppflags} -DUSE_INTERP_RESULT"
 
 %install
 rm -rf $RPM_BUILD_ROOT
diff --git a/ical-build.patch b/ical-build.patch
new file mode 100644
index 0000000..077665a
--- /dev/null
+++ b/ical-build.patch
@@ -0,0 +1,11 @@
+--- ical-2.2/calendar/calfile.C~	1997-05-24 02:23:52.000000000 +0200
++++ ical-2.2/calendar/calfile.C	2014-06-03 10:55:47.545370505 +0200
+@@ -60,7 +60,7 @@
+     backupName = tmp;
+ 
+     // Get directory name for access checks
+-    char* lastSlash = strrchr(name, '/');
++    char* lastSlash = (char *)strrchr(name, '/');
+     if (lastSlash == 0) {
+ 	/* Calendar is in current directory */
+ 	tmp = new char[3];
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ical.git/commitdiff/c3d5c048c548f17d7d82ac40a86563434f0d8c9c