View | Details | Raw Unified | Return to bug 243652 | Differences between
and this patch

Collapse All | Expand All

(-)b/editors/abiword/Makefile (-9 / +16 lines)
Lines 2-9 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	abiword
4
PORTNAME=	abiword
5
PORTVERSION=	3.0.1
5
PORTVERSION=	3.0.4
6
PORTREVISION=	16
7
CATEGORIES=	editors
6
CATEGORIES=	editors
8
MASTER_SITES=	http://www.abisource.com/downloads/abiword/${PORTVERSION}/source/
7
MASTER_SITES=	http://www.abisource.com/downloads/abiword/${PORTVERSION}/source/
9
DIST_SUBDIR=	AbiWord
8
DIST_SUBDIR=	AbiWord
Lines 19-30 LIB_DEPENDS= libboost_system.so:devel/boost-libs \ Link Here
19
		libpng.so:graphics/png \
18
		libpng.so:graphics/png \
20
		libwv.so:textproc/wv \
19
		libwv.so:textproc/wv \
21
		libfribidi.so:converters/fribidi \
20
		libfribidi.so:converters/fribidi \
22
		libgoffice-0.10.so:devel/goffice
21
		libgoffice-0.10.so:devel/goffice \
22
		libdbus-1.so:devel/dbus \
23
		libgpg-error.so:security/libgpg-error \
24
		libgcrypt.so:security/libgcrypt \
25
		libfreetype.so:print/freetype2 \
26
		libfontconfig.so:x11-fonts/fontconfig \
27
		librasqal.so:textproc/rasqal \
28
		librdf.so:textproc/redland \
29
		libraptor2.so:textproc/raptor2 \
30
		libical.so:devel/libical \
31
		libwmf.so:graphics/libwmf
23
RUN_DEPENDS=	${LOCALBASE}/share/fonts/dejavu/DejaVuSerif.ttf:x11-fonts/dejavu
32
RUN_DEPENDS=	${LOCALBASE}/share/fonts/dejavu/DejaVuSerif.ttf:x11-fonts/dejavu
24
33
25
USES=		compiler:c++11-lang desktop-file-utils gmake gnome iconv jpeg \
34
USES=		compiler:c++17-lang desktop-file-utils gmake gnome iconv jpeg \
26
		libtool pathfix pkgconfig
35
		libtool pathfix pkgconfig readline
27
USE_GNOME=	libxml2 gtk30 librsvg2 libxslt
36
USE_GNOME=	libxml2 cairo gtk30 librsvg2 libxslt
37
USE_XORG+=	x11
28
GNU_CONFIGURE=	yes
38
GNU_CONFIGURE=	yes
29
CPPFLAGS+=	-I${LOCALBASE}/include
39
CPPFLAGS+=	-I${LOCALBASE}/include
30
LDFLAGS+=	-L${LOCALBASE}/lib
40
LDFLAGS+=	-L${LOCALBASE}/lib
Lines 148-156 ABIWORD_PLUGINS+= wpg wordperfect Link Here
148
.endif
158
.endif
149
159
150
post-patch:
160
post-patch:
151
	@${REINPLACE_CMD} -e 's|glib/.*\.h>|glib.h>|g' \
152
		${WRKSRC}/goffice-bits/goffice/app/goffice-app.h \
153
		${WRKSRC}/src/af/util/xp/ut_go_file.h
154
# The following substitutions ensure that plugins are linked with libabiword
161
# The following substitutions ensure that plugins are linked with libabiword
155
# from the work or stage directory instead of a previously installed library.
162
# from the work or stage directory instead of a previously installed library.
156
# In pseudo code:
163
# In pseudo code:
(-)b/editors/abiword/distinfo (-2 / +3 lines)
Lines 1-2 Link Here
1
SHA256 (AbiWord/abiword-3.0.1.tar.gz) = e094f6fbf0afc5c5538b4894888e7c346f8ee8f49c9d24821dd696d0734865c6
1
TIMESTAMP = 1580095743
2
SIZE (AbiWord/abiword-3.0.1.tar.gz) = 11144990
2
SHA256 (AbiWord/abiword-3.0.4.tar.gz) = e93096cb192e5bc19d62e180fc5eda643206465315a710113ae5036bc2a1a5d7
3
SIZE (AbiWord/abiword-3.0.4.tar.gz) = 11064305
(-)b/editors/abiword/files/patch-abiword.desktop (-3 / +3 lines)
Lines 1-6 Link Here
1
--- abiword.desktop.orig	2010-04-14 23:50:18.000000000 +0200
1
--- abiword.desktop.orig	2019-04-03 21:21:51 UTC
2
+++ abiword.desktop	2010-05-22 09:08:45.000000000 +0200
2
+++ abiword.desktop
3
@@ -6,7 +6,7 @@
3
@@ -6,7 +6,7 @@ Type=Application
4
 Categories=Office;WordProcessor;GNOME;GTK;X-Red-Hat-Base;
