Sat Nov 24 19:14:09 2018 UTC ()
editors/abiword: Update to 3.0.2

Changes:

Fixes in the core (all platforms)

    Various build fixes: Bug 13697, bug 13650, bug 13726, Bug 13753, Bug 13569
    Various crash fixes: Bug 13716, Bug 13752, Bug 13807, Bug 13766
    Various memory leaks fixes.
    Bug 13709 - Fix import of very long paragraphs.

Gtk

Fixes specific to the Gtk+ version

    Bug 13533 - Fix printing of SVG images.
    Bug 13722 - Fix scrolling in the Insert Symbol dialog.
    Bug 13729 - Make the available languages list expandable.
    Bug 13731 - Fix text rendering after an SVG image
    Bug 13662 - Never change an image resolution on scaling.
    Bug 13734 - Do not execute radio buttons events when unchecked.
    Bug 13736 - Properly iterate through the plugin arguments
    Fix SVG icon.)
    Fixed bug in the font chooser.
    Bug 13773 - Fix the ruler and background page theming on Gtk3. Ruler knobs no longer do "3D" on Gtk3. Bug 13762
    Bug 13787 - Fix the table widget drawing
    AbiWord works better on Wayland: Bug 13766, Bug 13767

Import/Export

Fixes in the OpenDocument importer / exporter

    Bug 13707 - Fixed paragraph export to Open Document.
    Bug 13706 - If needed apply default style for headers.
    OpenDocument: Fix a buffer overrun

Plugins

Fixes in the collaboration plugin

    Fix various build issues. Bug 13712, Bug 13754 and Bug 13742


(nia)
diff -r1.179 -r1.180 pkgsrc/editors/abiword/Makefile
diff -r1.46 -r1.47 pkgsrc/editors/abiword/Makefile.common
diff -r1.74 -r1.75 pkgsrc/editors/abiword/distinfo
diff -r1.2 -r1.3 pkgsrc/editors/abiword/options.mk
diff -r1.94 -r1.95 pkgsrc/editors/abiword-plugins/Makefile
diff -r1.1 -r1.2 pkgsrc/editors/abiword/patches/patch-plugin-configure.m4
diff -r1.1 -r0 pkgsrc/editors/abiword/patches/patch-plugins_collab_backends_service_xp_RealmProtocol.cpp
diff -r1.1 -r0 pkgsrc/editors/abiword/patches/patch-plugins_collab_backends_service_xp_soa__soup.cpp
diff -r1.1 -r0 pkgsrc/editors/abiword/patches/patch-plugins_collab_backends_service_xp_tls__tunnel.cpp
diff -r1.1 -r0 pkgsrc/editors/abiword/patches/patch-plugins_grammar_linkgrammarwrap_LinkGrammarWrap.cpp
diff -r1.1 -r0 pkgsrc/editors/abiword/patches/patch-plugins_latex_xp_ie__exp__LaTeX.cpp
diff -r1.1 -r0 pkgsrc/editors/abiword/patches/patch-plugins_xslfo_xp_ie__exp__XSL-FO.cpp
diff -r1.1 -r0 pkgsrc/editors/abiword/patches/patch-src_text_ptbl_xp_pd__DocumentRDF.h
diff -r1.2 -r1.3 pkgsrc/editors/abiword/patches/patch-src_text_ptbl_xp_pd__DocumentRDF.cpp
cvs diff -r1.179 -r1.180 pkgsrc/editors/abiword/Makefile (expand / switch to unified diff)

