diff options
| author | jperkin <jperkin@pkgsrc.org> | 2012-09-26 08:17:00 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2012-09-26 08:17:00 +0000 |
| commit | 11726c17b7373c21dec421f509577c7010153240 (patch) | |
| tree | 8afe2943e41e9578e3fda379a6a548b9497e8493 /inputmethod | |
| parent | df42dfc431e7680a585a648eaacce46bf844239b (diff) | |
| download | pkgsrc-11726c17b7373c21dec421f509577c7010153240.tar.gz | |
Solaris requires more alloca.h fixes, move them to a common header.
Add a MSG_NOSIGNAL compatability define.
Fixes package on Solaris.
Diffstat (limited to 'inputmethod')
4 files changed, 24 insertions, 35 deletions
diff --git a/inputmethod/scim/distinfo b/inputmethod/scim/distinfo index bc46e61d6bc..68ad556f61c 100644 --- a/inputmethod/scim/distinfo +++ b/inputmethod/scim/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.7 2012/09/22 08:27:28 obache Exp $ +$NetBSD: distinfo,v 1.8 2012/09/26 08:17:00 jperkin Exp $ SHA1 (scim-1.4.14.tar.gz) = 73391be371dd7ef9f9af8b3a211e2bedec0cf71b RMD160 (scim-1.4.14.tar.gz) = 50643a8a8084c32612d415bfb0fe8b7f91c22459 @@ -19,7 +19,6 @@ SHA1 (patch-extras_immodules_agent_scim-bridge-agent.cpp) = f1a9bd1b185a02ba2e84 SHA1 (patch-extras_immodules_client-common_scim-bridge-client-output.c) = 51c8635a3084112fd4362862690c4cc5bfffbe01 SHA1 (patch-extras_immodules_client-common_scim-bridge-client.c) = ee441af01f39d65f8ed3f305407add2ac9fc0a32 SHA1 (patch-extras_immodules_client-gtk_scim-bridge-client-imcontext-gtk.c) = 19c8f4ec70bb1c21c7318819367729579641866e -SHA1 (patch-extras_immodules_common_scim-bridge-messenger.c) = 51a9a091fbbe9b212c695713d18260794ff30d81 SHA1 (patch-extras_immodules_common_scim-bridge-messenger.h) = 1a9defe26a124317c410bef12b2a7f023ea284b4 -SHA1 (patch-extras_immodules_common_scim-bridge-string.c) = 77b2ec6744fdb650760a7858f6ff8fce999b86db +SHA1 (patch-extras_immodules_common_scim-bridge-output.h) = 65d32eb28ef92d8580352e333fa2e95243f5d987 SHA1 (patch-src_scim__helper__manager__server.cpp) = 3a1130f37c7c93389e2ae7db65af7438bac5de51 diff --git a/inputmethod/scim/patches/patch-extras_immodules_common_scim-bridge-messenger.c b/inputmethod/scim/patches/patch-extras_immodules_common_scim-bridge-messenger.c deleted file mode 100644 index 31b346b88ce..00000000000 --- a/inputmethod/scim/patches/patch-extras_immodules_common_scim-bridge-messenger.c +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-extras_immodules_common_scim-bridge-messenger.c,v 1.1 2012/09/22 08:27:29 obache Exp $ - -* alloca.h is required for alloca(3C) on Solaris. - ---- extras/immodules/common/scim-bridge-messenger.c.orig 2012-06-13 15:22:28.000000000 +0000 -+++ extras/immodules/common/scim-bridge-messenger.c -@@ -25,6 +25,9 @@ - #include <stdlib.h> - #include <string.h> - #include <unistd.h> -+#ifdef __sun -+#include <alloca.h> -+#endif - - #include <sys/select.h> - #include <sys/socket.h> diff --git a/inputmethod/scim/patches/patch-extras_immodules_common_scim-bridge-output.h b/inputmethod/scim/patches/patch-extras_immodules_common_scim-bridge-output.h new file mode 100644 index 00000000000..0f77ed4199e --- /dev/null +++ b/inputmethod/scim/patches/patch-extras_immodules_common_scim-bridge-output.h @@ -0,0 +1,22 @@ +$NetBSD: patch-extras_immodules_common_scim-bridge-output.h,v 1.1 2012/09/26 08:17:00 jperkin Exp $ + +* alloca.h is required for alloca(3C) on Solaris. +* Not all systems provide MSG_NOSIGNAL. + +--- extras/immodules/common/scim-bridge-output.h.orig 2012-06-13 15:22:28.000000000 +0000 ++++ extras/immodules/common/scim-bridge-output.h 2012-09-26 07:56:02.073082321 +0000 +@@ -28,6 +28,14 @@ + #include "scim-bridge.h" + #include "scim-bridge-debug.h" + ++#ifdef __sun ++#include <alloca.h> ++#endif ++ ++#ifndef MSG_NOSIGNAL ++#define MSG_NOSIGNAL 0 ++#endif ++ + #ifdef __cplusplus + extern "C" + { diff --git a/inputmethod/scim/patches/patch-extras_immodules_common_scim-bridge-string.c b/inputmethod/scim/patches/patch-extras_immodules_common_scim-bridge-string.c deleted file mode 100644 index af5d04df63b..00000000000 --- a/inputmethod/scim/patches/patch-extras_immodules_common_scim-bridge-string.c +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-extras_immodules_common_scim-bridge-string.c,v 1.1 2012/09/22 08:27:29 obache Exp $ - -* alloca.h is required for alloca(3C) on Solaris. - ---- extras/immodules/common/scim-bridge-string.c.orig 2012-06-13 15:22:28.000000000 +0000 -+++ extras/immodules/common/scim-bridge-string.c -@@ -24,6 +24,9 @@ - #include <stdlib.h> - #include <string.h> - #include <wchar.h> -+#ifdef __sun -+#include <alloca.h> -+#endif - - #include "scim-bridge-string.h" - #include "scim-bridge-output.h" |