diff options
| author | tron <tron> | 2000-03-13 14:41:50 +0000 |
|---|---|---|
| committer | tron <tron> | 2000-03-13 14:41:50 +0000 |
| commit | 54c41b1a86da915d56d91cc087e71ee91a303bcd (patch) | |
| tree | c74af855c048a2a71280af393e1dea9b5832eeb1 | |
| parent | f2ff649e5af5501cbfcf89b52442f60ba7d0f5a4 (diff) | |
| download | pkgsrc-54c41b1a86da915d56d91cc087e71ee91a303bcd.tar.gz | |
Use "glib-config" and not "gtk-config" plus "sed" to obtain compiler
flags for "glib" programs. This fixes build problems after the update
of the "glib" package.
| -rw-r--r-- | graphics/gimp-current/files/patch-sum | 4 | ||||
| -rw-r--r-- | graphics/gimp-current/patches/patch-aa | 15 |
2 files changed, 15 insertions, 4 deletions
diff --git a/graphics/gimp-current/files/patch-sum b/graphics/gimp-current/files/patch-sum index d1261a6e466..ed5507c2635 100644 --- a/graphics/gimp-current/files/patch-sum +++ b/graphics/gimp-current/files/patch-sum @@ -1,6 +1,6 @@ -$NetBSD: patch-sum,v 1.3 2000/01/02 03:39:12 wiz Exp $ +$NetBSD: patch-sum,v 1.4 2000/03/13 14:41:51 tron Exp $ -MD5 (patch-aa) = 892f8843394bd39ab54811de38d9e08f +MD5 (patch-aa) = f2ba997288d6d53e5cd3764227798db7 MD5 (patch-ab) = e84a3fa8448a9574cf2f8efbbb5e5140 MD5 (patch-ac) = 2b688e4ce5da5794af580957219d6a99 MD5 (patch-ad) = 1c8d3910d553cc38f07ea6482f7348ba diff --git a/graphics/gimp-current/patches/patch-aa b/graphics/gimp-current/patches/patch-aa index f9df524c6ce..d02390465b8 100644 --- a/graphics/gimp-current/patches/patch-aa +++ b/graphics/gimp-current/patches/patch-aa @@ -1,7 +1,7 @@ -$NetBSD: patch-aa,v 1.1.1.1 1999/11/27 04:08:32 hubertf Exp $ +$NetBSD: patch-aa,v 1.2 2000/03/13 14:41:50 tron Exp $ --- configure.orig Thu Nov 25 21:24:04 1999 -+++ configure Fri Nov 26 16:05:46 1999 ++++ configure Mon Mar 13 15:15:15 2000 @@ -668,7 +668,7 @@ # It thinks the first close brace ends the variable substitution. test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' @@ -27,6 +27,17 @@ $NetBSD: patch-aa,v 1.1.1.1 1999/11/27 04:08:32 hubertf Exp $ # Redirect the config.log output again, so that the ltconfig log is not # clobbered by the next message. +@@ -4293,8 +4295,8 @@ + + + +-GLIB_CFLAGS=`echo $GTK_CFLAGS | sed 's/^.*\(-I[^ ]*glib[^ ]* *-I[^ ]*\).*$/\1/'` +-GLIB_LDFLAGS=`echo $GTK_LIBS | sed -e 's/^.*-lgdk[^ ]* *\(-L[^ ]*\).*$/\1/' -e 's/^.* -lgdk[^ ]* .*$//'` ++GLIB_CFLAGS=`${LOCALBASE}/bin/glib-config --cflags` ++GLIB_LDFLAGS=`${LOCALBASE}/bin/glib-config --libs` + if test -z "$GLIB_LDFLAGS" ; then + GLIB_LDFLAGS=`echo $GTK_LIBS | sed 's/^ *\(-L[^ ]*\) .*$/\1/'` + fi @@ -4657,7 +4659,7 @@ echo $ac_n "(cached) $ac_c" 1>&6 else |