--- pkgsrc/editors/abiword/Makefile 2018/11/14 22:21:21 1.179
+++ pkgsrc/editors/abiword/Makefile 2018/11/24 19:14:09 1.180
@@ -1,34 +1,33 @@ @@ -1,34 +1,33 @@
1# $NetBSD: Makefile,v 1.179 2018/11/14 22:21:21 kleink Exp $ 1# $NetBSD: Makefile,v 1.180 2018/11/24 19:14:09 nia Exp $
2 2
3.include "Makefile.common" 3.include "Makefile.common"
4DISTNAME= abiword-${ABIVERSION} 4DISTNAME= abiword-${ABIVERSION}
5PKGREVISION= 20 
6CATEGORIES= editors 5CATEGORIES= editors
7MASTER_SITES= http://www.abiword.com/downloads/abiword/${PKGVERSION_NOREV}/source/ 6MASTER_SITES= http://www.abiword.com/downloads/abiword/${PKGVERSION_NOREV}/source/
8 7
9MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.abiword.com/ 9HOMEPAGE= http://www.abiword.com/
11COMMENT= Open Source cross-platform word processor 10COMMENT= Open Source cross-platform word processor
12LICENSE= gnu-gpl-v2 11LICENSE= gnu-gpl-v2
13 12
14CONFLICTS= abiword-personal-[0-9]* abiword2-[0-9]* 13CONFLICTS= abiword-personal-[0-9]* abiword2-[0-9]*
15 14
16DEPENDS+= adwaita-icon-theme>0:../../graphics/adwaita-icon-theme 15DEPENDS+= adwaita-icon-theme>0:../../graphics/adwaita-icon-theme
17 16
18GNU_CONFIGURE= yes 17GNU_CONFIGURE= yes
19USE_LIBTOOL= yes 18USE_LIBTOOL= yes
20USE_TOOLS+= autoconf automake gmake pkg-config 19USE_TOOLS+= autoconf automake gmake pkg-config
21USE_LANGUAGES= c c++03 20USE_LANGUAGES= c c++11
22 21
23CONFIGURE_ARGS+= --disable-default-plugins #do not build any plugins by default 22CONFIGURE_ARGS+= --disable-default-plugins #do not build any plugins by default
24CONFIGURE_ARGS+= --enable-spell # (Gtk+ only) include spell checking support 23CONFIGURE_ARGS+= --enable-spell # (Gtk+ only) include spell checking support
25CONFIGURE_ARGS+= --enable-plugins="" 24CONFIGURE_ARGS+= --enable-plugins=""
26# evolution data server can't be found even if buildlinked 25# evolution data server can't be found even if buildlinked
27# disable to make sure it's not found somewhere else 26# disable to make sure it's not found somewhere else
28CONFIGURE_ARGS+= --with-evolution-data-server=no 27CONFIGURE_ARGS+= --with-evolution-data-server=no
29 28
30PKGCONFIG_OVERRIDE+= libabiword.pc.in 29PKGCONFIG_OVERRIDE+= libabiword.pc.in
31 30
32pre-configure: 31pre-configure:
33 cd ${WRKSRC}; \ 32 cd ${WRKSRC}; \
34 autoreconf --force --install 33 autoreconf --force --install
cvs diff -r1.46 -r1.47 pkgsrc/editors/abiword/Makefile.common (expand / switch to unified diff)

--- pkgsrc/editors/abiword/Makefile.common 2016/09/27 12:00:50 1.46
+++ pkgsrc/editors/abiword/Makefile.common 2018/11/24 19:14:09 1.47
@@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
1# $NetBSD: Makefile.common,v 1.46 2016/09/27 12:00:50 wiz Exp $ 1# $NetBSD: Makefile.common,v 1.47 2018/11/24 19:14:09 nia Exp $
2# used by editors/abiword-plugins/Makefile 2# used by editors/abiword-plugins/Makefile
3 3
4ABIVERSION=3.0.1 4ABIVERSION=3.0.2
cvs diff -r1.74 -r1.75 pkgsrc/editors/abiword/distinfo (expand / switch to unified diff)

