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

[Antonio Rojas]

    Date: Monday, November 25, 2019 @ 11:09:41
  Author: arojas
Revision: 369747

Update to 3.0.3

Modified:
  abiword/trunk/PKGBUILD
Deleted:
  abiword/trunk/bug13815.patch
  abiword/trunk/libical-deprecated.patch

--------------------------+
 PKGBUILD                 |   23 +++++----------------
 bug13815.patch           |   49 ---------------------------------------------
 libical-deprecated.patch |   13 -----------
 3 files changed, 6 insertions(+), 79 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-11-25 10:11:53 UTC (rev 369746)
+++ PKGBUILD	2019-11-25 11:09:41 UTC (rev 369747)
@@ -3,8 +3,8 @@
 # Contributor: Maël Lavault <moimael at neuf.fr>
 
 pkgname=abiword
-pkgver=3.0.2
-pkgrel=10
+pkgver=3.0.3
+pkgrel=1
 pkgdesc='Fully-featured word processor'
 arch=('x86_64')
 license=('GPL')
@@ -12,7 +12,7 @@
 depends=('fribidi' 'wv' 'goffice' 'librsvg' 'enchant' 'desktop-file-utils'
          'redland' 'libical' 'gtk-update-icon-cache' 'loudmouth' 'libwpg' 'libwps' 'libwmf' 'link-grammar' 
          'gtkmathview' 'aiksaurus' 'libxslt' 'libsoup' 'libots' 'libgsf' 'psiconv')
-makedepends=('pkgconfig' 'asio' 'boost' 'gobject-introspection' 'libwpd' 'libwps' 'python2-gobject' 'python-gobject')
+makedepends=('pkgconfig' 'asio' 'boost' 'gobject-introspection' 'libwpd' 'libwps' 'python2-gobject' 'python-gobject' 'autoconf-archive')
 conflicts=('abiword-plugins')
 replaces=('abiword-plugins')
 options=('!makeflags')
@@ -22,18 +22,14 @@
         aiksaurus-plugin.m4
         command-plugin.m4
         python-override.patch
-        bug13815.patch
-        enchant-2.1.patch
-        libical-deprecated.patch)
-sha256sums=('afbfd458fd02989d8b0c6362ba8a4c14686d89666f54cfdb5501bd2090cf3522'
+        enchant-2.1.patch)
+sha256sums=('b3af1b653b78dbc39b310374c05a87d1b334d62bc6b0e99380b0ffa46116520f'
             '77b52a3722096cec3bfbe4fff3802f51b6c9e0ff7aaa30028c29825fd4e6a65f'
             'f1375b2ab7af2959717cba0259ba546c8e75ef849e84263bdc253019e849cb2a'
             '5f80a2f94f9929cdba9809c5e1a87cd5d537a2518bb879bfb9eab51a71c8dac1'
             '2f26826e9d59d80dacd0dae4aceb815804eaa75954e47507a0897794f33e45be'
             'dba1e3265cd42589f17b41fea1a39c8aa4b83c7203b9d5944b578d0ff9c858be'
-            '05f2544a177d6f58424af9045c26e82aca64938d0daf00f43f6b99a2abf64496'
-            '444dc2aadea3c80310a509b690097541573f6d2652c573d04da66a0f385fcfb2'
-            'fe6eec4129777117bbfd5fa12d02208e430c8a3b96a54dcf8574ce800f240489')
+            '444dc2aadea3c80310a509b690097541573f6d2652c573d04da66a0f385fcfb2')
 
 prepare() {
   cd $pkgname-$pkgver
@@ -47,16 +43,9 @@
   # Fix python override code to work with Python 3.x
   patch -Np1 -i ../python-override.patch
 
-  # Fix black on black (FS#51667)
-  # 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

Deleted: bug13815.patch
===================================================================
--- bug13815.patch	2019-11-25 10:11:53 UTC (rev 369746)
+++ bug13815.patch	2019-11-25 11:09:41 UTC (rev 369747)
@@ -1,49 +0,0 @@
-commit 2ee38d1881aeea27bb49acc450631d813d1f28ba
-Author: Hubert Figuière <hub at figuiere.net>
-Date:   Wed Dec 7 09:44:01 2016 -0500
-
-    Bug 13815 - draw event should return TRUE
-    
-    This fix the black drawing regression witj Gtk3.22
-
-diff --git a/src/af/xap/gtk/xap_UnixFrameImpl.cpp b/src/af/xap/gtk/xap_UnixFrameImpl.cpp
-index 780000e..10f8e00 100644
---- a/src/af/xap/gtk/xap_UnixFrameImpl.cpp
-+++ b/src/af/xap/gtk/xap_UnixFrameImpl.cpp
-@@ -1208,9 +1208,9 @@ gint XAP_UnixFrameImpl::_fe::delete_event(GtkWidget * w, GdkEvent * /*event*/, g
- }
- 
- #if GTK_CHECK_VERSION(3,0,0)
--gint XAP_UnixFrameImpl::_fe::draw(GtkWidget * w, cairo_t * cr)
-+gboolean XAP_UnixFrameImpl::_fe::draw(GtkWidget * w, cairo_t * cr)
- #else
--gint XAP_UnixFrameImpl::_fe::expose(GtkWidget * w, GdkEventExpose* pExposeEvent)
-+gboolean XAP_UnixFrameImpl::_fe::expose(GtkWidget * w, GdkEventExpose* pExposeEvent)
- #endif
- {
- 	XAP_UnixFrameImpl * pUnixFrameImpl = static_cast<XAP_UnixFrameImpl *>(g_object_get_data(G_OBJECT(w), "user_data"));
-@@ -1243,7 +1243,7 @@ gint XAP_UnixFrameImpl::_fe::expose(GtkWidget * w, GdkEventExpose* pExposeEvent)
- 		pView->draw(&rClip);
- #endif
- 	}
--	return FALSE;
-+	return TRUE;
- }
- 
- static bool bScrollWait = false;
-diff --git a/src/af/xap/gtk/xap_UnixFrameImpl.h b/src/af/xap/gtk/xap_UnixFrameImpl.h
-index 30ee5d8..a0ff57f 100644
---- a/src/af/xap/gtk/xap_UnixFrameImpl.h
-+++ b/src/af/xap/gtk/xap_UnixFrameImpl.h
-@@ -152,9 +152,9 @@ protected:
- 			static gint key_release_event(GtkWidget* w, GdkEventKey* e);
- 			static gint delete_event(GtkWidget * w, GdkEvent * /*event*/, gpointer /*data*/);
- #if GTK_CHECK_VERSION(3,0,0)
--			static gint draw(GtkWidget * w, cairo_t * cr);
-+			static gboolean draw(GtkWidget * w, cairo_t * cr);
- #else
--			static gint expose(GtkWidget * w, GdkEventExpose* pExposeEvent);
-+			static gboolean expose(GtkWidget * w, GdkEventExpose* pExposeEvent);
- #endif
- 			static gint do_ZoomUpdate( gpointer /* xap_UnixFrame * */ p);
- 			static void vScrollChanged(GtkAdjustment * w, gpointer /*data*/);

Deleted: libical-deprecated.patch
===================================================================
--- libical-deprecated.patch	2019-11-25 10:11:53 UTC (rev 369746)
+++ libical-deprecated.patch	2019-11-25 11:09:41 UTC (rev 369747)
@@ -1,13 +0,0 @@
---- 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() );