diff options
| author |   Marijn Schouten <hkbst@gentoo.org> | 2007-01-20 10:02:22 +0000 |
|---|---|---|
| committer | Marijn Schouten <hkbst@gentoo.org> | 2007-01-20 10:02:22 +0000 |
| commit | 92e439677e6403806da4ef59844664d1b3e6aaf2 (patch) | |
| tree | 64846a0f530dc1f429291a4a8d2469bfdfc61a5b | |
| parent | Added ~ppc64 (dep from dev-db/jxtray) (diff) | |
| download | gentoo-2-92e439677e6403806da4ef59844664d1b3e6aaf2.tar.gz gentoo-2-92e439677e6403806da4ef59844664d1b3e6aaf2.tar.bz2 gentoo-2-92e439677e6403806da4ef59844664d1b3e6aaf2.zip | |
fix g-wrap-1.9.6 automagic patch to respect use flag
(Portage version: 2.1.2-r1)
| -rw-r--r-- | dev-libs/g-wrap/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-libs/g-wrap/files/g-wrap-1.9.6_glib_automagic.patch | 10 |
2 files changed, 11 insertions, 5 deletions
diff --git a/dev-libs/g-wrap/ChangeLog b/dev-libs/g-wrap/ChangeLog index 662748fe8d80..e571194d3cc7 100644 --- a/dev-libs/g-wrap/ChangeLog +++ b/dev-libs/g-wrap/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-libs/g-wrap # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/g-wrap/ChangeLog,v 1.32 2007/01/19 15:42:22 hkbst Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/g-wrap/ChangeLog,v 1.33 2007/01/20 10:02:22 hkbst Exp $ + + 20 Jan 2007; Marijn Schouten <hkBst@gentoo.org> + files/g-wrap-1.9.6_glib_automagic.patch: + fix 1.9.6 patch 19 Jan 2007; Marijn Schouten <hkBst@gentoo.org> -g-wrap-1.9.7.ebuild: remove because of automagic dep on glib-1.2 diff --git a/dev-libs/g-wrap/files/g-wrap-1.9.6_glib_automagic.patch b/dev-libs/g-wrap/files/g-wrap-1.9.6_glib_automagic.patch index 1b5f8f13940e..cf4f4b36c139 100644 --- a/dev-libs/g-wrap/files/g-wrap-1.9.6_glib_automagic.patch +++ b/dev-libs/g-wrap/files/g-wrap-1.9.6_glib_automagic.patch @@ -1,11 +1,13 @@ ---- configure.ac.old 2007-01-19 16:07:41.000000000 +0100 -+++ configure.ac 2007-01-19 16:07:59.000000000 +0100 -@@ -95,7 +95,7 @@ +--- configure.ac.old 2007-01-20 10:54:27.000000000 +0100 ++++ configure.ac 2007-01-20 10:55:49.000000000 +0100 +@@ -95,7 +95,9 @@ AM_CONDITIONAL(HAVE_SRFI_35, test "$HAVE_SRFI_35" = yes) dnl Check for optional libraries -PKG_CHECK_MODULES(GLIB, glib, [have_glib=yes], [have_glib=no]) -+PKG_CHECK_MODULES(GLIB, glib-2.0, [have_glib=yes], [have_glib=no]) ++if test "x$with_glib" != "xno"; then ++ PKG_CHECK_MODULES([GLIB], [glib-2.0], [have_glib=yes], [have_glib=no]) ++fi AM_CONDITIONAL(HAVE_GLIB, test "$have_glib" = yes) dnl Check for compiler flags and warnings. This should be last, since |