summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPacho Ramos <pacho@gentoo.org>2011-03-18 16:39:29 +0000
committerPacho Ramos <pacho@gentoo.org>2011-03-18 16:39:29 +0000
commitd41dbc3708658107833db1f270480e5ab89f7986 (patch)
tree90cda1c7556ed3d32f26195793b9226fa76d75b6 /app-office/abiword/files
parentBump to newest available version as suggested by Ed Wildgoose, closes bug #35... (diff)
downloadhistorical-d41dbc3708658107833db1f270480e5ab89f7986.tar.gz
historical-d41dbc3708658107833db1f270480e5ab89f7986.tar.bz2
historical-d41dbc3708658107833db1f270480e5ab89f7986.zip
Drop old as bsd won't keyword this.
Package-Manager: portage-2.1.9.43/cvs/Linux x86_64
Diffstat (limited to 'app-office/abiword/files')
-rw-r--r--app-office/abiword/files/11_history_fullpath.dpatch73
-rw-r--r--app-office/abiword/files/freebsd_fix.patch11
2 files changed, 0 insertions, 84 deletions
diff --git a/app-office/abiword/files/11_history_fullpath.dpatch b/app-office/abiword/files/11_history_fullpath.dpatch
deleted file mode 100644
index 059dac6cc2ab..000000000000
--- a/app-office/abiword/files/11_history_fullpath.dpatch
+++ /dev/null
@@ -1,73 +0,0 @@
-#!/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/freebsd_fix.patch b/app-office/abiword/files/freebsd_fix.patch
deleted file mode 100644
index 9e95194c18bf..000000000000
--- a/app-office/abiword/files/freebsd_fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/af/util/xp/ut_iconv.cpp.orig Tue Jan 10 00:18:13 2006
-+++ src/af/util/xp/ut_iconv.cpp Tue Jan 10 00:18:31 2006
-@@ -67,7 +67,7 @@
- #if defined (WIN32) || defined(__QNXNTO__) || defined(__CYGWIN__) || \
- (defined (__MACH__) && defined (__APPLE__)) || \
- (defined(TARGET_OS_MAC) && TARGET_OS_MAC) || \
--defined (__AIX__) || defined(__OpenBSD__) || \
-+defined (__AIX__) || defined(__OpenBSD__) || defined (__FreeBSD__) || \
- (defined(__linux__) && defined(__powerpc__) && (__GLIBC__ <= 2) && (__GLIBC_MINOR__ <= 1))
-
- #define ICONV_CONST const