diff options
author | Andreas Müller <schnitzeltony@googlemail.com> | 2017-07-10 19:35:06 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2017-07-14 23:44:32 +0200 |
commit | 54ca918b6cc562a9719dbb2a4ad40e862155a238 (patch) | |
tree | 2ab96b185b6ee38007a259155eebab5233db9153 /meta-gnome | |
parent | 0783e2326214521969996bc7f7f64fc309cd0dee (diff) | |
download | meta-openembedded-contrib-54ca918b6cc562a9719dbb2a4ad40e862155a238.tar.gz |
abiword: update 3.0.1 -> 3.0.2
Patch was a backport now included upstream
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-gnome')
-rw-r--r-- | meta-gnome/recipes-gnome/abiword/abiword/0002-Bug-13754-Fix-build-on-gcc-6-default-to-C-11.patch | 74 | ||||
-rw-r--r-- | meta-gnome/recipes-gnome/abiword/abiword_3.0.2.bb (renamed from meta-gnome/recipes-gnome/abiword/abiword_3.0.1.bb) | 5 |
2 files changed, 2 insertions, 77 deletions
diff --git a/meta-gnome/recipes-gnome/abiword/abiword/0002-Bug-13754-Fix-build-on-gcc-6-default-to-C-11.patch b/meta-gnome/recipes-gnome/abiword/abiword/0002-Bug-13754-Fix-build-on-gcc-6-default-to-C-11.patch deleted file mode 100644 index 595ee8e5a2d..00000000000 --- a/meta-gnome/recipes-gnome/abiword/abiword/0002-Bug-13754-Fix-build-on-gcc-6-default-to-C-11.patch +++ /dev/null @@ -1,74 +0,0 @@ -From a83e6f50dbd5efa16fb39efe32b9de370f103130 Mon Sep 17 00:00:00 2001 -From: Hubert Figuiere <hub@figuiere.net> -Date: Sat, 23 Jan 2016 20:46:02 +0000 -Subject: [PATCH] Bug 13754 - Fix build on gcc-6 (default to C++11). - -This is debian bug https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=811381 - -git-svn-id: svn+ssh://svn.abisource.com/svnroot/abiword/trunk@35182 bcba8976-2d24-0410-9c9c-aab3bd5fdfd6 - -Upstream-Status: Backport ---- - plugins/collab/backends/service/xp/RealmProtocol.cpp | 4 ++-- - plugins/collab/backends/service/xp/soa_soup.cpp | 2 +- - plugins/latex/xp/ie_exp_LaTeX.cpp | 2 +- - plugins/xslfo/xp/ie_exp_XSL-FO.cpp | 2 +- - 4 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/plugins/collab/backends/service/xp/RealmProtocol.cpp b/plugins/collab/backends/service/xp/RealmProtocol.cpp -index fb426eb..347a49c 100644 ---- a/plugins/collab/backends/service/xp/RealmProtocol.cpp -+++ b/plugins/collab/backends/service/xp/RealmProtocol.cpp -@@ -6,8 +6,8 @@ namespace protocolv1 { - - #define MAX_PACKET_DATA_SIZE 64*1024*1024 - --#define RPV1_PACKET_NONEXISTENT -2 --#define RPV1_PACKET_VARIABLE -1 -+#define RPV1_PACKET_NONEXISTENT uint32_t(-2) -+#define RPV1_PACKET_VARIABLE uint32_t(-1) - - static uint32_t body_size[6] = { - RPV1_PACKET_NONEXISTENT, /* 0: reserved */ -diff --git a/plugins/collab/backends/service/xp/soa_soup.cpp b/plugins/collab/backends/service/xp/soa_soup.cpp -index 4b81735..f4f5134 100644 ---- a/plugins/collab/backends/service/xp/soa_soup.cpp -+++ b/plugins/collab/backends/service/xp/soa_soup.cpp -@@ -163,7 +163,7 @@ namespace soup_soa { - - static bool _invoke(const std::string& /*url*/, const soa::method_invocation& /*mi*/, SoaSoupSession& sess, std::string& result) { - if (!sess.m_session || !sess.m_msg ) -- return soa::GenericPtr(); -+ return false; - - guint status = soup_session_send_message (sess.m_session, sess.m_msg); - if (!(SOUP_STATUS_IS_SUCCESSFUL (status) || -diff --git a/plugins/latex/xp/ie_exp_LaTeX.cpp b/plugins/latex/xp/ie_exp_LaTeX.cpp -index 7aaf3a9..8bcc250 100644 ---- a/plugins/latex/xp/ie_exp_LaTeX.cpp -+++ b/plugins/latex/xp/ie_exp_LaTeX.cpp -@@ -1330,7 +1330,7 @@ void s_LaTeX_Listener::_outputData(const UT_UCSChar * data, UT_uint32 length) - m_pie->write(sBuf.c_str(),sBuf.size()); - } - --#define SUB(a,who) case a: subst = "\\(\\"who"\\)"; return true; -+#define SUB(a,who) case a: subst = "\\(\\" who"\\)"; return true; - #define SUBd(a,who) case a: subst = who; return true; - static bool _convertLettersToSymbols(char c, const char *& subst) - { -diff --git a/plugins/xslfo/xp/ie_exp_XSL-FO.cpp b/plugins/xslfo/xp/ie_exp_XSL-FO.cpp -index cc5e4e6..957226e 100644 ---- a/plugins/xslfo/xp/ie_exp_XSL-FO.cpp -+++ b/plugins/xslfo/xp/ie_exp_XSL-FO.cpp -@@ -1451,7 +1451,7 @@ void s_XSL_FO_Listener::_openSection(PT_AttrPropIndex api) - { \ - UT_UTF8String esc = szValue; \ - esc.escapeXML(); \ -- buf += " "x"=\""; \ -+ buf += " " x"=\""; \ - buf += esc.utf8_str(); \ - buf += "\""; \ - } --- -2.5.5 - diff --git a/meta-gnome/recipes-gnome/abiword/abiword_3.0.1.bb b/meta-gnome/recipes-gnome/abiword/abiword_3.0.2.bb index 34fc97d4acb..2a13e483932 100644 --- a/meta-gnome/recipes-gnome/abiword/abiword_3.0.1.bb +++ b/meta-gnome/recipes-gnome/abiword/abiword_3.0.2.bb @@ -28,13 +28,12 @@ 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://0002-Bug-13754-Fix-build-on-gcc-6-default-to-C-11.patch \ " LIC_FILES_CHKSUM = "file://COPYING;md5=c5edcc3ccd864b19004d14e9c1c9a26a" -SRC_URI[md5sum] = "f3f8052e7b4979a43b75775a381e6cb8" -SRC_URI[sha256sum] = "e094f6fbf0afc5c5538b4894888e7c346f8ee8f49c9d24821dd696d0734865c6" +SRC_URI[md5sum] = "cda6dd58c747c133b421cc7eb18f5796" +SRC_URI[sha256sum] = "afbfd458fd02989d8b0c6362ba8a4c14686d89666f54cfdb5501bd2090cf3522" #want 3.x from 3.x.y for the installation directory SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" |