diff options
author | tnn <tnn@pkgsrc.org> | 2008-12-08 16:10:19 +0000 |
---|---|---|
committer | tnn <tnn@pkgsrc.org> | 2008-12-08 16:10:19 +0000 |
commit | 5c920ede6c6e2c1b94e9553d1b2d53b9edc2afc4 (patch) | |
tree | 407f20e5a5ee370b43a3d876b6ea516d0378b747 /devel | |
parent | 53f583a94d8afc6bdae66821f3e3dcdfc69650d8 (diff) | |
download | pkgsrc-5c920ede6c6e2c1b94e9553d1b2d53b9edc2afc4.tar.gz |
regen patch-aa from patch-ak to silence patch warning about missing hunk
Diffstat (limited to 'devel')
-rw-r--r-- | devel/glib2/distinfo | 4 | ||||
-rw-r--r-- | devel/glib2/patches/patch-aa | 48 |
2 files changed, 16 insertions, 36 deletions
diff --git a/devel/glib2/distinfo b/devel/glib2/distinfo index 47c0de00dfe..e52ad21e1e8 100644 --- a/devel/glib2/distinfo +++ b/devel/glib2/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.107 2008/12/01 15:27:52 dmcmahill Exp $ +$NetBSD: distinfo,v 1.108 2008/12/08 16:10:19 tnn Exp $ SHA1 (glib-2.18.3.tar.bz2) = 293f639fb85ea47347eb34e122327c60ef7606e4 RMD160 (glib-2.18.3.tar.bz2) = cf43fbba04250becaabdb7b7f55bcdec584f019e Size (glib-2.18.3.tar.bz2) = 4835503 bytes -SHA1 (patch-aa) = 7cddba48d8ad2616279a5e9fff0c57bcdbba4fba +SHA1 (patch-aa) = e8d533e6279a537fc536f61ef397165518c4bcd7 SHA1 (patch-ab) = 757cfd7f686d3e3147d13f530d1c85c7835bf762 SHA1 (patch-ac) = 96e153339675457356f71e35d20375bed669d337 SHA1 (patch-ad) = c926d96bdc9ddf4f434fc57af0adbe11002cffc3 diff --git a/devel/glib2/patches/patch-aa b/devel/glib2/patches/patch-aa index abab7effa71..70058da04a8 100644 --- a/devel/glib2/patches/patch-aa +++ b/devel/glib2/patches/patch-aa @@ -1,16 +1,16 @@ -$NetBSD: patch-aa,v 1.44 2008/10/24 15:59:52 wiz Exp $ +$NetBSD: patch-aa,v 1.45 2008/12/08 16:10:19 tnn Exp $ ---- configure.orig 2008-10-16 14:41:13.000000000 +0000 +--- configure.orig 2008-11-24 06:50:01.000000000 +0100 +++ configure -@@ -986,6 +986,7 @@ MKDIR_P - INSTALL_STRIP_PROGRAM - STRIP - install_sh +@@ -835,6 +835,7 @@ GIO + GSPAWN + GLIB_DEBUG_FLAGS + G_MODULE_NEED_USCORE +G_MODULE_BROKEN_DLOPEN_NULL - MAKEINFO - AUTOHEADER - AUTOMAKE -@@ -37256,6 +37257,7 @@ else + G_MODULE_BROKEN_RTLD_GLOBAL + G_MODULE_HAVE_DLERROR + G_MODULE_LDFLAGS +@@ -34079,6 +34080,7 @@ else fi G_MODULE_NEED_USCORE=0 G_MODULE_BROKEN_RTLD_GLOBAL=0 @@ -18,7 +18,7 @@ $NetBSD: patch-aa,v 1.44 2008/10/24 15:59:52 wiz Exp $ G_MODULE_HAVE_DLERROR=0 if test -z "$G_MODULE_IMPL"; then case "$host" in -@@ -38091,6 +38093,87 @@ fi +@@ -34914,6 +34916,87 @@ fi LIBS="$LIBS_orig" fi @@ -106,7 +106,7 @@ $NetBSD: patch-aa,v 1.44 2008/10/24 15:59:52 wiz Exp $ if test -z "$G_MODULE_IMPL"; then G_MODULE_IMPL=0 G_MODULE_SUPPORTED=false -@@ -38127,6 +38210,8 @@ fi +@@ -34950,6 +35033,8 @@ fi @@ -115,7 +115,7 @@ $NetBSD: patch-aa,v 1.44 2008/10/24 15:59:52 wiz Exp $ { $as_echo "$as_me:$LINENO: checking for gspawn implementation" >&5 $as_echo_n "checking for gspawn implementation... " >&6; } case "$host" in -@@ -39873,117 +39958,8 @@ if test x"$have_threads" != xno; then +@@ -36696,117 +36781,8 @@ if test x"$have_threads" != xno; then G_THREAD_LIBS="-lpthread -lthread" ;; *) @@ -235,7 +235,7 @@ $NetBSD: patch-aa,v 1.44 2008/10/24 15:59:52 wiz Exp $ ;; esac fi -@@ -42177,6 +42153,10 @@ case $host in +@@ -39000,6 +38976,10 @@ case $host in *) G_THREAD_LIBS_FOR_GTHREAD="$G_THREAD_LIBS" ;; @@ -246,23 +246,3 @@ $NetBSD: patch-aa,v 1.44 2008/10/24 15:59:52 wiz Exp $ esac -@@ -47480,9 +47460,9 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ - } - split(mac1, mac2, "(") #) - macro = mac2[1] -- prefix = substr(line, 1, index(line, defundef) - 1) - if (D_is_set[macro]) { - # Preserve the white space surrounding the "#". -+ prefix = substr(line, 1, index(line, defundef) - 1) - print prefix "define", macro P[macro] D[macro] - next - } else { -@@ -47490,7 +47470,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ - # in the case of _POSIX_SOURCE, which is predefined and required - # on some systems where configure will not decide to define it. - if (defundef == "undef") { -- print "/*", prefix defundef, macro, "*/" -+ print "/*", line, "*/" - next - } - } |