[arch-commits] Commit in abiword/trunk (PKGBUILD bug13815.patch)

[Jan de Groot]

    Date: Thursday, December 22, 2016 @ 11:18:41
  Author: jgc
Revision: 284424

upgpkg: abiword 3.0.2-4

Fix FS#51667

Added:
  abiword/trunk/bug13815.patch
Modified:
  abiword/trunk/PKGBUILD

----------------+
 PKGBUILD       |   12 +++++++++---
 bug13815.patch |   49 +++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 58 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-12-22 07:12:09 UTC (rev 284423)
+++ PKGBUILD	2016-12-22 11:18:41 UTC (rev 284424)
@@ -5,7 +5,7 @@
 
 pkgname=abiword
 pkgver=3.0.2
-pkgrel=3
+pkgrel=4
 pkgdesc='Fully-featured word processor'
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -22,13 +22,15 @@
 	abiword-3.0.1-libwps-0.4.patch
         aiksaurus-plugin.m4
         command-plugin.m4
-        python-override.patch)
+        python-override.patch
+        bug13815.patch)
 sha256sums=('afbfd458fd02989d8b0c6362ba8a4c14686d89666f54cfdb5501bd2090cf3522'
             '77b52a3722096cec3bfbe4fff3802f51b6c9e0ff7aaa30028c29825fd4e6a65f'
             'f1375b2ab7af2959717cba0259ba546c8e75ef849e84263bdc253019e849cb2a'
             '5f80a2f94f9929cdba9809c5e1a87cd5d537a2518bb879bfb9eab51a71c8dac1'
             '2f26826e9d59d80dacd0dae4aceb815804eaa75954e47507a0897794f33e45be'
-            'dba1e3265cd42589f17b41fea1a39c8aa4b83c7203b9d5944b578d0ff9c858be')
+            'dba1e3265cd42589f17b41fea1a39c8aa4b83c7203b9d5944b578d0ff9c858be'
+            '05f2544a177d6f58424af9045c26e82aca64938d0daf00f43f6b99a2abf64496')
 
 prepare() {
   cd $pkgname-$pkgver
@@ -42,6 +44,10 @@
   # 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
+
   # Install missing m4 file
   install -m644 ../aiksaurus-plugin.m4 plugins/aiksaurus/plugin.m4
   install -m644 ../command-plugin.m4 plugins/command/plugin.m4

Added: bug13815.patch
===================================================================
--- bug13815.patch	                        (rev 0)
+++ bug13815.patch	2016-12-22 11:18:41 UTC (rev 284424)
@@ -0,0 +1,49 @@
+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*/);