pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/misc/gwaei Fix linking without gnome option enabled. F...
details: https://anonhg.NetBSD.org/pkgsrc/rev/dabaedc8b46b
branches: trunk
changeset: 568707:dabaedc8b46b
user: wiz <wiz%pkgsrc.org@localhost>
date: Wed Dec 16 22:52:42 2009 +0000
description:
Fix linking without gnome option enabled. From upstream.
diffstat:
misc/gwaei/distinfo | 3 +-
misc/gwaei/options.mk | 3 +-
misc/gwaei/patches/patch-aa | 76 +++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 79 insertions(+), 3 deletions(-)
diffs (104 lines):
diff -r 2f450464d8ff -r dabaedc8b46b misc/gwaei/distinfo
--- a/misc/gwaei/distinfo Wed Dec 16 22:42:26 2009 +0000
+++ b/misc/gwaei/distinfo Wed Dec 16 22:52:42 2009 +0000
@@ -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 -r 2f450464d8ff -r dabaedc8b46b misc/gwaei/options.mk
--- a/misc/gwaei/options.mk Wed Dec 16 22:42:26 2009 +0000
+++ b/misc/gwaei/options.mk Wed Dec 16 22:52:42 2009 +0000
@@ -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 -r 2f450464d8ff -r dabaedc8b46b misc/gwaei/patches/patch-aa
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/misc/gwaei/patches/patch-aa Wed Dec 16 22:52:42 2009 +0000
@@ -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:
Home |
Main Index |
Thread Index |
Old Index