--- pkgsrc/editors/abiword/distinfo 2018/06/30 12:43:28 1.74
+++ pkgsrc/editors/abiword/distinfo 2018/11/24 19:14:09 1.75
@@ -1,36 +1,29 @@ @@ -1,36 +1,29 @@
1$NetBSD: distinfo,v 1.74 2018/06/30 12:43:28 maya Exp $ 1$NetBSD: distinfo,v 1.75 2018/11/24 19:14:09 nia Exp $
2 2
3SHA1 (abiword-3.0.1.tar.gz) = 7badf9663564a144e16764a456cadda18df70991 3SHA1 (abiword-3.0.2.tar.gz) = 8226e0962e6667e0a461955a0ac680a629e0b55a
4RMD160 (abiword-3.0.1.tar.gz) = 05d92a7304e4e419776970d7b35065ceb59f7681 4RMD160 (abiword-3.0.2.tar.gz) = fde551492b0cffa7d522082906f374490bd47f5c
5SHA512 (abiword-3.0.1.tar.gz) = c655aabe0ba0a9880f30808e26c02ec3280c750625faa482a68d4d336742f85659a7af7d6413d8813b82d3de0a3f6b61b6f6898f030bb921d792ad866879dbcf 5SHA512 (abiword-3.0.2.tar.gz) = 29ce9e80b3b85ab2933e7d39216771d8c4e05db5255eaed0cf8e1d032ffaac2cb1880bf24e754196ad5dae4969a1c2101ce4dc9c1db14604adc2f852b6a17fe3
6Size (abiword-3.0.1.tar.gz) = 11144990 bytes 6Size (abiword-3.0.2.tar.gz) = 11154333 bytes
7SHA1 (patch-configure.ac) = 239c0635c2c616c7e0a986a5fd92428393af38b7 7SHA1 (patch-configure.ac) = 239c0635c2c616c7e0a986a5fd92428393af38b7
8SHA1 (patch-plugin-configure.m4) = a8b8db3bdbd69339e32eefec1de7b1b59467db40 8SHA1 (patch-plugin-configure.m4) = ccdb6932b389694998a8d50676347d4fa6a03910
9SHA1 (patch-plugins_aiksaurus_Makefile.am) = 1529d5098b7fb798c428fe02cc50879374cb3e9d 9SHA1 (patch-plugins_aiksaurus_Makefile.am) = 1529d5098b7fb798c428fe02cc50879374cb3e9d
10SHA1 (patch-plugins_collab_backends_service_xp_RealmProtocol.cpp) = 8b46d71b4ebb23aa4720e6d2d544004e178c1f2f 
11SHA1 (patch-plugins_collab_backends_service_xp_soa__soup.cpp) = 219532cffebd67a9ed2e62fd318ccfb7eee57036 
12SHA1 (patch-plugins_collab_backends_service_xp_tls__tunnel.cpp) = f8eed4520951653822c6de8da371c8cb42dcbc89 
13SHA1 (patch-plugins_command_Makefile.am) = e003a6bf9a6e0566abc85f09868fdf1aa93234d7 10SHA1 (patch-plugins_command_Makefile.am) = e003a6bf9a6e0566abc85f09868fdf1aa93234d7
14SHA1 (patch-plugins_gimp_xp_AbiGimp.cpp) = 15692cf15fd4099e7ad4ad854b6b57b103717269 11SHA1 (patch-plugins_gimp_xp_AbiGimp.cpp) = 15692cf15fd4099e7ad4ad854b6b57b103717269
15SHA1 (patch-plugins_goffice_Makefile.am) = 1959eea3b4e19f085aeb56870f682ce44561d445 12SHA1 (patch-plugins_goffice_Makefile.am) = 1959eea3b4e19f085aeb56870f682ce44561d445
16SHA1 (patch-plugins_grammar_linkgrammarwrap_LinkGrammarWrap.cpp) = f3916dbc0b208bfe9dbb55eac850a3094683694c 
17SHA1 (patch-plugins_latex_xp_ie__exp__LaTeX.cpp) = bffa5e143147214af4baf8bf778123ca7223a8eb 
18SHA1 (patch-plugins_mht_xp_tidyReader.h) = fa4ef0ee7f893fb070b76e21aaad4efd9b8b27ee 13SHA1 (patch-plugins_mht_xp_tidyReader.h) = fa4ef0ee7f893fb070b76e21aaad4efd9b8b27ee
19SHA1 (patch-plugins_paint_xp_AbiGeneric.cpp) = 0c29c7ddf0dbd55d4bb6ab90311e40f2cff7130b 14SHA1 (patch-plugins_paint_xp_AbiGeneric.cpp) = 0c29c7ddf0dbd55d4bb6ab90311e40f2cff7130b
20SHA1 (patch-plugins_paint_xp_AbiPaint.cpp) = bf1ea7eb25fb384014523554f7ca55e6507bcbe6 15SHA1 (patch-plugins_paint_xp_AbiPaint.cpp) = bf1ea7eb25fb384014523554f7ca55e6507bcbe6
21SHA1 (patch-plugins_psion_Makefile.am) = d18356c2a273d99918076d5aefafec595af3f898 16SHA1 (patch-plugins_psion_Makefile.am) = d18356c2a273d99918076d5aefafec595af3f898
22SHA1 (patch-plugins_wordperfect_xp_Makefile.am) = e5cba76cfdba5caca672b801fa222b277a7522c1 17SHA1 (patch-plugins_wordperfect_xp_Makefile.am) = e5cba76cfdba5caca672b801fa222b277a7522c1
23SHA1 (patch-plugins_wordperfect_xp_ie__imp__WordPerfect.cpp) = 10a6d88e21f98e743b4443a09cd73ab8b7812fc9 18SHA1 (patch-plugins_wordperfect_xp_ie__imp__WordPerfect.cpp) = 10a6d88e21f98e743b4443a09cd73ab8b7812fc9
24SHA1 (patch-plugins_wordperfect_xp_ie__imp__WordPerfect.h) = 6e1e264506edabf0e1cb359f664ed455d16fa05e 19SHA1 (patch-plugins_wordperfect_xp_ie__imp__WordPerfect.h) = 6e1e264506edabf0e1cb359f664ed455d16fa05e
25SHA1 (patch-plugins_wordperfect_xp_ie__impexp__WordPerfect.cpp) = c87bc227eebcfcc2ab11ee6b5237ef8fcc47c0bc 20SHA1 (patch-plugins_wordperfect_xp_ie__impexp__WordPerfect.cpp) = c87bc227eebcfcc2ab11ee6b5237ef8fcc47c0bc
26SHA1 (patch-plugins_wordperfect_xp_ie__impexp__WordPerfect.h) = 0a75276dc0d1d99b97155f61d9f98de7126fb0a3 21SHA1 (patch-plugins_wordperfect_xp_ie__impexp__WordPerfect.h) = 0a75276dc0d1d99b97155f61d9f98de7126fb0a3
27SHA1 (patch-plugins_wpg_xp_ie__impGraphic__WPG.cpp) = 36d7ca7855ddc504701e392c28e3d8530f78b81e 22SHA1 (patch-plugins_wpg_xp_ie__impGraphic__WPG.cpp) = 36d7ca7855ddc504701e392c28e3d8530f78b81e
28SHA1 (patch-plugins_xslfo_xp_ie__exp__XSL-FO.cpp) = 8dfb1c643d70ff1813fd3d9eaa71074e8954975a 
29SHA1 (patch-src_af_util_xp_ut__endian.h) = e1dd4cc0df3b0eb66dbd673fb5c0d2e3b24b30a4 23SHA1 (patch-src_af_util_xp_ut__endian.h) = e1dd4cc0df3b0eb66dbd673fb5c0d2e3b24b30a4
30SHA1 (patch-src_af_util_xp_ut__iconv.cpp) = 613f162d4db0ba9520e0481a98564e59ccd862d4 24SHA1 (patch-src_af_util_xp_ut__iconv.cpp) = 613f162d4db0ba9520e0481a98564e59ccd862d4
31SHA1 (patch-src_af_util_xp_ut__iconv.h) = bbcfa2098ea77d393feb50d69de9ae29fcce302f 25SHA1 (patch-src_af_util_xp_ut__iconv.h) = bbcfa2098ea77d393feb50d69de9ae29fcce302f
32SHA1 (patch-src_af_util_xp_ut__mbtowc.cpp) = 01f6793651533e7e39f665e5c15e6c12e1c7b96d 26SHA1 (patch-src_af_util_xp_ut__mbtowc.cpp) = 01f6793651533e7e39f665e5c15e6c12e1c7b96d
33SHA1 (patch-src_af_util_xp_ut__misc.cpp) = f552ecbb87490355d8e74218dd59fd3961f1af5d 27SHA1 (patch-src_af_util_xp_ut__misc.cpp) = f552ecbb87490355d8e74218dd59fd3961f1af5d
34SHA1 (patch-src_text_fmt_xp_fv__FrameEdit.h) = 684310bf9aece4ce72d004dfae9a4b4b6ca69570 28SHA1 (patch-src_text_fmt_xp_fv__FrameEdit.h) = 684310bf9aece4ce72d004dfae9a4b4b6ca69570
35SHA1 (patch-src_text_ptbl_xp_pd__DocumentRDF.cpp) = 0c111e9e88c27ad0321c1a3d337abd1f158398d0 29SHA1 (patch-src_text_ptbl_xp_pd__DocumentRDF.cpp) = 5673e9341372913156f2f722229569199d97af4c
36SHA1 (patch-src_text_ptbl_xp_pd__DocumentRDF.h) = 59837727c060bc8f8f14478c3a0245b877c2d29a 
cvs diff -r1.2 -r1.3 pkgsrc/editors/abiword/options.mk (expand / switch to unified diff)

