pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/editors abiword: Update to 3.0.3
details: https://anonhg.NetBSD.org/pkgsrc/rev/feb943f8f213
branches: trunk
changeset: 344810:feb943f8f213
user: nia <nia%pkgsrc.org@localhost>
date: Tue Nov 26 16:54:13 2019 +0000
description:
abiword: Update to 3.0.3
Changes:
Bug 13827 - Fix overflow read in PNG
Bug 13826 - Fix out of bounds access
Bug 13834 - Do not delete[] strings allocated with g_malloc()
Bug 13815 - Fix the black drawing regression with Gtk3.22
Bug 13791 - Fix flicker and caret problems
Bug 13791 - Reduce flickering
Fix Gtk criticals in dialog stylist
Fix stylist styles population
Fix a bad static_cast
Fix a runtime error (integer overflow)
Update sq-AL.po
Bug 13904 - Fix touch pad scrolling
diffstat:
editors/abiword-plugins/Makefile | 3 +-
editors/abiword/Makefile | 4 +-
editors/abiword/Makefile.common | 4 +-
editors/abiword/PLIST | 3 +-
editors/abiword/distinfo | 31 +-
editors/abiword/patches/patch-plugin-configure.m4 | 12 +-
editors/abiword/patches/patch-src_af_gr_gtk_gr__UnixCairoGraphics.cpp | 51 -
editors/abiword/patches/patch-src_af_gr_gtk_gr__UnixImage.cpp | 24 -
editors/abiword/patches/patch-src_af_gr_xp_gr__Caret.cpp | 305 ----------
editors/abiword/patches/patch-src_af_gr_xp_gr__Caret.h | 26 -
editors/abiword/patches/patch-src_af_gr_xp_gr__Graphics.cpp | 40 -
editors/abiword/patches/patch-src_af_gr_xp_gr__Graphics.h | 17 -
editors/abiword/patches/patch-src_af_util_unix_ut__unixTimer.cpp | 22 -
editors/abiword/patches/patch-src_af_util_xp_ut__png.cpp | 34 -
editors/abiword/patches/patch-src_af_xap_gtk_xap__UnixFrameImpl.cpp | 62 --
editors/abiword/patches/patch-src_af_xap_gtk_xap__UnixFrameImpl.h | 18 -
editors/abiword/patches/patch-src_af_xap_xp_xap__Frame.cpp | 31 -
editors/abiword/patches/patch-src_text_fmt_xp_fl__SectionLayout.cpp | 16 -
editors/abiword/patches/patch-src_text_fmt_xp_fv__View.cpp | 43 -
editors/abiword/patches/patch-src_text_fmt_xp_fv__ViewDoubleBuffering.cpp | 15 -
editors/abiword/patches/patch-src_text_fmt_xp_fv__View__protected.cpp | 51 -
editors/abiword/patches/patch-src_text_ptbl_xp_pd__DocumentRDF.cpp | 17 -
editors/abiword/patches/patch-src_wp_ap_gtk_ap__UnixFrameImpl.cpp | 20 -
editors/abiword/patches/patch-src_wp_impexp_xp_ie__exp__DocRangeListener.cpp | 15 -
editors/abiword/patches/patch-src_wp_impexp_xp_ie__imp__RTF.cpp | 36 -
25 files changed, 19 insertions(+), 881 deletions(-)
diffs (truncated from 1056 to 300 lines):
diff -r b088295f5c83 -r feb943f8f213 editors/abiword-plugins/Makefile
--- a/editors/abiword-plugins/Makefile Tue Nov 26 16:53:17 2019 +0000
+++ b/editors/abiword-plugins/Makefile Tue Nov 26 16:54:13 2019 +0000
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.105 2019/08/22 12:23:04 ryoon Exp $
+# $NetBSD: Makefile,v 1.106 2019/11/26 16:54:13 nia Exp $
.include "../../editors/abiword/Makefile.common"
DISTNAME= abiword-${ABIVERSION}
PKGNAME= abiword-plugins-${ABIVERSION}
-PKGREVISION= 9
CATEGORIES= editors
MASTER_SITES= http://www.abiword.com/downloads/abiword/${PKGVERSION_NOREV}/source/
diff -r b088295f5c83 -r feb943f8f213 editors/abiword/Makefile
--- a/editors/abiword/Makefile Tue Nov 26 16:53:17 2019 +0000
+++ b/editors/abiword/Makefile Tue Nov 26 16:54:13 2019 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.190 2019/08/22 12:23:04 ryoon Exp $
+# $NetBSD: Makefile,v 1.191 2019/11/26 16:54:13 nia Exp $
.include "Makefile.common"
+
DISTNAME= abiword-${ABIVERSION}
-PKGREVISION= 9
CATEGORIES= editors
MASTER_SITES= http://www.abiword.com/downloads/abiword/${PKGVERSION_NOREV}/source/
diff -r b088295f5c83 -r feb943f8f213 editors/abiword/Makefile.common
--- a/editors/abiword/Makefile.common Tue Nov 26 16:53:17 2019 +0000
+++ b/editors/abiword/Makefile.common Tue Nov 26 16:54:13 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.48 2019/06/08 10:40:53 rillig Exp $
+# $NetBSD: Makefile.common,v 1.49 2019/11/26 16:54:13 nia Exp $
# used by editors/abiword-plugins/Makefile
-ABIVERSION= 3.0.2
+ABIVERSION= 3.0.3
diff -r b088295f5c83 -r feb943f8f213 editors/abiword/PLIST
--- a/editors/abiword/PLIST Tue Nov 26 16:53:17 2019 +0000
+++ b/editors/abiword/PLIST Tue Nov 26 16:54:13 2019 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.27 2015/09/13 21:32:12 nros Exp $
+@comment $NetBSD: PLIST,v 1.28 2019/11/26 16:54:13 nia Exp $
bin/abiword
include/abiword-3.0/abiwidget.h
include/abiword-3.0/libabiword.h
@@ -280,6 +280,7 @@
share/abiword-3.0/ui/xap_UnixDlg_PluginManager.ui
share/abiword-3.0/ui/xap_UnixDlg_WindowMore.ui
share/abiword-3.0/ui/xap_UnixDlg_Zoom.ui
+share/appdata/abiword.appdata.xml
share/applications/abiword.desktop
share/icons/hicolor/16x16/apps/abiword.png
share/icons/hicolor/22x22/apps/abiword.png
diff -r b088295f5c83 -r feb943f8f213 editors/abiword/distinfo
--- a/editors/abiword/distinfo Tue Nov 26 16:53:17 2019 +0000
+++ b/editors/abiword/distinfo Tue Nov 26 16:54:13 2019 +0000
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.78 2019/06/08 10:40:53 rillig Exp $
+$NetBSD: distinfo,v 1.79 2019/11/26 16:54:13 nia Exp $
-SHA1 (abiword-3.0.2.tar.gz) = 8226e0962e6667e0a461955a0ac680a629e0b55a
-RMD160 (abiword-3.0.2.tar.gz) = fde551492b0cffa7d522082906f374490bd47f5c
-SHA512 (abiword-3.0.2.tar.gz) = 29ce9e80b3b85ab2933e7d39216771d8c4e05db5255eaed0cf8e1d032ffaac2cb1880bf24e754196ad5dae4969a1c2101ce4dc9c1db14604adc2f852b6a17fe3
-Size (abiword-3.0.2.tar.gz) = 11154333 bytes
+SHA1 (abiword-3.0.3.tar.gz) = bdc9cb32b1f17d7245c45eac3256d49b85e41e8d
+RMD160 (abiword-3.0.3.tar.gz) = d52c30a9a10f1f89dff8c7df6bd50911f14cbdcf
+SHA512 (abiword-3.0.3.tar.gz) = cabe5cfea02b0656bc8b14b0daf3ea5bf6e1487c1eb5a8fa21b93723163d9798768d8aae3c9ece9a1d0e939592649783eb9c78d44ce7e03724eb57a824a080f9
+Size (abiword-3.0.3.tar.gz) = 10940348 bytes
SHA1 (patch-configure.ac) = 239c0635c2c616c7e0a986a5fd92428393af38b7
-SHA1 (patch-plugin-configure.m4) = 50b5b6be8a1e8270c7ce45a4ed94cb5d436516f2
+SHA1 (patch-plugin-configure.m4) = 396c7ec04298b5af3807248f94f2c8630f3579ac
SHA1 (patch-plugins_aiksaurus_Makefile.am) = 1529d5098b7fb798c428fe02cc50879374cb3e9d
SHA1 (patch-plugins_command_Makefile.am) = e003a6bf9a6e0566abc85f09868fdf1aa93234d7
SHA1 (patch-plugins_gimp_xp_AbiGimp.cpp) = 2b245de4beb2f4b9b8cd8593c811bb086bb2bde3
@@ -20,29 +20,10 @@
SHA1 (patch-plugins_wordperfect_xp_ie__impexp__WordPerfect.cpp) = 255ac57f2f127d76aff6bdbf1f0ddc223a673ca9
SHA1 (patch-plugins_wordperfect_xp_ie__impexp__WordPerfect.h) = a3eac8abff26bf91f698948430e89bff13db710b
SHA1 (patch-plugins_wpg_xp_ie__impGraphic__WPG.cpp) = 7eb0296fdff2fa27288f4c68fc337ba105695551
-SHA1 (patch-src_af_gr_gtk_gr__UnixCairoGraphics.cpp) = 2fb170202d13c9ddf077cea545d8d8f79fdbf5c2
-SHA1 (patch-src_af_gr_gtk_gr__UnixImage.cpp) = 2546621961ce959a8d5078ff52efa4650362be54
-SHA1 (patch-src_af_gr_xp_gr__Caret.cpp) = 96b186c4fc762f6734226b4505e2d4c64fb2b03a
-SHA1 (patch-src_af_gr_xp_gr__Caret.h) = f7ee697a720205cd9026a85d7683092fc147a237
-SHA1 (patch-src_af_gr_xp_gr__Graphics.cpp) = 9cf398ea8e787e5820d41182c005fe2906c7ec06
-SHA1 (patch-src_af_gr_xp_gr__Graphics.h) = a3539f0e2e3a8f661a01428f7550f8a4bebb1ee5
-SHA1 (patch-src_af_util_unix_ut__unixTimer.cpp) = 543d8977c8da5c1db4e26581d82f72a4f936f190
SHA1 (patch-src_af_util_xp_ut__endian.h) = e1dd4cc0df3b0eb66dbd673fb5c0d2e3b24b30a4
SHA1 (patch-src_af_util_xp_ut__iconv.cpp) = 18529454262fe6cb3ae15fd485c7bcc8adb00ae3
SHA1 (patch-src_af_util_xp_ut__iconv.h) = bbcfa2098ea77d393feb50d69de9ae29fcce302f
SHA1 (patch-src_af_util_xp_ut__mbtowc.cpp) = cf7078a6bfdf9ac9b30478d11d9d3a81a95b8ed1
SHA1 (patch-src_af_util_xp_ut__misc.cpp) = f552ecbb87490355d8e74218dd59fd3961f1af5d
-SHA1 (patch-src_af_util_xp_ut__png.cpp) = 9f4ae043873fc6d66e063419d0736bb6104483b0
-SHA1 (patch-src_af_xap_gtk_xap__UnixFrameImpl.cpp) = 5b67bd234209beddc751e7c98b17cf1844b73b1a
-SHA1 (patch-src_af_xap_gtk_xap__UnixFrameImpl.h) = af256fec37a7b9cd4239802985ad1a46f8272ad8
SHA1 (patch-src_af_xap_xp_enchant__checker.cpp) = 5ad3b8bb4e186e998d7e8930247534c9f058c534
-SHA1 (patch-src_af_xap_xp_xap__Frame.cpp) = d7f29f199b7109c8a09fa40f969be0db3a6b79ba
-SHA1 (patch-src_text_fmt_xp_fl__SectionLayout.cpp) = 3f1f9255bb979812c8062f542ed4b9faa488a368
SHA1 (patch-src_text_fmt_xp_fv__FrameEdit.h) = 684310bf9aece4ce72d004dfae9a4b4b6ca69570
-SHA1 (patch-src_text_fmt_xp_fv__View.cpp) = 872f4d94a3797b0ae1c32500267e46afa5ebd3ac
-SHA1 (patch-src_text_fmt_xp_fv__ViewDoubleBuffering.cpp) = ef11cce5d6d07c33416666e30c1aed33abfa8e1c
-SHA1 (patch-src_text_fmt_xp_fv__View__protected.cpp) = c567a8962280aa6f5b20151b74616b14ff0c2aa7
-SHA1 (patch-src_text_ptbl_xp_pd__DocumentRDF.cpp) = 5673e9341372913156f2f722229569199d97af4c
-SHA1 (patch-src_wp_ap_gtk_ap__UnixFrameImpl.cpp) = 709abd20ccaffc96cf8b9e77ea506fe6732e6d62
-SHA1 (patch-src_wp_impexp_xp_ie__exp__DocRangeListener.cpp) = cab84cf239874409d8e349c58c3605d91712b3c4
-SHA1 (patch-src_wp_impexp_xp_ie__imp__RTF.cpp) = 89cddf0213c1aeb1c915f4722e5db3a68f553ae6
diff -r b088295f5c83 -r feb943f8f213 editors/abiword/patches/patch-plugin-configure.m4
--- a/editors/abiword/patches/patch-plugin-configure.m4 Tue Nov 26 16:53:17 2019 +0000
+++ b/editors/abiword/patches/patch-plugin-configure.m4 Tue Nov 26 16:54:13 2019 +0000
@@ -1,12 +1,12 @@
-$NetBSD: patch-plugin-configure.m4,v 1.3 2019/06/08 10:40:53 rillig Exp $
+$NetBSD: patch-plugin-configure.m4,v 1.4 2019/11/26 16:54:13 nia Exp $
* adapt wordperfect plugins to dependecies available in pkgsrc
from abiword svn date 2014-12-27
---- plugin-configure.m4.orig 2016-10-21 00:42:58.000000000 +0000
+--- plugin-configure.m4.orig 2019-11-24 22:57:35.000000000 +0000
+++ plugin-configure.m4
-@@ -72,7 +72,7 @@ AC_SUBST([GRAMMAR_CFLAGS])
- AC_SUBST([GRAMMAR_LIBS])
+@@ -691,7 +691,7 @@ AC_SUBST([RSVG_CFLAGS])
+ AC_SUBST([RSVG_LIBS])
-wpg_pkgs="$gsf_req libwpg-0.2 >= 0.2.0 libwpd-0.9 >= 0.9.0 libwpd-stream-0.9 >= 0.9.0"
@@ -14,8 +14,8 @@
wpg_deps="no"
if test "$enable_wpg" != ""; then
-@@ -962,8 +962,8 @@ AC_SUBST([XSLFO_CFLAGS])
- AC_SUBST([XSLFO_LIBS])
+@@ -1797,8 +1797,8 @@ AC_SUBST([FREETRANSLATION_CFLAGS])
+ AC_SUBST([FREETRANSLATION_LIBS])
-wordperfect_pkgs="libwpg-0.2 >= 0.2.0 libwpd-0.9 >= 0.9.0 libwpd-stream-0.9 >= 0.9.0 $gsf_req"
diff -r b088295f5c83 -r feb943f8f213 editors/abiword/patches/patch-src_af_gr_gtk_gr__UnixCairoGraphics.cpp
--- a/editors/abiword/patches/patch-src_af_gr_gtk_gr__UnixCairoGraphics.cpp Tue Nov 26 16:53:17 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-$NetBSD: patch-src_af_gr_gtk_gr__UnixCairoGraphics.cpp,v 1.1 2018/12/28 22:24:53 gutteridge Exp $
-
-Abiword bug 13791, SVN revision 35476: Fix flicker and caret problems.
-
-Abiword bug 13791, SVN revision 35482: Disable double buffering on GTK3.
-
---- src/af/gr/gtk/gr_UnixCairoGraphics.cpp.orig 2016-10-21 00:39:16.000000000 +0000
-+++ src/af/gr/gtk/gr_UnixCairoGraphics.cpp
-@@ -126,8 +126,12 @@ GR_Graphics * GR_UnixCairoGraphics::gr
-
- // UT_return_val_if_fail(!info.isPrinterGraphics(), NULL);
- GR_UnixCairoAllocInfo &AI = (GR_UnixCairoAllocInfo&)info;
--
-+#if GTK_CHECK_VERSION(3,0,0)
-+ // We disable double buffering on Gtk3 because it doesn't work.
-+ return new GR_UnixCairoGraphics(AI.m_win, false);
-+#else
- return new GR_UnixCairoGraphics(AI.m_win, AI.m_double_buffered);
-+#endif
- }
-
- inline UT_RGBColor _convertGdkColor(const GdkColor &c)
-@@ -566,7 +570,10 @@ void GR_UnixCairoGraphics::_beginPaint()
- void GR_UnixCairoGraphics::_endPaint()
- {
- if (m_CairoCreated)
-+ {
-+ cairo_surface_flush(cairo_get_target(m_cr));
- cairo_destroy (m_cr);
-+ }
- m_cr = NULL;
-
- m_Painting = false;
-@@ -577,9 +584,17 @@ void GR_UnixCairoGraphics::_endPaint()
-
- void GR_UnixCairoGraphics::flush(void)
- {
-+
- if (m_Widget) {
- gtk_widget_queue_draw(m_Widget);
- }
-+
-+/*
-+ if(m_cr)
-+ {
-+ cairo_surface_flush(cairo_get_target(m_cr));
-+ }
-+*/
- }
-
- bool GR_UnixCairoGraphics::queryProperties(GR_Graphics::Properties gp) const
diff -r b088295f5c83 -r feb943f8f213 editors/abiword/patches/patch-src_af_gr_gtk_gr__UnixImage.cpp
--- a/editors/abiword/patches/patch-src_af_gr_gtk_gr__UnixImage.cpp Tue Nov 26 16:53:17 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-$NetBSD: patch-src_af_gr_gtk_gr__UnixImage.cpp,v 1.1 2018/12/28 22:24:53 gutteridge Exp $
-
-Abiword bug 13834, SVN revision 35393: Crash fixes.
-
---- src/af/gr/gtk/gr_UnixImage.cpp.orig 2015-10-16 02:42:45.000000000 +0000
-+++ src/af/gr/gtk/gr_UnixImage.cpp
-@@ -244,12 +244,13 @@ bool GR_UnixImage::saveToPNG(const char
- UT_return_val_if_fail(m_image,false);
-
- GError * error = NULL;
-- gboolean res = gdk_pixbuf_save (m_image, szFile, "png", &error,NULL);
-- if(res != FALSE)
-- {
-+ gboolean res = gdk_pixbuf_save (m_image, szFile, "png", &error, NULL);
-+ if (res != FALSE) {
-+ if (error) {
-+ g_error_free (error);
-+ }
- return true;
- }
-- delete error;
- return false;
-
- }
diff -r b088295f5c83 -r feb943f8f213 editors/abiword/patches/patch-src_af_gr_xp_gr__Caret.cpp
--- a/editors/abiword/patches/patch-src_af_gr_xp_gr__Caret.cpp Tue Nov 26 16:53:17 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,305 +0,0 @@
-$NetBSD: patch-src_af_gr_xp_gr__Caret.cpp,v 1.1 2018/12/28 22:24:53 gutteridge Exp $
-
-Abiword bug 13791, SVN revision 35476: Fix flicker and caret problems.
-
---- src/af/gr/xp/gr_Caret.cpp.orig 2013-04-07 13:53:03.000000000 +0000
-+++ src/af/gr/xp/gr_Caret.cpp
-@@ -30,6 +30,11 @@
- #include "gr_Graphics.h"
- #include "gr_Painter.h"
- #include "ut_debugmsg.h"
-+#include <inttypes.h>
-+#include <math.h>
-+#include <stdio.h>
-+#include <time.h>
-+
- static const UT_uint32 CURSOR_DELAY_TIME = 10; // milliseconds
-
- #ifdef TOOLKIT_GTK_ALL
-@@ -56,6 +61,11 @@ GR_Caret::GR_Caret(GR_Graphics * pG)
- m_yPoint2(0),
- m_pClr(NULL),
- m_pG(pG),
-+ m_iWindowWidth(0),
-+ m_iWindowHeight(0),
-+ m_worker(NULL),
-+ m_enabler(NULL),
-+ m_blinkTimeout(NULL),
- m_nDisableCount(1),
- m_bCursorBlink(true),
- m_bCursorIsOn(false),
-@@ -70,7 +80,10 @@ GR_Caret::GR_Caret(GR_Graphics * pG)
- m_bRemote(false),
- m_clrRemote(0,0,0),
- m_sID(""),
-- m_iCaretNumber(0)
-+ m_iCaretNumber(0),
-+ m_iLastDrawTime(0),
-+ m_iRetry(0),
-+ m_bPendingBlink(false)
- {
- UT_WorkerFactory::ConstructMode outMode = UT_WorkerFactory::NONE;
- m_worker = static_cast<UT_Timer *>(UT_WorkerFactory::static_constructor
-@@ -97,6 +110,11 @@ GR_Caret::GR_Caret(GR_Graphics * pG, con
- m_yPoint2(0),
- m_pClr(NULL),
- m_pG(pG),
-+ m_iWindowWidth(0),
-+ m_iWindowHeight(0),
-+ m_worker(NULL),
-+ m_enabler(NULL),
-+ m_blinkTimeout(NULL),
- m_nDisableCount(1),
- m_bCursorBlink(true),
- m_bCursorIsOn(false),
-@@ -111,7 +129,10 @@ GR_Caret::GR_Caret(GR_Graphics * pG, con
- m_bRemote(true),
- m_clrRemote(0,0,0),
- m_sID(sId),
-- m_iCaretNumber(0)
-+ m_iCaretNumber(0),
-+ m_iLastDrawTime(0),
-+ m_iRetry(0),
-+ m_bPendingBlink(false)
- {
- UT_WorkerFactory::ConstructMode outMode = UT_WorkerFactory::NONE;
- m_worker = static_cast<UT_Timer *>(UT_WorkerFactory::static_constructor
-@@ -145,9 +166,16 @@ GR_Caret::~GR_Caret()
- void GR_Caret::s_work(UT_Worker * _w)
- {
- GR_Caret * c = static_cast<GR_Caret *>(_w->getInstanceData());
--
-+ xxx_UT_DEBUGMSG((" Caret timer called Disable Count = %d \n",c->m_nDisableCount));
- if (c->m_nDisableCount == 0)
-+ {
-+#ifdef TOOLKIT_GTK_ALL
-+ c->setPendingBlink();
Home |
Main Index |
Thread Index |
Old Index