CVS commit: pkgsrc/editors/abiword

["Mark Davies" <markd%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   markd
Date:           Wed Apr 25 05:53:53 UTC 2018

Modified Files:
        pkgsrc/editors/abiword: Makefile distinfo
        pkgsrc/editors/abiword/patches:
            patch-src_text_ptbl_xp_pd__DocumentRDF.cpp

Log Message:
abiword: build with libical-3


To generate a diff of this commit:
cvs rdiff -u -r1.172 -r1.173 pkgsrc/editors/abiword/Makefile
cvs rdiff -u -r1.72 -r1.73 pkgsrc/editors/abiword/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/editors/abiword/patches/patch-src_text_ptbl_xp_pd__DocumentRDF.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/editors/abiword/Makefile
diff -u pkgsrc/editors/abiword/Makefile:1.172 pkgsrc/editors/abiword/Makefile:1.173
--- pkgsrc/editors/abiword/Makefile:1.172       Mon Apr 16 14:33:49 2018
+++ pkgsrc/editors/abiword/Makefile     Wed Apr 25 05:53:53 2018
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.172 2018/04/16 14:33:49 wiz Exp $
+# $NetBSD: Makefile,v 1.173 2018/04/25 05:53:53 markd Exp $
 
 .include       "Makefile.common"
 DISTNAME=      abiword-${ABIVERSION}
-PKGREVISION=   14
+PKGREVISION=   15
 CATEGORIES=    editors
 MASTER_SITES=  http://www.abiword.com/downloads/abiword/${PKGVERSION_NOREV}/source/
 

Index: pkgsrc/editors/abiword/distinfo
diff -u pkgsrc/editors/abiword/distinfo:1.72 pkgsrc/editors/abiword/distinfo:1.73
--- pkgsrc/editors/abiword/distinfo:1.72        Mon Feb 20 09:35:16 2017
+++ pkgsrc/editors/abiword/distinfo     Wed Apr 25 05:53:53 2018
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.72 2017/02/20 09:35:16 wiz Exp $
+$NetBSD: distinfo,v 1.73 2018/04/25 05:53:53 markd Exp $
 
 SHA1 (abiword-3.0.1.tar.gz) = 7badf9663564a144e16764a456cadda18df70991
 RMD160 (abiword-3.0.1.tar.gz) = 05d92a7304e4e419776970d7b35065ceb59f7681
@@ -28,5 +28,5 @@ SHA1 (patch-src_af_util_xp_ut__iconv.h) 
 SHA1 (patch-src_af_util_xp_ut__mbtowc.cpp) = 01f6793651533e7e39f665e5c15e6c12e1c7b96d
 SHA1 (patch-src_af_util_xp_ut__misc.cpp) = f552ecbb87490355d8e74218dd59fd3961f1af5d
 SHA1 (patch-src_text_fmt_xp_fv__FrameEdit.h) = 684310bf9aece4ce72d004dfae9a4b4b6ca69570
-SHA1 (patch-src_text_ptbl_xp_pd__DocumentRDF.cpp) = d07eaf64446efc83c24e02e5969e0921451269a8
+SHA1 (patch-src_text_ptbl_xp_pd__DocumentRDF.cpp) = 0c111e9e88c27ad0321c1a3d337abd1f158398d0
 SHA1 (patch-src_text_ptbl_xp_pd__DocumentRDF.h) = 59837727c060bc8f8f14478c3a0245b877c2d29a

Index: pkgsrc/editors/abiword/patches/patch-src_text_ptbl_xp_pd__DocumentRDF.cpp
diff -u pkgsrc/editors/abiword/patches/patch-src_text_ptbl_xp_pd__DocumentRDF.cpp:1.1 pkgsrc/editors/abiword/patches/patch-src_text_ptbl_xp_pd__DocumentRDF.cpp:1.2
--- pkgsrc/editors/abiword/patches/patch-src_text_ptbl_xp_pd__DocumentRDF.cpp:1.1       Sun Sep 13 21:32:13 2015
+++ pkgsrc/editors/abiword/patches/patch-src_text_ptbl_xp_pd__DocumentRDF.cpp   Wed Apr 25 05:53:53 2018
@@ -1,10 +1,12 @@
-$NetBSD: patch-src_text_ptbl_xp_pd__DocumentRDF.cpp,v 1.1 2015/09/13 21:32:13 nros Exp $
+$NetBSD: patch-src_text_ptbl_xp_pd__DocumentRDF.cpp,v 1.2 2018/04/25 05:53:53 markd Exp $
 
 * fixes build on FreeBSD 10 with clang. From FreeBSD ports mailing list.
   Applied upstream.
   https://lists.freebsd.org/pipermail/freebsd-ports/2015-March/098621.html
 
---- src/text/ptbl/xp/pd_DocumentRDF.cpp.orig   2015-04-04 22:33:15.000000000 +0000
+* fix using modern libical
+
+--- src/text/ptbl/xp/pd_DocumentRDF.cpp.orig   2014-02-27 05:11:32.000000000 +0000
 +++ src/text/ptbl/xp/pd_DocumentRDF.cpp
 @@ -570,6 +570,11 @@ bool PD_URI::operator==(const std::strin
      return m_value == b;
@@ -30,3 +32,14 @@ $NetBSD: patch-src_text_ptbl_xp_pd__Docu
  bool operator<( std::pair< PD_URI, PD_URI > a, PD_URI b)
  {
      return a.first.toString() < b.toString();
+@@ -2269,8 +2269,8 @@ PD_RDFEvent::exportToFile( const std::st
+         icalcomponent_set_uid( c,         m_uid.c_str() );
+         icalcomponent_set_location( c,    m_location.c_str() );
+         icalcomponent_set_description( c, m_desc.c_str() );
+-        icalcomponent_set_dtstart( c,     icaltime_from_timet( m_dtstart, 0 ) );
+-        icalcomponent_set_dtend( c,       icaltime_from_timet( m_dtend, 0 ) );
++        icalcomponent_set_dtstart( c,     icaltime_from_timet_with_zone( m_dtstart, 0, 0 ) );
++        icalcomponent_set_dtend( c,       icaltime_from_timet_with_zone( m_dtend, 0, 0 ) );
+ 
+         char* data = icalcomponent_as_ical_string( c );
+         std::ofstream oss( filename.c_str() );