- rel 6; fixes build

diff --git a/abiword.spec b/abiword.spec
index ebcab43db51da18052588ec19f4f93ad6730b89f..6678cf898929811e4d242f3f804a0dcaf442739b 100644 (file)
--- a/abiword.spec
+++ b/abiword.spec
@@ -20,7 +20,7 @@ Summary:      Multi-platform word processor
 Summary(pl.UTF-8):     Wieloplatformowy procesor tekstu
 Name:          abiword
 Version:       3.0.2
-Release:       5
+Release:       6
 Epoch:         1
 License:       GPL v2+
 Group:         X11/Applications/Editors
@@ -29,6 +29,8 @@ Source0:      http://www.abisource.com/downloads/abiword/%{version}/source/%{name}-%{
 Patch0:                %{name}-desktop.patch
 Patch1:                %{name}-mht.patch
 Patch2:                %{name}-librevenge.patch
+Patch3:                ecal.patch
+Patch4:                icu.patch
 Patch6:                %{name}-tidy.patch
 Patch7:                %{name}-asio.patch
 URL:           http://www.abisource.com/
@@ -376,6 +378,8 @@ Jest to teczka clipartów używanych przez AbiWorda.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p0
+%patch3 -p1
+%patch4 -p1
 %patch6 -p1
 %patch7 -p1
 

diff --git a/ecal.patch b/ecal.patch
new file mode 100644 (file)
index 0000000..80ac2b7
--- /dev/null
+++ b/ecal.patch
@@ -0,0 +1,11 @@
+--- abiword-3.0.2/configure.ac~        2016-10-21 02:38:12.000000000 +0200
++++ abiword-3.0.2/configure.ac 2019-10-19 23:08:25.758721467 +0200
+@@ -477,7 +477,7 @@ AM_CONDITIONAL([WITH_REDLAND], test "$ab
+ AM_CONDITIONAL([HAVE_REDLAND], test "$abi_cv_redland" = "yes")
+ 
+ 
+-evolution_data_server_req='libebook-1.2 >= 3.6 libecal-1.2'
++evolution_data_server_req='libebook-1.2 >= 3.6 libecal-2.0'
+ AC_ARG_WITH([evolution_data_server], 
+       [AS_HELP_STRING([--with-evolution-data-server], [Use Evolution Data Server to get at contact and calendar information])], 
+ [

diff --git a/icu.patch b/icu.patch
new file mode 100644 (file)
index 0000000..ba84c3c
--- /dev/null
+++ b/icu.patch
@@ -0,0 +1,13 @@
+--- abiword-3.0.2/src/text/ptbl/xp/pd_DocumentRDF.cpp~ 2015-04-02 05:09:20.000000000 +0200
++++ abiword-3.0.2/src/text/ptbl/xp/pd_DocumentRDF.cpp  2019-10-19 23:16:42.823811887 +0200
+@@ -2269,8 +2269,8 @@ PD_RDFEvent::exportToFile( const std::st
+         icalcomponent_set_uid( c,         m_uid.c_str() );
+         icalcomponent_set_location( c,    m_location.c_str() );
+         icalcomponent_set_description( c, m_desc.c_str() );
+-        icalcomponent_set_dtstart( c,     icaltime_from_timet( m_dtstart, 0 ) );
+-        icalcomponent_set_dtend( c,       icaltime_from_timet( m_dtend, 0 ) );
++        icalcomponent_set_dtstart( c,     icaltime_from_timet_with_zone ( m_dtstart, 0, NULL) );
++        icalcomponent_set_dtend( c,       icaltime_from_timet_with_zone( m_dtend, 0, NULL ) );
+ 
+         char* data = icalcomponent_as_ical_string( c );
+         std::ofstream oss( filename.c_str() );