Index: Makefile =================================================================== --- Makefile (revision 524459) +++ Makefile (working copy) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= abiword -PORTVERSION= 3.0.1 -PORTREVISION= 16 +PORTVERSION= 3.0.4 CATEGORIES= editors MASTER_SITES= http://www.abisource.com/downloads/abiword/${PORTVERSION}/source/ DIST_SUBDIR= AbiWord @@ -19,12 +18,23 @@ libpng.so:graphics/png \ libwv.so:textproc/wv \ libfribidi.so:converters/fribidi \ - libgoffice-0.10.so:devel/goffice + libgoffice-0.10.so:devel/goffice \ + libdbus-1.so:devel/dbus \ + libgpg-error.so:security/libgpg-error \ + libgcrypt.so:security/libgcrypt \ + libfreetype.so:print/freetype2 \ + libfontconfig.so:x11-fonts/fontconfig \ + librasqal.so:textproc/rasqal \ + librdf.so:textproc/redland \ + libraptor2.so:textproc/raptor2 \ + libical.so:devel/libical \ + libwmf.so:graphics/libwmf RUN_DEPENDS= ${LOCALBASE}/share/fonts/dejavu/DejaVuSerif.ttf:x11-fonts/dejavu -USES= compiler:c++11-lang desktop-file-utils gmake gnome iconv jpeg \ - libtool pathfix pkgconfig -USE_GNOME= libxml2 gtk30 librsvg2 libxslt +USES= compiler:c++17-lang desktop-file-utils gmake gnome iconv jpeg \ + libtool pathfix pkgconfig readline +USE_GNOME= libxml2 cairo gtk30 librsvg2 libxslt +USE_XORG+= x11 GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib @@ -148,9 +158,6 @@ .endif post-patch: - @${REINPLACE_CMD} -e 's|glib/.*\.h>|glib.h>|g' \ - ${WRKSRC}/goffice-bits/goffice/app/goffice-app.h \ - ${WRKSRC}/src/af/util/xp/ut_go_file.h # The following substitutions ensure that plugins are linked with libabiword # from the work or stage directory instead of a previously installed library. # In pseudo code: Index: distinfo =================================================================== --- distinfo (revision 524459) +++ distinfo (working copy) @@ -1,2 +1,3 @@ -SHA256 (AbiWord/abiword-3.0.1.tar.gz) = e094f6fbf0afc5c5538b4894888e7c346f8ee8f49c9d24821dd696d0734865c6 -SIZE (AbiWord/abiword-3.0.1.tar.gz) = 11144990 +TIMESTAMP = 1580095743 +SHA256 (AbiWord/abiword-3.0.4.tar.gz) = e93096cb192e5bc19d62e180fc5eda643206465315a710113ae5036bc2a1a5d7 +SIZE (AbiWord/abiword-3.0.4.tar.gz) = 11064305 Index: files/patch-abiword.desktop =================================================================== --- files/patch-abiword.desktop (revision 524459) +++ files/patch-abiword.desktop (working copy) @@ -1,6 +1,6 @@ ---- abiword.desktop.orig 2010-04-14 23:50:18.000000000 +0200 -+++ abiword.desktop 2010-05-22 09:08:45.000000000 +0200 -@@ -6,7 +6,7 @@ +--- abiword.desktop.orig 2019-04-03 21:21:51 UTC ++++ abiword.desktop +@@ -6,7 +6,7 @@ Type=Application Categories=Office;WordProcessor;GNOME;GTK;X-Red-Hat-Base; StartupNotify=true X-Desktop-File-Install-Version=0.9 Index: files/patch-configure =================================================================== --- files/patch-configure (revision 524459) +++ files/patch-configure (working copy) @@ -1,15 +1,15 @@ ---- configure.orig 2014-12-23 06:13:20.000000000 +0100 -+++ configure 2016-01-26 21:22:33.585049000 +0100 -@@ -23915,7 +23915,7 @@ +--- configure.orig 2020-01-27 15:58:12 UTC ++++ configure +@@ -22697,7 +22697,7 @@ fi -wpg_pkgs="$gsf_req libwpg-0.2 >= 0.2.0 libwpd-0.9 >= 0.9.0 libwpd-stream-0.9 >= 0.9.0" -+wpg_pkgs="libwpg-0.3 $gsf_req" ++wpg_pkgs="$gsf_req libwpg-0.3" wpg_deps="no" if test "$enable_wpg" != ""; then -@@ -24341,8 +24341,8 @@ +@@ -25939,8 +25939,8 @@ fi @@ -20,7 +20,7 @@ wordperfect_deps="no" WORDPERFECT_CFLAGS= -@@ -24385,7 +24385,7 @@ +@@ -25983,7 +25983,7 @@ if test -n "$PKG_CONFIG" && \ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then Index: files/patch-src_af_ev_gtk-ev_UnixMouse.cpp =================================================================== --- files/patch-src_af_ev_gtk-ev_UnixMouse.cpp (nonexistent) +++ files/patch-src_af_ev_gtk-ev_UnixMouse.cpp (working copy) @@ -0,0 +1,10 @@ +--- src/af/ev/gtk/ev_UnixMouse.cpp.orig 2020-01-27 14:54:30 UTC ++++ src/af/ev/gtk/ev_UnixMouse.cpp +@@ -20,6 +20,7 @@ + // TODO see if we need to do the GTK absolute-to-relative coordinate + // TODO trick like we did in the top ruler. + ++#include + #include "ut_assert.h" + #include "ut_debugmsg.h" + #include "ut_types.h" Property changes on: files/patch-src_af_ev_gtk-ev_UnixMouse.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: files/patch-src_af_gr_gtk-gr_UnixcairoGraphics.cpp =================================================================== --- files/patch-src_af_gr_gtk-gr_UnixcairoGraphics.cpp (nonexistent) +++ files/patch-src_af_gr_gtk-gr_UnixcairoGraphics.cpp (working copy) @@ -0,0 +1,14 @@ +--- src/af/gr/gtk/gr_UnixCairoGraphics.cpp.orig 2020-01-27 14:28:34 UTC ++++ src/af/gr/gtk/gr_UnixCairoGraphics.cpp +@@ -585,10 +585,7 @@ void GR_UnixCairoGraphics::_endPaint() + void GR_UnixCairoGraphics::flush(void) + { + +- if (m_Widget) { +- gtk_widget_queue_draw(m_Widget); +- } +- ++ gdk_flush(); + /* + if(m_cr) + { Property changes on: files/patch-src_af_gr_gtk-gr_UnixcairoGraphics.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: files/patch-src_af_util_xp-ut_iconv.cpp =================================================================== --- files/patch-src_af_util_xp-ut_iconv.cpp (nonexistent) +++ files/patch-src_af_util_xp-ut_iconv.cpp (working copy) @@ -0,0 +1,15 @@ +--- src/af/util/xp/ut_iconv.cpp.orig 2020-01-27 14:37:51 UTC ++++ src/af/util/xp/ut_iconv.cpp +@@ -264,10 +264,10 @@ const char * ucs4Internal () + // we special-case the win32 build, otherwise spelling and other stuff + // just doesn't work + return "UCS-4LE"; +-#elif defined(_LIBICONV_H) ++#elif defined(_LIBICONV_H) || defined(__FreeBSD__) + // libiconv seems to prefer UCS-4-INTERNAL to UCS-4BE and UCS-4LE + return "UCS-4-INTERNAL"; +-#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) ++#elif defined(__OpenBSD__) || defined(__NetBSD__) + // we special case the BSDs since spelling just doesn't work + return "UCS4"; + #else Property changes on: files/patch-src_af_util_xp-ut_iconv.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: files/patch-src_af_xap_xp_xap__Dialog.cpp =================================================================== --- files/patch-src_af_xap_xp_xap__Dialog.cpp (nonexistent) +++ files/patch-src_af_xap_xp_xap__Dialog.cpp (working copy) @@ -0,0 +1,11 @@ +--- src/af/xap/xp/xap_Dialog.cpp.orig 2019-04-03 22:06:58 UTC ++++ src/af/xap/xp/xap_Dialog.cpp +@@ -267,7 +267,7 @@ XAP_Dialog_Modeless::BuildWindowName(char * pWindowNam + // This function constructs and returns the window name of a modeless dialog by + // concatenating the active frame with the dialog name + +- *pWindowName = (char) NULL; ++ *pWindowName = (char)(size_t) NULL; + UT_UTF8String wn = UT_UTF8String(pDialogName); + + XAP_Frame* pFrame = getActiveFrame(); Property changes on: files/patch-src_af_xap_xp_xap__Dialog.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: files/patch-src_wp_ap_gtk_ap__UnixApp.cpp =================================================================== --- files/patch-src_wp_ap_gtk_ap__UnixApp.cpp (nonexistent) +++ files/patch-src_wp_ap_gtk_ap__UnixApp.cpp (working copy) @@ -0,0 +1,11 @@ +--- src/wp/ap/gtk/ap_UnixApp.cpp.orig 2019-04-03 22:28:26 UTC ++++ src/wp/ap/gtk/ap_UnixApp.cpp +@@ -863,7 +863,7 @@ static bool is_so (const char *file) { + if (len < (strlen(G_MODULE_SUFFIX) + 2)) // this is ".so" and at least one char for the filename + return false; + const char *suffix = file+(len-3); +- if(0 == strcmp (suffix, "."G_MODULE_SUFFIX)) ++ if(0 == strcmp (suffix, "." G_MODULE_SUFFIX)) + return true; + return false; + } Property changes on: files/patch-src_wp_ap_gtk_ap__UnixApp.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: pkg-plist =================================================================== --- pkg-plist (revision 524459) +++ pkg-plist (working copy) @@ -391,4 +391,5 @@ share/icons/hicolor/48x48/apps/abiword.png share/icons/hicolor/512x512/apps/abiword.png share/icons/hicolor/scalable/apps/abiword.svg +share/appdata/abiword.appdata.xml %%COLTELEPATHY%%share/telepathy/clients/AbiCollab.client