diff options
| author | mezz <mezz@df743ca5-7f9a-e211-a948-0013205c9059> | 2004-12-05 02:33:13 +0800 |
|---|---|---|
| committer | mezz <mezz@df743ca5-7f9a-e211-a948-0013205c9059> | 2004-12-05 02:33:13 +0800 |
| commit | e8e0d9b1bb0656ad84828d6694bdba7b3f78ceb9 (patch) | |
| tree | 3d03d0b7669a3c1d1dda2213097293f36512a995 /editors | |
| parent | 3ffc337a8dde4bae34d39c459621195380650748 (diff) | |
| download | marcuscom-ports-e8e0d9b1bb0656ad84828d6694bdba7b3f78ceb9.tar.gz marcuscom-ports-e8e0d9b1bb0656ad84828d6694bdba7b3f78ceb9.tar.zst marcuscom-ports-e8e0d9b1bb0656ad84828d6694bdba7b3f78ceb9.zip | |
Sync with FreeBSD port by remove two patches, it shows that they aren't need.
Let me know if you want those to be back. Final testing...
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@3214 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'editors')
| -rw-r--r-- | editors/AbiWord2/files/patch-src::wp::ap::unix::ap_UnixApp.cpp | 15 | ||||
| -rw-r--r-- | editors/AbiWord2/files/patch-src_af_util_xp_ut_string_class.cpp | 26 |
2 files changed, 0 insertions, 41 deletions
diff --git a/editors/AbiWord2/files/patch-src::wp::ap::unix::ap_UnixApp.cpp b/editors/AbiWord2/files/patch-src::wp::ap::unix::ap_UnixApp.cpp deleted file mode 100644 index 68ffd22d8..000000000 --- a/editors/AbiWord2/files/patch-src::wp::ap::unix::ap_UnixApp.cpp +++ /dev/null @@ -1,15 +0,0 @@ - -$FreeBSD$ - ---- src/wp/ap/unix/ap_UnixApp.cpp.orig Thu Jun 17 14:57:19 2004 -+++ src/wp/ap/unix/ap_UnixApp.cpp Thu Jun 17 14:58:01 2004 -@@ -788,7 +788,7 @@ - { - pluginDir = pluginList[i]; - -- n = scandir(pluginDir.c_str(), &namelist, so_only, alphasort); -+ n = scandir(pluginDir.c_str(), &namelist, (int (*)(dirent *))so_only, alphasort); - UT_DEBUGMSG(("DOM: found %d plugins in %s\n", n, pluginDir.c_str())); - - if (n > 0) - diff --git a/editors/AbiWord2/files/patch-src_af_util_xp_ut_string_class.cpp b/editors/AbiWord2/files/patch-src_af_util_xp_ut_string_class.cpp deleted file mode 100644 index 668f9ea55..000000000 --- a/editors/AbiWord2/files/patch-src_af_util_xp_ut_string_class.cpp +++ /dev/null @@ -1,26 +0,0 @@ ---- src/af/util/xp/ut_string_class.cpp.orig Thu Jun 17 15:00:46 2004 -+++ src/af/util/xp/ut_string_class.cpp Thu Jun 17 15:02:15 2004 -@@ -28,6 +28,7 @@ - #include <locale.h> - #include <ctype.h> - #include <stdarg.h> -+#include <glib.h> - - #include "ut_string.h" - #include "ut_string_class.h" -@@ -342,13 +343,13 @@ - return len; - } - -+#define VA_COPY G_VA_COPY -+ - #if !defined (VA_COPY) - # if defined (__GNUC__) && defined (__PPC__) && (defined (_CALL_SYSV) || defined (_WIN32) || defined(WIN32)) || defined(__s390__) || defined(__x86_64__) - # define VA_COPY(ap1, ap2) (*(ap1) = *(ap2)) - # elif defined (VA_COPY_AS_ARRAY) - # define VA_COPY(ap1, ap2) memmove ((ap1), (ap2), sizeof (va_list)) --# elif defined (__GNUC__) && defined (__va_copy) --# define VA_COPY(ap1,ap2) __va_copy((ap1),(ap2)) - # else /* va_list is a pointer */ - # define VA_COPY(ap1, ap2) ((ap1) = (ap2)) - # endif /* va_list is a pointer */ |