2005-03-28 Tollef Fog Heen <tfheen@err.no>

Author: tfheen
Date: 2005-03-28 14:21:23 GMT
2005-03-28  Tollef Fog Heen  <tfheen@err.no>

    * autogen.sh: Extra paranoia -- fail if running auto* fails or if
    patching fails.

    * glib-patches/mkinstalldirs.update.diff: Update patch so it
    applies cleanly

    * glib-patches/pthread-config-fix.diff: adjust offsets so patch is
    quiet again

diff --git a/ChangeLog b/ChangeLog
index c523d6bb71538ce8e73ff23c9c810a2c2591ed35..48981496c64614a63c1d27693b143c4820da3311 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2005-03-28  Tollef Fog Heen  <tfheen@err.no>
+
+       * autogen.sh: Extra paranoia -- fail if running auto* fails or if
+       patching fails.
+
+       * glib-patches/mkinstalldirs.update.diff: Update patch so it
+       applies cleanly
+
+       * glib-patches/pthread-config-fix.diff: adjust offsets so patch is
+       quiet again
+
 2005-03-26  Tollef Fog Heen  <tfheen@err.no>
 
        * configure.in: Bump to 0.16

diff --git a/autogen.sh b/autogen.sh
index f1c8b11fb62349c9f32f11430d60ee696e8ecd9c..d1e6dfe15637d6a6259d048fb45d78f54b30f38f 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -75,9 +75,9 @@ perl -p -w -i.bak -e 's/if \(compare_func\(l1->data,l2->data\) < 0\)/if \(compar
 # Update random auto* files to actually have something which have a snowball's
 # chance in a hot place of working with modern auto* tools.
 
-(cd glib-1.2.8 && for p in ../glib-patches/*.diff; do echo $p; patch -p1 < $p; done )
+(cd glib-1.2.8 && for p in ../glib-patches/*.diff; do echo $p; patch -p1 < $p || exit 1; done ) || exit 1
 
-(cd glib-1.2.8 && libtoolize --copy --force && $ACLOCAL $ACLOCAL_FLAGS && $AUTOMAKE && $AUTOCONF)
+(cd glib-1.2.8 && libtoolize --copy --force && $ACLOCAL $ACLOCAL_FLAGS && $AUTOMAKE && $AUTOCONF) || exit 1
 
 if test -z "$*"; then
        echo "I am going to run ./configure with no arguments - if you wish "

diff --git a/glib-patches/mkinstalldirs.update.diff b/glib-patches/mkinstalldirs.update.diff
index a0b732ece964c4557bb9255673c3e3f36251a856..f936c477848d3aa922a1360c7bc2b4e85d0ccae2 100644 (file)
--- a/glib-patches/mkinstalldirs.update.diff
+++ b/glib-patches/mkinstalldirs.update.diff
@@ -1,5 +1,9 @@
+#
+# Update to mkinstalldirs from automake 1.7
+#
+
 --- glib-1.2.8/mkinstalldirs   2000-03-11 10:25:38.000000000 +0100
-+++ glib-1.2.8-pkgconfig/mkinstalldirs 2005-02-20 23:26:36.579760784 +0100
++++ glib-1.2.8/mkinstalldirs   2004-06-20 10:56:22.000000000 +0200
 @@ -4,37 +4,108 @@
  # Created: 1993-05-16
  # Public domain

diff --git a/glib-patches/pthread-config-fix.diff b/glib-patches/pthread-config-fix.diff
index 36baf23f9f3cb5936108981c22a6aab4a4045504..cc42455ff43cf0a5cb4ea8c3561bb4213c09e246 100644 (file)
--- a/glib-patches/pthread-config-fix.diff
+++ b/glib-patches/pthread-config-fix.diff
@@ -1,6 +1,6 @@
 --- glib-1.2.8/configure.in    2000-05-25 02:29:09.000000000 +0200
 +++ glib-1.2.8/configure.in    2004-10-13 09:45:16.965305752 +0200
-@@ -831,6 +831,7 @@
+@@ -833,6 +833,7 @@
                AC_MSG_CHECKING(whether pthread_cond_timedwait is posix like)
                # DCE Threads return -1 as failure, posix ETIMEDOUT.
                AC_TRY_RUN([#include <pthread.h>
@@ -8,7 +8,7 @@
                        int main () { 
                        pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
                        pthread_cond_t cond = PTHREAD_COND_INITIALIZER;
-@@ -839,6 +840,7 @@
+@@ -841,6 +842,7 @@
                        gettimeofday (&tval, NULL);
                        tspec.tv_sec = tval.tv_sec;
                        tspec.tv_nsec = 0;