diff options
| author | wiz <wiz@pkgsrc.org> | 2009-12-16 22:52:42 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2009-12-16 22:52:42 +0000 |
| commit | 65c6fe6d33ce749aa6fd8e767772d4e55926dd50 (patch) | |
| tree | c0c882ff1046af6fae0b70278fb745e6047bca2f /misc/gwaei | |
| parent | e884e2384d827ec512425be6c8b6b33bcbcd2415 (diff) | |
| download | pkgsrc-65c6fe6d33ce749aa6fd8e767772d4e55926dd50.tar.gz | |
Fix linking without gnome option enabled. From upstream.
Diffstat (limited to 'misc/gwaei')
| -rw-r--r-- | misc/gwaei/distinfo | 3 | ||||
| -rw-r--r-- | misc/gwaei/options.mk | 3 | ||||
| -rw-r--r-- | misc/gwaei/patches/patch-aa | 76 |
3 files changed, 79 insertions, 3 deletions
diff --git a/misc/gwaei/distinfo b/misc/gwaei/distinfo index b93aa76ccb9..246f222bd6c 100644 --- a/misc/gwaei/distinfo +++ b/misc/gwaei/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.8 2009/12/15 14:46:44 wiz Exp $ +$NetBSD: distinfo,v 1.9 2009/12/16 22:52:42 wiz Exp $ SHA1 (gwaei-1.2.1.tar.gz) = b22fc28790223d115a121206f4855f3ab421c9eb RMD160 (gwaei-1.2.1.tar.gz) = 5d06eecf5efde6aa6fed2d055b5637ca87fbb3a8 Size (gwaei-1.2.1.tar.gz) = 643964 bytes +SHA1 (patch-aa) = 2bab4ddca6b4547f9f748dffe2c79fdec8badf38 diff --git a/misc/gwaei/options.mk b/misc/gwaei/options.mk index 593eeb12489..1619049dc07 100644 --- a/misc/gwaei/options.mk +++ b/misc/gwaei/options.mk @@ -1,8 +1,7 @@ -# $NetBSD: options.mk,v 1.2 2009/12/15 14:46:44 wiz Exp $ +# $NetBSD: options.mk,v 1.3 2009/12/16 22:52:42 wiz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.gwaei PKG_SUPPORTED_OPTIONS= gnome -# XXX: needed in 1.2.1, link failure if disabled PKG_SUGGESTED_OPTIONS= gnome .include "../../mk/bsd.options.mk" diff --git a/misc/gwaei/patches/patch-aa b/misc/gwaei/patches/patch-aa new file mode 100644 index 00000000000..5d04ebb70f3 --- /dev/null +++ b/misc/gwaei/patches/patch-aa @@ -0,0 +1,76 @@ +$NetBSD: patch-aa,v 1.3 2009/12/16 22:52:42 wiz Exp $ + +--- configure.orig 2009-11-15 04:57:24.000000000 +0000 ++++ configure +@@ -2545,10 +2545,12 @@ if test -n "$DEPS_CFLAGS"; then + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED_VERSION ++ gobject-2.0 >= \$GLIB_REQUIRED_VERSION + libcurl >= \$LIBCURL_REQUIRED_VERSION + gmodule-2.0 >= \$GMODULE_EXPORT_REQUIRED_VERSION + gthread-2.0 >= \$GTHREAD_REQUIRED_VERSION \"") >&5 + ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED_VERSION ++ gobject-2.0 >= $GLIB_REQUIRED_VERSION + libcurl >= $LIBCURL_REQUIRED_VERSION + gmodule-2.0 >= $GMODULE_EXPORT_REQUIRED_VERSION + gthread-2.0 >= $GTHREAD_REQUIRED_VERSION ") 2>&5 +@@ -2556,6 +2558,7 @@ if test -n "$DEPS_CFLAGS"; then + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_DEPS_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= $GLIB_REQUIRED_VERSION ++ gobject-2.0 >= $GLIB_REQUIRED_VERSION + libcurl >= $LIBCURL_REQUIRED_VERSION + gmodule-2.0 >= $GMODULE_EXPORT_REQUIRED_VERSION + gthread-2.0 >= $GTHREAD_REQUIRED_VERSION " 2>/dev/null` +@@ -2570,10 +2573,12 @@ if test -n "$DEPS_LIBS"; then + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED_VERSION ++ gobject-2.0 >= \$GLIB_REQUIRED_VERSION + libcurl >= \$LIBCURL_REQUIRED_VERSION + gmodule-2.0 >= \$GMODULE_EXPORT_REQUIRED_VERSION + gthread-2.0 >= \$GTHREAD_REQUIRED_VERSION \"") >&5 + ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED_VERSION ++ gobject-2.0 >= $GLIB_REQUIRED_VERSION + libcurl >= $LIBCURL_REQUIRED_VERSION + gmodule-2.0 >= $GMODULE_EXPORT_REQUIRED_VERSION + gthread-2.0 >= $GTHREAD_REQUIRED_VERSION ") 2>&5 +@@ -2581,6 +2586,7 @@ if test -n "$DEPS_LIBS"; then + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_DEPS_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= $GLIB_REQUIRED_VERSION ++ gobject-2.0 >= $GLIB_REQUIRED_VERSION + libcurl >= $LIBCURL_REQUIRED_VERSION + gmodule-2.0 >= $GMODULE_EXPORT_REQUIRED_VERSION + gthread-2.0 >= $GTHREAD_REQUIRED_VERSION " 2>/dev/null` +@@ -2602,11 +2608,13 @@ else + fi + if test $_pkg_short_errors_supported = yes; then + DEPS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0 >= $GLIB_REQUIRED_VERSION ++ gobject-2.0 >= $GLIB_REQUIRED_VERSION + libcurl >= $LIBCURL_REQUIRED_VERSION + gmodule-2.0 >= $GMODULE_EXPORT_REQUIRED_VERSION + gthread-2.0 >= $GTHREAD_REQUIRED_VERSION " 2>&1` + else + DEPS_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0 >= $GLIB_REQUIRED_VERSION ++ gobject-2.0 >= $GLIB_REQUIRED_VERSION + libcurl >= $LIBCURL_REQUIRED_VERSION + gmodule-2.0 >= $GMODULE_EXPORT_REQUIRED_VERSION + gthread-2.0 >= $GTHREAD_REQUIRED_VERSION " 2>&1` +@@ -2615,6 +2623,7 @@ fi + echo "$DEPS_PKG_ERRORS" >&5 + + { { $as_echo "$as_me:$LINENO: error: Package requirements (glib-2.0 >= $GLIB_REQUIRED_VERSION ++ gobject-2.0 >= $GLIB_REQUIRED_VERSION + libcurl >= $LIBCURL_REQUIRED_VERSION + gmodule-2.0 >= $GMODULE_EXPORT_REQUIRED_VERSION + gthread-2.0 >= $GTHREAD_REQUIRED_VERSION ) were not met: +@@ -2629,6 +2638,7 @@ and DEPS_LIBS to avoid the need to call + See the pkg-config man page for more details. + " >&5 + $as_echo "$as_me: error: Package requirements (glib-2.0 >= $GLIB_REQUIRED_VERSION ++ gobject-2.0 >= $GLIB_REQUIRED_VERSION + libcurl >= $LIBCURL_REQUIRED_VERSION + gmodule-2.0 >= $GMODULE_EXPORT_REQUIRED_VERSION + gthread-2.0 >= $GTHREAD_REQUIRED_VERSION ) were not met: |