From 117651f200fc3ffb6578630141cf393dd856807b Mon Sep 17 00:00:00 2001 From: mobinmob Date: Sat, 30 Nov 2019 23:18:26 +0200 Subject: [PATCH] abiword: update to 3.0.4. --- srcpkgs/abiword/patches/libical-3.0.patch | 13 ------------- srcpkgs/abiword/template | 11 +++++------ 2 files changed, 5 insertions(+), 19 deletions(-) delete mode 100644 srcpkgs/abiword/patches/libical-3.0.patch diff --git a/srcpkgs/abiword/patches/libical-3.0.patch b/srcpkgs/abiword/patches/libical-3.0.patch deleted file mode 100644 index 3abd90b21c7..00000000000 --- a/srcpkgs/abiword/patches/libical-3.0.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- /src/text/ptbl/xp/pd_DocumentRDF.cpp.orig 2015-04-02 03:09:20.000000000 +0000 -+++ src/text/ptbl/xp/pd_DocumentRDF.cpp 2017-11-19 22:57:49.533304878 +0000 -@@ -2269,8 +2269,8 @@ - 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() ); diff --git a/srcpkgs/abiword/template b/srcpkgs/abiword/template index a605b7d18a8..459c7eeba20 100644 --- a/srcpkgs/abiword/template +++ b/srcpkgs/abiword/template @@ -1,7 +1,7 @@ # Template file for 'abiword' pkgname=abiword -version=3.0.2 -revision=5 +version=3.0.4 +revision=1 build_style=gnu-configure configure_args="--enable-plugins --enable-clipart --enable-templates $(vopt_if gtk3 '--with-gtk3' '--with-gtk2') @@ -15,13 +15,12 @@ makedepends="libjpeg-turbo-devel libpng-devel fribidi-devel libgsf-devel depends="hicolor-icon-theme desktop-file-utils" short_desc="Free word processing program similar to Microsoft(R) Word" maintainer="Orphaned " -license="GPL-3" +license="GPL-2.0-or-later" homepage="http://www.abisource.com/" distfiles="${homepage}/downloads/${pkgname}/${version}/source/${pkgname}-${version}.tar.gz" -checksum=afbfd458fd02989d8b0c6362ba8a4c14686d89666f54cfdb5501bd2090cf3522 +checksum=e93096cb192e5bc19d62e180fc5eda643206465315a710113ae5036bc2a1a5d7 build_options="gtk3 goffice" -# reenable when http://bugzilla.abisource.com/show_bug.cgi?id=13815 is fixed. -# build_options_default="gtk3 goffice" +build_options_default="gtk3 goffice" CXXFLAGS="-std=c++11"