jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

abiword: update to 3.0.0.

Browse source
This commit is contained in:
xdave 2013-10-27 20:28:05 -06:00
parent edc686367f
commit 3b45eef974
7 changed files with 49 additions and 174 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/shlibs
View file

@ -867,7 +867,7 @@ libgiggle.so.0 libgiggle-0.6.1_1
libgiggle-git.so.0 libgiggle-0.6.1_1
libwine.so.1 libwine-1.6_1
libwv-1.2.so.3 libwv-1.2.4_1
libabiword-2.8.so libabiword-2.8.6_1
libabiword-3.0.so libabiword-3.0.0_1
libmpg123.so.0 libmpg123-1.13.4_2_1
libopenal.so.1 libopenal-1.13_1
libalut.so.0 freealut-1.1.0_1

1
srcpkgs/abiword-plugins Symbolic link
View file

@ -0,0 +1 @@
abiword

21
srcpkgs/abiword/patches/abiword-2.8.6-no-undefined.patch
View file

@ -1,21 +0,0 @@
diff -u -r abiword-2.8.6.orig/src/Makefile.am abiword-2.8.6/src/Makefile.am
--- src/Makefile.am 2009-09-09 15:11:01.000000000 +0200
+++ src/Makefile.am 2011-08-02 23:35:51.904761961 +0200
@@ -107,7 +107,7 @@
AbiWord_LDFLAGS = \
$(DEPS_LIBS) \
- --no-undefined \
+ -Wl,--no-undefined \
-avoid-version \
-export-dynamic \
-headerpad_max_install_names
@@ -129,7 +129,7 @@
abiword_LDFLAGS = \
$(platform_ldflags) \
- --no-undefined \
+ -Wl,--no-undefined \
-avoid-version \
-export-dynamic

107
srcpkgs/abiword/patches/abiword-2.8.6-png15.patch
View file

