diff options
| author | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2011-06-14 03:21:00 +0200 |
|---|---|---|
| committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2011-06-14 03:21:00 +0200 |
| commit | 3c1e5d564cfd06105ed9d119dd2a5509e6c316d2 (patch) | |
| tree | b6019f2d9ff2919f98b692dd9b287ef3237e7265 /pango/pango-1.28.3.patch | |
| parent | baa4d72f225911e38b6e68c8fa7968c27c582769 (diff) | |
silence pango, get rid of $/ escapes, pass verbosity switches
Diffstat (limited to 'pango/pango-1.28.3.patch')
| -rw-r--r-- | pango/pango-1.28.3.patch | 34 |
1 files changed, 31 insertions, 3 deletions
diff --git a/pango/pango-1.28.3.patch b/pango/pango-1.28.3.patch index 7da953f28311..45ce441dfcbd 100644 --- a/pango/pango-1.28.3.patch +++ b/pango/pango-1.28.3.patch @@ -1,6 +1,15 @@ --- misc/pango-1.28.3/configure 2010-09-29 13:02:33.000000000 +0200 +++ misc/build/pango-1.28.3/configure 2011-03-01 17:56:26.000000000 +0100 -@@ -18596,16 +18596,16 @@ +@@ -17980,8 +17980,6 @@ + + + if test x$no_x = xyes ; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: X development libraries not found" >&5 +-$as_echo "$as_me: WARNING: X development libraries not found" >&2;} + have_x=false + else + X_LIBS="$X_LIBS -lX11" +@@ -18596,16 +18594,16 @@ fi if $have_atsui; then @@ -26,12 +35,31 @@ fi if $have_cairo_atsui; then -@@ -18859,7 +18859,7 @@ +@@ -18858,20 +18856,20 @@ + fi # Setup GLIB_MKENUMS to use glib-mkenums even if GLib is uninstalled. - GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0` +-GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0` - ++#GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0` +GLIB_MKENUMS=glib-mkenums # Add in gthread-2.0 to CFLAGS but not to LIBS so we get any + # necesary defines for thread-safety. +-GLIB_CFLAGS=`$PKG_CONFIG --cflags $GLIB_MODULES gthread-2.0` ++#GLIB_CFLAGS=`$PKG_CONFIG --cflags $GLIB_MODULES gthread-2.0` + + # See if it's safe to turn G_DISABLE_DEPRECATED on. +-GLIB_VERSION_MAJOR_MINOR=`$PKG_CONFIG --modversion glib-2.0 | sed "s/\.[^.]*\$//"` +-GLIB_REQUIRED_VERSION_MAJOR_MINOR=`echo $GLIB_REQUIRED_VERSION | sed "s/\.[^.]*\$//"` +-if test "x$GLIB_VERSION_MAJOR_MINOR" = "x$GLIB_REQUIRED_VERSION_MAJOR_MINOR"; then ++#GLIB_VERSION_MAJOR_MINOR=`$PKG_CONFIG --modversion glib-2.0 | sed "s/\.[^.]*\$//"` ++#GLIB_REQUIRED_VERSION_MAJOR_MINOR=`echo $GLIB_REQUIRED_VERSION | sed "s/\.[^.]*\$//"` ++#if test "x$GLIB_VERSION_MAJOR_MINOR" = "x$GLIB_REQUIRED_VERSION_MAJOR_MINOR"; then + GLIB_CFLAGS="-DG_DISABLE_DEPRECATED $GLIB_CFLAGS" +-fi ++#fi + + # + # Checks for LibThai |