[Libreoffice-commits] .: Branch 'feature/gnumake4' - gdk-pixbuf/gdk-pixbuf-2.23.0.patch gdk-pixbuf/makefile.mk

[Bjoern Michaelsen]

 gdk-pixbuf/gdk-pixbuf-2.23.0.patch |    2 +-
 gdk-pixbuf/makefile.mk             |    2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit cf0edd9026e937af20f9e59c33e946c17f4f40a3
Author: Philipp Lohmann [pl] <Philipp.Lohmann at Oracle.COM>
Date:   Wed Apr 6 14:24:05 2011 +0200

    ooo34gsl01: #i117732# patch to make configure work with homebrew (thanks hbrinkm !) [hg:1780f020f3f4]

diff --git a/gdk-pixbuf/gdk-pixbuf-2.23.0.patch b/gdk-pixbuf/gdk-pixbuf-2.23.0.patch
index 1bff293..7e6db67 100644
--- a/gdk-pixbuf/gdk-pixbuf-2.23.0.patch
+++ b/gdk-pixbuf/gdk-pixbuf-2.23.0.patch
@@ -5,7 +5,7 @@
  
  
 -
-+if 0; then
++if false; then
  
  if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
  	if test -n "$ac_tool_prefix"; then
diff --git a/gdk-pixbuf/makefile.mk b/gdk-pixbuf/makefile.mk
index 663f0f2..d44f1a0 100644
--- a/gdk-pixbuf/makefile.mk
+++ b/gdk-pixbuf/makefile.mk
@@ -54,6 +54,8 @@ CONFIGURE_DIR=
 CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) \
                 BASE_DEPENDENCIES_CFLAGS="-I$(SOLARINCDIR)$/external -I$(SOLARINCDIR)$/external/glib-2.0" \
                 BASE_DEPENDENCIES_LIBS=" " \
+		GDK_PIXBUF_XLIB_DEP_CFLAGS="-I$(SOLARINCDIR)$/external -I$(SOLARINCDIR)$/external/glib-2.0" \
+		GDK_PIXBUF_XLIB_DEP_LIBS=" " \
                  .$/configure \
                  --prefix=$(SRC_ROOT)$/$(PRJNAME)$/$(MISC) \
                  CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS) -I$(SOLARINCDIR)$/external -I$(SOLARINCDIR)$/external$/glib-2.0 -I$(SOLARINCDIR)$/external$/libpng -I$(SOLARINCDIR)$/external$/libjpeg" \