diff options
author | ahoka <ahoka@pkgsrc.org> | 2008-11-30 22:25:01 +0000 |
---|---|---|
committer | ahoka <ahoka@pkgsrc.org> | 2008-11-30 22:25:01 +0000 |
commit | 54f48a47e3a239c5ee9d2ef4eb4202f3777a0d38 (patch) | |
tree | b25f18874ba1b01ef99d298d2ba924cd483c1f2f /devel | |
parent | 5614873bfe324b66eb77b4d32f8536e7ddc2357a (diff) | |
download | pkgsrc-54f48a47e3a239c5ee9d2ef4eb4202f3777a0d38.tar.gz |
Compensate QNX's lack of SA_RESTART flag (It can be safely ignored).
Maybe this could be autoconf (but defining HAVE_SA_RESTART if
SA_RESTART is defined would be awkward (wouldn't it?).
Diffstat (limited to 'devel')
-rw-r--r-- | devel/glib2/distinfo | 5 | ||||
-rw-r--r-- | devel/glib2/patches/patch-ag | 16 | ||||
-rw-r--r-- | devel/glib2/patches/patch-ai | 20 |
3 files changed, 35 insertions, 6 deletions
diff --git a/devel/glib2/distinfo b/devel/glib2/distinfo index 8f270154da7..816453cd9e4 100644 --- a/devel/glib2/distinfo +++ b/devel/glib2/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.105 2008/11/29 19:09:04 jmcneill Exp $ +$NetBSD: distinfo,v 1.106 2008/11/30 22:25:01 ahoka Exp $ SHA1 (glib-2.18.3.tar.bz2) = 293f639fb85ea47347eb34e122327c60ef7606e4 RMD160 (glib-2.18.3.tar.bz2) = cf43fbba04250becaabdb7b7f55bcdec584f019e @@ -9,8 +9,9 @@ SHA1 (patch-ac) = 96e153339675457356f71e35d20375bed669d337 SHA1 (patch-ad) = c926d96bdc9ddf4f434fc57af0adbe11002cffc3 SHA1 (patch-ae) = 09f16e8e14bdea3ee0e478d335f65cb66939e5f5 SHA1 (patch-af) = fa3bbb257d37b3763a628d09681701b697b9b75c +SHA1 (patch-ag) = f4b1694c19dbddaf8b536c63f73d95f60cbec669 SHA1 (patch-ah) = 239dc3d0734424a7cafc5dd8d8381768cba2d23e -SHA1 (patch-ai) = 29faa9647a201bf82b016af0d48f61fc06baac7c +SHA1 (patch-ai) = 30b371e345a1ab3a07ce1fe2fe9c599398d668eb SHA1 (patch-aj) = a8c4e79113828e6dadf0b158777bb860aa44de3e SHA1 (patch-ak) = f382189966f073b3b6e6de89ea7709571241a9a0 SHA1 (patch-al) = de5135c328027b3c4543bb09994d31b6ffedeafa diff --git a/devel/glib2/patches/patch-ag b/devel/glib2/patches/patch-ag new file mode 100644 index 00000000000..b3103267195 --- /dev/null +++ b/devel/glib2/patches/patch-ag @@ -0,0 +1,16 @@ +$NetBSD: patch-ag,v 1.17 2008/11/30 22:25:01 ahoka Exp $ + +--- glib/gtester.c.orig 2008-11-24 06:45:23.000000000 +0100 ++++ glib/gtester.c +@@ -636,7 +636,11 @@ main (int argc, + struct sigaction osa; + sa.sa_handler = SIG_DFL; + sigfillset (&sa.sa_mask); ++#ifdef SA_RESTART + sa.sa_flags = SA_RESTART; ++#else /* QNX */ ++ sa.sa_flags = 0; ++#endif + sigaction (SIGCHLD, &sa, &osa); + } + diff --git a/devel/glib2/patches/patch-ai b/devel/glib2/patches/patch-ai index 9d2463b6d2a..425ad987b1e 100644 --- a/devel/glib2/patches/patch-ai +++ b/devel/glib2/patches/patch-ai @@ -1,8 +1,8 @@ -$NetBSD: patch-ai,v 1.15 2008/09/06 11:07:20 obache Exp $ +$NetBSD: patch-ai,v 1.16 2008/11/30 22:25:01 ahoka Exp $ ---- glib/gmain.c.orig 2008-09-02 15:09:41.000000000 +0000 +--- glib/gmain.c.orig 2008-11-24 06:45:23.000000000 +0100 +++ glib/gmain.c -@@ -2717,13 +2717,13 @@ g_main_context_iterate (GMainContext *co +@@ -2720,13 +2720,13 @@ g_main_context_iterate (GMainContext *co { gboolean got_ownership; @@ -18,7 +18,7 @@ $NetBSD: patch-ai,v 1.15 2008/09/06 11:07:20 obache Exp $ if (!context->cond) context->cond = g_cond_new (); -@@ -2733,7 +2733,6 @@ g_main_context_iterate (GMainContext *co +@@ -2736,7 +2736,6 @@ g_main_context_iterate (GMainContext *co if (!got_ownership) { @@ -26,3 +26,15 @@ $NetBSD: patch-ai,v 1.15 2008/09/06 11:07:20 obache Exp $ return FALSE; } } +@@ -4039,7 +4038,11 @@ g_child_watch_source_init_multi_threaded + + action.sa_handler = g_child_watch_signal_handler; + sigemptyset (&action.sa_mask); ++#ifdef SA_RESTART + action.sa_flags = SA_RESTART | SA_NOCLDSTOP; ++#else /* QNX */ ++ action.sa_flags = SA_NOCLDSTOP; ++#endif + sigaction (SIGCHLD, &action, NULL); + } + |