--- pkgsrc/editors/abiword/options.mk 2016/02/12 23:42:15 1.2
+++ pkgsrc/editors/abiword/options.mk 2018/11/24 19:14:09 1.3
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: options.mk,v 1.2 2016/02/12 23:42:15 jperkin Exp $ 1# $NetBSD: options.mk,v 1.3 2018/11/24 19:14:09 nia Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.abiword 3PKG_OPTIONS_VAR= PKG_OPTIONS.abiword
4PKG_SUPPORTED_OPTIONS= debug 4PKG_SUPPORTED_OPTIONS= debug
5.include "../../mk/bsd.options.mk" 5.include "../../mk/bsd.options.mk"
6 6
7# 7#
8# Enable debugging funcionality 8# Enable debugging funcionality
9# more verbose terminal output 9# more verbose terminal output
10# 10#
11.if !empty(PKG_OPTIONS:Mdebug) 11.if !empty(PKG_OPTIONS:Mdebug)
12CC+= -ggdb 12CC+= -ggdb
13CXX+= -ggdb 13CXX+= -ggdb
14CONFIGURE_ARGS+= --enable-debug 14CONFIGURE_ARGS+= --enable-debug
15INSTALL_UNSTRIPPED= yes 15INSTALL_UNSTRIPPED= yes
16CFLAGS+= -O0 16CFLAGS+= -O0
17.endif 17.endif
 18