@ -1,107 +0,0 @@
--- plugins/bmp/xp/ie_impGraphic_BMP.cpp.png15 2012-02-27 15:39:39.258617605 -0500
+++ plugins/bmp/xp/ie_impGraphic_BMP.cpp 2012-02-27 15:48:37.830936901 -0500
@@ -191,7 +191,14 @@ UT_Error IE_ImpGraphic_BMP::_convertGrap
/* Clean Up Memory Used */
+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
+ int num_palette;
+ png_colorp palette;
+ png_get_PLTE(m_pPNG, m_pPNGInfo, &palette, &num_palette);
+ FREEP(palette);
+#else
FREEP(m_pPNGInfo->palette);
+#endif
DELETEP(pBB);
png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
@@ -313,7 +320,11 @@ UT_Error IE_ImpGraphic_BMP::Initialize_P
* the normal method of doing things with libpng). REQUIRED unless you
* set up your own error handlers in the png_create_read_struct() earlier.
*/
+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
+ if (setjmp(png_jmpbuf(m_pPNG)))
+#else
if (setjmp(m_pPNG->jmpbuf))
+#endif
{
/* Free all of the memory associated with the png_ptr and info_ptr */
png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
@@ -332,7 +343,11 @@ UT_Error IE_ImpGraphic_BMP::Initialize_P
UT_Error IE_ImpGraphic_BMP::Convert_BMP_Pallet(UT_ByteBuf* pBB)
{
/* Reset error handling for libpng */
+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
+ if (setjmp(png_jmpbuf(m_pPNG)))
+#else
if (setjmp(m_pPNG->jmpbuf))
+#endif
{
png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
return UT_ERROR;
@@ -372,7 +387,11 @@ UT_Error IE_ImpGraphic_BMP::Initialize_P
UT_Error IE_ImpGraphic_BMP::Convert_BMP(UT_ByteBuf* pBB)
{
/* Reset error handling for libpng */
+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
+ if (setjmp(png_jmpbuf(m_pPNG)))
+#else
if (setjmp(m_pPNG->jmpbuf))
+#endif
{
png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
return UT_ERROR;
--- plugins/garble/xp/abiword-garble-png.cpp.png15 2012-02-27 15:31:30.178868169 -0500
+++ plugins/garble/xp/abiword-garble-png.cpp 2012-02-27 15:36:17.795368497 -0500
@@ -79,7 +79,11 @@ bool abiword_document::garble_png( void*
png_set_strip_alpha( png_ptr );
png_set_interlace_handling( png_ptr );
png_set_bgr( png_ptr );
+#if (PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4) && defined(PNG_EASY_ACCESS_SUPPORTED)
+ rowbytes = png_get_rowbytes( png_ptr, info_ptr );
+#else
rowbytes = info_ptr->rowbytes;
+#endif
png_destroy_read_struct( &png_ptr, &info_ptr, NULL );
}
--- src/af/util/xp/ut_png.cpp.png15 2012-02-27 15:11:18.599397989 -0500
+++ src/af/util/xp/ut_png.cpp 2012-02-27 15:12:20.560859433 -0500
@@ -71,7 +71,11 @@ bool UT_PNG_getDimensions(const UT_ByteB
* the normal method of doing things with libpng). REQUIRED unless you
* set up your own error handlers in the png_create_read_struct() earlier.
*/
+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
+ if (setjmp(png_jmpbuf(png_ptr)))
+#else
if (setjmp(png_ptr->jmpbuf))
+#endif
{
/* Free all of the memory associated with the png_ptr and info_ptr */
png_destroy_read_struct(&png_ptr, &info_ptr, static_cast<png_infopp>(NULL));
--- src/wp/impexp/gtk/ie_impGraphic_GdkPixbuf.cpp.png15 2012-02-27 15:24:23.959572417 -0500
+++ src/wp/impexp/gtk/ie_impGraphic_GdkPixbuf.cpp 2012-02-27 15:26:42.549367943 -0500
@@ -185,7 +185,11 @@ UT_Error IE_ImpGraphic_GdkPixbuf::import
/** needed for the stejmp context */
UT_Error IE_ImpGraphic_GdkPixbuf::_png_write(GdkPixbuf * pixbuf)
{
+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
+ if (setjmp(png_jmpbuf(m_pPNG)))
+#else
if (setjmp(m_pPNG->jmpbuf))
+#endif
{
DELETEP(m_pPngBB);
png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
@@ -446,7 +450,11 @@ UT_Error IE_ImpGraphic_GdkPixbuf::Initia
* the normal method of doing things with libpng). REQUIRED unless you
* set up your own error handlers in the png_create_read_struct() earlier.
*/
+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
+ if (setjmp(png_jmpbuf(m_pPNG)))
+#else
if (setjmp(m_pPNG->jmpbuf))
+#endif
{
/* Free all of the memory associated with the png_ptr and info_ptr */
png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);

33
srcpkgs/abiword/patches/abiword-3.0.0-fix-crash__gentoo.patch Normal file
View file

@ -0,0 +1,33 @@
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)
{

32
srcpkgs/abiword/patches/glib-2.32.patch
View file

@ -1,32 +0,0 @@
--- goffice-bits/goffice/utils/go-glib-extras.c.orig 2012-05-24 12:07:28.399969286 +0200
+++ goffice-bits/goffice/utils/go-glib-extras.c 2012-05-24 12:08:35.993335129 +0200
@@ -11,7 +11,7 @@
#include <goffice/goffice-config.h>
#include "go-glib-extras.h"
-#include <glib/gi18n-lib.h>
+#include <glib.h>
#include <gsf/gsf-impl-utils.h>
#include <libxml/encoding.h>
--- goffice-bits/goffice/app/goffice-app.h.orig 2012-05-24 12:09:06.121606751 +0200
+++ goffice-bits/goffice/app/goffice-app.h 2012-05-24 12:09:15.321462357 +0200
@@ -22,7 +22,7 @@
#ifndef GOFFICE_APP_H
#define GOFFICE_APP_H
-#include <glib/gmacros.h>
+#include <glib.h>
G_BEGIN_DECLS
--- src/af/util/xp/ut_go_file.h.orig 2012-05-24 12:11:30.229201580 +0200
+++ src/af/util/xp/ut_go_file.h 2012-05-24 12:11:41.052939975 +0200
@@ -31,7 +31,6 @@
#include <glib.h>
#include <gsf/gsf.h>
-#include <glib/gerror.h>
#include <time.h>
G_BEGIN_DECLS

27
srcpkgs/abiword/template
View file

@ -1,29 +1,23 @@
# Template file for 'abiword'
pkgname=abiword
version=2.8.6
revision=8
version=3.0.0
revision=1
build_style=gnu-configure
configure_args="--enable-shave --enable-collab-backend-telepathy
--enable-collab-backend-tcp --enable-collab-backend-service
--enable-templates --enable-clipart --enable-plugins --with-gio
--disable-static"
configure_args="--enable-plugins --enable-clipart --enable-templates"
hostmakedepends="automake libtool flex pkg-config"
makedepends="libjpeg-turbo-devel libpng-devel>=1.6
fribidi-devel libgsf-devel enchant-devel gtk+-devel librsvg-devel
wv-devel boost-devel libxslt-devel libwmf-devel"
fribidi-devel libgsf-devel enchant-devel gtk+3-devel librsvg-devel
wv-devel boost-devel libxslt-devel libwmf-devel libchamplain-devel
redland-devel libical-devel"
short_desc="Free word processing program similar to Microsoft(R) Word"
maintainer="davehome <davehome@redthumb.info.tm>"
license="GPL-3"
homepage="http://www.abisource.com/"
distfiles="${homepage}/downloads/${pkgname}/${version}/source/${pkgname}-${version}.tar.gz"
checksum=d99089a63a6cfc1a6a4a026be9278028d47d224088d24b1853acb67e95683a15
checksum=d17e318c00ff4eb353e0e7994b098b1d4f9ddd8712ac0261a0e38b89081fac01
CPPFLAGS="-I/usr/include/boost"
pre_configure() {
autoreconf -fi
}
libabiword_package() {
short_desc+=" - Runtime library"
pkg_install() {
@ -31,6 +25,13 @@ libabiword_package() {
}
}
abiword-plugins_package() {
short_desc+=" - Plugins"
pkg_install() {
vmove usr/lib/abiword-3.0/plugins
}
}
abiword-devel_package() {
depends="fribidi-devel libgsf-devel wv-devel enchant-devel gtk-devel
librsvg-devel libabiword>=${version}"