[arch-commits] Commit in abiword/trunk (3 files)

[Jan de Groot]

    Date: Sunday, November 19, 2017 @ 23:03:58
  Author: jgc
Revision: 310462

Prepare for enchant 2.1.x and libical 3.x rebuild

Added:
  abiword/trunk/enchant-2.1.patch
  abiword/trunk/libical-deprecated.patch
Modified:
  abiword/trunk/PKGBUILD

--------------------------+
 PKGBUILD                 |   14 ++++++++++++--
 enchant-2.1.patch        |   29 +++++++++++++++++++++++++++++
 libical-deprecated.patch |   13 +++++++++++++
 3 files changed, 54 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-11-19 22:35:01 UTC (rev 310461)
+++ PKGBUILD	2017-11-19 23:03:58 UTC (rev 310462)
@@ -23,7 +23,9 @@
         aiksaurus-plugin.m4
         command-plugin.m4
         python-override.patch
-        bug13815.patch)
+        bug13815.patch
+        enchant-2.1.patch
+        libical-deprecated.patch)
 sha256sums=('afbfd458fd02989d8b0c6362ba8a4c14686d89666f54cfdb5501bd2090cf3522'
             '77b52a3722096cec3bfbe4fff3802f51b6c9e0ff7aaa30028c29825fd4e6a65f'
             'f1375b2ab7af2959717cba0259ba546c8e75ef849e84263bdc253019e849cb2a'
@@ -30,7 +32,9 @@
             '5f80a2f94f9929cdba9809c5e1a87cd5d537a2518bb879bfb9eab51a71c8dac1'
             '2f26826e9d59d80dacd0dae4aceb815804eaa75954e47507a0897794f33e45be'
             'dba1e3265cd42589f17b41fea1a39c8aa4b83c7203b9d5944b578d0ff9c858be'
-            '05f2544a177d6f58424af9045c26e82aca64938d0daf00f43f6b99a2abf64496')
+            '05f2544a177d6f58424af9045c26e82aca64938d0daf00f43f6b99a2abf64496'
+            '444dc2aadea3c80310a509b690097541573f6d2652c573d04da66a0f385fcfb2'
+            'fe6eec4129777117bbfd5fa12d02208e430c8a3b96a54dcf8574ce800f240489')
 
 prepare() {
   cd $pkgname-$pkgver
@@ -48,6 +52,12 @@
   # http://bugzilla.abisource.com/show_bug.cgi?id=13815
   patch -Np1 -i ../bug13815.patch
 
+  # Replace deprecated enchant functions
+  patch -Np1 -i ../enchant-2.1.patch
+
+  # Replace deprecated libical functions
+  patch -Np1 -i ../libical-deprecated.patch
+
   # Install missing m4 file
   install -m644 ../aiksaurus-plugin.m4 plugins/aiksaurus/plugin.m4
   install -m644 ../command-plugin.m4 plugins/command/plugin.m4

Added: enchant-2.1.patch
===================================================================
--- enchant-2.1.patch	                        (rev 0)
+++ enchant-2.1.patch	2017-11-19 23:03:58 UTC (rev 310462)
@@ -0,0 +1,29 @@
+--- abiword-3.0.2/src/af/xap/xp/enchant_checker.cpp.orig	2013-04-07 13:53:03.000000000 +0000
++++ abiword-3.0.2/src/af/xap/xp/enchant_checker.cpp	2017-11-19 22:54:41.236180298 +0000
+@@ -127,7 +127,7 @@
+ 				pvSugg->addItem (ucszSugg);
+ 		}
+ 
+-		enchant_dict_free_suggestions (m_dict, suggestions);
++		enchant_dict_free_string_list (m_dict, suggestions);
+ 	}
+ 
+ 	return pvSugg;
+@@ -139,7 +139,7 @@
+ 
+ 	if (word && len) {
+ 		UT_UTF8String utf8 (word, len);
+-		enchant_dict_add_to_personal (m_dict, utf8.utf8_str(), utf8.byteLength());
++		enchant_dict_add (m_dict, utf8.utf8_str(), utf8.byteLength());
+ 		return true;
+ 	}
+ 	return false;
+@@ -150,7 +150,7 @@
+ 	UT_return_val_if_fail (m_dict, false);
+ 
+ 	UT_UTF8String ignore (toCorrect, toCorrectLen);
+-	return enchant_dict_is_in_session (m_dict, ignore.utf8_str(), ignore.byteLength()) != 0;
++	return enchant_dict_is_added (m_dict, ignore.utf8_str(), ignore.byteLength()) != 0;
+ }
+ 
+ void EnchantChecker::ignoreWord (const UT_UCSChar *toCorrect, size_t toCorrectLen)

Added: libical-deprecated.patch
===================================================================
--- libical-deprecated.patch	                        (rev 0)
+++ libical-deprecated.patch	2017-11-19 23:03:58 UTC (rev 310462)
@@ -0,0 +1,13 @@
+--- abiword-3.0.2/src/text/ptbl/xp/pd_DocumentRDF.cpp.orig	2015-04-02 03:09:20.000000000 +0000
++++ abiword-3.0.2/src/text/ptbl/xp/pd_DocumentRDF.cpp	2017-11-19 22:57:49.533304878 +0000
+@@ -2269,8 +2269,8 @@
+         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, 0 ) );
++        icalcomponent_set_dtend( c,       icaltime_from_timet_with_zone( m_dtend, 0, 0 ) );
+ 
+         char* data = icalcomponent_as_ical_string( c );
+         std::ofstream oss( filename.c_str() );