[Libreoffice-commits] .: libgsf/libgsf-1.14.19.patch libgsf/makefile.mk

Christian Lohmaier cloph at kemper.freedesktop.org
Mon May 30 12:23:41 PDT 2011


 libgsf/libgsf-1.14.19.patch |    9 +++++++++
 libgsf/makefile.mk          |    6 +++---
 2 files changed, 12 insertions(+), 3 deletions(-)

New commits:
commit 49418eae60a538c5cfe865c6dab7f7e42ca75405
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date:   Mon May 30 21:27:17 2011 +0200

    fix build on Mac (add LIBXML_CFLAGS, disable unneeded intltool-xml check)

diff --git a/libgsf/libgsf-1.14.19.patch b/libgsf/libgsf-1.14.19.patch
index a397583..12d20c6 100644
--- a/libgsf/libgsf-1.14.19.patch
+++ b/libgsf/libgsf-1.14.19.patch
@@ -18,3 +18,12 @@
  
  
  
+@@ -11963,7 +11963,7 @@
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IT_PERL_VERSION" >&5
+ $as_echo "$IT_PERL_VERSION" >&6; }
+ fi
+-if test "x" != "xno-xml"; then
++if test "xno-xml" != "xno-xml"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XML::Parser" >&5
+ $as_echo_n "checking for XML::Parser... " >&6; }
+    if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
diff --git a/libgsf/makefile.mk b/libgsf/makefile.mk
index fc2897d..955925f 100755
--- a/libgsf/makefile.mk
+++ b/libgsf/makefile.mk
@@ -37,8 +37,8 @@ TARGET=so_libgsf
 
 .IF "$(SYSTEM_LIBGSF)" == "YES"
 all:
-    @echo "An already available installation of gdk-pixbuf 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 gdk-pixbuf should exist on your system."
+	@echo "Therefore the version provided here does not need to be built in addition."
 .ENDIF
 
 # --- Files --------------------------------------------------------
@@ -67,7 +67,7 @@ CONFIGURE_DIR=
 CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) \
                  .$/configure \
                  --prefix=$(SRC_ROOT)$/$(PRJNAME)$/$(MISC) \
-                 CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS) -I$(SOLARINCDIR)$/external -I$(SOLARINCDIR)$/external$/glib-2.0" \
+                 CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS) $(LIBXML_CFLAGS) -I$(SOLARINCDIR)$/external -I$(SOLARINCDIR)$/external$/glib-2.0" \
                  LDFLAGS="-L$(SOLARLIBDIR)" \
                  --without-python \
                  --without-bonobo \


More information about the Libreoffice-commits mailing list