rev bump to fix bug #157804

(Portage version: 2.1.2_rc3-r2)

3 files changed, 102 insertions, 0 deletions

diff --git a/app-office/abiword/files/11_history_fullpath.dpatch b/app-office/abiword/files/11_history_fullpath.dpatch
new file mode 100644
index 000000000000..059dac6cc2ab
--- /dev/null
+++ b/app-office/abiword/files/11_history_fullpath.dpatch
@@ -0,0 +1,73 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+## 11_history_fullpath.dpatch by Joshua Kwan <joshk@triplehelix.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Store absolute paths, however gnarly, into history, when relative file
+## DP: paths are used on the command line.
+
+--- abiword-2.2.0/abi/src/wp/ap/xp/ap_App.cpp~	2004-11-23 02:02:17.000000000 -0800
++++ abiword-2.2.0/abi/src/wp/ap/xp/ap_App.cpp	2004-11-23 02:02:04.000000000 -0800
+@@ -18,6 +18,8 @@
+  * 02111-1307, USA.
+  */
+ 
++#include <limits.h>
++
+ #include "ap_Features.h"
+ #include "ap_App.h"
+ #include "ap_Args.h"
+@@ -50,13 +50,45 @@
+ {
+ 	int kWindowsOpened = 0;
+ 	const char *file = NULL;
++
++#ifdef WIN32
++# define arch_separator '\\'
++#else
++# define arch_separator '/'
++#endif
++	char cwd[PATH_MAX];
+ 	poptContext poptcon = args->poptcon;
++	
++	getcwd(cwd, PATH_MAX);
+ 
+ 	while ((file = poptGetArg (poptcon)) != NULL) {
+ 		XAP_Frame * pFrame = newFrame();
++		char* fullpath = NULL;
++		
++		if (*file != arch_separator)
++		{
++			size_t file_len = strlen(file);
++#ifdef WIN32
++			if (file_len > 1 && (file[1] != ':' || !(file[0] != '\\' && file[1] != '\\'))) /* check for C:\Blah.doc and \\share\Blah.doc */
++#endif
++			{
++				size_t len = strlen(cwd) + file_len + 2; /* C/F + NUL */
++				fullpath = (char*)malloc(len);
++
++				/* First, resolve the path into an absolute one as best as we can */
++				snprintf(fullpath, len, "%s%c%s", cwd, arch_separator, file);
++			}
++		}
+ 
+ 		UT_Error error = pFrame->loadDocument
+-			(file, IEFT_Unknown, true);
++			(fullpath ? fullpath : file, IEFT_Unknown, true);
++		
++		if (fullpath != NULL)
++		{
++			free (fullpath);
++			fullpath = NULL;
++		}
++
+ 		if (!error)
+ 		{
+ 			kWindowsOpened++;
+@@ -74,6 +106,7 @@
+ 			pFrame->loadDocument(NULL, IEFT_Unknown);
+ 			pFrame->raise();
+ 
++			/* OK to use relative path here. We get it */
+ 			errorMsgBadFile (pFrame, file, error);
+ 		}
+ 
diff --git a/app-office/abiword/files/16_fcfini_crash.dpatch b/app-office/abiword/files/16_fcfini_crash.dpatch
new file mode 100644
index 000000000000..73b9d895caab
--- /dev/null
+++ b/app-office/abiword/files/16_fcfini_crash.dpatch
@@ -0,0 +1,26 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 16_fcfini_crash.dpatch by Joshua Kwan <joshk@triplehelix.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+Index: xap_UnixApp.cpp
+===================================================================
+RCS file: /cvsroot/abi/src/af/xap/unix/xap_UnixApp.cpp,v
+retrieving revision 1.102.2.1
+retrieving revision 1.102.2.2
+diff -u -r1.102.2.1 -r1.102.2.2
+--- a/abi/src/af/xap/unix/xap_UnixApp.cpp	12 May 2006 20:40:11 -0000	1.102.2.1
++++ b/abi/src/af/xap/unix/xap_UnixApp.cpp	15 Sep 2006 22:53:03 -0000	1.102.2.2
+@@ -134,10 +134,6 @@
+ 	DELETEP(m_pUnixToolbarIcons);
+ 	
+ 	delete m_fontManager;
+-
+-#if FC_MINOR > 2
+-	FcFini();
+-#endif
+ }
+ 
+ bool XAP_UnixApp::initialize(const char * szKeyBindingsKey, const char * szKeyBindingsDefaultValue)
diff --git a/app-office/abiword/files/digest-abiword-2.4.5-r1 b/app-office/abiword/files/digest-abiword-2.4.5-r1
new file mode 100644
index 000000000000..92a5bbc12741
--- /dev/null
+++ b/app-office/abiword/files/digest-abiword-2.4.5-r1
@@ -0,0 +1,3 @@
+MD5 e018669a154164d31c768f773a1c95b4 abiword-2.4.5.tar.bz2 24930028
+RMD160 f0de27f97135f8fff9b4400b05d74a27eee348cd abiword-2.4.5.tar.bz2 24930028
+SHA256 b8e5f61697c6d796e8f9f0812886666487fd0125bc777ca093c096b4b3e31264 abiword-2.4.5.tar.bz2 24930028