4
 Categories=Office;WordProcessor;GNOME;GTK;X-Red-Hat-Base;
5
 StartupNotify=true
5
 StartupNotify=true
6
 X-Desktop-File-Install-Version=0.9
6
 X-Desktop-File-Install-Version=0.9
(-)a/editors/abiword/files/patch-c++11 (-100 lines)
Removed Link Here
1
xap_Dialog.cpp:270:17: error: cast from pointer to smaller type 'char' loses information
2
        *pWindowName = (char) NULL;
3
                       ^~~~~~~~~~~
4
ap_UnixApp.cpp:866:29: error: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wreserved-user-defined-literal]
5
        if(0 == strcmp (suffix, "."G_MODULE_SUFFIX))
6
                                   ^
7
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]
8
                buf += " "x"=\""; \
9
                          ^
10
ie_exp_LaTeX.cpp:1332:43: error: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wreserved-user-defined-literal]
11
#define SUB(a,who) case a: subst = "\\(\\"who"\\)"; return true;
12
                                          ^
13
RealmProtocol.cpp:16:2: error: constant expression evaluates to -1 which cannot be narrowed to type 'uint32_t' (aka 'unsigned int') [-Wc++11-narrowing]
14
        RPV1_PACKET_VARIABLE, /* user joined */
15
        ^~~~~~~~~~~~~~~~~~~~
16
RealmProtocol.cpp:10:30: note: expanded from macro 'RPV1_PACKET_VARIABLE'
17
#define RPV1_PACKET_VARIABLE -1
18
                             ^~
19
RealmProtocol.cpp:16:2: note: insert an explicit cast to silence this issue
20
        RPV1_PACKET_VARIABLE, /* user joined */
21
        ^~~~~~~~~~~~~~~~~~~~
22
        static_cast<uint32_t>( )
23
RealmProtocol.cpp:10:30: note: expanded from macro 'RPV1_PACKET_VARIABLE'
24
#define RPV1_PACKET_VARIABLE -1
25
                             ^~
26
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'
27
                        return soa::GenericPtr();
28
                               ^~~~~~~~~~~~~~~~~
