incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From er...@apache.org
Subject svn commit: r1167574 - in /incubator/ooo/trunk/main/gdk-pixbuf: gdk-pixbuf-2.23.0.patch makefile.mk
Date Sat, 10 Sep 2011 18:09:27 GMT
Author: erack
Date: Sat Sep 10 18:09:27 2011
New Revision: 1167574

URL: http://svn.apache.org/viewvc?rev=1167574&view=rev
Log:
ooo34gsl01: #i117732# patch to make configure work with homebrew (thanks hbrinkm !)

# User Philipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM>

Modified:
    incubator/ooo/trunk/main/gdk-pixbuf/gdk-pixbuf-2.23.0.patch
    incubator/ooo/trunk/main/gdk-pixbuf/makefile.mk

Modified: incubator/ooo/trunk/main/gdk-pixbuf/gdk-pixbuf-2.23.0.patch
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/gdk-pixbuf/gdk-pixbuf-2.23.0.patch?rev=1167574&r1=1167573&r2=1167574&view=diff
==============================================================================
--- incubator/ooo/trunk/main/gdk-pixbuf/gdk-pixbuf-2.23.0.patch (original)
+++ incubator/ooo/trunk/main/gdk-pixbuf/gdk-pixbuf-2.23.0.patch Sat Sep 10 18:09:27 2011
@@ -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

Modified: incubator/ooo/trunk/main/gdk-pixbuf/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/gdk-pixbuf/makefile.mk?rev=1167574&r1=1167573&r2=1167574&view=diff
==============================================================================
--- incubator/ooo/trunk/main/gdk-pixbuf/makefile.mk (original)
+++ incubator/ooo/trunk/main/gdk-pixbuf/makefile.mk Sat Sep 10 18:09:27 2011
@@ -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" \



Mime
View raw message