Update abiword 3.0.1 --> 3.0.4. This resolves 13-CURRENT build

failures.
freebsd · Dec 10, 2020 · d2693be · d2693be
1 parent 9f0a171
commit d2693be
Show file tree

Hide file tree

Showing 8 changed files with 5 additions and 147 deletions.
diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	abiword
-PORTVERSION=	3.0.1
-PORTREVISION=	17
+PORTVERSION=	3.0.4
 CATEGORIES=	editors
 MASTER_SITES=	http://www.abisource.com/downloads/abiword/${PORTVERSION}/source/
 DIST_SUBDIR=	AbiWord

diff --git a/editors/abiword/distinfo b/editors/abiword/distinfo
@@ -1,2 +1,3 @@
-SHA256 (AbiWord/abiword-3.0.1.tar.gz) = e094f6fbf0afc5c5538b4894888e7c346f8ee8f49c9d24821dd696d0734865c6
-SIZE (AbiWord/abiword-3.0.1.tar.gz) = 11144990
+TIMESTAMP = 1607614164
+SHA256 (AbiWord/abiword-3.0.4.tar.gz) = e93096cb192e5bc19d62e180fc5eda643206465315a710113ae5036bc2a1a5d7
+SIZE (AbiWord/abiword-3.0.4.tar.gz) = 11064305
diff --git a/editors/abiword/files/patch-c++11 b/editors/abiword/files/patch-c++11
@@ -4,78 +4,10 @@ xap_Dialog.cpp:270:17: error: cast from pointer to smaller type 'char' loses inf
 ap_UnixApp.cpp:866:29: error: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wreserved-user-defined-literal]
         if(0 == strcmp (suffix, "."G_MODULE_SUFFIX))
                                    ^
-ie_exp_XSL-FO.cpp:1454:13: error: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wreserved-user-defined-literal]
-                buf += " "x"=\""; \
-                          ^
-ie_exp_LaTeX.cpp:1332:43: error: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wreserved-user-defined-literal]
-#define SUB(a,who) case a: subst = "\\(\\"who"\\)"; return true;
-                                          ^
-RealmProtocol.cpp:16:2: error: constant expression evaluates to -1 which cannot be narrowed to type 'uint32_t' (aka 'unsigned int') [-Wc++11-narrowing]
-        RPV1_PACKET_VARIABLE, /* user joined */
-        ^~~~~~~~~~~~~~~~~~~~
-RealmProtocol.cpp:10:30: note: expanded from macro 'RPV1_PACKET_VARIABLE'
-#define RPV1_PACKET_VARIABLE -1
-                             ^~
-RealmProtocol.cpp:16:2: note: insert an explicit cast to silence this issue
-        RPV1_PACKET_VARIABLE, /* user joined */
-        ^~~~~~~~~~~~~~~~~~~~
-        static_cast<uint32_t>( )
-RealmProtocol.cpp:10:30: note: expanded from macro 'RPV1_PACKET_VARIABLE'
-#define RPV1_PACKET_VARIABLE -1
-                             ^~
-soa_soup.cpp:166:11: error: no viable conversion from returned value of type 'soa::GenericPtr' (aka 'shared_ptr<soa::Generic>') to function return type 'bool'
-                        return soa::GenericPtr();
-                               ^~~~~~~~~~~~~~~~~
 
 https://github.com/AbiWord/abiword/commit/a83e6f50dbd5
 https://github.com/AbiWord/abiword/commit/5623a94c756c
 
---- plugins/collab/backends/service/xp/RealmProtocol.cpp.orig	2009-05-27 05:41:59 UTC
-+++ 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 */
---- plugins/collab/backends/service/xp/soa_soup.cpp.orig	2009-09-29 13:58:11 UTC
-+++ 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) ||
---- plugins/latex/xp/ie_exp_LaTeX.cpp.orig	2013-04-07 13:53:03 UTC
-+++ plugins/latex/xp/ie_exp_LaTeX.cpp
-@@ -1329,7 +1329,7 @@ void s_LaTeX_Listener::_outputData(const UT_UCSChar * 
- 	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)
- {
---- plugins/xslfo/xp/ie_exp_XSL-FO.cpp.orig	2013-04-07 13:53:03 UTC
-+++ plugins/xslfo/xp/ie_exp_XSL-FO.cpp
-@@ -1451,7 +1451,7 @@ void s_XSL_FO_Listener::_openSection(PT_AttrPropIndex 
- 	{ \
- 		UT_UTF8String esc = szValue; \
- 		esc.escapeXML(); \
--		buf += " "x"=\""; \
-+		buf += " " x"=\""; \
- 		buf += esc.utf8_str(); \
- 		buf += "\""; \
- 	}
 --- src/af/xap/xp/xap_Dialog.cpp.orig	2013-04-07 13:53:03 UTC
 +++ src/af/xap/xp/xap_Dialog.cpp
 @@ -267,7 +267,7 @@ XAP_Dialog_Modeless::BuildWindowName(char * pWindowNam

diff --git a/editors/abiword/files/patch-plugins_collab_backends_service_xp_tls_tunnel.cpp b/editors/abiword/files/patch-plugins_collab_backends_service_xp_tls_tunnel.cpp
diff --git a/editors/abiword/files/patch-plugins_collab_backends_sipsimple_xp_SIPSimpleBuddy.h b/editors/abiword/files/patch-plugins_collab_backends_sipsimple_xp_SIPSimpleBuddy.h
diff --git a/editors/abiword/files/patch-src_text_ptbl_xp_pd__DocumentRDF.cpp b/editors/abiword/files/patch-src_text_ptbl_xp_pd__DocumentRDF.cpp
diff --git a/editors/abiword/files/patch-src_text_ptbl_xp_pd__DocumentRDF.h b/editors/abiword/files/patch-src_text_ptbl_xp_pd__DocumentRDF.h
diff --git a/editors/abiword/pkg-plist b/editors/abiword/pkg-plist
@@ -382,6 +382,7 @@ man/man1/abiword.1.gz
 %%DATADIR%%-%%ABIVERSION%%/xsltml/scripts.xsl
 %%DATADIR%%-%%ABIVERSION%%/xsltml/tables.xsl
 %%DATADIR%%-%%ABIVERSION%%/xsltml/tokens.xsl
+share/appdata/abiword.appdata.xml
 share/applications/abiword.desktop
 %%COLTELEPATHY%%share/dbus-1/services/org.freedesktop.Telepathy.Client.AbiCollab.service
 share/icons/hicolor/16x16/apps/abiword.png