zepto-forks/meta-office
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

abiword: upgrade 3.0.2 -> 3.0.4 / workaround build fails with latest asio

Browse Source 
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
This commit is contained in:
Andreas Müller
2020-06-21 00:23:52 +02:00
parent 19054ff9b7
commit 6787daeeb3
3 changed files with 5 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
recipes-abiword/abiword/abiword/0001-Bug-13770-Require-C-11-from-now-on.patch → recipes-abiword/abiword/abiword/0002-Bug-13770-Require-C-11-from-now-on.patch
View File

15
recipes-abiword/abiword/abiword/libical3.patch
View File

@@ -1,15 +0,0 @@
Index: src/text/ptbl/xp/pd_DocumentRDF.cpp
===================================================================
--- a/src/text/ptbl/xp/pd_DocumentRDF.cpp (revision 35456)
+++ b/src/text/ptbl/xp/pd_DocumentRDF.cpp (revision 35457)
@@ -2266,8 +2266,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, NULL ) );
+ icalcomponent_set_dtend( c, icaltime_from_timet_with_zone( m_dtend, 0, NULL ) );
char* data = icalcomponent_as_ical_string( c );
std::ofstream oss( filename.c_str() );

10
recipes-abiword/abiword/abiword_3.0.2.bb → recipes-abiword/abiword/abiword_3.0.4.bb
View File

@@ -27,14 +27,13 @@ RCONFLICTS_${PN} = "${PN}-embedded"
SRC_URI = " \
http://www.abisource.com/downloads/${BPN}/${PV}/source/${BP}.tar.gz \
file://0001-plugins-aiksaurus-Makefile.am-remove-uncomplete-opti.patch \
file://0001-Bug-13770-Require-C-11-from-now-on.patch \
file://libical3.patch \
file://0002-Bug-13770-Require-C-11-from-now-on.patch \
"
LIC_FILES_CHKSUM = "file://COPYING;md5=c5edcc3ccd864b19004d14e9c1c9a26a"
SRC_URI[md5sum] = "cda6dd58c747c133b421cc7eb18f5796"
SRC_URI[sha256sum] = "afbfd458fd02989d8b0c6362ba8a4c14686d89666f54cfdb5501bd2090cf3522"
SRC_URI[md5sum] = "04e31887049a8c72297881bc153b77c4"
SRC_URI[sha256sum] = "e93096cb192e5bc19d62e180fc5eda643206465315a710113ae5036bc2a1a5d7"
#want 3.x from 3.x.y for the installation directory
SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}"
@@ -44,7 +43,7 @@ inherit features_check autotools-brokensep pkgconfig mime-xdg
REQUIRED_DISTRO_FEATURES = "x11"
PACKAGECONFIG ??= " \
collab-backend-xmpp collab-backend-tcp \
collab-backend-xmpp \
libical \
"
PACKAGECONFIG[libical] = "--with-libical,--without-libical,libical raptor2"
@@ -81,6 +80,7 @@ FILES_${PN} += " \
${libdir}/lib${PN}-*.so \
${datadir}/mime-info \
${datadir}/icons/* \
${datadir}/appdata \
${datadir}/${PN}-${SHRT_VER}/glade \
${datadir}/${PN}-${SHRT_VER}/scripts \
${datadir}/${PN}-${SHRT_VER}/system.profile-en \