diff options
author | Jonathan Callen <abcd@gentoo.org> | 2010-04-05 04:04:43 +0000 |
---|---|---|
committer | Jonathan Callen <abcd@gentoo.org> | 2010-04-05 04:04:43 +0000 |
commit | 17fd30e892cfc4107af1dc381c14bde4380134f3 (patch) | |
tree | 5744143d9cb60d598f402a22debe61a27745be3a /app-editors/cooledit/files | |
parent | Version bump. Avoid segfault when shutting down; return previous mute state i... (diff) | |
download | gentoo-2-17fd30e892cfc4107af1dc381c14bde4380134f3.tar.gz gentoo-2-17fd30e892cfc4107af1dc381c14bde4380134f3.tar.bz2 gentoo-2-17fd30e892cfc4107af1dc381c14bde4380134f3.zip |
Add prefix keywords, patches for Interix
(Portage version: -svn/cvs/Linux i686)
Diffstat (limited to 'app-editors/cooledit/files')
-rw-r--r-- | app-editors/cooledit/files/cooledit-3.17.17-interix.patch | 31 | ||||
-rw-r--r-- | app-editors/cooledit/files/cooledit-3.17.17-interix5.patch | 13 |
2 files changed, 44 insertions, 0 deletions
diff --git a/app-editors/cooledit/files/cooledit-3.17.17-interix.patch b/app-editors/cooledit/files/cooledit-3.17.17-interix.patch new file mode 100644 index 000000000000..f6599ae8557c --- /dev/null +++ b/app-editors/cooledit/files/cooledit-3.17.17-interix.patch @@ -0,0 +1,31 @@ +diff -ru -x '*.Po' -x '*.Plo' cooledit-3.17.17.orig/editor/_coolpython.c cooledit-3.17.17/editor/_coolpython.c +--- cooledit-3.17.17.orig/editor/_coolpython.c 2008-04-03 10:59:33 +0200 ++++ cooledit-3.17.17/editor/_coolpython.c 2008-04-03 11:02:45 +0200 +@@ -1,4 +1,15 @@ + ++// on interix, need this before config.h to avoid clashes ++// with wchar.h, which cooledit believes is not there, and therefore ++// defines mbstate_t. Python.h includes it, and thus wchar.h messes up. ++#ifdef __cplusplus ++extern "C" { ++#endif ++#include "Python.h" ++#ifdef __cplusplus ++} ++#endif ++ + #include <config.h> + + #ifdef HAVE_PYTHON +diff -ru -x '*.Po' -x '*.Plo' cooledit-3.17.17.orig/rxvt/_rxvtlib.h cooledit-3.17.17/rxvt/_rxvtlib.h +--- cooledit-3.17.17.orig/rxvt/_rxvtlib.h 2008-04-03 11:10:02 +0200 ++++ cooledit-3.17.17/rxvt/_rxvtlib.h 2008-04-03 09:00:13 +0200 +@@ -170,7 +170,7 @@ + #include <netinet/in.h> + #include <arpa/inet.h> + #include <net/if.h> +-#if !defined(__NetBSD__) && !defined(__OpenBSD__) ++#if !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__INTERIX) + #include <net/if_arp.h> + #endif + #include "X11/keysymdef.h" diff --git a/app-editors/cooledit/files/cooledit-3.17.17-interix5.patch b/app-editors/cooledit/files/cooledit-3.17.17-interix5.patch new file mode 100644 index 000000000000..46048c334c98 --- /dev/null +++ b/app-editors/cooledit/files/cooledit-3.17.17-interix5.patch @@ -0,0 +1,13 @@ +diff -ru -x '*.Po' -x '*.Plo' cooledit-3.17.17.orig/rxvt/_rxvtlib.h cooledit-3.17.17/rxvt/_rxvtlib.h +--- cooledit-3.17.17.orig/rxvt/_rxvtlib.h 2008-04-17 12:09:05 +0200 ++++ cooledit-3.17.17/rxvt/_rxvtlib.h 2008-04-17 12:09:31 +0200 +@@ -169,7 +169,9 @@ + #endif + #include <netinet/in.h> + #include <arpa/inet.h> ++#ifndef __INTERIX + #include <net/if.h> ++#endif + #if !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__INTERIX) + #include <net/if_arp.h> + #endif |