abiword: update to 3.0.1.

This commit is contained in:
Juan RP 2015-02-17 16:35:19 +01:00
parent 8c031993c0
commit f8a8c450b4
2 changed files with 3 additions and 36 deletions

View file

@ -1,33 +0,0 @@
commit e0e81e6c2d7f2478b9effc8476b62425ca2c12cd
Author: Hubert Figuière <hub@figuiere.net>
Date: Wed Oct 16 22:48:36 2013 -0400
Bug 13564 - Fix crash in abw to HTML conversion.
diff --git a/src/wp/impexp/xp/ie_exp_HTML_Listener.cpp b/src/wp/impexp/xp/ie_exp_HTML_Listener.cpp
index 86c57ec..b9dace1 100644
--- src/wp/impexp/xp/ie_exp_HTML_Listener.cpp
+++ src/wp/impexp/xp/ie_exp_HTML_Listener.cpp
@@ -2232,12 +2232,18 @@ void IE_Exp_HTML_Listener::_openList(PT_AttrPropIndex api, bool recursiveCall)
_openList(api, true);
}
}
-
- }else
+ }
+ else
{
- const gchar* szListStyle;
+ const gchar* szListStyle = NULL;
pAP->getProperty("list-style", szListStyle);
- bool isOrdered = g_ascii_strcasecmp(szListStyle, "Bullet List") != 0;
+ bool isOrdered = szListStyle
+ && (g_ascii_strcasecmp(szListStyle, "Bullet List") != 0);
+#ifdef DEBUG
+ if(!szListStyle) {
+ UT_DEBUGMSG(("***BUG*** szListStyle is NULL - http://bugzilla.abisource.com/show_bug.cgi?id=13564\n"));
+ }
+#endif
ListInfo info;
if (iCurrentLevel == 0)
{

View file

@ -1,7 +1,7 @@
# Template file for 'abiword' # Template file for 'abiword'
pkgname=abiword pkgname=abiword
version=3.0.0 version=3.0.1
revision=7 revision=1
build_style=gnu-configure build_style=gnu-configure
configure_args="--enable-plugins --enable-clipart --enable-templates" configure_args="--enable-plugins --enable-clipart --enable-templates"
hostmakedepends="automake libtool flex pkg-config" hostmakedepends="automake libtool flex pkg-config"
@ -14,7 +14,7 @@ maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-3" license="GPL-3"
homepage="http://www.abisource.com/" homepage="http://www.abisource.com/"
distfiles="${homepage}/downloads/${pkgname}/${version}/source/${pkgname}-${version}.tar.gz" distfiles="${homepage}/downloads/${pkgname}/${version}/source/${pkgname}-${version}.tar.gz"
checksum=d17e318c00ff4eb353e0e7994b098b1d4f9ddd8712ac0261a0e38b89081fac01 checksum=e094f6fbf0afc5c5538b4894888e7c346f8ee8f49c9d24821dd696d0734865c6
libabiword_package() { libabiword_package() {
short_desc+=" - Runtime library" short_desc+=" - Runtime library"