cvs diff -r1.94 -r1.95 pkgsrc/editors/abiword-plugins/Makefile (expand / switch to unified diff)

--- pkgsrc/editors/abiword-plugins/Makefile 2018/11/14 22:21:21 1.94
+++ pkgsrc/editors/abiword-plugins/Makefile 2018/11/24 19:14:09 1.95
@@ -1,19 +1,18 @@ @@ -1,19 +1,18 @@
1# $NetBSD: Makefile,v 1.94 2018/11/14 22:21:21 kleink Exp $ 1# $NetBSD: Makefile,v 1.95 2018/11/24 19:14:09 nia Exp $
2 2
3.include "../../editors/abiword/Makefile.common" 3.include "../../editors/abiword/Makefile.common"
4DISTNAME= abiword-${ABIVERSION} 4DISTNAME= abiword-${ABIVERSION}
5PKGNAME= abiword-plugins-${ABIVERSION} 5PKGNAME= abiword-plugins-${ABIVERSION}
6PKGREVISION= 33 
7CATEGORIES= editors 6CATEGORIES= editors
8MASTER_SITES= http://www.abiword.com/downloads/abiword/${PKGVERSION_NOREV}/source/ 7MASTER_SITES= http://www.abiword.com/downloads/abiword/${PKGVERSION_NOREV}/source/
9 8
10MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://www.abiword.com/ 10HOMEPAGE= http://www.abiword.com/
12COMMENT= Open Source cross-platform word processor 11COMMENT= Open Source cross-platform word processor
13LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
14 13
15DISTINFO_FILE= ${.CURDIR}/../../editors/abiword/distinfo 14DISTINFO_FILE= ${.CURDIR}/../../editors/abiword/distinfo
16PATCHDIR= ${.CURDIR}/../../editors/abiword/patches 15PATCHDIR= ${.CURDIR}/../../editors/abiword/patches
17 16
18CONFLICTS= abiword-plugins-[0-9]* abiword-personal-[0-9]* abiword2-[0-9]* 17CONFLICTS= abiword-plugins-[0-9]* abiword-personal-[0-9]* abiword2-[0-9]*
19 18
cvs diff -r1.1 -r1.2 pkgsrc/editors/abiword/patches/patch-plugin-configure.m4 (expand / switch to unified diff)

