diff options
| author | Baptiste Daroussin <bapt@FreeBSD.org> | 2012-07-26 06:36:09 +0000 |
|---|---|---|
| committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2012-07-26 06:36:09 +0000 |
| commit | d619b0d8987b04e398d09ee82315aa5718385652 (patch) | |
| tree | 3be3354c6d1370aeccc587d02ae59ea9a8ef537e /devel/gnome-common | |
| parent | 2652481d27fb10f8c301873068c94e7b2ccf786e (diff) | |
Notes
Diffstat (limited to 'devel/gnome-common')
| -rw-r--r-- | devel/gnome-common/files/patch-macros2_gnome-autogen.sh-fix-pkg-config | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/devel/gnome-common/files/patch-macros2_gnome-autogen.sh-fix-pkg-config b/devel/gnome-common/files/patch-macros2_gnome-autogen.sh-fix-pkg-config index 877b592e85dc..dc6703919abe 100644 --- a/devel/gnome-common/files/patch-macros2_gnome-autogen.sh-fix-pkg-config +++ b/devel/gnome-common/files/patch-macros2_gnome-autogen.sh-fix-pkg-config @@ -33,38 +33,3 @@ https://bugzilla.gnome.org/show_bug.cgi?id=680363 sed 's/^.*[ ]\([0-9.]*[a-z]*\).*$/\1/'` if compare_versions $vc_min_version $vc_actual_version; then echo "found $vc_actual_version" -https://bugs.gentoo.org/show_bug.cgi?id=427432 -https://bugzilla.gnome.org/show_bug.cgi?id=680363 - ---- ./macros2/gnome-autogen.sh.orig 2009-05-27 23:29:07.000000000 +0200 -+++ ./macros2/gnome-autogen.sh 2012-07-24 10:29:13.064750613 +0200 -@@ -77,6 +77,7 @@ - vc_min_version=$4 - vc_source=$5 - vc_status=1 -+ vc_option="--version" - - vc_checkprog=`eval echo "\\$$vc_variable"` - if [ -n "$vc_checkprog" ]; then -@@ -89,11 +90,19 @@ - else - vc_comparator=">=" - fi -+ # The most reliable way to check pkg-config version is to query the actual -+ # virtual -+ # pkg-config package entry's modversion. This works in all known -+ # implementations. -+ -+ if test "x$vc_package" = "xpkg-config"; then -+ vc_option="--modversion pkg-config" -+ fi - printbold "checking for $vc_package $vc_comparator $vc_min_version..." - for vc_checkprog in $vc_checkprogs; do - echo $ECHO_N " testing $vc_checkprog... " $ECHO_C -- if $vc_checkprog --version < /dev/null > /dev/null 2>&1; then -- vc_actual_version=`$vc_checkprog --version | head -n 1 | \ -+ if $vc_checkprog $vc_option < /dev/null > /dev/null 2>&1; then -+ vc_actual_version=`$vc_checkprog $vc_option | head -n 1 | \ - sed 's/^.*[ ]\([0-9.]*[a-z]*\).*$/\1/'` - if compare_versions $vc_min_version $vc_actual_version; then - echo "found $vc_actual_version" |