[Libreoffice-commits] .: pango/makefile.mk pango/pango-1.28.3.patch

[Christian Lohmaier]

 pango/makefile.mk        |   16 ++++++++--------
 pango/pango-1.28.3.patch |   34 +++++++++++++++++++++++++++++++---
 2 files changed, 39 insertions(+), 11 deletions(-)

New commits:
commit 73bd399f5b14c184775f9a4a9e9026f4e0f53869
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date:   Tue Jun 14 03:21:00 2011 +0200

    silence pango, get rid of $/ escapes, pass verbosity switches

diff --git a/pango/makefile.mk b/pango/makefile.mk
index 44fd080..66bf866 100644
--- a/pango/makefile.mk
+++ b/pango/makefile.mk
@@ -36,8 +36,8 @@ TARGET=so_pango
 
 .IF "$(SYSTEM_PANGO)" == "YES"
 all:
-    @echo "An already available installation of pango should exist on your system."
-    @echo "Therefore the version provided here does not need to be built in addition."
+	@echo "An already available installation of pango should exist on your system."
+	@echo "Therefore the version provided here does not need to be built in addition."
 .ENDIF
 
 # --- Files --------------------------------------------------------
@@ -56,15 +56,15 @@ PATCH_FILES=pango-1.28.3.patch
 CONFIGURE_LDFLAGS="-L$(SOLARLIBDIR)"
 CONFIGURE_DIR=
 CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) \
-                 .$/configure --prefix=$(SRC_ROOT)$/$(PRJNAME)$/$(MISC) \
-                 CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS) $(EXTRA_CDEFS) -I$(SOLARINCDIR) -I$(SOLARINCDIR)$/external -I$(SOLARINCDIR)$/external$/glib-2.0" \
-                 CXXFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS) $(EXTRA_CDEFS) -I$(SOLARINCDIR) -I$(SOLARINCDIR)$/external -I$(SOLARINCDIR)$/external$/glib-2.0" \
+                 ./configure --prefix=$(SRC_ROOT)/$(PRJNAME)/$(MISC) --disable-dependency-tracking --disable-doc-cross-references \
+                 CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS) $(EXTRA_CDEFS) -I$(SOLARINCDIR) -I$(SOLARINCDIR)/external -I$(SOLARINCDIR)/external/glib-2.0" \
+                 CXXFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS) $(EXTRA_CDEFS) -I$(SOLARINCDIR) -I$(SOLARINCDIR)/external -I$(SOLARINCDIR)/external/glib-2.0" \
                  LDFLAGS="$(CONFIGURE_LDFLAGS)" \
-                 CAIRO_CFLAGS="-I$(SOLARINCDIR) -I$(SOLARINCDIR)$/cairo" \
+                 CAIRO_CFLAGS="-I$(SOLARINCDIR) -I$(SOLARINCDIR)/cairo" \
                  CAIRO_LIBS="-lcairo" \
-                 GLIB_CFLAGS="-I$(SOLARINCDIR)$/external$/glib-2.0" \
+                 GLIB_CFLAGS="-I$(SOLARINCDIR)/external/glib-2.0" \
                  GLIB_LIBS="-lgthread-2.0 -lgmodule-2.0 -lgobject-2.0 -lglib-2.0 -lintl"
-CONFIGURE_FLAGS=--with-included-modules=yes
+CONFIGURE_FLAGS=--with-included-modules=yes $(eq,$(VERBOSE),$(NULL) --enable-silent-rules --disable-silent-rules)
 CONFIGURE_FLAGS+= CPPFLAGS="$(ARCH_FLAGS) $(EXTRA_CDEFS)"
 CONFIGURE_ACTION+="--without-x"
 
diff --git a/pango/pango-1.28.3.patch b/pango/pango-1.28.3.patch
index 7da953f..45ce441 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