29
30
https://github.com/AbiWord/abiword/commit/a83e6f50dbd5
31
https://github.com/AbiWord/abiword/commit/5623a94c756c
32
33
--- plugins/collab/backends/service/xp/RealmProtocol.cpp.orig	2009-05-27 05:41:59 UTC
34
+++ plugins/collab/backends/service/xp/RealmProtocol.cpp
35
@@ -6,8 +6,8 @@ namespace protocolv1 {
36
 
37
 #define MAX_PACKET_DATA_SIZE 64*1024*1024
38
 		
39
-#define RPV1_PACKET_NONEXISTENT -2
40
-#define RPV1_PACKET_VARIABLE -1
41
+#define RPV1_PACKET_NONEXISTENT uint32_t(-2)
42
+#define RPV1_PACKET_VARIABLE uint32_t(-1)
43
 	
44
 static uint32_t body_size[6] = {
45
 	RPV1_PACKET_NONEXISTENT, /* 0: reserved */
46
--- plugins/collab/backends/service/xp/soa_soup.cpp.orig	2009-09-29 13:58:11 UTC
47
+++ plugins/collab/backends/service/xp/soa_soup.cpp
48
@@ -163,7 +163,7 @@ namespace soup_soa {
49
 	
50
 	static bool _invoke(const std::string& /*url*/, const soa::method_invocation& /*mi*/, SoaSoupSession& sess, std::string& result) {
51
 		if (!sess.m_session || !sess.m_msg )
52
-			return soa::GenericPtr();
53
+			return false;
54
 
55
 		guint status = soup_session_send_message (sess.m_session, sess.m_msg);
56
 		if (!(SOUP_STATUS_IS_SUCCESSFUL (status) ||
57
--- plugins/latex/xp/ie_exp_LaTeX.cpp.orig	2013-04-07 13:53:03 UTC
58
+++ plugins/latex/xp/ie_exp_LaTeX.cpp
59
@@ -1329,7 +1329,7 @@ void s_LaTeX_Listener::_outputData(const UT_UCSChar * 
60
 	m_pie->write(sBuf.c_str(),sBuf.size());
61
 }
62
 
63
-#define SUB(a,who) case a: subst = "\\(\\"who"\\)"; return true;
64
+#define SUB(a,who) case a: subst = "\\(\\" who"\\)"; return true;
65
 #define SUBd(a,who) case a: subst = who; return true;
66
 static bool _convertLettersToSymbols(char c, const char *& subst)
67
 {
68
--- plugins/xslfo/xp/ie_exp_XSL-FO.cpp.orig	2013-04-07 13:53:03 UTC
69
+++ plugins/xslfo/xp/ie_exp_XSL-FO.cpp
70
@@ -1451,7 +1451,7 @@ void s_XSL_FO_Listener::_openSection(PT_AttrPropIndex 
71
 	{ \
72
 		UT_UTF8String esc = szValue; \
73
 		esc.escapeXML(); \
74
-		buf += " "x"=\""; \
75
+		buf += " " x"=\""; \
76
 		buf += esc.utf8_str(); \
77
 		buf += "\""; \
78
 	}
79
--- src/af/xap/xp/xap_Dialog.cpp.orig	2013-04-07 13:53:03 UTC
80
+++ src/af/xap/xp/xap_Dialog.cpp
81
@@ -267,7 +267,7 @@ XAP_Dialog_Modeless::BuildWindowName(char * pWindowNam
82
 // This function constructs and returns the window name of a modeless dialog by
83
 // concatenating the active frame with the dialog name
84
 
85
-	*pWindowName = (char) NULL;
86
+	*pWindowName = '\0';
87
 	UT_UTF8String wn = UT_UTF8String(pDialogName);
88
 
89
 	XAP_Frame* pFrame = getActiveFrame();
90
--- src/wp/ap/gtk/ap_UnixApp.cpp.orig	2013-04-07 13:53:03 UTC
91
+++ src/wp/ap/gtk/ap_UnixApp.cpp
92
@@ -863,7 +863,7 @@ static bool is_so (const char *file) {
93
 	if (len < (strlen(G_MODULE_SUFFIX) + 2)) // this is ".so" and at least one char for the filename
94
 		return false;
95
 	const char *suffix = file+(len-3);
96
-	if(0 == strcmp (suffix, "."G_MODULE_SUFFIX))
97
+	if(0 == strcmp (suffix, "." G_MODULE_SUFFIX))
98
 		return true;
99
 	return false;
100
 }
(-)b/editors/abiword/files/patch-configure (-6 / +6 lines)
Lines 1-15 Link Here
1
--- configure.orig	2014-12-23 06:13:20.000000000 +0100
1
--- configure.orig	2020-01-27 15:58:12 UTC
2
+++ configure	2016-01-26 21:22:33.585049000 +0100
2
+++ configure
3
@@ -23915,7 +23915,7 @@
3
@@ -22697,7 +22697,7 @@ fi
4
 
4
 
5
 
5
 
6
 
6
 
7
-wpg_pkgs="$gsf_req libwpg-0.2 >= 0.2.0 libwpd-0.9 >= 0.9.0 libwpd-stream-0.9 >= 0.9.0"
7
-wpg_pkgs="$gsf_req libwpg-0.2 >= 0.2.0 libwpd-0.9 >= 0.9.0 libwpd-stream-0.9 >= 0.9.0"
8
+wpg_pkgs="libwpg-0.3 $gsf_req"
8
+wpg_pkgs="$gsf_req libwpg-0.3"
9
 wpg_deps="no"
9
 wpg_deps="no"
10
 
10
 
11
 if test "$enable_wpg" != ""; then
11
 if test "$enable_wpg" != ""; then
12
@@ -24341,8 +24341,8 @@
12
@@ -25939,8 +25939,8 @@ fi
13
 
13
 
14
 
14
 
15
 
15
 
Lines 20-26 Link Here
20
 wordperfect_deps="no"
20
 wordperfect_deps="no"
21
 
21
 
22
 WORDPERFECT_CFLAGS=
22
 WORDPERFECT_CFLAGS=
23
@@ -24385,7 +24385,7 @@
23
@@ -25983,7 +25983,7 @@ if test -n "$PKG_CONFIG" && \
24
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
24
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
25
   test $ac_status = 0; }; then
25
   test $ac_status = 0; }; then
26
 
26
 
(-)a/editors/abiword/files/patch-plugins_collab_backends_service_xp_tls_tunnel.cpp (-24 lines)
Removed Link Here
1
--- plugins/collab/backends/service/xp/tls_tunnel.cpp.orig	2014-11-04 01:12:14 UTC
2
+++ plugins/collab/backends/service/xp/tls_tunnel.cpp
3
@@ -306,8 +306,6 @@ void Proxy::tunnel_(transport_ptr_t tran
4
 	disconnect_(transport_ptr, session_ptr, local_socket_ptr, remote_socket_ptr);		
5
 }
6
 
7
-static const int PRIORITIES[] = { GNUTLS_KX_ANON_DH, GNUTLS_KX_RSA, GNUTLS_KX_DHE_DSS, GNUTLS_KX_DHE_RSA, 0 };
8
-static const int CIPHERS[] = { GNUTLS_CIPHER_AES_256_CBC, GNUTLS_CIPHER_AES_128_CBC, GNUTLS_CIPHER_3DES_CBC, GNUTLS_CIPHER_ARCFOUR_128, 0 };
9
 
10
 // FIXME: this clientproxy can only handle 1 SSL connection at the same time
11
 ClientProxy::ClientProxy(const std::string& connect_address, unsigned short connect_port, 
12
@@ -399,9 +397,9 @@ session_ptr_t ClientProxy::setup_tls_ses
13
 
14
 	// setup session
15
 	return_val_if_neg(gnutls_init(session_ptr.get(), GNUTLS_CLIENT), session_ptr_t());
16
-	return_val_if_neg(gnutls_set_default_priority(*session_ptr), session_ptr_t());
17
-	return_val_if_neg(gnutls_kx_set_priority(*session_ptr,PRIORITIES), session_ptr_t());
18
-	return_val_if_neg(gnutls_cipher_set_priority(*session_ptr,CIPHERS), session_ptr_t());
19
+	return_val_if_neg(gnutls_priority_set_direct(*session_ptr,"NORMAL"
20
+		":-CIPHER-ALL:+AES-256-CBC:+AES-128-CBC:+3DES-CBC:+ARCFOUR-128"
21
+		":-KX-ALL:+ANON-DH:+RSA:+DHE-DSS:+DHE-RSA",NULL), session_ptr_t());
22
 	return_val_if_neg(gnutls_credentials_set(*session_ptr, GNUTLS_CRD_CERTIFICATE, x509cred), session_ptr_t());
23
 
24
 	// setup transport
(-)a/editors/abiword/files/patch-plugins_collab_backends_sipsimple_xp_SIPSimpleBuddy.h (-15 lines)
Removed Link Here
1
--- plugins/collab/backends/sipsimple/xp/SIPSimpleBuddy.h.orig	2015-04-04 04:57:15 UTC
2
+++ plugins/collab/backends/sipsimple/xp/SIPSimpleBuddy.h
3
@@ -52,10 +52,10 @@ public:
4
 
5
 	virtual const DocTreeItem* getDocTreeItems() const
6
 	{
7
-		const vector<DocHandle*>& docHandles = getDocHandles();
8
+		const std::vector<DocHandle*>& docHandles = getDocHandles();
9
 		DocTreeItem* first = 0;
10
 		DocTreeItem* prev = 0;
11
-		for (vector<DocHandle*>::const_iterator pos = docHandles.begin(); pos != docHandles.end(); pos++)
12
+		for (std::vector<DocHandle*>::const_iterator pos = docHandles.begin(); pos != docHandles.end(); pos++)
13
 		{
14
 			DocTreeItem* item = new DocTreeItem();
15
 			item->m_type = DOCTREEITEM_TYPE_DOCUMENT;
(-)b/editors/abiword/files/patch-src_af_ev_gtk-ev_UnixMouse.cpp (+10 lines)
Added Link Here
1
--- src/af/ev/gtk/ev_UnixMouse.cpp.orig	2020-01-27 14:54:30 UTC
2
+++ src/af/ev/gtk/ev_UnixMouse.cpp
3
@@ -20,6 +20,7 @@
4
 // TODO see if we need to do the GTK absolute-to-relative coordinate
5
 // TODO trick like we did in the top ruler.
6
7
+#include <math.h>
8
 #include "ut_assert.h"
9
 #include "ut_debugmsg.h"
10
 #include "ut_types.h"
(-)b/editors/abiword/files/patch-src_af_util_xp-ut_iconv.cpp (-2 / +2 lines)
Lines 1-5 Link Here
1
--- src/af/util/xp/ut_iconv.cpp.orig	2009-06-25 02:52:27.000000000 +0200
1
--- src/af/util/xp/ut_iconv.cpp.orig	2020-01-27 14:37:51 UTC
2
+++ src/af/util/xp/ut_iconv.cpp	2009-10-27 22:43:07.000000000 +0100
2
+++ src/af/util/xp/ut_iconv.cpp
3
@@ -264,10 +264,10 @@ const char * ucs4Internal ()
3
@@ -264,10 +264,10 @@ const char * ucs4Internal ()
4
   // we special-case the win32 build, otherwise spelling and other stuff
4
   // we special-case the win32 build, otherwise spelling and other stuff
5
   // just doesn't work
5
   // just doesn't work
(-)b/editors/abiword/files/patch-src_af_xap_xp_xap__Dialog.cpp (+11 lines)
Added Link Here
1
--- src/af/xap/xp/xap_Dialog.cpp.orig	2019-04-03 22:06:58 UTC
2
+++ src/af/xap/xp/xap_Dialog.cpp
3
@@ -267,7 +267,7 @@ XAP_Dialog_Modeless::BuildWindowName(char * pWindowNam
4
 // This function constructs and returns the window name of a modeless dialog by
5
 // concatenating the active frame with the dialog name
6
7
-	*pWindowName = (char) NULL;
8
+	*pWindowName = (char)(size_t) NULL;
9
	UT_UTF8String wn = UT_UTF8String(pDialogName);
10
11
	XAP_Frame* pFrame = getActiveFrame();
(-)a/editors/abiword/files/patch-src_text_ptbl_xp_pd__DocumentRDF.cpp (-26 lines)
Removed Link Here
1
--- src/text/ptbl/xp/pd_DocumentRDF.cpp.orig	2015-03-31 15:14:42 UTC
2
+++ src/text/ptbl/xp/pd_DocumentRDF.cpp
3
@@ -570,6 +570,11 @@ bool PD_URI::operator==(const std::strin
4
     return m_value == b;
5
 }
6
 
7
+bool PD_URI::operator<(const PD_URI& b) const
8
+{
9
+    return m_value < b.m_value;
10
+}
11
+
12
 PD_URI
13
 PD_URI::prefixedToURI( PD_RDFModelHandle model ) const
14
 {
15
@@ -611,11 +616,6 @@ bool PD_URI::write( std::ostream& ss ) c
16
     return true;
17
 }
18
 
19
-bool operator<( PD_URI a, PD_URI b)
20
-{
21
-    return a.toString() < b.toString();
22
-}
23
-
24
 bool operator<( std::pair< PD_URI, PD_URI > a, PD_URI b)
25
 {
26
     return a.first.toString() < b.toString();
(-)a/editors/abiword/files/patch-src_text_ptbl_xp_pd__DocumentRDF.h (-10 lines)
Removed Link Here
1
--- src/text/ptbl/xp/pd_DocumentRDF.h.orig	2015-03-31 15:15:00 UTC
2
+++ src/text/ptbl/xp/pd_DocumentRDF.h
3
@@ -68,6 +68,7 @@ class ABI_EXPORT PD_URI
4
     bool isValid() const;
5
     bool operator==(const PD_URI& b) const;
6
     bool operator==(const std::string& b) const;
7
+    bool operator<(const PD_URI& b) const;
8
 
9
     virtual bool read( std::istream& ss );
10
     virtual bool write( std::ostream& ss ) const;
(-)b/editors/abiword/files/patch-src_wp_ap_gtk_ap__UnixApp.cpp (+11 lines)
Added Link Here
1
--- src/wp/ap/gtk/ap_UnixApp.cpp.orig	2019-04-03 22:28:26 UTC
2
+++ src/wp/ap/gtk/ap_UnixApp.cpp
3
@@ -863,7 +863,7 @@ static bool is_so (const char *file) {
4
	if (len < (strlen(G_MODULE_SUFFIX) + 2)) // this is ".so" and at least one char for the filename
5
		return false;
6
	const char *suffix = file+(len-3);
7
-	if(0 == strcmp (suffix, "."G_MODULE_SUFFIX))
8
+	if(0 == strcmp (suffix, "." G_MODULE_SUFFIX))
9
		return true;
10
	return false;
11
 }
(-)b/editors/abiword/pkg-plist (+1 lines)
Lines 391-394 share/icons/hicolor/32x32/apps/abiword.png Link Here
391
share/icons/hicolor/48x48/apps/abiword.png
391
share/icons/hicolor/48x48/apps/abiword.png
392
share/icons/hicolor/512x512/apps/abiword.png
392
share/icons/hicolor/512x512/apps/abiword.png
393
share/icons/hicolor/scalable/apps/abiword.svg
393
share/icons/hicolor/scalable/apps/abiword.svg
394
share/appdata/abiword.appdata.xml
394
%%COLTELEPATHY%%share/telepathy/clients/AbiCollab.client
395
%%COLTELEPATHY%%share/telepathy/clients/AbiCollab.client

Return to bug 243652