[pkgsrc/pkgsrc-2006Q3]: pkgsrc/devel/glib2 Pullup ticket 1838 - requested by ...

[ghen <ghen%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/7a07957fbaef
branches:  pkgsrc-2006Q3
changeset: 519095:7a07957fbaef
user:      ghen <ghen%pkgsrc.org@localhost>
date:      Tue Oct 03 14:23:12 2006 +0000

description:
Pullup ticket 1838 - requested by dmcmahill
build fix for glib2 on solaris

Revisions pulled up:
- pkgsrc/devel/glib2/distinfo                   1.69-1.70
- pkgsrc/devel/glib2/patch-ai                   1.10-1.11
- pkgsrc/devel/glib2/patch-ag                   1.8-1.9

   Module Name: pkgsrc
   Committed By:        dmcmahill
   Date:                Mon Oct  2 21:20:09 UTC 2006

   Modified Files:
        pkgsrc/devel/glib2: distinfo
        pkgsrc/devel/glib2/patches: patch-ai
   Added Files:
        pkgsrc/devel/glib2/patches: patch-ag
---
   Log Message:
   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.

   Module Name: pkgsrc
   Committed By:        dmcmahill
   Date:                Tue Oct  3 02:31:46 UTC 2006

   Modified Files:
        pkgsrc/devel/glib2: distinfo
        pkgsrc/devel/glib2/patches: patch-ag patch-ai

   Log Message:
   Add bugzilla URL's now that bug reports exist upstream.

diffstat:

 devel/glib2/distinfo         |   5 +++--
 devel/glib2/patches/patch-ag |  24 ++++++++++++++++++++++++
 devel/glib2/patches/patch-ai |  24 ++++++++++++++++--------
 3 files changed, 43 insertions(+), 10 deletions(-)

diffs (88 lines):

diff -r 6174fa1ce4d2 -r 7a07957fbaef devel/glib2/distinfo
--- a/devel/glib2/distinfo      Tue Oct 03 14:14:07 2006 +0000
+++ b/devel/glib2/distinfo      Tue Oct 03 14:23:12 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.68 2006/09/08 09:32:57 joerg Exp $
+$NetBSD: distinfo,v 1.68.2.1 2006/10/03 14:23:12 ghen Exp $
 
 SHA1 (glib-2.12.3.tar.bz2) = 117abb0e73fddb46650f0f38bfbbddc658dc2ddf
 RMD160 (glib-2.12.3.tar.bz2) = 65c6d717742add451af769299428f4597effb4a8
@@ -9,6 +9,7 @@
 SHA1 (patch-ad) = c926d96bdc9ddf4f434fc57af0adbe11002cffc3
 SHA1 (patch-ae) = 09f16e8e14bdea3ee0e478d335f65cb66939e5f5
 SHA1 (patch-af) = 192998d1e2188c0210d7a471786495b758c437ae
+SHA1 (patch-ag) = 456ec5678684e3a440991f037e74a2b0262b156b
 SHA1 (patch-ah) = 8b65c137b07659351b97089c10db0dac61f04905
-SHA1 (patch-ai) = eda9bb160d7eeee9b48bd9ca6ce3004278acf17c
+SHA1 (patch-ai) = 1cdbe158b288600d03f41ce7ead656f61fa9d119
 SHA1 (patch-aj) = f0c15174e83dae88cca50d040d0c09438ee9053b
diff -r 6174fa1ce4d2 -r 7a07957fbaef devel/glib2/patches/patch-ag
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/glib2/patches/patch-ag      Tue Oct 03 14:23:12 2006 +0000
@@ -0,0 +1,24 @@
+$NetBSD: patch-ag,v 1.9.2.1 2006/10/03 14:23:12 ghen Exp $
+
+http://bugzilla.gnome.org/show_bug.cgi?id=347944
+
+--- 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 -r 6174fa1ce4d2 -r 7a07957fbaef devel/glib2/patches/patch-ai
--- a/devel/glib2/patches/patch-ai      Tue Oct 03 14:14:07 2006 +0000
+++ b/devel/glib2/patches/patch-ai      Tue Oct 03 14:23:12 2006 +0000
@@ -1,22 +1,30 @@
-$NetBSD: patch-ai,v 1.7 2006/09/08 09:32:57 joerg Exp $
+$NetBSD: patch-ai,v 1.7.2.1 2006/10/03 14:23:12 ghen Exp $
+
+http://bugzilla.gnome.org/show_bug.cgi?id=359190
 
---- 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