diff options
| author | dmcmahill <dmcmahill@pkgsrc.org> | 2006-10-02 21:20:09 +0000 |
|---|---|---|
| committer | dmcmahill <dmcmahill@pkgsrc.org> | 2006-10-02 21:20:09 +0000 |
| commit | 8846cb2313c330131b4c103362e90af0f46d837b (patch) | |
| tree | c79e50fcac8e5f2054b4f7a4cdf67202fb0f2c09 /devel/glib2 | |
| parent | 6ea3730cfef96d608b9493c77f47a1fe3a198b46 (diff) | |
| download | pkgsrc-8846cb2313c330131b4c103362e90af0f46d837b.tar.gz | |
Fix compilation on solaris and also increase the portability of a shell
script used in the testsuite. 49/50 tests pass on solaris-2.9.
Diffstat (limited to 'devel/glib2')
| -rw-r--r-- | devel/glib2/distinfo | 5 | ||||
| -rw-r--r-- | devel/glib2/patches/patch-ag | 22 | ||||
| -rw-r--r-- | devel/glib2/patches/patch-ai | 22 |
3 files changed, 39 insertions, 10 deletions
diff --git a/devel/glib2/distinfo b/devel/glib2/distinfo index ebfb07fdccc..268753d1092 100644 --- a/devel/glib2/distinfo +++ b/devel/glib2/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.68 2006/09/08 09:32:57 joerg Exp $ +$NetBSD: distinfo,v 1.69 2006/10/02 21:20:09 dmcmahill Exp $ SHA1 (glib-2.12.3.tar.bz2) = 117abb0e73fddb46650f0f38bfbbddc658dc2ddf RMD160 (glib-2.12.3.tar.bz2) = 65c6d717742add451af769299428f4597effb4a8 @@ -9,6 +9,7 @@ SHA1 (patch-ac) = 43a30df9822e90e0f84df4458cc20de286509961 SHA1 (patch-ad) = c926d96bdc9ddf4f434fc57af0adbe11002cffc3 SHA1 (patch-ae) = 09f16e8e14bdea3ee0e478d335f65cb66939e5f5 SHA1 (patch-af) = 192998d1e2188c0210d7a471786495b758c437ae +SHA1 (patch-ag) = c70a1caa8cc78e1f5ff5c99cb6b283afd0b86dfc SHA1 (patch-ah) = 8b65c137b07659351b97089c10db0dac61f04905 -SHA1 (patch-ai) = eda9bb160d7eeee9b48bd9ca6ce3004278acf17c +SHA1 (patch-ai) = 8a9706b794077c9e1d4499e28530bf8f84f792c8 SHA1 (patch-aj) = f0c15174e83dae88cca50d040d0c09438ee9053b diff --git a/devel/glib2/patches/patch-ag b/devel/glib2/patches/patch-ag new file mode 100644 index 00000000000..7a6dce2d6dd --- /dev/null +++ b/devel/glib2/patches/patch-ag @@ -0,0 +1,22 @@ +$NetBSD: patch-ag,v 1.10 2006/10/02 21:20:09 dmcmahill Exp $ + +--- tests/run-markup-tests.sh.orig 2006-05-28 18:58:41.000000000 -0400 ++++ tests/run-markup-tests.sh +@@ -26,7 +26,8 @@ for I in ${srcdir:-.}/markups/fail-*.gma + fi + done + +-for (( I=1 ; I < 100 ; I++ )) ; do ++I=1 ++while test $I -lt 100 ; do + F=${srcdir:-.}/markups/valid-$I.gmarkup + if [ -f $F ] ; then + echo_v "Parsing $F, should succeed" +@@ -34,6 +35,7 @@ for (( I=1 ; I < 100 ; I++ )) ; do + diff -u ${srcdir:-.}/markups/expected-$I actual || fail "unexpected output on $F" + rm actual + fi ++ I=`expr $I + 1` + done + + echo_v "All tests passed." diff --git a/devel/glib2/patches/patch-ai b/devel/glib2/patches/patch-ai index 8d143e7a772..63f30a87463 100644 --- a/devel/glib2/patches/patch-ai +++ b/devel/glib2/patches/patch-ai @@ -1,22 +1,28 @@ -$NetBSD: patch-ai,v 1.7 2006/09/08 09:32:57 joerg Exp $ +$NetBSD: patch-ai,v 1.8 2006/10/02 21:20:09 dmcmahill Exp $ ---- glib/gtimer.c.orig 2006-09-08 09:11:08.000000000 +0000 -+++ glib/gtimer.c -@@ -91,12 +91,17 @@ init_posix_clock (void) - if (!initialized) +--- glib/gtimer.c.orig 2006-08-27 23:05:42.000000000 -0400 ++++ glib/gtimer.c 2006-10-02 09:34:45.507139000 -0400 +@@ -48,4 +48,6 @@ + #endif /* G_OS_WIN32 */ + ++#include <time.h> ++ + #include "glib.h" + #include "galias.h" +@@ -92,5 +94,9 @@ { initialized = TRUE; +-#if !defined(_POSIX_MONOTONIC_CLOCK) || _POSIX_MONOTONIC_CLOCK >= 0 +#if defined(__DragonFly__) + /* DragonFly has a monotonic clock, but not the define or sysconf support */ + posix_clock = CLOCK_MONOTONIC; +#else - #if !defined(_POSIX_MONOTONIC_CLOCK) || _POSIX_MONOTONIC_CLOCK >= 0 ++#if defined(_SC_MONOTONIC_CLOCK) && (!defined(_POSIX_MONOTONIC_CLOCK) || _POSIX_MONOTONIC_CLOCK >= 0) if (sysconf (_SC_MONOTONIC_CLOCK) >= 0) posix_clock = CLOCK_MONOTONIC; - else +@@ -98,4 +104,5 @@ #endif posix_clock = CLOCK_REALTIME; +#endif } } - #endif |