From a97991961490691b6428b50ab02cf5d01cb5594c Mon Sep 17 00:00:00 2001 From: Omar Vega Ramos Date: Sat, 4 Jan 2020 21:58:29 -0500 Subject: abiword-3.0.4-1.parabola1: updating version --- libre/abiword/PKGBUILD | 36 +++-------- libre/abiword/bug13815.patch | 49 --------------- libre/abiword/fix-flickering.patch | 109 --------------------------------- libre/abiword/libical-deprecated.patch | 13 ---- 4 files changed, 10 insertions(+), 197 deletions(-) delete mode 100644 libre/abiword/bug13815.patch delete mode 100644 libre/abiword/fix-flickering.patch delete mode 100644 libre/abiword/libical-deprecated.patch (limited to 'libre/abiword') diff --git a/libre/abiword/PKGBUILD b/libre/abiword/PKGBUILD index 1f30fcd37..b92e4d879 100644 --- a/libre/abiword/PKGBUILD +++ b/libre/abiword/PKGBUILD @@ -6,9 +6,9 @@ # Contributor: Omar Vega Ramos pkgname=abiword -pkgver=3.0.2 -pkgrel=9 -pkgrel+=.par1 +pkgver=3.0.4 +pkgrel=1 +pkgrel+=.parabola1 pkgdesc='Fully-featured word processor' pkgdesc+=', without Google search engine and nonfree fonts support' arch=('x86_64') @@ -18,32 +18,28 @@ url='https://www.abisource.com' 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' 'abiword-libre') replaces=('abiword-plugins' 'abiword-libre') options=(!makeflags) -source=(https://www.abisource.com/downloads/$pkgname/$pkgver/source/$pkgname-$pkgver.tar.gz +source=(https://www.abisource.com/downloads/$pkgname/$pkgver/source/$pkgname-$pkgver.tar.gz{,.asc} abiword-3.0.0-librevenge.patch abiword-3.0.1-libwps-0.4.patch aiksaurus-plugin.m4 command-plugin.m4 python-override.patch - bug13815.patch enchant-2.1.patch - libical-deprecated.patch - liberation-fonts.patch - fix-flickering.patch) -sha256sums=('afbfd458fd02989d8b0c6362ba8a4c14686d89666f54cfdb5501bd2090cf3522' + liberation-fonts.patch) +sha256sums=('e93096cb192e5bc19d62e180fc5eda643206465315a710113ae5036bc2a1a5d7' + 'SKIP' '77b52a3722096cec3bfbe4fff3802f51b6c9e0ff7aaa30028c29825fd4e6a65f' 'f1375b2ab7af2959717cba0259ba546c8e75ef849e84263bdc253019e849cb2a' '5f80a2f94f9929cdba9809c5e1a87cd5d537a2518bb879bfb9eab51a71c8dac1' '2f26826e9d59d80dacd0dae4aceb815804eaa75954e47507a0897794f33e45be' 'dba1e3265cd42589f17b41fea1a39c8aa4b83c7203b9d5944b578d0ff9c858be' - '05f2544a177d6f58424af9045c26e82aca64938d0daf00f43f6b99a2abf64496' '444dc2aadea3c80310a509b690097541573f6d2652c573d04da66a0f385fcfb2' - 'fe6eec4129777117bbfd5fa12d02208e430c8a3b96a54dcf8574ce800f240489' - '8a0b6e444e937924743f95c747cbe395a30fb8677a010e60c973b9039e258079' - '4497da364256340ccd9a60c2fc858a6999f1b2ebc2dad5e6d297e7ab9cabccef') + '8a0b6e444e937924743f95c747cbe395a30fb8677a010e60c973b9039e258079') +validpgpkeys=('6C44DB3E0BF3EAF5B433239A5FEE05E6A56E15A3') # Hubert Figuiere prepare() { cd $pkgname-$pkgver @@ -57,24 +53,12 @@ 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 deprecated enchant functions patch -Np1 -i ../enchant-2.1.patch - # Replace deprecated libical functions - patch -Np1 -i ../libical-deprecated.patch - # Replace nonfree fonts support to liberation fonts patch -Np1 -i ../liberation-fonts.patch - # Fix incessant flickering - # https://bugzilla.abisource.com/show_bug.cgi?id=13791 - # https://sources.debian.org/patches/abiword/3.0.2-6/ - patch -Np1 -i ../fix-flickering.patch - # Install missing m4 file install -m644 ../aiksaurus-plugin.m4 plugins/aiksaurus/plugin.m4 install -m644 ../command-plugin.m4 plugins/command/plugin.m4 diff --git a/libre/abiword/bug13815.patch b/libre/abiword/bug13815.patch deleted file mode 100644 index 88a5ca4c3..000000000 --- a/libre/abiword/bug13815.patch +++ /dev/null @@ -1,49 +0,0 @@ -commit 2ee38d1881aeea27bb49acc450631d813d1f28ba -Author: Hubert Figuière -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(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*/); diff --git a/libre/abiword/fix-flickering.patch b/libre/abiword/fix-flickering.patch deleted file mode 100644 index 70dcb154f..000000000 --- a/libre/abiword/fix-flickering.patch +++ /dev/null @@ -1,109 +0,0 @@ -Description: Fix flickering - - in GR_Caret::s_blink_timeout, avoid repeated calls by stopping the - timer, it will be restarted when needed, - . - - in GR_Caret::s_enable, avoid extra unnecessary _blink calls when blink - is enabled, as they serve no purpose, - . - - in XAP_UnixFrameImpl::_fe::expose, use the Cairo clip rectangle - instead of the expose event area, thanks to Hubert Figuière in - 865c1dda7e13deff04573ffc42028b71fee07f9c, - . - - in XAP_UnixFrameImpl::_fe::expose, do not return FALSE, as other - handlers will need to handle the draw event, - . - - in GR_UnixCairoGraphics::flush, fix excessive draw events; - gtk_widget_queue_draw only marks the widget as needing redrawing, - which causes a draw event for each call to flush, therefore every - caret blink, so use gdk_flush instead, -Author: James Cameron -Origin: other -Bug: https://bugzilla.abisource.com/show_bug.cgi?id=13791 -Bug-SugarLabs: https://bugs.sugarlabs.org/ticket/4915 -Bug-Ubuntu: https://pad.lv/1574278 -Last-Update: 2017-09-24 ---- a/src/af/gr/gtk/gr_UnixCairoGraphics.cpp -+++ b/src/af/gr/gtk/gr_UnixCairoGraphics.cpp -@@ -577,9 +577,7 @@ void GR_UnixCairoGraphics::_endPaint() - - void GR_UnixCairoGraphics::flush(void) - { -- if (m_Widget) { -- gtk_widget_queue_draw(m_Widget); -- } -+ gdk_flush(); - } - - bool GR_UnixCairoGraphics::queryProperties(GR_Graphics::Properties gp) const ---- a/src/af/gr/xp/gr_Caret.cpp -+++ b/src/af/gr/xp/gr_Caret.cpp -@@ -155,22 +155,17 @@ void GR_Caret::s_enable(UT_Worker * _w) - { - GR_Caret * c = static_cast(_w->getInstanceData()); - -+ c->m_enabler->stop(); - c->m_worker->stop(); -- c->_blink(true); -- if (!c->m_bCursorIsOn) -- c->_blink(true); // blink again -- else -- { -- c->_blink(true); // ?? - MARCM -- c->_blink(true); -- } - c->m_worker->start(); -- c->m_enabler->stop(); -+ c->_blink(true); - } - - void GR_Caret::s_blink_timeout(UT_Worker * _w) - { - GR_Caret * c = static_cast(_w->getInstanceData()); -+ -+ c->m_blinkTimeout->stop(); - if (c->isEnabled()) - c->disable(); - } ---- a/src/af/xap/gtk/xap_UnixFrameImpl.cpp -+++ b/src/af/xap/gtk/xap_UnixFrameImpl.cpp -@@ -1215,8 +1215,16 @@ gboolean XAP_UnixFrameImpl::_fe::expose( - { - XAP_UnixFrameImpl * pUnixFrameImpl = static_cast(g_object_get_data(G_OBJECT(w), "user_data")); - FV_View * pView = static_cast(pUnixFrameImpl->getFrame()->getCurrentView()); -+ double x, y, width, height; - #if GTK_CHECK_VERSION(3,0,0) -- GdkEventExpose *pExposeEvent = reinterpret_cast(gtk_get_current_event()); -+ cairo_clip_extents (cr, &x, &y, &width, &height); -+ width -= x; -+ height -= y; -+#else -+ x = pExposeEvent->area.x; -+ y = pExposeEvent->area.y; -+ width = pExposeEvent->area.width; -+ height = pExposeEvent->area.height; - #endif - /* Jean: commenting out next lines since the zoom update code does draw only - * part of what needs to be updated. */ -@@ -1230,16 +1238,17 @@ gboolean XAP_UnixFrameImpl::_fe::expose( - UT_Rect rClip; - if (pGr->getPaintCount () > 0) - return TRUE; -- xxx_UT_DEBUGMSG(("Expose area: x %d y %d width %d height %d \n",pExposeEvent->area.x,pExposeEvent->area.y,pExposeEvent->area.width,pExposeEvent->area.height)); -- rClip.left = pGr->tlu(pExposeEvent->area.x); -- rClip.top = pGr->tlu(pExposeEvent->area.y); -- rClip.width = pGr->tlu(pExposeEvent->area.width)+1; -- rClip.height = pGr->tlu(pExposeEvent->area.height)+1; -+ rClip.left = pGr->tlu(x); -+ rClip.top = pGr->tlu(y); - #if GTK_CHECK_VERSION(3,0,0) -+ rClip.width = pGr->tlu(width); -+ rClip.height = pGr->tlu(height); - static_cast(pGr)->setCairo(cr); - pView->draw(&rClip); - static_cast(pGr)->setCairo(NULL); - #else -+ rClip.width = pGr->tlu(width)+1; -+ rClip.height = pGr->tlu(height)+1; - pView->draw(&rClip); - #endif - } diff --git a/libre/abiword/libical-deprecated.patch b/libre/abiword/libical-deprecated.patch deleted file mode 100644 index 9ca15bee1..000000000 --- a/libre/abiword/libical-deprecated.patch +++ /dev/null @@ -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() ); -- cgit v1.2.2