Index: editors/abiword/Makefile =================================================================== --- editors/abiword/Makefile (revision 331379) +++ editors/abiword/Makefile (working copy) @@ -3,10 +3,9 @@ # $MCom: ports/editors/abiword/Makefile,v 1.13 2009/11/10 13:56:18 kwm Exp $ PORTNAME= abiword -PORTVERSION= 2.8.6 +PORTVERSION= 3.0.0 CATEGORIES= editors -MASTER_SITES= http://www.abisource.com/downloads/%SUBDIR%/${PORTVERSION}/source/ -MASTER_SITE_SUBDIR= abiword +MASTER_SITES= http://www.abisource.com/downloads/${PORTNAME}/${PORTVERSION}/source/ DIST_SUBDIR= AbiWord MAINTAINER= gnome@FreeBSD.org @@ -19,7 +18,7 @@ libjpeg.so:${PORTSDIR}/graphics/jpeg \ libfribidi.so:${PORTSDIR}/converters/fribidi \ libpsiconv.so:${PORTSDIR}/converters/psiconv \ - libgoffice-0.8.so:${PORTSDIR}/devel/goffice + libgoffice-0.10.so:${PORTSDIR}/devel/goffice010 RUN_DEPENDS= ${LOCALBASE}/lib/X11/fonts/dejavu/DejaVuSerif.ttf:${PORTSDIR}/x11-fonts/dejavu LICENSE= GPLv2 @@ -31,6 +30,7 @@ CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --without-gnomevfs --enable-plugins="${ABIWORD_PLUGINS}" \ + --with-gio --with-goffice \ enable_dynamic="yes" enable_static="no" \ --disable-collab-backend-telepathy \ --enable-collab-backend-sugar @@ -37,7 +37,7 @@ USE_LDCONFIG= yes INSTALLS_ICONS= yes -ABIVERSION= 2.8 +ABIVERSION= 3.0 PLIST_SUB+= ABIVERSION=${ABIVERSION} OPTIONS_DEFINE= DEBUG SPELLCHECK CLIPART TEMPLATES MATHVIEW \ @@ -67,6 +67,15 @@ clarisworks pdb urldict openwriter mswrite gimp \ passepartout collab eml +#rsvg s5 hrtext pdf goffice openxml +# babelfish iscii passepartout psion hancom t602 +# mswrite paint garble collab mathview opendocument +# pdb docbook clarisworks gda ots wikipedia wml +# command opml wmf loadbindings epub latex eml bmp wpg +# applix aiksaurus wordperfect gdict mht openwriter +# mif urldict presentation sdw freetranslation xslfo +# kword gimp google grammar + # opendocument enabled by default, rsvg plugin isn't needed on unix. # Plugins we don't support: # gda @@ -73,6 +82,9 @@ .include +# needs champlain 0.12 +CONFIGURE_ARGS+= --without-champlain + .if ${PORT_OPTIONS:MMATHVIEW} LIB_DEPENDS+= libmathview.so:${PORTSDIR}/x11-toolkits/gtkmathview ABIWORD_PLUGINS:= ${ABIWORD_PLUGINS} mathview Index: editors/abiword/distinfo =================================================================== --- editors/abiword/distinfo (revision 331379) +++ editors/abiword/distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (AbiWord/abiword-2.8.6.tar.gz) = d99089a63a6cfc1a6a4a026be9278028d47d224088d24b1853acb67e95683a15 -SIZE (AbiWord/abiword-2.8.6.tar.gz) = 9218827 +SHA256 (AbiWord/abiword-3.0.0.tar.gz) = d17e318c00ff4eb353e0e7994b098b1d4f9ddd8712ac0261a0e38b89081fac01 +SIZE (AbiWord/abiword-3.0.0.tar.gz) = 10956892 Index: editors/abiword/files/patch-Makefile.in =================================================================== --- editors/abiword/files/patch-Makefile.in (revision 331379) +++ editors/abiword/files/patch-Makefile.in (working copy) @@ -1,11 +1,11 @@ ---- Makefile.in.orig 2009-10-28 18:39:23.000000000 +0100 -+++ Makefile.in 2009-10-28 18:39:42.000000000 +0100 -@@ -418,7 +418,7 @@ DIST_SUBDIRS = goffice-bits src plugins - @WITH_GOFFICE_BUILTIN_TRUE@SUBDIRS = goffice-bits src plugins user - @EMBEDDED_HILDON_FALSE@@TOOLKIT_GTK_TRUE@desktopdir = $(datadir)/applications - @EMBEDDED_HILDON_FALSE@@TOOLKIT_GTK_TRUE@desktop_DATA = abiword.desktop --@TOOLKIT_GTK_TRUE@mimedir = @ABIWORD_DATADIR@/mime-info -+@TOOLKIT_GTK_TRUE@mimedir = $(datadir)/mime-info - @TOOLKIT_GTK_TRUE@mime_DATA = abiword.keys - @TOOLKIT_GTK_TRUE@pkgconfigdir = $(prefix)/libdata/pkgconfig - @TOOLKIT_GTK_TRUE@pkgconfig_DATA = abiword-$(ABIWORD_SERIES).pc +--- Makefile.in.orig 2013-10-23 00:43:45.000000000 +0200 ++++ Makefile.in 2013-10-23 00:44:43.000000000 +0200 +@@ -555,7 +555,7 @@ + @WITH_GOFFICE_BUILTIN_FALSE@SUBDIRS = src plugins po user + @EMBEDDED_HILDON_FALSE@@TOOLKIT_GTK_ALL_TRUE@desktopdir = $(datadir)/applications + @EMBEDDED_HILDON_FALSE@@TOOLKIT_GTK_ALL_TRUE@desktop_DATA = abiword.desktop +-@TOOLKIT_GTK_ALL_TRUE@mimedir = @ABIWORD_DATADIR@/mime-info ++@TOOLKIT_GTK_ALL_TRUE@mimedir = share/mime-info + @TOOLKIT_GTK_ALL_TRUE@mime_DATA = abiword.keys + @TOOLKIT_GTK_ALL_TRUE@pkgconfigdir = $(prefix)/libdata/pkgconfig + @TOOLKIT_GTK_ALL_TRUE@pkgconfig_DATA = abiword-$(ABIWORD_SERIES).pc Index: editors/abiword/files/patch-plugins_bmp_xp_ie_impGraphic_BMP.cpp =================================================================== --- editors/abiword/files/patch-plugins_bmp_xp_ie_impGraphic_BMP.cpp (revision 331379) +++ editors/abiword/files/patch-plugins_bmp_xp_ie_impGraphic_BMP.cpp (working copy) @@ -1,38 +0,0 @@ ---- plugins/bmp/xp/ie_impGraphic_BMP.cpp.orig 2013-03-25 06:58:03.000000000 +0000 -+++ plugins/bmp/xp/ie_impGraphic_BMP.cpp 2013-03-25 07:00:22.000000000 +0000 -@@ -191,7 +191,7 @@ - - /* Clean Up Memory Used */ - -- FREEP(m_pPNGInfo->palette); -+ //FREEP(m_pPNGInfo->palette); - DELETEP(pBB); - png_destroy_write_struct(&m_pPNG, &m_pPNGInfo); - -@@ -313,7 +313,7 @@ - * 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 (setjmp(m_pPNG->jmpbuf)) -+ if (setjmp(png_jmpbuf(m_pPNG))) - { - /* Free all of the memory associated with the png_ptr and info_ptr */ - png_destroy_write_struct(&m_pPNG, &m_pPNGInfo); -@@ -332,7 +332,7 @@ - UT_Error IE_ImpGraphic_BMP::Convert_BMP_Pallet(UT_ByteBuf* pBB) - { - /* Reset error handling for libpng */ -- if (setjmp(m_pPNG->jmpbuf)) -+ if (setjmp(png_jmpbuf(m_pPNG))) - { - png_destroy_write_struct(&m_pPNG, &m_pPNGInfo); - return UT_ERROR; -@@ -372,7 +372,7 @@ - UT_Error IE_ImpGraphic_BMP::Convert_BMP(UT_ByteBuf* pBB) - { - /* Reset error handling for libpng */ -- if (setjmp(m_pPNG->jmpbuf)) -+ if (setjmp(png_jmpbuf(m_pPNG))) - { - png_destroy_write_struct(&m_pPNG, &m_pPNGInfo); - return UT_ERROR; Index: editors/abiword/files/patch-plugins_garble_xp_abiword-garble-png.cpp =================================================================== --- editors/abiword/files/patch-plugins_garble_xp_abiword-garble-png.cpp (revision 331379) +++ editors/abiword/files/patch-plugins_garble_xp_abiword-garble-png.cpp (working copy) @@ -1,11 +0,0 @@ ---- plugins/garble/xp/abiword-garble-png.cpp.orig 2013-03-25 06:55:41.000000000 +0000 -+++ plugins/garble/xp/abiword-garble-png.cpp 2013-03-25 06:56:20.000000000 +0000 -@@ -79,7 +79,7 @@ - png_set_strip_alpha( png_ptr ); - png_set_interlace_handling( png_ptr ); - png_set_bgr( png_ptr ); -- rowbytes = info_ptr->rowbytes; -+ rowbytes = png_get_rowbytes(png_ptr, info_ptr); - png_destroy_read_struct( &png_ptr, &info_ptr, NULL ); - } - Index: editors/abiword/files/patch-src_af_util_xp_ut_png.cpp =================================================================== --- editors/abiword/files/patch-src_af_util_xp_ut_png.cpp (revision 331379) +++ editors/abiword/files/patch-src_af_util_xp_ut_png.cpp (working copy) @@ -1,11 +0,0 @@ ---- src/af/util/xp/ut_png.cpp.orig 2010-04-14 23:50:11.000000000 +0200 -+++ src/af/util/xp/ut_png.cpp 2012-04-28 06:58:49.000000000 +0200 -@@ -71,7 +71,7 @@ - * 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 (setjmp(png_ptr->jmpbuf)) -+ if (setjmp(png_jmpbuf(png_ptr))) - { - /* Free all of the memory associated with the png_ptr and info_ptr */ - png_destroy_read_struct(&png_ptr, &info_ptr, static_cast(NULL)); Index: editors/abiword/files/patch-src_wp_impexp_gtk_ie_impGraphic_GdkPixbuf.cpp =================================================================== --- editors/abiword/files/patch-src_wp_impexp_gtk_ie_impGraphic_GdkPixbuf.cpp (revision 331379) +++ editors/abiword/files/patch-src_wp_impexp_gtk_ie_impGraphic_GdkPixbuf.cpp (working copy) @@ -1,20 +0,0 @@ ---- src/wp/impexp/gtk/ie_impGraphic_GdkPixbuf.cpp.orig 2010-04-14 23:50:13.000000000 +0200 -+++ src/wp/impexp/gtk/ie_impGraphic_GdkPixbuf.cpp 2012-04-28 07:25:54.000000000 +0200 -@@ -185,7 +185,7 @@ - /** needed for the stejmp context */ - UT_Error IE_ImpGraphic_GdkPixbuf::_png_write(GdkPixbuf * pixbuf) - { -- if (setjmp(m_pPNG->jmpbuf)) -+ if (setjmp(png_jmpbuf(m_pPNG))) - { - DELETEP(m_pPngBB); - png_destroy_write_struct(&m_pPNG, &m_pPNGInfo); -@@ -446,7 +446,7 @@ - * 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 (setjmp(m_pPNG->jmpbuf)) -+ if (setjmp(png_jmpbuf(m_pPNG))) - { - /* Free all of the memory associated with the png_ptr and info_ptr */ - png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);