Root/gimmix/patches/001-fix-compile-error.patch

1diff --git a/configure b/configure
2index 2332de3..0ec086d 100755
3--- a/configure
4+++ b/configure
5@@ -3308,7 +3308,7 @@ if test -n "0.21"; then
6 $as_echo_n "checking for intltool >= 0.21... " >&6; }
7 
8     INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.21 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
9- INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
10+ INTLTOOL_APPLIED_VERSION=`echo 0.21`
11     INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
12 
13     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_APPLIED_VERSION found" >&5
14@@ -3437,10 +3437,6 @@ $as_echo "no" >&6; }
15 fi
16 
17 
18-if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then
19- as_fn_error "The intltool scripts were not found. Please install intltool." "$LINENO" 5
20-fi
21-
22   INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
23 INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
24      INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
25@@ -12735,7 +12731,7 @@ fi
26     # Put the nasty error message in config.log where it belongs
27     echo "$GIMMIX_PKG_ERRORS" >&5
28 
29- as_fn_error "Package requirements ($pkg_modules) were not met:
30+ as_echo "Package requirements ($pkg_modules) were not met:
31 
32 $GIMMIX_PKG_ERRORS
33 
34

Archive Download this file

Branches:
backfire
master
release_2010-11-17
release_2010-12-14
release_2011-02-23
release_2011-05-28
release_2011-08-27
release_2011-11-13
release_2012-03-18
release_2012-04-09
release_2012-07-11
release_2012-10-11



interactive