--- pkgsrc/editors/abiword/patches/patch-plugin-configure.m4 2015/09/13 21:32:13 1.1
+++ pkgsrc/editors/abiword/patches/patch-plugin-configure.m4 2018/11/24 19:14:09 1.2
@@ -1,25 +1,25 @@ @@ -1,25 +1,25 @@
1$NetBSD: patch-plugin-configure.m4,v 1.1 2015/09/13 21:32:13 nros Exp $ 1$NetBSD: patch-plugin-configure.m4,v 1.2 2018/11/24 19:14:09 nia Exp $
2* adapt wordperfect plugins to dependecies available in pkgsrc  2* adapt wordperfect plugins to dependecies available in pkgsrc
3 from abiword svn date 2014-12-27 3 from abiword svn date 2014-12-27
4--- plugin-configure.m4.orig 2014-12-23 05:13:14.000000000 +0000 4--- plugin-configure.m4.orig 2016-10-21 00:42:58.000000000 +0000
5+++ plugin-configure.m4 5+++ plugin-configure.m4
6@@ -1355,7 +1355,7 @@ AC_SUBST([BMP_CFLAGS]) 6@@ -72,7 +72,7 @@ AC_SUBST([GRAMMAR_CFLAGS])
7 AC_SUBST([BMP_LIBS]) 7 AC_SUBST([GRAMMAR_LIBS])
8  8
9  9
10-wpg_pkgs="$gsf_req libwpg-0.2 >= 0.2.0 libwpd-0.9 >= 0.9.0 libwpd-stream-0.9 >= 0.9.0" 10-wpg_pkgs="$gsf_req libwpg-0.2 >= 0.2.0 libwpd-0.9 >= 0.9.0 libwpd-stream-0.9 >= 0.9.0"
11+wpg_pkgs="libwpg-0.3 $gsf_req" 11+wpg_pkgs="libwpg-0.3 $gsf_req"
12 wpg_deps="no" 12 wpg_deps="no"
13  13
14 if test "$enable_wpg" != ""; then 14 if test "$enable_wpg" != ""; then
15@@ -1469,8 +1469,8 @@ AC_SUBST([AIKSAURUS_CFLAGS]) 15@@ -962,8 +962,8 @@ AC_SUBST([XSLFO_CFLAGS])
16 AC_SUBST([AIKSAURUS_LIBS]) 16 AC_SUBST([XSLFO_LIBS])
17  17
18  18
19-wordperfect_pkgs="libwpg-0.2 >= 0.2.0 libwpd-0.9 >= 0.9.0 libwpd-stream-0.9 >= 0.9.0 $gsf_req" 19-wordperfect_pkgs="libwpg-0.2 >= 0.2.0 libwpd-0.9 >= 0.9.0 libwpd-stream-0.9 >= 0.9.0 $gsf_req"
20-wordperfect_wps_pkgs='libwps-0.2 >= 0.1.0' 20-wordperfect_wps_pkgs='libwps-0.2 >= 0.1.0'
21+wordperfect_pkgs="libwpd-0.10 $gsf_req" 21+wordperfect_pkgs="libwpd-0.10 $gsf_req"
22+wordperfect_wps_pkgs='libwps-0.3' 22+wordperfect_wps_pkgs='libwps-0.3'
23 wordperfect_deps="no" 23 wordperfect_deps="no"
24  24
25 WORDPERFECT_CFLAGS= 25 WORDPERFECT_CFLAGS=
File Deleted: pkgsrc/editors/abiword/patches/Attic/patch-plugins_collab_backends_service_xp_RealmProtocol.cpp
File Deleted: pkgsrc/editors/abiword/patches/Attic/patch-plugins_collab_backends_service_xp_soa__soup.cpp
File Deleted: pkgsrc/editors/abiword/patches/Attic/patch-plugins_collab_backends_service_xp_tls__tunnel.cpp
File Deleted: pkgsrc/editors/abiword/patches/Attic/patch-plugins_grammar_linkgrammarwrap_LinkGrammarWrap.cpp
File Deleted: pkgsrc/editors/abiword/patches/Attic/patch-plugins_latex_xp_ie__exp__LaTeX.cpp
File Deleted: pkgsrc/editors/abiword/patches/Attic/patch-plugins_xslfo_xp_ie__exp__XSL-FO.cpp
File Deleted: pkgsrc/editors/abiword/patches/Attic/patch-src_text_ptbl_xp_pd__DocumentRDF.h
cvs diff -r1.2 -r1.3 pkgsrc/editors/abiword/patches/Attic/patch-src_text_ptbl_xp_pd__DocumentRDF.cpp (expand / switch to unified diff)

