diff options
| -rw-r--r-- | libre/abiword/PKGBUILD | 10 | ||||
| -rw-r--r-- | libre/abiword/bug13815.patch | 49 |
2 files changed, 57 insertions, 2 deletions
diff --git a/libre/abiword/PKGBUILD b/libre/abiword/PKGBUILD index ec0740ffc..9226913c0 100644 --- a/libre/abiword/PKGBUILD +++ b/libre/abiword/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 280086 2016-11-07 18:38:01Z foutrelis $ +# $Id: PKGBUILD 284775 2016-12-25 20:26:42Z felixonmars $ # Maintainer (Arch): Jan de Groot <jgc@archlinux.org> # Contributor (Arch): Giovanni Scafora <giovanni@archlinux.org> # Contributor (Arch): Maël Lavault <moimael@neuf.fr> @@ -6,7 +6,7 @@ pkgname=abiword pkgver=3.0.2 -pkgrel=2.parabola1 +pkgrel=4.parabola1 pkgdesc='Fully-featured word processor, without Google search engine and nonfree fonts support' arch=('i686' 'x86_64' 'armv7h') license=('GPL') @@ -24,6 +24,7 @@ source=(http://abisource.com/downloads/$pkgname/$pkgver/source/$pkgname-$pkgver. aiksaurus-plugin.m4 command-plugin.m4 python-override.patch + bug13815.patch liberation-fonts.patch) sha256sums=('afbfd458fd02989d8b0c6362ba8a4c14686d89666f54cfdb5501bd2090cf3522' '77b52a3722096cec3bfbe4fff3802f51b6c9e0ff7aaa30028c29825fd4e6a65f' @@ -31,6 +32,7 @@ sha256sums=('afbfd458fd02989d8b0c6362ba8a4c14686d89666f54cfdb5501bd2090cf3522' '5f80a2f94f9929cdba9809c5e1a87cd5d537a2518bb879bfb9eab51a71c8dac1' '2f26826e9d59d80dacd0dae4aceb815804eaa75954e47507a0897794f33e45be' 'dba1e3265cd42589f17b41fea1a39c8aa4b83c7203b9d5944b578d0ff9c858be' + '05f2544a177d6f58424af9045c26e82aca64938d0daf00f43f6b99a2abf64496' '8a0b6e444e937924743f95c747cbe395a30fb8677a010e60c973b9039e258079') prepare() { @@ -45,6 +47,10 @@ prepare() { # 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 nonfree fonts support to liberation fonts patch -Np1 -i ../liberation-fonts.patch diff --git a/libre/abiword/bug13815.patch b/libre/abiword/bug13815.patch new file mode 100644 index 000000000..88a5ca4c3 --- /dev/null +++ b/libre/abiword/bug13815.patch @@ -0,0 +1,49 @@ +commit 2ee38d1881aeea27bb49acc450631d813d1f28ba +Author: Hubert Figuière <hub@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*/); |