--- pkgsrc/editors/abiword/patches/Attic/patch-src_text_ptbl_xp_pd__DocumentRDF.cpp 2018/04/25 05:53:53 1.2
+++ pkgsrc/editors/abiword/patches/Attic/patch-src_text_ptbl_xp_pd__DocumentRDF.cpp 2018/11/24 19:14:09 1.3
@@ -1,45 +1,17 @@ @@ -1,45 +1,17 @@
1$NetBSD: patch-src_text_ptbl_xp_pd__DocumentRDF.cpp,v 1.2 2018/04/25 05:53:53 markd Exp $ 1$NetBSD: patch-src_text_ptbl_xp_pd__DocumentRDF.cpp,v 1.3 2018/11/24 19:14:09 nia Exp $
2 2
3* fixes build on FreeBSD 10 with clang. From FreeBSD ports mailing list. 3fix using modern libical
4 Applied upstream. 
5 https://lists.freebsd.org/pipermail/freebsd-ports/2015-March/098621.html 
6 4
7* fix using modern libical 5--- src/text/ptbl/xp/pd_DocumentRDF.cpp.orig 2015-04-02 03:09:20.000000000 +0000
8 
9--- src/text/ptbl/xp/pd_DocumentRDF.cpp.orig 2014-02-27 05:11:32.000000000 +0000 
10+++ src/text/ptbl/xp/pd_DocumentRDF.cpp 6+++ src/text/ptbl/xp/pd_DocumentRDF.cpp
11@@ -570,6 +570,11 @@ bool PD_URI::operator==(const std::strin 
12 return m_value == b; 
13 } 
14  
15+bool PD_URI::operator<(const PD_URI& b) const 
16+{ 
17+return m_value < b.m_value; 
18+} 
19+ 
20 PD_URI 
21 PD_URI::prefixedToURI( PD_RDFModelHandle model ) const 
22 { 
23@@ -611,11 +616,6 @@ bool PD_URI::write( std::ostream& ss ) c 
24 return true; 
25 } 
26  
27-bool operator<( PD_URI a, PD_URI b) 
28-{ 
29- return a.toString() < b.toString(); 
30-} 
31- 
32 bool operator<( std::pair< PD_URI, PD_URI > a, PD_URI b) 
33 { 
34 return a.first.toString() < b.toString(); 
35@@ -2269,8 +2269,8 @@ PD_RDFEvent::exportToFile( const std::st 7@@ -2269,8 +2269,8 @@ PD_RDFEvent::exportToFile( const std::st
36 icalcomponent_set_uid( c, m_uid.c_str() ); 8 icalcomponent_set_uid( c, m_uid.c_str() );
37 icalcomponent_set_location( c, m_location.c_str() ); 9 icalcomponent_set_location( c, m_location.c_str() );
38 icalcomponent_set_description( c, m_desc.c_str() ); 10 icalcomponent_set_description( c, m_desc.c_str() );
39- icalcomponent_set_dtstart( c, icaltime_from_timet( m_dtstart, 0 ) ); 11- icalcomponent_set_dtstart( c, icaltime_from_timet( m_dtstart, 0 ) );
40- icalcomponent_set_dtend( c, icaltime_from_timet( m_dtend, 0 ) ); 12- icalcomponent_set_dtend( c, icaltime_from_timet( m_dtend, 0 ) );
41+ icalcomponent_set_dtstart( c, icaltime_from_timet_with_zone( m_dtstart, 0, 0 ) ); 13+ icalcomponent_set_dtstart( c, icaltime_from_timet_with_zone( m_dtstart, 0, 0 ) );
42+ icalcomponent_set_dtend( c, icaltime_from_timet_with_zone( m_dtend, 0, 0 ) ); 14+ icalcomponent_set_dtend( c, icaltime_from_timet_with_zone( m_dtend, 0, 0 ) );
43  15
44 char* data = icalcomponent_as_ical_string( c ); 16 char* data = icalcomponent_as_ical_string( c );
45 std::ofstream oss( filename.c_str() ); 17 std::ofstream oss( filename.c_str() );